This commit was manufactured by cvs2svn to create tag 'Root_ptp_5_0'. Sprout from master 2011-06-13 15:32:51 UTC Greg Watson <g.watson@computer.org> 'Add constructor' Delete: org.eclipse.photran-dev-docs/.cdtproject org.eclipse.photran-dev-docs/.cproject org.eclipse.photran-dev-docs/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder (1).launch org.eclipse.photran-dev-docs/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder.launch org.eclipse.photran-dev-docs/.externalToolBuilders/org.eclipse.cdt.make.core.makeBuilder.launch org.eclipse.photran-dev-docs/.project org.eclipse.photran-dev-docs/.settings/org.eclipse.cdt.core.prefs org.eclipse.photran-dev-docs/README.txt org.eclipse.photran-dev-docs/about.html org.eclipse.photran-dev-docs/contributions/debugger/! README.txt org.eclipse.photran-dev-docs/contributions/debugger/notes-from-feanil-200705.txt org.eclipse.photran-dev-docs/contributions/debugger/senior-project-final-report-200705.pdf org.eclipse.photran-dev-docs/contributions/find-references/! README.txt org.eclipse.photran-dev-docs/contributions/find-references/CONTRIB.txt org.eclipse.photran-dev-docs/contributions/find-references/ContextMenuManualTest.txt org.eclipse.photran-dev-docs/contributions/find-references/DOC.odt org.eclipse.photran-dev-docs/contributions/find-references/DOC.pdf org.eclipse.photran-dev-docs/contributions/find-references/MenuBarManualTest.txt org.eclipse.photran-dev-docs/contributions/find-references/Milestone1.txt org.eclipse.photran-dev-docs/contributions/find-references/Milestone2.txt org.eclipse.photran-dev-docs/contributions/find-references/Milestone3.txt org.eclipse.photran-dev-docs/contributions/find-references/README.odt org.eclipse.photran-dev-docs/contributions/find-references/README.pdf org.eclipse.photran-dev-docs/contributions/fixed-form-lexer/! README.txt org.eclipse.photran-dev-docs/contributions/fixed-form-lexer/correspondence.txt org.eclipse.photran-dev-docs/contributions/fortran-nature/! README.txt org.eclipse.photran-dev-docs/contributions/fortran-nature/correspondence.txt org.eclipse.photran-dev-docs/contributions/fortran-nature/screenshot.gif org.eclipse.photran-dev-docs/contributions/help-plugin/correspondence.txt org.eclipse.photran-dev-docs/contributions/refactorings-cs427-fa10/Remove Obsolete Language Features (332492).pdf org.eclipse.photran-dev-docs/dev-guide/.cvsignore org.eclipse.photran-dev-docs/dev-guide/app-contributing.ltx-inc org.eclipse.photran-dev-docs/dev-guide/app-cvs-maint.ltx-inc org.eclipse.photran-dev-docs/dev-guide/app-cvs.ltx-inc org.eclipse.photran-dev-docs/dev-guide/app-deploy.ltx-inc org.eclipse.photran-dev-docs/dev-guide/app-error-parsers.ltx-inc org.eclipse.photran-dev-docs/dev-guide/app-generating-help.ltx-inc org.eclipse.photran-dev-docs/dev-guide/app-history.ltx-inc org.eclipse.photran-dev-docs/dev-guide/app-launch.ltx-inc org.eclipse.photran-dev-docs/dev-guide/app-new-syntax.ltx-inc org.eclipse.photran-dev-docs/dev-guide/app-obfuscate-fortran.ltx-inc org.eclipse.photran-dev-docs/dev-guide/app-rename-tests.ltx-inc org.eclipse.photran-dev-docs/dev-guide/app-tests.ltx-inc org.eclipse.photran-dev-docs/dev-guide/app-uiuc.ltx-inc org.eclipse.photran-dev-docs/dev-guide/build.sh org.eclipse.photran-dev-docs/dev-guide/build.xml org.eclipse.photran-dev-docs/dev-guide/cha-ast-vpg.ltx-inc org.eclipse.photran-dev-docs/dev-guide/cha-cdt.ltx-inc org.eclipse.photran-dev-docs/dev-guide/cha-checklist.ltx-inc org.eclipse.photran-dev-docs/dev-guide/cha-editor.ltx-inc org.eclipse.photran-dev-docs/dev-guide/cha-intro.ltx-inc org.eclipse.photran-dev-docs/dev-guide/cha-parsing.ltx-inc org.eclipse.photran-dev-docs/dev-guide/cha-plugins.ltx-inc org.eclipse.photran-dev-docs/dev-guide/cha-refactoring.ltx-inc org.eclipse.photran-dev-docs/dev-guide/cvs-instructions.ltx org.eclipse.photran-dev-docs/dev-guide/cvs-instructions.pdf org.eclipse.photran-dev-docs/dev-guide/dev-guide-general.ltx org.eclipse.photran-dev-docs/dev-guide/dev-guide-general.pdf org.eclipse.photran-dev-docs/dev-guide/dev-guide-specialized.ltx org.eclipse.photran-dev-docs/dev-guide/dev-guide-specialized.pdf org.eclipse.photran-dev-docs/dev-guide/find-pdflatex.sh org.eclipse.photran-dev-docs/dev-guide/images/diagrams/editor_hierarchy.graffle org.eclipse.photran-dev-docs/dev-guide/images/diagrams/parser_chain.graffle org.eclipse.photran-dev-docs/dev-guide/images/diagrams/photran_architecture.graffle org.eclipse.photran-dev-docs/dev-guide/images/editor_hierarchy.png org.eclipse.photran-dev-docs/dev-guide/images/parser_chain.png org.eclipse.photran-dev-docs/dev-guide/images/parsetree1.png org.eclipse.photran-dev-docs/dev-guide/images/photran_architecture.pdf org.eclipse.photran-dev-docs/dev-guide/images/photran_architecture.png org.eclipse.photran-dev-docs/dev-guide/images/sample_vpg.png org.eclipse.photran-dev-docs/dev-guide/images/simple_fortran_AST.png org.eclipse.photran-dev-docs/dev-guide/images/vpg_db_er.png org.eclipse.photran-dev-docs/dev-guide/prologue.ltx-inc org.eclipse.photran-dev-docs/eclipse-config/photran-code-formatter-settings.xml org.eclipse.photran-dev-docs/eclipse-config/photran-ibm-codetemplates.xml org.eclipse.photran-dev-docs/eclipse-config/photran-uiuc-codetemplates.xml org.eclipse.photran-dev-docs/misc-notes/Fortran 95 Feature Coverage.xls org.eclipse.photran-dev-docs/misc-notes/cdt-outline-view-icons.txt org.eclipse.photran-dev-docs/misc-notes/cs427fa08-mp5-summary.pdf org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/deployment.txt org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-03-cdt.tex org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-06-parser.tex org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-07-analysis.tex org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-08-symtbls.tex org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-09-refac-suppt.tex org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-10-refactoring.tex org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-a2-xyz.tex org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-a3-cdt-ext-pt.tex org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-a4-misc-notes.tex org.eclipse.photran-samples/.cdtproject org.eclipse.photran-samples/.cproject org.eclipse.photran-samples/.project org.eclipse.photran-samples/.settings/org.eclipse.cdt.core.prefs org.eclipse.photran-samples/.settings/org.eclipse.photran.core.prefs org.eclipse.photran-samples/.settings/scoped_pref_store.prefs org.eclipse.photran-samples/Makefile org.eclipse.photran-samples/liebmann-viz.gif org.eclipse.photran-samples/liebmann-viz.sh org.eclipse.photran-samples/src-common/.cvsignore org.eclipse.photran-samples/src-common/change_c.f90 org.eclipse.photran-samples/src-common/main.f90 org.eclipse.photran-samples/src-cray-pointers/.cvsignore org.eclipse.photran-samples/src-cray-pointers/cray-pointers.f90 org.eclipse.photran-samples/src-fixed-form-1/.cvsignore org.eclipse.photran-samples/src-fixed-form-1/hello.f org.eclipse.photran-samples/src-fixed-form-2/.cvsignore org.eclipse.photran-samples/src-fixed-form-2/Makefile org.eclipse.photran-samples/src-fixed-form-2/sample.f org.eclipse.photran-samples/src-fortran-and-c/Makefile org.eclipse.photran-samples/src-fortran-and-c/c.c org.eclipse.photran-samples/src-fortran-and-c/fortran.f90 org.eclipse.photran-samples/src-fortran2003/.cvsignore org.eclipse.photran-samples/src-fortran2003/01-class.f03 org.eclipse.photran-samples/src-fortran2003/02-inheritance.f03 org.eclipse.photran-samples/src-fortran2003/03-destructor.f03 org.eclipse.photran-samples/src-fortran2003/Makefile org.eclipse.photran-samples/src-fortran2003/char-fn-test.f03 org.eclipse.photran-samples/src-fortran2003/nag-bug.f03 org.eclipse.photran-samples/src-fortran2003/params.f03 org.eclipse.photran-samples/src-fortran2003/stream-io.f03 org.eclipse.photran-samples/src-fortran2003/string.f03 org.eclipse.photran-samples/src-fortran2003/xlf-bug.f03 org.eclipse.photran-samples/src-fortran2003/xlf-bug2.f03 org.eclipse.photran-samples/src-fortran2003/xlf-crash.f03 org.eclipse.photran-samples/src-fortran2008/.cvsignore org.eclipse.photran-samples/src-fortran2008/01-submodules.f08 org.eclipse.photran-samples/src-fortran2008/02-mpsubprog.f08 org.eclipse.photran-samples/src-fortran2008/03-block-construct.f08 org.eclipse.photran-samples/src-fortran2008/04-coarray-decl-1.f08 org.eclipse.photran-samples/src-fortran2008/05-coarray-decl-2.f08 org.eclipse.photran-samples/src-fortran2008/06-coarray-target.f08 org.eclipse.photran-samples/src-fortran2008/07-coarray-exprs.f08 org.eclipse.photran-samples/src-fortran2008/08-complex-part-desig.f08 org.eclipse.photran-samples/src-fortran2008/09-critical-construct.f08 org.eclipse.photran-samples/src-fortran2008/10-allstop-stmt.f08 org.eclipse.photran-samples/src-fortran2008/11-sync-stmts.f08 org.eclipse.photran-samples/src-fortran2008/12-lock-stmts.f08 org.eclipse.photran-samples/src-fortran2008/Makefile org.eclipse.photran-samples/src-gaussian-elimination/.cvsignore org.eclipse.photran-samples/src-gaussian-elimination/gauselim.f90 org.eclipse.photran-samples/src-implicits-1/.cvsignore org.eclipse.photran-samples/src-implicits-1/hello.f90 org.eclipse.photran-samples/src-implicits-2/.cvsignore org.eclipse.photran-samples/src-implicits-2/fortran.f90 org.eclipse.photran-samples/src-implicits-3/.cvsignore org.eclipse.photran-samples/src-implicits-3/crazyimplicits.f90 org.eclipse.photran-samples/src-includes/.cvsignore org.eclipse.photran-samples/src-includes/inc.h org.eclipse.photran-samples/src-includes/innocuous.f90 org.eclipse.photran-samples/src-includes/main.doesnotcompile org.eclipse.photran-samples/src-interfaces/.cvsignore org.eclipse.photran-samples/src-interfaces/gfortran_compile_error.txt org.eclipse.photran-samples/src-interfaces/interfaces.f90 org.eclipse.photran-samples/src-language-features/.cvsignore org.eclipse.photran-samples/src-language-features/almost-exhaustive.f90 org.eclipse.photran-samples/src-liebmann-1-eoshift/.cvsignore org.eclipse.photran-samples/src-liebmann-1-eoshift/liebmann.f90 org.eclipse.photran-samples/src-liebmann-2-arrays/.cvsignore org.eclipse.photran-samples/src-liebmann-2-arrays/liebmann.f90 org.eclipse.photran-samples/src-liebmann-3-loops/.cvsignore org.eclipse.photran-samples/src-liebmann-3-loops/liebmann.f90 org.eclipse.photran-samples/src-line-fitting/.cvsignore org.eclipse.photran-samples/src-line-fitting/bstfit.f90 org.eclipse.photran-samples/src-modules-addl/.cvsignore org.eclipse.photran-samples/src-modules-addl/Makefile org.eclipse.photran-samples/src-modules-addl/import-rename-bug-1.f90 org.eclipse.photran-samples/src-modules-addl/import-rename-bug-2.f90 org.eclipse.photran-samples/src-modules-addl/transitive-import.f90 org.eclipse.photran-samples/src-modules/.cvsignore org.eclipse.photran-samples/src-modules/module1.f90 org.eclipse.photran-samples/src-modules/module2.f90 org.eclipse.photran-samples/src-modules/zmain.f90 org.eclipse.photran-samples/src-op-overload/.cvsignore org.eclipse.photran-samples/src-op-overload/op.f90 org.eclipse.photran-samples/src-scoping/.cvsignore org.eclipse.photran-samples/src-scoping/scoping.f90 org.eclipse.photran-samples/src-types/.cvsignore org.eclipse.photran-samples/src-types/types.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/.classpath org.eclipse.photran.core.vpg.preprocessor.c.tests/.project org.eclipse.photran.core.vpg.preprocessor.c.tests/.settings/org.eclipse.jdt.core.prefs org.eclipse.photran.core.vpg.preprocessor.c.tests/.settings/org.eclipse.jdt.ui.prefs org.eclipse.photran.core.vpg.preprocessor.c.tests/META-INF/MANIFEST.MF org.eclipse.photran.core.vpg.preprocessor.c.tests/about.html org.eclipse.photran.core.vpg.preprocessor.c.tests/build.properties org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/extractvariable/ExtractVariable.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/extractvariable/ExtractVariableAfter.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/MainProgramRefactoringAfter.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/MainProgramRefactoringBefore.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/Subroutine2RefactoringsAfter.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/Subroutine2RefactoringsBefore.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/SubroutineRefactoringAfter.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/SubroutineRefactoringBefore.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/SubroutineThatHasAnImplicitStmt.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/SubroutineWithDecalaredVarsRefactoringBefore.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/SubroutineWithDeclaredVarsRefactoringAfter.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test1aRefactored.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test1abOriginal.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test1bRefactored.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test2Original.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test3Original.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test4Original.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test4Refactored.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro1.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro2.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro3.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro4.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro5.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro6.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/basic_function_test.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/constant_test.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/empty_macro_test.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/indirect_macro_test.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/newline_bug_test.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/trigraph_splice_macro_test.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/basic_included.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/basic_includer.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/commented_included.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/commented_includer.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/deep_includer.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/directive_includer.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/empty_file.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/empty_includer.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/failing_includer.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/if_test.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/at_sign_test.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/backslash_test.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/comment_test.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/end_of_file_directive_test.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/end_of_file_test.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/line_splice_test.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/pound_test.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/token_test.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/trigraph_test.f90 org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/AbstractCppTestCase.java org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/AbstractCppTestSuite.java org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/CppIntegratedSourceReproductionTestCase.java org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/CppIntegratedSourceReproductionTestSuite.java org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/CppIsolatedSourceReproductionTestCase.java org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/CppIsolatedSourceReproductionTestSuite.java org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintArjanVanDijkAtmos.java org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintAsteroids.java org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintBasicTestFiles.java org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintFMLIB.java org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintMacroTestFiles.java org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintOtherDirectiveTestFiles.java org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintPOP.java org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintProjectString.java org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintTokenTestFiles.java org.eclipse.photran.core.vpg.tests.failing/.classpath org.eclipse.photran.core.vpg.tests.failing/.project org.eclipse.photran.core.vpg.tests.failing/.settings/org.eclipse.jdt.core.prefs org.eclipse.photran.core.vpg.tests.failing/.settings/org.eclipse.jdt.ui.prefs org.eclipse.photran.core.vpg.tests.failing/META-INF/MANIFEST.MF org.eclipse.photran.core.vpg.tests.failing/build.properties org.eclipse.photran.core.vpg.tests.failing/refactoring-test-code/intro-implicit-none/test-subroutine-1/hello.f90 org.eclipse.photran.core.vpg.tests.failing/refactoring-test-code/intro-implicit-none/test-subroutine-1/hello.f90.result org.eclipse.photran.core.vpg.tests.failing/refactoring-test-code/intro-implicit-none/test-subroutine-2/hello2.f90 org.eclipse.photran.core.vpg.tests.failing/refactoring-test-code/intro-implicit-none/test-subroutine-2/hello2.f90.result org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/failing/Activator.java org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/parser/failing/00-README.txt org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/parser/failing/ParseBrainerdTestSuiteFixed.java org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/parser/failing/ParseBrainerdTestSuiteFree.java org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/parser/failing/ParseFilesFromTheWWW.java org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/failing/TestReindent.java org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/refactoring/introimplicitnone/failing/IntroImplicitTestSuite.java org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/search/failing/VPGSearchTestSuite.java org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/vpg/failing/VariableAccessTestSuite.java org.eclipse.photran.core.vpg.tests.failing/var-access-test-code/test-io/test-io.f90 org.eclipse.photran.core.vpg.tests/.classpath org.eclipse.photran.core.vpg.tests/.project org.eclipse.photran.core.vpg.tests/.settings/org.eclipse.jdt.core.prefs org.eclipse.photran.core.vpg.tests/.settings/org.eclipse.jdt.ui.prefs org.eclipse.photran.core.vpg.tests/META-INF/MANIFEST.MF org.eclipse.photran.core.vpg.tests/Makefile org.eclipse.photran.core.vpg.tests/NOTE org.eclipse.photran.core.vpg.tests/build.properties org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-allstop/test-allstop.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-allstop/test-allstop.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-arithmetic-if/test-arithmetic-if.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-arithmetic-if/test-arithmetic-if.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-assigned-goto/test-assigned-goto.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-assigned-goto/test-assigned-goto.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-associate/test-associate.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-associate/test-associate.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-block/test-block.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-block/test-block.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-computed-goto/test-computed-goto.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-computed-goto/test-computed-goto.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-critical/test-critical.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-critical/test-critical.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-cycle/test-cycle.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-cycle/test-cycle.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-do-loop/test-do-loop.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-do-loop/test-do-loop.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-do-while/test-do-while.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-do-while/test-do-while.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-forall/test-forall.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-forall/test-forall.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-function/test-function.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-function/test-function.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-goto/test-goto.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-goto/test-goto.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-if-single/test-if-single1.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-if-single/test-if-single1.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-ifconstruct/test-ifconstruct.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-ifconstruct/test-ifconstruct.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-io/test-io.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-io/test-io.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-loopswithexit/test-loopwithexit.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-loopswithexit/test-loopwithexit.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-module/test-module.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-module/test-module.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-return/test-return.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-return/test-return.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-select-type/test-select-type.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-select-type/test-select-type.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-stmt-function/test-stmt-function.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-stmt-function/test-stmt-function.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-stop/test-stop.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-stop/test-stop.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-subroutine/test-subroutine.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-subroutine/test-subroutine.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-where-construct/test-where-construct.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-where-construct/test-where-construct.f90.result org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-where-stmt/test-where-stmt.f90 org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-where-stmt/test-where-stmt.f90.result org.eclipse.photran.core.vpg.tests/parser-test-code/.cvsignore org.eclipse.photran.core.vpg.tests/parser-test-code/fortran2003_tests/fortran2003-syntax.f03 org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/extractvariable/ExtractVariable.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/extractvariable/ExtractVariableAfter.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/MainProgramRefactoringAfter.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/MainProgramRefactoringBefore.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/Subroutine2RefactoringsAfter.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/Subroutine2RefactoringsBefore.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/SubroutineRefactoringAfter.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/SubroutineRefactoringBefore.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/SubroutineThatHasAnImplicitStmt.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/SubroutineWithDecalaredVarsRefactoringBefore.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/SubroutineWithDeclaredVarsRefactoringAfter.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test1aRefactored.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test1abOriginal.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test1bRefactored.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test2Original.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test3Original.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test4Original.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test4Refactored.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/AssignResult.F90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/BlockData.F90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/ConstSubstring.F90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/DblPrecDim.F90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/FormatTest.F90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/Function.F90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/ImplicitTest.F90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/IntentTest.F90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/LineContinuationTest.F90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/OperatorStarTest.F90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/ParenSlash.F90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug118954-todo.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug118955.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug118965.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug126383.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug126546.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug126547.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug126548.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug138221.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug167734.f org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug193031.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug193196.f org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug195801.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug212606-todo.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug212606.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug276186.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug294055.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug298895.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug300931.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug304269.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug305134.f org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug305134_sub_module_TnumERROR.f org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug305134_sub_module_TnumOK.f org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug308196.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug308197.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug314450.f03 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug320148.f org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug320148.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug329745a1.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug329745a2.F90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug329745b.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug329745c.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug331850.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug337623.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/formatbugs.f90 org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/valref.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test1/test1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test1/test1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test2/test2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test3/test3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test4/test4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test5/test5.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test5/test5.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test1/test1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test1/test1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test2/test2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test2/test2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test3/test3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test3/test3.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test4/test4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test4/test4.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test5/test5.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test5/test5.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test6/test6.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test6/test6.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test1/module2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test1/module3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test1/module4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test1/test1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test1/test1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test2/module2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test2/module3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test2/module4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test2/test2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test2/test2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test3/module2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test3/module3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test3/module4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test3/module5.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test3/test3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test4/module2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test4/module3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test4/module4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test4/module5.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test4/test3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test5/module2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test5/module3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test5/module4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test5/module5.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test5/test3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test6/module4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test6/test6.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test7/module4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test7/test7.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test8/module4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test8/test8.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test8/test8.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test9/module.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test9/test9.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test9/test9.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test1-basic/add_subroutine_parameter_1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test1-basic/add_subroutine_parameter_1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test10-fail-invalidtype/add_subroutine_parameter_10.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test11-updatecallsitewhenvariablenamesaddedincall/add_subroutine_parameter_11.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test11-updatecallsitewhenvariablenamesaddedincall/add_subroutine_parameter_11.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test12-includevalidattributes/add_subroutine_parameter_12.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test12-includevalidattributes/add_subroutine_parameter_12.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test13-fail-invalidattribute/add_subroutine_parameter_13.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test14-fail-conflictingattributes/add_subroutine_parameter_14.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test15-fail-conflictingvariablenames/add_subroutine_parameter_15.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test16-fail-whitespacevariablename/add_subroutine_parameter_16.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test17-fail-parameternamebeginswithnumber/add_subroutine_parameter_17.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test18-fail-defaultvalueisvariablestartingwithnumber/add_subroutine_parameter_18.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test19-fail-defaultvalueisrealwhentypeisinteger/add_subroutine_parameter_19.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test2-updatecallsite/add_subroutine_parameter_2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test2-updatecallsite/add_subroutine_parameter_2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test20-fail-defaultvalueisnumberwhentypeisnonnumber/add_subroutine_parameter_20.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test21-fail-defaultvalueisnullwhentypeisnotpointer/add_subroutine_parameter_21.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test22-basicpointer/add_subroutine_parameter_22.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test22-basicpointer/add_subroutine_parameter_22.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test3-updatecallsitewithorder/add_subroutine_parameter_3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test3-updatecallsitewithorder/add_subroutine_parameter_3.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test4-fail-negativeposition/add_subroutine_parameter_4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test5-fail-outofboundsposition/add_subroutine_parameter_5.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test6-fail-whitespacedefaultvalue/add_subroutine_parameter_6.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test7-basicarray/add_subroutine_parameter_7.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test7-basicarray/add_subroutine_parameter_7.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test8-logicalbasic/add_subroutine_parameter_8.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test8-logicalbasic/add_subroutine_parameter_8.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test9-dontsetvariabletype/add_subroutine_parameter_9.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test9-dontsetvariabletype/add_subroutine_parameter_9.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test-array/test-array.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test-array/test-array.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test-pointer/test-pointer.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test-pointer/test-pointer.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test1/dataToParameter.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test1/dataToParameter.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-dt/test-encap-01c-basic-dt.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-dt/test-encap-01c-basic-dt.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-integer/test-encap-01a-basic-integer.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-integer/test-encap-01a-basic-integer.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-real/test-encap-01b-basic-real.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-real/test-encap-01b-basic-real.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-contains/test-encap-02-contains.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-contains/test-encap-02-contains.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-expr/test-encap-03-expr.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-expr/test-encap-03-expr.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-allocatable1/test-encap-06c-fail-allocatable1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-allocatable2/test-encap-06d-fail-allocatable2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-array/test-encap-06a-fail-array.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-conflict/test-encap-05a-fail-conflict.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-pointer/test-encap-06b-fail-pointer.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-target/test-encap-06e-fail-target.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-nosetter-parameter/test-encap-04-nosetter-parameter.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-simple/module1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-simple/module1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-simple/test-simple01.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-simple/test-simple01.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test1-basic/extract_local_1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test1-basic/extract_local_1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test2-formatting/extract_local_2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test2-formatting/extract_local_2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test3-fail-precedence/extract_local_3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test4-fail-conflict/extract_local_4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test01-simple.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test01-simple.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test02-locals.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test02-locals.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test03-locals2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test03-locals2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test04-in-loop.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test04-in-loop.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test05-parameter.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test05-parameter.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test06-parameter.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test06-parameter.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test07-attribs.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test07-attribs.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test08-charlen.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test08-charlen.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/increment-decrement-fusion/incrementDecrementTest.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/increment-decrement-fusion/incrementDecrementTest.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/simple-fuse-test/simpleFusionTest.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/simple-fuse-test/simpleFusionTest.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/two-decremented-loops/decrementedLoopsTest.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/two-decremented-loops/decrementedLoopsTest.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test01-fail-notAValidIfStatement/convertIfStatementToIfConstruct_InvalidIfStatement.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test02-convert_ifConstructToIfStmt/convert_ifConstruct.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test02-convert_ifConstructToIfStmt/convert_ifConstruct.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test03-fail-ifNamedVariable/convert_ifStatement_ifNamedVariable.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test04-complexboolean/ifStmtComplexBoolean_1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test04-complexboolean/ifStmtComplexBoolean_1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test05-complexboolean/ifStmtComplexBoolean_2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test05-complexboolean/ifStmtComplexBoolean_2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test06-convertifStmt/convertIfStatementToIfConstruct.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test06-convertifStmt/convertIfStatementToIfConstruct.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test07-ifConstructToStmtBasic/ifConstructToStmtBasic_1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test07-ifConstructToStmtBasic/ifConstructToStmtBasic_1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test08-nonIfToken/nonIfToken_fail.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test09-ifConstructComplexBoolean/ifConstructComplexBoolean_1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test09-ifConstructComplexBoolean/ifConstructComplexBoolean_1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test10-namedIfConstruct/namedIfConstruct_fail.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test11-multiLineIfConstructToIfStatement-failure/multiLineIfConstructToIfStmt.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test12-generalIfConstToIfStmt-failure/generalIfConstToIfStmt.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test13-fail-multipleIfSelections1/multipleIfSelections1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test14-fail-multipleIfSelections2/multipleIfSelections2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test15-commentInIfConstructToIfStmt/commentIfConstructToIfStmt.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test15-commentInIfConstructToIfStmt/commentIfConstructToIfStmt.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test16-commentInIfStmtToIfConstruct/commentInIfStmtToIfConst.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test16-commentInIfStmtToIfConstruct/commentInIfStmtToIfConst.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test17-reindentIfConstruct/reindentIfConstruct.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test17-reindentIfConstruct/reindentIfConstruct.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test18-commentHandling/commentHandling.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test18-commentHandling/commentHandling.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test19-optionalElse/optionalElse.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test19-optionalElse/optionalElse.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test20-optionalElseNotAdded/optionalElseNotAdded.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test20-optionalElseNotAdded/optionalElseNotAdded.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/check-can-add-decl/external.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/check-can-add-decl/main.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/check-can-add-decl/module.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/01-simple.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/01-simple.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/02-end-after.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/02-end-after.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/03-blank-after.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/03-blank-after.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/04-guess-indent.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/04-guess-indent.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/05-eachline-test.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/05-eachline-test.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/06-continuation-test.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/06-continuation-test.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/07-singleLineIf-test.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/07-singleLineIf-test.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/08-labelAndComments-test.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/08-labelAndComments-test.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/09-bug331904.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/09-bug331904.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/10-continue.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/10-continue.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/11-select-case.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/11-select-case.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/12-line-continuations.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/12-line-continuations.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-1-initial.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-2-proggie-shorter.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-3-proggie-longer.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-4-q-cut.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-5-q-pasted.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-6-q-pasted-at-bottom.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-7-q-pasted-formatted.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-8-q-pasted-at-bottom-formatted.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-9-t-above-q.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-single/test-single-loop.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-single/test-single-loop.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-triple1/test-triple-loop.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-triple1/test-triple-loop.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-triple2/test-triple-loop2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-triple2/test-triple-loop2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test1-simple/test01-simple.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test1-simple/test01-simple.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test2-simple/test02-simple.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test2-simple/test02-simple.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-big-expression/bigexpression.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-big-expression/bigexpression.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-crazy-implicits/crazyimplicits.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-crazy-implicits/crazyimplicits.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-format-stmt/bug306444.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-format-stmt/bug306444.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-fortran/fortran.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-fortran/fortran.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-implicit-subprog/implicit-subprog.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-implicit-subprog/implicit-subprog.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-two-files1/crazyimplicits.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-two-files1/crazyimplicits.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-two-files2/fortran.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-two-files2/fortran.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/simple1/01-simple.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/simple1/01-simple.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/two-files1/01-simple.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/two-files1/01-simple.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/two-files2/02-end-after.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/two-files2/02-end-after.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test0.1/justCommons1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test0.1/justCommons1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test0.2/justCommons2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test0.2/justCommons2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common3.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common4.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test2.1/namesProv1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test2.1/namesProv1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test2.2/namesProv2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test2.2/namesProv2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test4.1/short1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test4.1/short1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test4.2/short2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test4.2/short2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.1/common1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.1/common2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.1/common3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.1/common4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.2/common1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.2/common2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.2/common3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.2/common4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test6.1/typesDiffer1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test6.2/typesDiffer1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test6.3/typesDiffer2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/priv1/priv1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/priv1/priv1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/priv2/priv2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/priv2/priv2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test10/priv2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test10/testFile1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test12/test12.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test12/test12.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test13/test13.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test3/test3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test3/test3.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test4/test4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test4/test4.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test5/test5.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test5/test5.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test6/test6.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test6/test6.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test7/test7.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test7/test7.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test7_1/test7_1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test7_1/test7_1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test8/priv1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test9/priv1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test9/testFile1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.1/make_save_1_1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.1/make_save_1_1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.2/make_save_1_2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.2/make_save_1_2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.3/make_save_1_3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.3/make_save_1_3.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.4/make_save_1_4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.4/make_save_1_4.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.1/make_save_2_1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.1/make_save_2_1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.2/make_save_2_2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.2/make_save_2_2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.3/make_save_2_3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.3/make_save_2_3.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-3/test-3.1/make_save_3_1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-3/test-3.1/make_save_3_1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-3/test-3.2/make_save_3_2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-3/test-3.2/make_save_3_2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.1/make_save_4_1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.1/make_save_4_1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.2/make_save_4_2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.2/make_save_4_2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.3/make_save_4_3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.3/make_save_4_3.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.4/make_save_4_4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.4/make_save_4_4.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.5/make_save_4_5.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.5/make_save_4_5.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.1/make_save_5_1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.1/make_save_5_1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.2/make_save_5_2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.2/make_save_5_2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.3/make_save_5_3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.3/make_save_5_3.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.4/make_save_5_4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.4/make_save_5_4.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.1/make_save_6_1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.1/make_save_6_1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.2/make_save_6_2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.2/make_save_6_2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.3/make_save_6_3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.3/make_save_6_3.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.4/make_save_6_4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.4/make_save_6_4.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.5/make_save_6_5.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.5/make_save_6_5.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.1/make_save_7_1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.1/make_save_7_1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.2/make_save_7_2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.2/make_save_7_2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.3/make_save_7_3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.3/make_save_7_3.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.1/make_save_8_1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.1/make_save_8_1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.2/make_save_8_2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.2/make_save_8_2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.3/make_save_8_3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.3/make_save_8_3.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test1/module.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test1/test1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test1/test1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test10/program1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test10/program1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test2/module.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test2/test2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test2/test2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test3/module.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test3/test3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test3/test3.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test4/module.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test4/test4_5.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test5/module.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test5/test4_5.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test6/module.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test6/test6.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test7/module.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test7/test7.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test8/program3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test8/program3.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test9/program2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test9/program2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/move-saved-to-common-block/test1/test1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/move-saved-to-common-block/test1/test1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/move-saved-to-common-block/test2/test2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/move-saved-to-common-block/test2/test2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-alternate-return/test-alternate-return.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-alternate-return/test-alternate-return.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-basic/test-basic.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-basic/test-basic.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-interface/test-interface.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-interface/test-interface.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-interface2/test-interface2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-interface2/test-interface2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-internal-subroutine/test-internal-subroutine.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-internal-subroutine/test-internal-subroutine.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-no-arguments/test-no-arguments.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-optional-arguments/test-optional-arguments.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-optional-arguments/test-optional-arguments.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test1/test1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test1/test1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test2/test2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test2/test2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test3/test3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test3/test3.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test4/test4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test4/test4.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test5/bug335794.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test5/bug335794.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos-white-box/one_label_no_goto.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos-white-box/one_label_no_goto.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test01/one_label_no_goto.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test01/one_label_no_goto.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test02/one_label_one_address.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test02/one_label_one_address.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test03/one_label_three_addresses.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test03/one_label_three_addresses.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test04/two_labels_no_goto.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test04/two_labels_no_goto.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test05/two_labels_one_address.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test05/two_labels_one_address.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test06/two_labels_three_addresses.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test06/two_labels_three_addresses.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test07/one_label_reassign_address.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test07/one_label_reassign_label.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test08/two_label_same_address.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test08/two_labels_same_address.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test09/one_label_goto_two_different_addresses.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test09/one_label_goto_two_different_addresses.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test10/comment_assign_and_goto.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test11/comment_assign_valid_goto.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test12/valid_assign_comment_goto.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test12/valid_assign_comment_goto.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test13/split_assign_to_two_lines.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test13/split_assign_to_two_lines.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test14/one_label_no_goto_no_address.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test15/use_label_in_equivalence.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test15/use_label_in_equivalence.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test16/use_label_in_subroutine.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test17/use_label_in_write.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test18/use_label_in_assignment.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test19/use_label_in_declaration.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test19/use_label_in_declaration.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test20/use_label_in_common_block.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test20/use_label_in_common_block.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test21/two_assign_same_label_withgotos.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test21/two_assign_same_label_withgotos.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test22/one_label_one_address_no_default.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test22/one_label_one_address_no_default.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test23/one_label_goto_two_different_addresses_no_default.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test23/one_label_goto_two_different_addresses_no_default.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test24/one_goto_with_statement_label.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test24/one_goto_with_statement_label.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_from_Inside_and_outside_if_block/branch_from_Inside_and_outside_if_block.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_from_Inside_and_outside_if_block/branch_from_Inside_and_outside_if_block.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_from_inside_and_outside_if_block_no_do_loop/branch_from_inside_and_outside_if_block_no_do_loop.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_from_inside_and_outside_if_block_no_do_loop/branch_from_inside_and_outside_if_block_no_do_loop.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_to_immediate_end_if_from_else/branch_to_immediate_end_if_from_else.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_to_immediate_end_if_from_else/branch_to_immediate_end_if_from_else.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_If_block_branch_from_else/nested_If_block_branch_from_else.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_If_block_branch_from_else/nested_If_block_branch_from_else.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_basic/nested_if_block_basic.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_basic/nested_if_block_basic.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_branch_to_immediate_inner_end_if/nested_if_block_branch_to_immediate_inner_end_if.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_branch_to_immediate_inner_end_if/nested_if_block_branch_to_immediate_inner_end_if.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_branch_to_immediate_outer_end_if/nested_if_block_branch_to_immediate_outer_end_if.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_branch_to_immediate_outer_end_if/nested_if_block_branch_to_immediate_outer_end_if.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_end_if_label/test-branch_end_if_label.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_end_if_label/test-branch_end_if_label.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_to_immediate_end_if/test-branch_to_immediate_end_if.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_to_immediate_end_if/test-branch_to_immediate_end_if.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_to_immediate_end_if_with_continue_after_end_if/test-branch_to_immediate_end_if_with_continue_after_end_if.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_to_immediate_end_if_with_continue_after_end_if/test-branch_to_immediate_end_if_with_continue_after_end_if.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-end_if_label_between_branch_to_end_if/test-end_if_label_between_branch_to_end_if.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-end_if_label_between_branch_to_end_if/test-end_if_label_between_branch_to_end_if.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-endif_continue_branch-1/test-endif_continue_branch-1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-endif_continue_branch-1/test-endif_continue_branch-1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-endif_duplicate_continue/test-endif_duplicate_continue.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-endif_duplicate_continue/test-endif_duplicate_continue.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-invalid_selection/test-invalid_selection.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-invalid_selection/test-invalid_selection.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-nested_if_blocks/test-nested_if_blocks.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-nested_if_blocks/test-nested_if_blocks.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-no_branch_to_end_if_label/test-no_branch_to_end_if_label.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-no_branch_to_end_if_label/test-no_branch_to_end_if_label.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-numbered_statement_after_continue/test-numbered_statement_after_continue.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-numbered_statement_after_continue/test-numbered_statement_after_continue.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test1/test1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test1/test1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test2/test2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test2/test2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test3/test3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test3/test3.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test4/test4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test5/test5.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test5/test5.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_as_only_stmt/pause_as_only_stmt.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_as_only_stmt/pause_as_only_stmt.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_in_subroutine/pause_in_subroutine.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_in_subroutine/pause_in_subroutine.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_nested_in_if_and_do_loop/pause_nested_in_if_and_do_loop.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_nested_in_if_and_do_loop/pause_nested_in_if_and_do_loop.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_no_message/pause_no_message.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_no_message/pause_no_message.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_not_selected/pause_not_selected.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_not_selected/pause_not_selected.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/equal-lb-ub/equal-lb-ub.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/equal-lb-ub/equal-lb-ub.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/integer-control-variable/integer-control-variable.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/integer-control-variable/integer-control-variable.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-do-while/nested-do-double-inner-decrement-do-while.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-do-while/nested-do-double-inner-decrement-do-while.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-implicit-do-while/nested-do-double-inner-decrement-implicit-do-while.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-implicit-do-while/nested-do-double-inner-decrement-implicit-do-while.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-implicit/nested-do-double-inner-decrement-implicit.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-implicit/nested-do-double-inner-decrement-implicit.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement/nested-do-double-inner-decrement.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement/nested-do-double-inner-decrement.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-do-while/nested-do-double-outer-increment-do-while.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-do-while/nested-do-double-outer-increment-do-while.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-implicit-do-while/nested-do-double-outer-increment-implicit-do-while.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-implicit-do-while/nested-do-double-outer-increment-implicit-do-while.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-implicit/nested-do-double-outer-increment-implicit.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-implicit/nested-do-double-outer-increment-implicit.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment/nested-do-double-outer-increment.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment/nested-do-double-outer-increment.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-do-while/nested-do-real-inner-decrement-do-while.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-do-while/nested-do-real-inner-decrement-do-while.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-implicit-do-while/nested-do-real-inner-decrement-implicit-do-while.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-implicit-do-while/nested-do-real-inner-decrement-implicit-do-while.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-implicit/nested-do-real-inner-decrement-implicit.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-implicit/nested-do-real-inner-decrement-implicit.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement/nested-do-real-inner-decrement.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement/nested-do-real-inner-decrement.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-do-while/nested-do-real-outer-increment-do-while.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-do-while/nested-do-real-outer-increment-do-while.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-implicit-do-while/nested-do-real-outer-increment-implicit-do-while.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-implicit-do-while/nested-do-real-outer-increment-implicit-do-while.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-implicit/nested-do-real-outer-increment-implicit.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-implicit/nested-do-real-outer-increment-implicit.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment/nested-do-real-outer-increment.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment/nested-do-real-outer-increment.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/test-invalid-selection/test-invalid-selection.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/test-invalid-selection/test-invalid-selection.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/uncontrolled-do-loop/uncontrolled-do-loop.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/uncontrolled-do-loop/uncontrolled-do-loop.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test1/remove-unreferenced-labels-test1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test1/remove-unreferenced-labels-test1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test2/remove-unreferenced-labels-test2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test2/remove-unreferenced-labels-test2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test3/remove-unreferenced-labels-test3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test3/remove-unreferenced-labels-test3.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unused-local-vars/test1/unused_variables.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unused-local-vars/test1/unused_variables.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unused-local-vars/test2/unused_variables_2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unused-local-vars/test2/unused_variables_2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/.cvsignore org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/Makefile org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278103-mod.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278103-prog.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278103-subs.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278106-visibility.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278320-mod.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278320-prog.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278324.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename-extsub1-a.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename-extsub1-b.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename-fn-result.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename-overloads.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename3a.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename3b.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename3c.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename4a.fh org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename4b.fh org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename5.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename6.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename7.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename8.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename9.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename9a.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-character-star/test1/Test1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-character-star/test1/Test1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test1/test1.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test1/test1.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test2/test2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test2/test2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test3/test3.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test3/test3.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test4/test4.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test4/test4.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test5/test5.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test5/test5.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-decrement-loop/reverseDecrementedLoop.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-decrement-loop/reverseDecrementedLoop.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-loop-with-comment/reverseLoopWithComment.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-loop-with-comment/reverseLoopWithComment.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-nested-loops/reverseNested.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-nested-loops/reverseNested.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-nested-loops2/reverseNested2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-nested-loops2/reverseNested2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-reverse-with-expression/reverseLoopWithExpression.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-reverse-with-expression/reverseLoopWithExpression.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-simple-loop/reverseLoopRefactoring.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-simple-loop/reverseLoopRefactoring.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/standardize-stmts/test1/standardize_statements.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/standardize-stmts/test1/standardize_statements.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/standardize-stmts/test2/standardize_statements_2.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/standardize-stmts/test2/standardize_statements_2.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/all-identifiers/testAllIdentifiers.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/all-identifiers/testAllIdentifiers.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/sLoop-lowerBound-dependency/lowerBoundDependency.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/sLoop-lowerBound-dependency/lowerBoundDependency.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/sLoop-upperBound-dependency/loopUpperBoundDependency.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/sLoop-upperBound-dependency/loopUpperBoundDependency.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/simple-tiling-test/simpleTilingTest.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/simple-tiling-test/simpleTilingTest.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/before-and-after/beforeAndAfter.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/before-and-after/beforeAndAfter.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complete-unroll-with-step/completeUnrollWithStep.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complete-unroll-with-step/completeUnrollWithStep.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complex-body-unroll2/ComplexBodyCompleteUnroll.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complex-body-unroll2/ComplexBodyCompleteUnroll.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complexLoopBodyUnroll/complexLoopBodyUnroll.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complexLoopBodyUnroll/complexLoopBodyUnroll.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/decrement-loop-partial/decrementLoopPartial.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/decrement-loop-partial/decrementLoopPartial.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/decrement-loop/decrementLoopComplete.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/decrement-loop/decrementLoopComplete.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/nested-loop-unroll/nestedLoopUnroll.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/nested-loop-unroll/nestedLoopUnroll.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/simple-complete-unroll/simpleCompleteUnroll.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/simple-complete-unroll/simpleCompleteUnroll.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/test-simple-loop/testSimpleLoop.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/test-simple-loop/testSimpleLoop.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/testUnrollWithStep/unrollWithStep.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/testUnrollWithStep/unrollWithStep.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/unroll-with-expr-arg/unrollWithExpr.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/unroll-with-expr-arg/unrollWithExpr.f90.result org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/upper-bound-int-expr/unrollWithUpperIntExpr.f90 org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/upper-bound-int-expr/unrollWithUpperIntExpr.f90.result org.eclipse.photran.core.vpg.tests/search-test-code/foo.f90 org.eclipse.photran.core.vpg.tests/search-test-code/implicitTest.f90 org.eclipse.photran.core.vpg.tests/search-test-code/moduleInclusion.F90 org.eclipse.photran.core.vpg.tests/search-test-code/nameScoping.F90 org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/Activator.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/PhotranASTTestCase.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/PhotranRefactoringTestSuiteFromMarkers.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/PhotranTestCase.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/PhotranTestSuiteFromFiles.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/PhotranWorkspaceTestCase.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/dependence/AbstractDependencesTestCase.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/dependence/ArrayReferenceTest.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/dependence/DependencesTest.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/flow/ControlFlowTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/types/TypeCheckerTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/types/TypeCheckerTests.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/MultiTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseArjanVanDijkAtmos.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseAsteroids.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseBrainerdFortran2003.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseBrainerdTestSuiteFixed.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseBrainerdTestSuiteFree.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseCoarraySamples.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseCollections.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseFMLIB.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseFilesFromTheWWW.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseFortran2003TestFiles.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseHugeFile.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseIBEAMCppMod.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseLAPACK.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseNagleFortran2003.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParsePOP.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParsePhotranSamples.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseProjectCInterop.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseProjectGTKHello.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseProjectString.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseRefactoringTestFiles.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseRegressionTestFiles.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseWRF.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/TestOpenMPComments.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/patternmatching/TestIdentMatch.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/AddIdentifierToEndTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/AddOnlyToUseTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/AddSubroutineParameterTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/DataToParameterTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/EncapsulateVariableTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/ExtractLocalVariableTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/FuseLoopsRefactoringTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/IfConstructStatementConversionRefactoringTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/InterchangeLoopsTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/IntroImplicitTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/KeywordCaseTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/MakeCommonConsistentTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/MakePrivateEntityPublicTestCase.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/MakeSaveExplicitTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/MinOnlyListTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/MoveSavedToCommonBlockTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/PermuteSubroutineArgsTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveArithmeticIfTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveAssignedGotoTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveAssignedGotoWhiteBoxTestCase.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveBranchToEndIfTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveComputedGoToTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemovePauseStmtTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveRealAndDoublePrecisionLoopCountersTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveUnreferencedLabelsTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveUnusedTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/ReplaceCharacterStarTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/ReplaceOldStyleDoLoopTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/ReverseLoopRefactoringTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/SafeDeleteInternalSubprogramRefactoringTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/StandardizeStmtsTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/TileLoopRefactoringTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/UnrollLoopRefactoringTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/extractprocedure/ExtractProcTestCase.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/extractprocedure/ExtractProcTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/AbstractSourceEditorTestCase.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/CheckCanAddDeclTests.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/ReindenterTestCase.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/ReindenterTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/TestChangeText.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/TestRemove.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/TestSeparatedListRemoval.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename1.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename2.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename3.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename4.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename5.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename6.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename7.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename8.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename9.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameBug278103.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameBug278106_Visibility.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameBug278320.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameBug278324.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameExtSub1.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameFnResult.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameOverloads.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameTestCase.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/search/ManualSearchPageTests.txt org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/search/VPGSearchTestCase.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/search/VPGSearchTestSuite.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/vpg/InterfaceLinkTests.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/vpg/ListAllModulesTests.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/vpg/TokenOffsetTests.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/vpg/VPGSerializerTests.java org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/vpg/VariableAccessTestSuite.java org.eclipse.photran.core.vpg.tests/type-checker-test-code/test-constants/test.f90 org.eclipse.photran.core.vpg.tests/var-access-test-code/array-test/array-test.f90 org.eclipse.photran.core.vpg.tests/var-access-test-code/assignment-test/assignment-test.f90 org.eclipse.photran.core.vpg.tests/var-access-test-code/call-test/call-test.f90 org.eclipse.photran.core.vpg.tests/var-access-test-code/forall-test/forall-test.f90 org.eclipse.photran.core.vpg.tests/var-access-test-code/test-assigned-goto/test-assigned-goto.f90 org.eclipse.photran.core.vpg.tests/var-access-test-code/test-data-reference/test-data-reference.f90 org.eclipse.photran.core.vpg.tests/var-access-test-code/test-implied-do/test-implied-do.f90 org.eclipse.photran.core.vpg.tests/var-access-test-code/test-where-construct/test-where-construct.f90 org.eclipse.photran.core.vpg.tests/vpg-test-code/interface-links/definition1.f90 org.eclipse.photran.core.vpg.tests/vpg-test-code/interface-links/definition2.f90 org.eclipse.photran.core.vpg.tests/vpg-test-code/interface-links/interface1.f90 org.eclipse.photran.core.vpg.tests/vpg-test-code/interface-links/interface2.f90 org.eclipse.photran.core.vpg.tests/vpg-test-code/list-modules/module1.f90 org.eclipse.photran.core.vpg.tests/vpg-test-code/list-modules/module2-module3.f90 org.eclipse.photran.core.vpg.tests/vpg-test-code/list-modules/module4.f90 org.eclipse.photran.core.vpg.tests/vpg-test-code/list-modules/use-module1.f90 org.eclipse.photran.core.vpg.tests/vpg-test-code/list-modules/use-module4.f90 org.eclipse.rephraserengine-support/.classpath org.eclipse.rephraserengine-support/.project org.eclipse.rephraserengine-support/.settings/org.eclipse.jdt.core.prefs org.eclipse.rephraserengine-support/.settings/org.eclipse.jdt.ui.prefs org.eclipse.rephraserengine-support/README.txt org.eclipse.rephraserengine-support/about.html org.eclipse.rephraserengine-support/build/cdtdb-4.0.3.xml org.eclipse.rephraserengine-support/distrib/cdtdb-4.0.3-cmdline.jar org.eclipse.rephraserengine-support/distrib/cdtdb-4.0.3-eclipse.jar org.eclipse.rephraserengine-support/distrib/license.html org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/core/CCorePlugin.java org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/CCorePluginResources.properties org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/BTree.java org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/Chunk.java org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/ChunkCache.java org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/DBProperties.java org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/DBStatus.java org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/Database.java org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/IBTreeComparator.java org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/IBTreeVisitor.java org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/IString.java org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/ListItem.java org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/LongString.java org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/Messages.java org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/ShortString.java org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/messages.properties org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/dom/PDOMNotImplementedError.java org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/internal/runtime/IRuntimeConstants.java org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/internal/runtime/LocalizationUtils.java org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/internal/runtime/commonMessages.properties org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/runtime/Assert.java org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/runtime/AssertionFailedException.java org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/runtime/CoreException.java org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/runtime/IStatus.java org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/runtime/Status.java org.eclipse.rephraserengine.core.vpg.tests/.classpath org.eclipse.rephraserengine.core.vpg.tests/.project org.eclipse.rephraserengine.core.vpg.tests/.settings/org.eclipse.jdt.core.prefs org.eclipse.rephraserengine.core.vpg.tests/.settings/org.eclipse.jdt.ui.prefs org.eclipse.rephraserengine.core.vpg.tests/META-INF/MANIFEST.MF org.eclipse.rephraserengine.core.vpg.tests/about.html org.eclipse.rephraserengine.core.vpg.tests/build.properties org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/dependence/GCDTestTest.java org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/dependence/IntMatrixTests.java org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/flow/FlowGraphTests.java org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/flow/ReachingDefsTest.java org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/vpg/InternalCDTDBTests.java org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/vpg/RAMDBTests.java org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/vpg/TestTokenRef.java org.eclipse.rephraserengine.doc.isv/.project org.eclipse.rephraserengine.doc.isv/META-INF/MANIFEST.MF org.eclipse.rephraserengine.doc.isv/about.html org.eclipse.rephraserengine.doc.isv/build.properties org.eclipse.rephraserengine.doc.isv/html/concepts/introduction.html org.eclipse.rephraserengine.doc.isv/html/concepts/refactorings.html org.eclipse.rephraserengine.doc.isv/html/concepts/vpg.html org.eclipse.rephraserengine.doc.isv/html/samples/samples.html org.eclipse.rephraserengine.doc.isv/html/tasks/contribute-vpg-actions-editor.html org.eclipse.rephraserengine.doc.isv/html/tasks/contribute-vpg-actions-editor.rtf org.eclipse.rephraserengine.doc.isv/html/tasks/contribute-vpg-actions-perspective.html org.eclipse.rephraserengine.doc.isv/html/tasks/contribute-vpg-actions-perspective.rtf org.eclipse.rephraserengine.doc.isv/images/architecture.graffle org.eclipse.rephraserengine.doc.isv/images/architecture.png org.eclipse.rephraserengine.doc.isv/plugin.xml org.eclipse.rephraserengine.doc.isv/toc.xml org.eclipse.rephraserengine.doc.isv/tocconcepts.xml org.eclipse.rephraserengine.doc.isv/tocsamples.xml org.eclipse.rephraserengine.doc.isv/toctasks.xml org.eclipse.rephraserengine.examples.testing/.classpath org.eclipse.rephraserengine.examples.testing/.project org.eclipse.rephraserengine.examples.testing/.settings/org.eclipse.jdt.core.prefs org.eclipse.rephraserengine.examples.testing/.settings/org.eclipse.jdt.ui.prefs org.eclipse.rephraserengine.examples.testing/META-INF/MANIFEST.MF org.eclipse.rephraserengine.examples.testing/build.properties org.eclipse.rephraserengine.examples.testing/src/org/eclipse/rephraserengine/internal/examples/testing/ForEachExamples.java org.eclipse.rephraserengine.examples.testing/src/org/eclipse/rephraserengine/internal/examples/testing/GeneralTestSuiteFromFilesExample.java org.eclipse.rephraserengine.examples.testing/src/org/eclipse/rephraserengine/internal/examples/testing/GeneralTestSuiteFromMarkersExample.java org.eclipse.rephraserengine.examples.testing/src/org/eclipse/rephraserengine/internal/examples/testing/TestSuiteFromFilesExample.java org.eclipse.rephraserengine.examples.testing/src/org/eclipse/rephraserengine/internal/examples/testing/TestSuiteFromMarkersExample.java org.eclipse.rephraserengine.examples.testing/test-files-1/file1.txt org.eclipse.rephraserengine.examples.testing/test-files-1/file2.txt org.eclipse.rephraserengine.examples.testing/test-files-2/file-with-markers-1.txt org.eclipse.rephraserengine.examples.testing/test-files-2/file-with-markers-2.txt org.eclipse.rephraserengine.examples.text/.classpath org.eclipse.rephraserengine.examples.text/.project org.eclipse.rephraserengine.examples.text/.settings/org.eclipse.jdt.core.prefs org.eclipse.rephraserengine.examples.text/.settings/org.eclipse.jdt.ui.prefs org.eclipse.rephraserengine.examples.text/META-INF/MANIFEST.MF org.eclipse.rephraserengine.examples.text/README.txt org.eclipse.rephraserengine.examples.text/about.html org.eclipse.rephraserengine.examples.text/build.properties org.eclipse.rephraserengine.examples.text/icons/search_obj.gif org.eclipse.rephraserengine.examples.text/plugin.xml org.eclipse.rephraserengine.examples.text/src/org/eclipse/rephraserengine/internal/examples/text/ConvertTabsToSpacesRefactoring.java org.eclipse.rephraserengine.examples.text/src/org/eclipse/rephraserengine/internal/examples/text/TextFileResourceFilter.java org.eclipse.rephraserengine.examples.text/src/org/eclipse/rephraserengine/internal/examples/text/TextSearchPage.java org.eclipse.rephraserengine.examples.text/test/tab-example.txt org.eclipse.rephraserengine.testing.junit3/.classpath org.eclipse.rephraserengine.testing.junit3/.project org.eclipse.rephraserengine.testing.junit3/.settings/org.eclipse.jdt.core.prefs org.eclipse.rephraserengine.testing.junit3/.settings/org.eclipse.jdt.ui.prefs org.eclipse.rephraserengine.testing.junit3/META-INF/MANIFEST.MF org.eclipse.rephraserengine.testing.junit3/build.properties org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/combinatorial/CombinationGenerator.java org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/combinatorial/ForEach.java org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/GeneralTestSuiteFromFiles.java org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/GeneralTestSuiteFromMarkers.java org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/MarkerUtil.java org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/Messages.java org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/RefactoringTestCase.java org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/RefactoringTestSuite.java org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/TestSuiteFromFiles.java org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/TestSuiteFromMarkers.java org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/WorkspaceTestCase.java org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/messages.properties

commit: 599f1a7bb8e961b5601f07c883e69d5d08043b94 [log] [tgz]
author: cvs2svn <ptp-dev@eclipse.org> Mon Jun 13 15:32:52 2011 +0000
committer: cvs2svn <ptp-dev@eclipse.org> Mon Jun 13 15:32:52 2011 +0000
tree: 54525d8ac0456eb5f0c3bd397df03412164815fe
parent: e5f6fab10b208de0002e882eee13cb3914e0f532 [diff]
diff --git a/org.eclipse.photran-dev-docs/.cdtproject b/org.eclipse.photran-dev-docs/.cdtproject
deleted file mode 100644
index 1b2ea83..0000000
--- a/org.eclipse.photran-dev-docs/.cdtproject
+++ /dev/null

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse-cdt version="2.0"?>
-
-<cdtproject/>

diff --git a/org.eclipse.photran-dev-docs/.cproject b/org.eclipse.photran-dev-docs/.cproject
deleted file mode 100644
index 5ed875c..0000000
--- a/org.eclipse.photran-dev-docs/.cproject
+++ /dev/null

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?fileVersion 4.0.0?>
-
-<cproject>
-<storageModule moduleId="org.eclipse.cdt.core.settings">
-<cconfiguration id="converted.config.1692608738">
-<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="converted.config.1692608738" moduleId="org.eclipse.cdt.core.settings" name="convertedConfig">
-<externalSettings/>
-<extensions/>
-</storageModule>
-</cconfiguration>
-</storageModule>
-</cproject>

diff --git "a/org.eclipse.photran-dev-docs/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder \0501\051.launch" "b/org.eclipse.photran-dev-docs/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder \0501\051.launch"
deleted file mode 100644
index 82be9fa..0000000
--- "a/org.eclipse.photran-dev-docs/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder \0501\051.launch"
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
-<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="net.sourceforge.texlipse.builder.TexlipseBuilder"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-</launchConfiguration>

diff --git a/org.eclipse.photran-dev-docs/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder.launch b/org.eclipse.photran-dev-docs/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder.launch
deleted file mode 100644
index 82be9fa..0000000
--- a/org.eclipse.photran-dev-docs/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder.launch
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
-<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="net.sourceforge.texlipse.builder.TexlipseBuilder"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-</launchConfiguration>

diff --git a/org.eclipse.photran-dev-docs/.externalToolBuilders/org.eclipse.cdt.make.core.makeBuilder.launch b/org.eclipse.photran-dev-docs/.externalToolBuilders/org.eclipse.cdt.make.core.makeBuilder.launch
deleted file mode 100644
index 76c5283..0000000
--- a/org.eclipse.photran-dev-docs/.externalToolBuilders/org.eclipse.cdt.make.core.makeBuilder.launch
+++ /dev/null

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
-<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS">
-<mapEntry key="org.eclipse.cdt.make.core.build.arguments" value=""/>
-<mapEntry key="org.eclipse.cdt.core.errorOutputParser" value="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.VCErrorParser;"/>
-<mapEntry key="org.eclipse.cdt.make.core.enableAutoBuild" value="false"/>
-<mapEntry key="org.eclipse.cdt.make.core.environment" value=""/>
-<mapEntry key="org.eclipse.cdt.make.core.enableFullBuild" value="true"/>
-<mapEntry key="org.eclipse.cdt.make.core.build.target.inc" value="all"/>
-<mapEntry key="org.eclipse.cdt.make.core.enabledIncrementalBuild" value="true"/>
-<mapEntry key="org.eclipse.cdt.make.core.build.target.clean" value="clean"/>
-<mapEntry key="org.eclipse.cdt.make.core.build.command" value="make"/>
-<mapEntry key="org.eclipse.cdt.make.core.enableCleanBuild" value="true"/>
-<mapEntry key="org.eclipse.cdt.make.core.append_environment" value="true"/>
-<mapEntry key="org.eclipse.cdt.make.core.build.target.full" value="clean all"/>
-<mapEntry key="org.eclipse.cdt.make.core.useDefaultBuildCmd" value="true"/>
-<mapEntry key="org.eclipse.cdt.make.core.build.target.auto" value="all"/>
-<mapEntry key="org.eclipse.cdt.make.core.stopOnError" value="false"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.eclipse.cdt.make.core.makeBuilder"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-</launchConfiguration>

diff --git a/org.eclipse.photran-dev-docs/.project b/org.eclipse.photran-dev-docs/.project
deleted file mode 100644
index 163ef2c..0000000
--- a/org.eclipse.photran-dev-docs/.project
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.photran-dev-docs</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/net.sourceforge.texlipse.builder.TexlipseBuilder (1).launch</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>net.sourceforge.texlipse.builder.TexlipseNature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.photran-dev-docs/.settings/org.eclipse.cdt.core.prefs b/org.eclipse.photran-dev-docs/.settings/org.eclipse.cdt.core.prefs
deleted file mode 100644
index 3016190..0000000
--- a/org.eclipse.photran-dev-docs/.settings/org.eclipse.cdt.core.prefs
+++ /dev/null

@@ -1,3 +0,0 @@
-#Thu Jul 13 14:30:36 CDT 2006
-eclipse.preferences.version=1
-indexerId=org.eclipse.cdt.core.nullindexer

diff --git a/org.eclipse.photran-dev-docs/README.txt b/org.eclipse.photran-dev-docs/README.txt
deleted file mode 100644
index 0464e95..0000000
--- a/org.eclipse.photran-dev-docs/README.txt
+++ /dev/null

@@ -1,49 +0,0 @@
-*****   THIS MOST IMPORTANT FILE IN THIS PROJECT IS   *****
-*****                                                 *****
-*****             dev-guide/dev-guide.pdf             *****
-*****                                                 *****
-*****        IF YOU ARE LOOKING FOR DEVELOPER         *****
-*****           DOCUMENTATION, START THERE.           *****
-
-Contents of this project:
-
-dev-guide/
-	Contains the Photran Developer's Guide.  The CVS
-	instructions in Appendix A are also made into a
-	separate PDF.
-	
-	Run Ant on build.xml to build the documentation
-	using pdflatex.  (In Eclipse, right-click build.xml
-	and click on Run As > Ant Build.)
-	
-	Note that the PDFs contain CVS revision information
-	at the beginning of each chapter.  If you have write
-	access to Photran's CVS repository, make sure you
-		(1) first commit the LaTeX sources
-		(2) then re-build the PDFs
-		(3) then commit the PDFs
-	The PDF links on the Web site retrieve the PDFs
-	from the CVS repository; this ensures that those
-	PDFs have up-to-date CVS revision information in
-	each section.  (If you create the PDFs from modified
-	sources without committing them to CVS first, the
-	revision information will be for the last revision
-	in CVS rather than the date the revised version was
-	created.)
-
-misc-notes/
-	Various notes-to-self that aren't import enough to
-	be in the Developer's Guide.
-
-contributions/
-    Contains correspondence and documentation related to
-    third-party contributions in Photran.
-
-eclipse-config/
-    Contains settings for the Eclipse Java code formatter
-    and code templates.  These have since been hard-coded
-    into the settings for each project, so they will be
-    applied by default when code is formatted or new classes
-    are created.
-
---Jeff Overbey 8/19/05, updated 8/29/08, 11/12/09
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/about.html b/org.eclipse.photran-dev-docs/about.html
deleted file mode 100644
index 9c7ba0a..0000000
--- a/org.eclipse.photran-dev-docs/about.html
+++ /dev/null

@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>About</title></head>
-
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file

diff --git "a/org.eclipse.photran-dev-docs/contributions/debugger/\041 README.txt" "b/org.eclipse.photran-dev-docs/contributions/debugger/\041 README.txt"
deleted file mode 100644
index 62deaa9..0000000
--- "a/org.eclipse.photran-dev-docs/contributions/debugger/\041 README.txt"
+++ /dev/null

@@ -1,9 +0,0 @@
-In Spring, 2007, a Senior Projects group hacked CDT's debugger to solve some problems debugging
-Fortran code.  Many of these were due to eccentricities in the g95 compiler.  The project was
-never distributed publicly because the hacked debugger did not integrate with the newer versions of
-Eclipse and CDT released in June, 2007.  Kurt Hendle reviewed the Senior Projects work in Summer,
-2009; most of the "problems" fixed by the Senior Projects group had since been fixed in CDT proper,
-or we decided explicitly not to fix them (e.g., filtering U variables, because that is a problem
-with the g95 compiler, not Photran).
-
---Jeff Overbey (12 Nov 2009)
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/contributions/debugger/notes-from-feanil-200705.txt b/org.eclipse.photran-dev-docs/contributions/debugger/notes-from-feanil-200705.txt
deleted file mode 100644
index 8abf0cc..0000000
--- a/org.eclipse.photran-dev-docs/contributions/debugger/notes-from-feanil-200705.txt
+++ /dev/null

@@ -1,5 +0,0 @@
-* All modifications have "SP06" in a comment
-* Clicking on Run As/Debug As > Local Fortran Application sometimes does not work.
-  Workaround: Use the "Run.../Debug..." dialog.
-* Remember there are TWO "Set Breakpoint" commands now (right-click
-  the editor's ruler to see them): one for C/C++ and one for Fortran

diff --git a/org.eclipse.photran-dev-docs/contributions/debugger/senior-project-final-report-200705.pdf b/org.eclipse.photran-dev-docs/contributions/debugger/senior-project-final-report-200705.pdf
deleted file mode 100644
index 6ef8205..0000000
--- a/org.eclipse.photran-dev-docs/contributions/debugger/senior-project-final-report-200705.pdf
+++ /dev/null
Binary files differ

diff --git "a/org.eclipse.photran-dev-docs/contributions/find-references/\041 README.txt" "b/org.eclipse.photran-dev-docs/contributions/find-references/\041 README.txt"
deleted file mode 100644
index edf3cf4..0000000
--- "a/org.eclipse.photran-dev-docs/contributions/find-references/\041 README.txt"
+++ /dev/null

@@ -1,5 +0,0 @@
-A group from CS427 (Software Engineering I), Fall, 2007, contributed the Find All References action
-to Photran.  This contains their documentation.  This was extended by another CS427 group in Fall,
-2008, to implement the Fortran Search action.
-
---Jeff Overbey (12 Nov 2009)
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/contributions/find-references/CONTRIB.txt b/org.eclipse.photran-dev-docs/contributions/find-references/CONTRIB.txt
deleted file mode 100644
index ae935c2..0000000
--- a/org.eclipse.photran-dev-docs/contributions/find-references/CONTRIB.txt
+++ /dev/null

@@ -1,28 +0,0 @@
-"Find All References" was contributed by
-
-James Shepherd   - jshephe2@uiuc.edu
-Sarah De La Cruz - slieter2@uiuc.edu
-Charles Felish   - felish@uiuc.edu
-Kevin Decker     - kdecker3@uiuc.edu
-
-The work was completed as part of CS427 (Software Engineering I), Fall, 2007,
-under the guidance of Nicholas Chen and Prof. Ralph Johnson.
-
-The code was reviewed, edited, and submitted to Bugzilla by Jeff Overbey (4/12/08).
-
-
-
-Bios from the CS427 wiki:
-
-James is a software engineer for a Fortune 100 U.S. defense engineering firm
-living in Australia. CS428 is his fourth graduate class as an I2CS student.
-CS428 is also the third class in a row with Dr. Johnson and Nick Chen.
-
-Sarah: I am an online grad student and this is my first class so far. I work
-as an IT Analyst for John Deere and live in Moline, Illinois.
-
-Charles: I'm currently in the working world, working for Serengeti Law as a
-developer. I telecommute and currently live in W Lafayette, IN. I'm hoping to
-expand my knowledge with a few extra classes.
-
-Kevin: Busy developing for Xythos Software during days.
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/contributions/find-references/ContextMenuManualTest.txt b/org.eclipse.photran-dev-docs/contributions/find-references/ContextMenuManualTest.txt
deleted file mode 100644
index 69f8655..0000000
--- a/org.eclipse.photran-dev-docs/contributions/find-references/ContextMenuManualTest.txt
+++ /dev/null

@@ -1,18 +0,0 @@
-1. Using the Photran development environment, open a Fortran 90 project.
-2. Open source file into the editor.
-3. Select the text of a variable in the source file.
-4. Right click on the selected text.
-   4.1 Verify context menu contains "Find all references" with a submenu of File.
-5. Click on the File item of the submenu.
-   5.1 Verify that, at a minimum, the search view tab becomes visible. Basically, verify
-       that clicking begins execution of the command.
-6. Right click on the selected text.
-   6.1 Verify context menu contains "Find all references" with a submenu of Project.
-7. Click on the Project item of the submenu.
-   7.1 Verify that, at a minimum, the search view tab becomes visible. Basically, verify
-       that clicking begins execution of the command.
-8. Right click on the selected text.
-   8.1 Verify context menu contains "Find all references" with a submenu of Workspace.
-9. Click on the Workspace item of the submenu.
-   9.1 Verify that, at a minimum, the search view tab becomes visible. Basically, verify
-       that clicking begins execution of the command.
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/contributions/find-references/DOC.odt b/org.eclipse.photran-dev-docs/contributions/find-references/DOC.odt
deleted file mode 100644
index ab37c36..0000000
--- a/org.eclipse.photran-dev-docs/contributions/find-references/DOC.odt
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-dev-docs/contributions/find-references/DOC.pdf b/org.eclipse.photran-dev-docs/contributions/find-references/DOC.pdf
deleted file mode 100644
index 9dbfa9c..0000000
--- a/org.eclipse.photran-dev-docs/contributions/find-references/DOC.pdf
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-dev-docs/contributions/find-references/MenuBarManualTest.txt b/org.eclipse.photran-dev-docs/contributions/find-references/MenuBarManualTest.txt
deleted file mode 100644
index be95cd6..0000000
--- a/org.eclipse.photran-dev-docs/contributions/find-references/MenuBarManualTest.txt
+++ /dev/null

@@ -1,18 +0,0 @@
-1. Using the Photran development environment, open a Fortran 90 project.
-2. Open source file into the editor.
-3. Select the text of a variable in the source file.
-4. Click Search in the menu bar.
-   4.1 Verify menu contains "Find all references" with a submenu of File.
-5. Click on the File item of the submenu.
-   5.1 Verify that, at a minimum, the search view tab becomes visible. Basically, verify
-       that clicking begins execution of the command.
-6. Click Search in the menu bar.
-   6.1 Verify menu contains "Find all references" with a submenu of Project.
-7. Click on the Project item of the submenu.
-   7.1 Verify that, at a minimum, the search view tab becomes visible. Basically, verify
-       that clicking begins execution of the command.
-8. Click Search in the menu bar.
-   8.1 Verify menu contains "Find all references" with a submenu of Workspace.
-9. Click on the Workspace item of the submenu.
-   9.1 Verify that, at a minimum, the search view tab becomes visible. Basically, verify
-       that clicking begins execution of the command.
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/contributions/find-references/Milestone1.txt b/org.eclipse.photran-dev-docs/contributions/find-references/Milestone1.txt
deleted file mode 100644
index 14d6265..0000000
--- a/org.eclipse.photran-dev-docs/contributions/find-references/Milestone1.txt
+++ /dev/null

@@ -1,85 +0,0 @@
-Goal
-- In JDT, clicking on Search > References provides several options for searching
-  for all of the references to a particular entity. (This is also available in the
-  editor context menu.) The goal of this project is to implement this in Fortran.
-  At a minimum, a workspace-wide search should be implemented; searching within a
-  single project and/or working set should be attempted if time permits.
-
-Starting points suggestion from Contributors page
-- This will need to be implemented in the VPG UI plug-in. It is probably easiest
-  to contribute these actions to the experimental editor located in the
-  org.eclipse.photran.ui.vpg plug-in (when you run Photran, right-click a file and
-  choose Open With > Fortran Editor (VPG Experimental Features);
-  "EXPERIMENTAL" should be displayed in 36-point letters at the top of the editor window).
-  The JavaDoc and sample code in the org.eclipse.photran.internal.ui.editor_vpg
-  package should be particularly helpful.
-
-- Performing the search itself is actually quite easy (Hint: Finding all of the
-  references to a variable is an essential part of performing a Rename refactoring).
-
-List of probably useful packages
-- Reference Determinination:
-  - org.eclipse.photran.internal.core.refactoring.infrastructure.FortranRefactoring
-  - org.eclipse.photran.internal.core.refactoring.RenameRefactoring
-  - org.eclipse.jdt.ui.actions.FindReferencesIn(Project|Workspace|WorkingSet)Action
- 
-- Search Integration:
-  - org.eclipse.search.ui.ISearchQuery
-  - org.eclipse.jdt.internal.ui.search.JavaSearchQuery
-  - org.eclipse.search.ui.ISearchResult
-
-- Photran useful stuff
-  -  org.eclipse.photran.internal.actions.FortranBlockCOmmentAction
-  - FortranActionDelegate - Does a bunch of the base work for "Actions", things
-    the editor can request via a menu.
-  - We'll have to update org.eclipse.photran.ui\plugin.xml to reference our stuff.
-    Check out Comment/Uncomment in the .xml file.
-    
-- When used properly, the real benefit of a VPG is the methods that can be added to AST nodes. In the example VPG in the picture above, for example,
-    * The user could call a method getDeclaration() on a VariableReference node, which would return the corresponding Declaration node.
-    * The user could call a method getAllReferences() on a Declaration node, which would return a list of all of the references to that declaration.
-    * The user could call a method getScope() on a Declaration node, which would return the scope of that definition (e.g., a Program node).
-    * The user could call a method getScope() on a VariableReference node, which would return the scope of its definition. 
-  Again, it is important to remember that the returned node does not have to be in the same file. For example, getAllReferences() could return a list of all of the references to that variable, even if they span hundreds of files. (Of course, it does not have to load hundreds of ASTs into memory to do this!)
-- See ScopingNode.java, specifically ScopingNode.getAllDefinitions, FindAllDeclarationsInScope.java. getAllDefinitions
-  has a good example of using the vpg to find edges that point to the various references of a given node.
-- "To find all of the references to a variable, we search for all of the binding edges pointing to its declaration."
-  See BINDING_EDGE_TYPE in PhotranVPG
-
-- Probably spots to modify
-  - org.eclipse.photran.internal.ui.actions
-
-Notes From TA Meeting:
--  Try to determine the scope of our project
--  VPG can show a backpointer to where each entity is defined in the node
--  Suggests - First iteration, find out how much has already been implemented,
-   and narrow the scope down into three iterations so that we can implement something
-  
-
-XP Spike (Iteration 1)
--  Try to create a simple plugin (non-photran, a user story) that just pops a simple dialog.
-   Part of the Spike 
--  Take a look at "Views" and how they are implemented. He'll send us some info on the relevant chapters
-   -  How to populate the view
--  Sample tests cases to prove that we are able to read information from the VPG
-
-
-User Stories
--  User should be able to right click on selected source code and get a menu that allows
-   them to find all references.
--  User should be able to find references via the Search menu after highlighting code.
--  User should be able to double click on the references in the view to jump to the
-   point in the source code.
--  The Find All References functionality should be able to find all the references to a
-   simple variable within one file.  
--  Find All References should be able to present the information that we gathered in the
-   Search View.
--  The Find All References functionality should be able to find all the references to a
-   simple variable within a project with several files.
--  The Find All References functionality should be able to find all the references to a
-   simple variable within a workspace.
-   
-Other notes
-- Created a sample plugin "Hello World". SampleAction.run has the same prototype
-   as FortranEditorActionDelegate.run, so we can start with a frame from there. 
-- See Definition.findAllReferences
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/contributions/find-references/Milestone2.txt b/org.eclipse.photran-dev-docs/contributions/find-references/Milestone2.txt
deleted file mode 100644
index dd077a4..0000000
--- a/org.eclipse.photran-dev-docs/contributions/find-references/Milestone2.txt
+++ /dev/null

@@ -1,66 +0,0 @@
-<-- Notes -->
-  - Take a look at the CDT implementations for the search results page. PDOMSearch(Tree*|View*|List*)
-
-<-- BEGIN Chuck James -->
--  Day 1
-   -  Worked on user story 2.1.  Ran tests against refactored core.vpg.test.  
-      Completed in 1.5 units compared to 2 units estimated.
-   -  Started looking into showing/extending the menu items, but haven't updated the plugin xml yet.
-      Probably will be updating the org.eclipse.photran.ui plugin.xml.
--  Day 2
-   -  Experiment with a context menu using the Plugin template gave a good example of how to do
-      a context menu.
-   -  Do we need to create separate actions for each action type (file, workspace, project?) or can we re-use a single class
-      and use the action parameter? Maybe use 3 subclasses of the main action? Decided
-      on the single base class with 3 subclasses.
-   -  Plan to borrow the ActionSet code from the Comment/Uncomment code to create an ActionSet for
-      our refactor action.
-   -  Plan to write a manual test to verify the menu(s) are working.
--  Day 3
-   -  Added the ActionSet and got (after much deliberation) it to display in the Search menu.
-   -  Updated icon for search.
-   -  Wrote manual tests to verify the UI was working.
-   -  Discovered that "selecting" a token could be done by simply placing the cursor in
-      the text, not having to actually select the token. Also, selecting multiple tokens
-      or a token with any whitespace generates the error "Please select a token". Probably
-      should be fixed to reflect the "correct" error.
--  Day 4 (Short day)
-   - Started looking into how we might implement the search results objects by extending
-     org.eclipse.search.searchResultViewPages extension point. This will require implementing
-     the ISearchResultPage and IContentProvider interfaces. Didn't really get too far with this.
-   - We thought the VPG wasn't initalized on the call to SearchReferences, but apparently it was...
-     This was a wild goose chase. 
-<-- END Chuck James -->  
-
-<-- BEGIN Sarah Kevin -->
--  Day 1 (2.5 Units worked)
-   -  Worked on user story 2.4.  Implemented the ISearchQuery interface for the search through the 
-      ReferenceSearch class.  
-   -  Created the searchForReference method within the ReferenceSearch class as a 'helper' method.
--  Day 2 (2.5 Units worked)
-   -  Worked on user story 2.5.  Implemented the AbstractTextSearchResult to show the search view
-      through the ReferenceSearchResult class.
-   -  Finished implementing the ReferenceSearch run() method. Still need to determine if the 
-      getFile attribute is the best/correct value to use when adding a Match to the ReferenceSearchResult.
-   -  Changed the VPGInformationTest to test user stories 2.4 and 2.5. Checked the matches within
-      the ReferenceSearchResult to make sure they were what was expected.
-   -  Performed group work to integrate results so far with James and Chuck's progress (see Group Work). 
--  Day 3
-   -  Clean up tests and To Do's left in the code. Update the Wiki with the comments for user stories 2.4 
-      and 2.5.
-   -  Added JavaDoc to ReferenceSearch and ReferenceSearchResult.
-   -  Determined that we will leave some To Do's, such as CanRerun() which can be re-looked at after 
-      user story 3.1. This is the same for getEditorMatchAdapter() and getFileMatchAdapter(), which 
-      can be implemented during or after user story 3.1.
-   -  Determined that we can leave the getFile() attribute when creating a Match. If this needs to be 
-      changed later, it will not be a hard thing to modify.
-<-- END Sarah Kevin -->
-
-<-- BEGIN Group work -->
--  Day 2
-   -  The ActionDelegate code was completed and the SearchReferences within one file was completed, so
-      we put the modules together and verified that they worked as a pair.
-   -  Ran regression tests (whoo for buzzwords)
--  Day 4
-   -  Implemented 2.6 as a group.
-<-- END Group work -->
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/contributions/find-references/Milestone3.txt b/org.eclipse.photran-dev-docs/contributions/find-references/Milestone3.txt
deleted file mode 100644
index d105d41..0000000
--- a/org.eclipse.photran-dev-docs/contributions/find-references/Milestone3.txt
+++ /dev/null

@@ -1,75 +0,0 @@
-<-- Notes -->
--  Take a look at OpenDeclaration.java.
-   -  It has a declaration picker openSelectionDialog(defs).
-   -  It also has openEditorOn(def). We can use this in our own code.
-   -  Borrow no token error code from resolveBinding
--  Call ensureVPGIsUpToDate in the delegate before doing anything else. In the
-   results, filter out by file, project or no filter for ssFile, ssProject, and
-   ssWorkspace respectively. LoadVPGFor... can be removed.
--  If we're curious, we should examine VPG.printErrorLog
-
-<-- BEGIN Chuck James -->
--  Day 2
-   -  Added two more action delegate subclasses to handle project and workspace
-      searching and added the menus for each to the plugin XML.
-   -  Made a first attempt at getting the VPG search to work over multiple
-      files with limited success. Work on this aspect will continue at the next meeting.
-<-- END Chuck James -->
-
-<-- BEGIN Sarah Kevin -->
--  Day 2
-   -  Borrowing from CDT's example, implemented double click and arrow clicking
-      capability to the search results. Arrows jump to each result, double
-      clicking jumps to the correct editor, and results are highlighted in the source.
-<-- END Sarah Kevin -->  
-
-<-- BEGIN Group work -->
--  Day 1
-   -  Researched user story 3.6 as a group to establish what portion was complete and what was yet to 
-      do. Look at example from Nick on Wiki on how to use the VPG to load files.
--  Day 2
-   -  Discussed remaining stories, and split up UI work and backend work.
-   -  Discussed methods for activating the VPG on relevant files as a group.
--  Day 3
-   -  Finished implementing the VPG search for File, Project, and Workspace.
-   -  Refactored some code for better design.
-   -  Implemented the declaration picker openSelectionDialog(defs) in the 
-      FortranFindReferenceActionDelegate. Test to be written for this.
--  Day 4
-   -  Wiki is updated to reflect our complete user stories.
-   -  While our progress has been tracked on the Wiki, our problems
-      and continued work have been documented in the Milestone1-3.txt documents.
-      We've added a page to the wiki to help enumerate our difficulties
-   -  A workspace has been created with projects that can be used to demo
-      our completed functionality. (runtime-EclipseApplication.tgz in Docs).
-      Individual projects cannot be saved since Photran dependences are stored not
-      in the project but in the workspace plugins directory.
-   -  Unit test has been checked in, but we hope for updates to make it more
-      autonomous.
-   -  Manual/acceptance tests are partially completed.
--  Day 5
-   -  Unit test verified to work with Unix. Loading a full workspace is too difficult
-      for the remaining time and will be documented.      
-   -  Review the milestone documents and the wiki to create documentation as
-      specified on the CS427 Agora page. Added Milestone docs to the Wiki as attachments.
-   -  Apparently have to make sure our code works with the Head Revision. This
-      will be difficult since our code is so integrated with the existing project
-      structure. Done.
-   -  Discussed and divided the documentation for a draft that we plan to submit on
-      Wednesday.
--  Day 6
-   -  Presented to Nick who received our work well. We asked for an extension
-      to submit the documentation which as granted.
--  Day 7/8
-   -  Doc draft and final versions created and submitted.   
-<-- END Group work -->
-
-<-- What's left -->
-X  Review and update user story list
-X  Write acceptance tests for each relevant User Story (XP Spike and automated tests excluded)
-   X  Build a demo workspace (two projects) to represent our use cases.
-   X  One main UI test to make sure that all the user stories are met. 
-   X  Unit Test to verify results are returned from several files in workspace
--  JavaDoc
-X  Documentation as specified
-X  Make sure our code works with Head

diff --git a/org.eclipse.photran-dev-docs/contributions/find-references/README.odt b/org.eclipse.photran-dev-docs/contributions/find-references/README.odt
deleted file mode 100644
index 50e9fa2..0000000
--- a/org.eclipse.photran-dev-docs/contributions/find-references/README.odt
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-dev-docs/contributions/find-references/README.pdf b/org.eclipse.photran-dev-docs/contributions/find-references/README.pdf
deleted file mode 100644
index 56f6531..0000000
--- a/org.eclipse.photran-dev-docs/contributions/find-references/README.pdf
+++ /dev/null
Binary files differ

diff --git "a/org.eclipse.photran-dev-docs/contributions/fixed-form-lexer/\041 README.txt" "b/org.eclipse.photran-dev-docs/contributions/fixed-form-lexer/\041 README.txt"
deleted file mode 100644
index 64dd269..0000000
--- "a/org.eclipse.photran-dev-docs/contributions/fixed-form-lexer/\041 README.txt"
+++ /dev/null

@@ -1,3 +0,0 @@
-Dirk Rossow contributed the fixed form lexical analyzer.  See correspondence.txt for more info.
-
---Jeff Overbey (12 Nov 2009)
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/contributions/fixed-form-lexer/correspondence.txt b/org.eclipse.photran-dev-docs/contributions/fixed-form-lexer/correspondence.txt
deleted file mode 100644
index 8a12358..0000000
--- a/org.eclipse.photran-dev-docs/contributions/fixed-form-lexer/correspondence.txt
+++ /dev/null

@@ -1,56 +0,0 @@
-From: Dirk Rossow <rossow@foni.net>
-Date: 04/19/2005 01:00 PM
-
-Subject: FixedFormParser
-
-
-Hi Jeff,
-
-i have worked on the fixed form lexer and sending you my first results. It
-looks very promising that far. The details:
-
-FixedFormLexerPrepass preprocesses the input stream. It discards all
-whitespaces and comment lines and concatenates continuation lines.
-Additional it holds a mapping to the character-positions in the file (for
-correct start/end line/col in the Token objects).
-
-The modified InputStream is feed to FixedFormLexerPhase1, which is a
-modified copy of your FreeFormLexerPhase1. The mods are:
-
-Handling of hollerith constants (This is missing in your
-FreeFormLexerPhase1)
-A new state which is active at the start of line. Needed this for
-hollerith-handling
-A new state for IDENT-matching. It only gets active if no keyword matches. I
-added this because there are no whitespaces delimiting the tokens and for
-example callsubname needs to get matched as T_CALL T_IDENT. So the lexer
-tries first to match a token ignoring IDENTs. If there is no match, an IDENT
-is matched and returned.
-
-
-FixedFormLexerPhase1 feeds FixedFormLexerPhase2, which uses your
-FreeFormLexerPhase2.
-After your phase2lexer has processed the tokens, it checks if IDENT-Tokens
-need to get concatenated. This can happen if for example:
-callsubname=0
-T_CALL T_IDENT T_EQUAL T_ICON
-gets converted by your phase2lexer to
-T_IDENT T_IDENT T_EQUAL T_ICON
-
-Finally i modified your FreeFormLexerPhase2 and the generated Parser to
-support different Lexers. I simply added an Interface Ilexer.
-
-I did not commit anything to the repository, i thought you first want to
-have a look.
-There are still some bugs in the FreeFormLexerPhase2. You can find examples
-for them in the fixedTestFiles/regressionTestFiles folder. They are
-slashesInFormat.f, statusEqAfterIf.f, typeSpecAsIdent.f and impliedLoop.f.
-
-I added some of our fortran-code for testing my work, please dont add it to
-the repository.
-
-I hope my explanations are understandable and you like what i did :-) Dont
-hesitate to contact me if you have questions.
-
-Have a nice day
-  Dirk

diff --git "a/org.eclipse.photran-dev-docs/contributions/fortran-nature/\041 README.txt" "b/org.eclipse.photran-dev-docs/contributions/fortran-nature/\041 README.txt"
deleted file mode 100644
index a283e06..0000000
--- "a/org.eclipse.photran-dev-docs/contributions/fortran-nature/\041 README.txt"
+++ /dev/null

@@ -1,3 +0,0 @@
-Submitted by Matt Scarpino - mattscar@yahoo.com or matt.scarpino@eclipseengineer.com
-2009-07-18
-https://bugs.eclipse.org/bugs/show_bug.cgi?id=277879
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/contributions/fortran-nature/correspondence.txt b/org.eclipse.photran-dev-docs/contributions/fortran-nature/correspondence.txt
deleted file mode 100644
index eabc3ca..0000000
--- a/org.eclipse.photran-dev-docs/contributions/fortran-nature/correspondence.txt
+++ /dev/null

@@ -1,15 +0,0 @@
-The submitted patch serves two purposes: it assigns an 'F' icon to all Fortran source files (*.f, *.f77, etc.) and assigns a project nature image for Fortran projects. This is shown in the attached screenshot.
-
-The first part is easy to understand. The Fortran file navigator (represented by org.eclipse.photran.cdtinterface.ui.FortranView), uses a label provider to assign text/images to resources in the workspace. The CDT view uses a CViewLabelProvider for this, and I created a subclass called FViewLabelProvider. This checks the suffix of source files in the Fortran navigator and assigns f_file_obj.gif to any Fortran files.
-
-The second part is more involved. To ensure that Fortran projects can be distinguished from other projects, I took the following steps:
-
-1. Created a class called org.eclipse.photran.core.FProjectNature, which is essentially a copy of the CDT's CProjectNature. Defined an extension for the nature (org.eclipse.core.resources.natures) in plugin.xml.
-
-2. Defined an extension for org.eclipse.ui.ide.projectNatureImages in org.eclipse.photran.ui. This tells Eclipse to display the Fortran project icon (f_ovr.gif) whenever a project's *first* nature is org.eclipse.photran.core.fnature.
-
-3. Added code to FortranProjectWizard so that all Photran created projects have Fortran nature in addition to C nature. Added a lot of code so that this nature is the project's *first* nature. This doesn't affect any of the other natures, but it ensures that the Fortran icon will be displayed whenever the project is shown.
-
-Two last notes. The FViewLabelProvider only works if f_file_obj.gif is placed in the icons folder in the org.eclipse.photran.cdtinterface plug-in. I created my own icon for the project nature (f_ovr.gif), and it must be placed in the icons/full/obj16 folder in the org.eclipse.photran.ui plug-in.
-
-If you have any questions or comments, please e-mail me at matt.scarpino@eclipseengineer.com.
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/contributions/fortran-nature/screenshot.gif b/org.eclipse.photran-dev-docs/contributions/fortran-nature/screenshot.gif
deleted file mode 100644
index 3713050..0000000
--- a/org.eclipse.photran-dev-docs/contributions/fortran-nature/screenshot.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-dev-docs/contributions/help-plugin/correspondence.txt b/org.eclipse.photran-dev-docs/contributions/help-plugin/correspondence.txt
deleted file mode 100644
index e3b6c5c..0000000
--- a/org.eclipse.photran-dev-docs/contributions/help-plugin/correspondence.txt
+++ /dev/null

@@ -1,211 +0,0 @@
-
-*** See the Photran Developer's Guide for more information on the ***
-*** WikiToEclipse project and Photran's help plug-in.             ***
-
-====================================================================================================
-From: "Matt Scarpino" <matt.scarpino@eclipseengineer.com>
-To: "jeffrey Overbey" <overbey2@illinois.edu>
-Subject: Photran help
-Date: Sun, 23 Aug 2009 20:09:28 -0700
-
-Hi Jeff,
- 
-I uploaded an Eclipse help plug-in to Bugzilla along with a new screenshot. The plug-in doesn't contain source code (it's just XML, HTML, and images), so I didn't worry about the EPL headers or similar concerns. But if there's anything you'd like me to declare, please let me know.
- 
-In addition to the plug-in, I've created a Java project that reads Wiki markup in text files (e.g. photran5 and photran5advanced), and creates an Eclipse help plug-in. This way, as you update your Wiki, you can create an updated plug-in by running the application.
- 
-The project's libraries are so large that I couldn't upload the archive to Bugzilla. So I put it on my web site and you can download it here:
-http://www.eclipseengineer.com/photran/WikiToEclipse.zip
- 
-The WikiToEclipse project is public domain. The instructions.txt file explains how to use it. Let me know if you have any questions.
- 
-Matt
-
-====================================================================================================
-
-From: Jeffrey Overbey [mailto:overbey2@illinois.edu] 
-Sent: Friday, October 02, 2009 10:31 AM
-To: Sharon Corbett
-Cc: Matt Scarpino
-Subject: Question - Photran help
-
- 
-
-Sharon,
-
-I have an IP question, if you don't mind.
-
-Matt Scarpino owns a consulting company (Eclipse Engineering, LLC) and
-kindly wrote a converter for us which will generate Eclipse Help content
-from the documentation we've been writing for Photran on the Eclipse Wiki.
-He generated a plug-in for us using this converter, and that's posted on
-Bugzilla - https://bugs.eclipse.org/bugs/286862
-
-We would like to continue using his generator to re-generate our online help
-as we update the wiki over time.
-
-As you can see in Matt's e-mail below, the generator was too large to post
-to Bugzilla, mostly because it uses some (large) third-party libraries.
-Those are under the Apache and BSD licenses, so provenance checking would
-probably take a while.
-
-What are the IP requirements here?  Is it OK for us to use his generator
-as-is, or will it need to be contributed to Photran or Orbit first?  I
-copied him on this e-mail, so he can help answer any questions.
-
-Jeff
-
-====================================================================================================
-
-From: "Sharon Corbett" <sharon.corbett@eclipse.org>
-To: "'Jeffrey Overbey'" <overbey2@illinois.edu>
-Cc: "'Matt Scarpino'" <matt.scarpino@eclipseengineer.com>
-Subject: RE: Question - Photran help
-Date: Fri, 2 Oct 2009 10:54:18 -0400
-
-Hi Jeff:
-
-In order to further understand before I respond, can you let me know if the
-intent is to check the content into the Eclipse repository?
-
-Thanks,
-Sharon
-
-====================================================================================================
-
-From: "Matt Scarpino" <matt.scarpino@eclipseengineer.com>
-To: "Jeffrey Overbey" <overbey2@illinois.edu>,
-        "Sharon Corbett" <sharon.corbett@eclipse.org>
-References: <007301ca4370$3834e830$5101a8c0@SharoncLaptop> <4AC62433.5080408@illinois.edu>
-In-Reply-To: <4AC62433.5080408@illinois.edu>
-Subject: Re: Question - Photran help
-Date: Fri, 2 Oct 2009 09:13:26 -0700
-
-Hi,
-
-I'd be happy to contribute the plug-in generator, but Jeffrey's main =
-concern is whether the generated plug-ins can be added to the Photran =
-codebase.
-
-As I understand it, code licensing becomes an issue if the content =
-depends on licensed code. But in this case, all of the content is being =
-generated automatically. Once the plug-in is generated, it has no =
-external dependencies.
-
-The generator depends on Apache-licensed libraries, but that dependency =
-doesn't extend to the generated plug-ins. I think Jeffrey can add the =
-plug-ins to Photran without any licensing concerns, but I'm no expert.
-
-Best,
-Matt
-
-====================================================================================================
-
-Date: Fri, 02 Oct 2009 11:02:59 -0500
-From: Jeffrey Overbey <overbey2@illinois.edu>
-User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.23) Gecko/20090812 Lightning/0.9 Thunderbird/2.0.0.23 Mnenhy/0.7.6.666
-MIME-Version: 1.0
-To: Sharon Corbett <sharon.corbett@eclipse.org>
-CC: 'Matt Scarpino' <matt.scarpino@eclipseengineer.com>
-Subject: Re: Question - Photran help
-
-> In order to further understand before I respond, can you let me know 
-> if the intent is to check the content into the Eclipse repository?
->
-
-We are only interested in checking the generated help content (HTML and 
-XML) into the repository.
-
-I bet Matt would be willing to contribute the entire generator if we 
-need to (I don't know what the Foundation's rules about generating code 
-are), but if we can avoid that and only check in the generated help 
-project, that seems easiest.
-
-Thanks.
-
-Jeff
-
-====================================================================================================
-
-From: "Sharon Corbett" <sharon.corbett@eclipse.org>
-To: "'Jeffrey Overbey'" <overbey2@illinois.edu>
-Subject: RE: Question - Photran help
-Date: Mon, 5 Oct 2009 12:15:37 -0400
-
-Hi Jeff:
-
-Thanks for the info you provided as well as Matt's input.  In order to bring
-this forward for a response could I ask you to provide (in layman's terms)
-an overview statement/paragraph regarding this tool?  It will also be
-important to understand if there is any license associated with the tool
-that would impact the generated content from being licensed under the terms
-of the EPL?
-
-Regards,
-Sharon 
-
-====================================================================================================
-
-Date: Mon, 05 Oct 2009 14:23:53 -0500
-From: Jeffrey Overbey <overbey2@illinois.edu>
-User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US; rv:1.8.1.23) Gecko/20090812 Lightning/0.9 Thunderbird/2.0.0.23 Mnenhy/0.7.6.666
-MIME-Version: 1.0
-To: Sharon Corbett <sharon.corbett@eclipse.org>
-Subject: Re: Question - Photran help
-
-Hi Sharon,
-
-> provide (in layman's terms) an overview statement/paragraph regarding 
-> this tool?  It will also be important to understand if there is any 
-> license associated with the tool
->
-
-The WikiToEclipse tool takes a page from the Eclipse Wiki and translates 
-it into an Eclipse Help plug-in.  The intention is to use this for 
-Photran's end-user documentation, which is currently on the Eclipse 
-Wiki; by translating it into an Eclipse Help plug-in, users without 
-Internet access can still read the documentation inside the Eclipse Help 
-system.
-
-The translation from Eclipse Wiki markup to Eclipse Help markup is very 
-straightforward.  The tool does the same translation we would do by 
-hand.  Since it is just translating one kind of documentation into a 
-different kind of documentation (more or less like translating a Word 
-document into a WordPerfect document), the generated result does not 
-depend on any third-party libraries.
-
-Matt has placed the WikiToEclipse project in the public domain.  It uses 
-some BSD-licensed third-party libraries to read the input, etc., but the 
-output it generates in no way depends on these libraries; again, the 
-output (an Eclipse Help plug-in) is just a straightforward translation 
-of the input (an Eclipse Wiki page).  So, from what I can tell, and from 
-what Matt has told me, there is nothing preventing us from licensing the 
-generated Eclipse Help plug-in under the EPL.
-
-Jeff
-
-====================================================================================================
-
-From: "Sharon Corbett" <sharon.corbett@eclipse.org>
-To: "'Jeffrey Overbey'" <overbey2@illinois.edu>
-Subject: RE: Question - Photran help
-Date: Mon, 9 Nov 2009 14:54:38 -0500
-
-Hi Jeff:
-
-You are good to go with respect to using the generated content in the
-Eclipse repository.  
-
-If at some point in the future, you wish to check the generator tool itself
-into the repository; you will of course need to raise CQs as would be
-required.
-
-Regards,
-Sharon
-
- 
-
-Sharon Corbett
-
-Eclipse Foundation Inc.
-Tel:  613-224-9461 ext. 232

diff --git "a/org.eclipse.photran-dev-docs/contributions/refactorings-cs427-fa10/Remove Obsolete Language Features \050332492\051.pdf" "b/org.eclipse.photran-dev-docs/contributions/refactorings-cs427-fa10/Remove Obsolete Language Features \050332492\051.pdf"
deleted file mode 100644
index c1ef422..0000000
--- "a/org.eclipse.photran-dev-docs/contributions/refactorings-cs427-fa10/Remove Obsolete Language Features \050332492\051.pdf"
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-dev-docs/dev-guide/.cvsignore b/org.eclipse.photran-dev-docs/dev-guide/.cvsignore
deleted file mode 100644
index c4e2276..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-*.fdb_latexmk

diff --git a/org.eclipse.photran-dev-docs/dev-guide/app-contributing.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/app-contributing.ltx-inc
deleted file mode 100644
index 94dcf22..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/app-contributing.ltx-inc
+++ /dev/null

@@ -1,174 +0,0 @@
-% Contributing a New Feature or Bug Fix
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id: app-contributing.ltx-inc,v 1.2 2010/04/28 18:12:52 joverbey Exp $ $}
-
-%\begin{list}{$\bigcirc$}{}
-\begin{enumerate}
-
-\item Run Photran's automated test suite.  All tests must pass.
-
-\item If you are contributing a refactoring, program analysis, or similar
-      complex feature, please include JUnit tests in your contribution.
-      The parser and AST inevitably change over time, and this is how we will
-      determine whether or not a change has broken your contribution.
-
-\item Make sure you did not copy code from anywhere except Photran and CDT.
-      If you copied code from books, mailing lists, Web sites, any other open
-      source projects, other projects at your company, etc., \textbf{stop}
-      and ask for further instructions.  (If you do not know a Photran
-      committer personally, ask on the photran-dev mailing list.)  It may
-      or may not be possible to contribute your code.
-
-\item Determine who owns the copyright to your code.  Generally,
-      if you are an employee and you were paid to write the code, it is
-      the property of your employer.  If you are a student, the code may
-      be your personal property, or it may be the property of your
-      university, depending on several factors.  Always check with your
-      employer or university to determine who the copyright owner is.
-      The following examples assume that the code was written by John
-      Doe as an employee of the XYZ Corporation.
-
-\item Your code must be contributed under the terms of the Eclipse Public
-      License (EPL).  If the copyright is owned by your employer or
-      university, make sure they will permit you to contribute your code
-      under the EPL.  (They will probably be asked for verification by
-      the Eclipse Legal team.)
-
-\item Ensure that \textit{every} Java file you created or modified has an
-accurate copyright header.
-
-    \begin{itemize}
-
-    \item If you created the file from scratch (i.e., it is not a modification
-          of someone else's code), the copyright header must name the copyright
-          owner and list them as the initial contributor.  For example: \\
-          
-          {\scriptsize
-          \begin{verbatim}
-/*******************************************************************************
- * Copyright (c) 2010 XYZ Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    John Doe (XYZ Corporation) - Initial API and implementation
- *******************************************************************************/
-          \end{verbatim}
-          }
-
-    \item If you modified an existing file from Photran or CDT, it must retain the
-          \textit{original} copyright notice, but you should add yourself as a
-          contributor at the bottom.  For example: \\
-          
-          {\scriptsize
-          \begin{verbatim}
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM - Initial API and implementation
- *    John Doe (XYZ Corporation) - Photran modifications
- *******************************************************************************/
-          \end{verbatim}
-          }
-
-    \end{itemize}
-
-\item Every Java class should have a JavaDoc comment with a brief description
-      of the class and an \texttt{@author} tag with your full name.  Again,
-      if you modified an existing class, add an \texttt{@author} tag with your
-      name.  For example:
-      
-      {\scriptsize
-      \begin{verbatim}
-/**
- * Refactoring which creates getter and setter subprograms for a module variable and replaces
- * variable accesses with calls to those subprograms.
- * <p>
- * This refactoring accepts a module variable declaration, makes that declaration PRIVATE, adds
- * getter and setter procedures to the module, and then replaces accesses to the variable outside
- * the module with calls to the getter and setter routines.
- *
- * @author Tim Yuvashev
- * @author Jeff Overbey
- */
-public class EncapsulateVariableRefactoring
-{ ...
-      \end{verbatim}
-      }
-
-\item Create a new bug in Bugzilla on one of the ``Photran'' components.  You
-can do this by clicking the ``Report a Bug'' link on the Photran home page.
-If your code adds a new feature (rather than fixing a bug), set the severity
-of the bug to ``Enhancement.''
-
-\item Create a patch with the files that you changed. Ê(Highlight all of
-the projects you changed in the Package Explorer, right-click, and
-choose Team $>$ Create Patch.) ÊAttach the patch to the bug in Bugzilla.
-ÊIf you have any binary files (e.g., images), DO NOT include them in
-the patch; attach them to Bugzilla separately.
-
-\item A Photran committer will review the code and may ask you to make changes.
-If so, you will need to create a new patch, attach it to the bug, and mark the
-old patch as ``obsolete.''
-
-\item When the code review succeeds, the Photran committer will make the following
-comment on the bug: \\
-\ \\
-{\footnotesize\itshape
-\begin{minipage}{5.5in}
-Please confirm that
-\begin{enumerate}
-\item you wrote 100\% of the code without incorporating content from elsewhere or relying on the intellectual property of others,
-\item you have the right to contribute the code to Eclipse, and
-\item you have included the EPL license header in all source files?
-\end{enumerate}
-\end{minipage}
-} \\
-\ \\
-You can reply with something as simple as the following. \\
-\ \\
-{\footnotesize\itshape
-\begin{minipage}{5.5in}
-I confirm that
-\begin{enumerate}
-\item I wrote 100\% of the code without incorporating content from elsewhere or relying on the intellectual property of others,
-\item I have the right to contribute the code to Eclipse, and
-\item I have included the EPL license header in all source files.
-\end{enumerate}
-\end{minipage}
-} \\
-\ \\
-However, if you \textit{did} incorporate content from elsewhere -- e.g., if your
-contribution is based on code from CDT or elsewhere -- DO NOT copy-and-paste this
-directly; change the first statement to note this explicitly.
-
-\item Your code will be passed on to the intellectual property (IP) team at the
-Eclipse Foundation for a legal review.  If there are any questions or concerns
-about the code, a member of the Eclipse IP team will contact you.
-
-\item Once it passes IP review, the committer will commit your code to Photran's CVS repository.
-
-\item The committer will add your name to the ``Contributors'' page of the Photran Web site.
-
-\end{enumerate}
-%\end{list}
-
-\vfill
-
-{\footnotesize
-\textit{Eclipse Foundation References:}
-\\
-\href{http://wiki.eclipse.org/Development\_Resources\#Everyone:\_IP\_Cleanliness}
-     {http://wiki.eclipse.org/Development\_Resources\#Everyone:\_IP\_Cleanliness}
-\\
-\href{http://wiki.eclipse.org/Development\_Conventions\_and\_Guidelines}
-     {http://wiki.eclipse.org/Development\_Conventions\_and\_Guidelines}
-}
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/dev-guide/app-cvs-maint.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/app-cvs-maint.ltx-inc
deleted file mode 100644
index a5b4250..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/app-cvs-maint.ltx-inc
+++ /dev/null

@@ -1,96 +0,0 @@
-% Getting the Photran Sources from CVS
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id$ $}
-
-\emph{BEFORE YOU BEGIN: Make sure you are running \textbf{Eclipse 3.5} (Galileo)
-and a \textbf{Java 5} or later JVM. We recommend the
-\href{http://www.eclipse.org/downloads/packages/eclipse-rcpplug-developers/ganymeder}{Eclipse for RCP/Plug-in Developers Package}.}
-
-\newcounter{running_counter}
-\textbf{Part~I.  Check out the CDT 6.0 sources from CVS}
-
-\begin{enumerate}
-	\item  In Eclipse, switch to the CVS Repository Exploring perspective.
-	\item  Right-click the CVS Repositories view; choose New, Repository Location
-	\item  In the dialog box, enter the following information, then click Finish. \\
-	\begin{tabular}{ll}
-	        Host name:       & dev.eclipse.org \\
-	        Repository path: & /cvsroot/tools \\
-	        Username:        & anonymous \\
-	        Password:        & (no password) \\
-	        Connection type: & pserver \\
-	\end{tabular}
-	\item  In the CVS Repositories view
-	       \begin{itemize}
-	       \item  Expand ``:pserver:anonymous@dev.eclipse.org:/cvsroot/tools''
-	       \item  Then expand ``HEAD''
-	       \end{itemize}
-	\item  Right-click on ``org.eclipse.cdt''
-	\item  Select ``Configure Branches and Versions\ldots''
-	\item  Under ``Browse files for tags'', expand ``all'', then expand
-	       ``org.eclipse.cdt'', then click on the .project file
-	\item  Under ``New tags found in the selected files'', click on the Deselect
-	       All button, then check cdt\_6\_0 in the list above it
-  \item	 Click Add Checked Tags
-	\item	 Click OK
-	\item  Now, in the CVS Repositories view
-				 \begin{itemize}
-				 \item  Expand ``:pserver:anonymous@dev.eclipse.org:/cvsroot/tools''
-		     \item  Then expand ``Branches''
-				 \item  Then expand ``cdt\_6\_0''
-		     \item  Then expand ``org.eclipse.cdt cdt\_6\_0''
-		     \item  Then expand ``all''
-			  \end{itemize}
-	\item  Click on the first entry under ``all''
-	       (it should be org.eclipse.cdt), then shift-click on the last entry
-	       under ``all'' (it should be org.eclipse.cdt.ui.tests).
-	       All of the intervening plug-ins should now be selected.
-	       Right-click on any of the selected plug-ins, and select
-	       Check Out from the pop-up menu.
-	       (Check out will take several minutes.)
-	\item  You now have the CDT source code.  Make sure it compiles successfully
-	       (lots of warnings, but no errors).
-	\setcounter{running_counter}{\value{enumi}}
-\end{enumerate}
-
-\vspace{1em}
-\textbf{Part~II.  Check out the Photran sources from CVS}
-\begin{enumerate}
-	\setcounter{enumi}{\value{running_counter}}
-	\item Under ``:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,''
-	    expand HEAD, then expand
-	    org.eclipse.ptp, then expand
-	    photran
-	\item  Click on the first entry under ``photran''
-	       (it should be org.eclipse.photran-dev-docs), then shift-click on the last entry
-	       under ``photran'' (it should be org.eclipse.rephraserengine.ui.vpg).
-	       All of the intervening plug-ins should now be selected.
-	       Right-click on any of the selected plug-ins, and select
-	       Check Out from the pop-up menu.
-	       (Check out will take several minutes.)
-	\setcounter{running_counter}{\value{enumi}}
-\end{enumerate}
-The sources should all compile (albeit with lots of warnings).
-
-\vspace{1em}
-\noindent\textbf{Part~III.  Running the test cases}
-
-\begin{enumerate}
-	\setcounter{enumi}{\value{running_counter}}
-	\item In Package Explorer view, select the \texttt{org.eclipse.photran.core.vpg.tests} project.
-	\item Right-click on that project and select Run As $>$ Run Configurations\ldots. A dialog will appear.
-	\item In that dialog, create a new \textbf{JUnit Plug-in Test} launch configuration. Call it ``Photran-Tests''.
-	\item For the configuration that you have just created, switch to the ``Arguments'' tab.
-	      Change the ``VM arguments'' field to \texttt{-ea -Xms40m -Xmx512m}
-	\item Then switch to the ``Environment'' tab and create a new environment variable called ``TESTING'' with a value of 1.
-	\item Select ``Run'' to run the tests. To run the tests again, just launch the ``Photran-Tests'' configuration from the Eclipse Run menu.
-
-	\vspace{.5em}
-	\noindent\textit{\textbf{Note.} If you will be developing refactorings or modifying the parser,
-	please read the appendix ``Running Photran's Automated Test Suite'' in the \textit{Photran
-	Developer's Guide.}  Also note that some parser tests will attempt to look for closed-source
-	code that you did not check out as part of this procedure;
-	a warning will appear in the JUnit runner if this code is not available.}
-	\setcounter{running_counter}{\value{enumi}}
-\end{enumerate}

diff --git a/org.eclipse.photran-dev-docs/dev-guide/app-cvs.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/app-cvs.ltx-inc
deleted file mode 100644
index ea444b0..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/app-cvs.ltx-inc
+++ /dev/null

@@ -1,123 +0,0 @@
-% Getting the Photran Sources from CVS
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id: app-cvs.ltx-inc,v 1.15 2010/05/25 19:40:03 joverbey Exp $ $}
-
-\textbf{Before you begin\dots}
-
-\vspace{-1em}
-
-\begin{enumerate}
-\item You will need to be running \textbf{Eclipse 3.6 (Helios)} on a Java 5 or later JVM.
-      You should install \textit{Eclipse Classic 3.6} (also called the \textit{Eclipse SDK),}
-      which includes the Eclipse Platform,
-      Java development tools, and Plug-in Development Environment.  (Since Photran is a
-      set of Eclipse plug-ins, you need a version of Eclipse that includes the Plug-in
-      Development Environment.)
-      %\begin{itemize}
-      %\item As of May, 2010, Eclipse 3.6 \textit{has not yet been released.}  You can download a
-      %release candidate of the Eclipse SDK from
-      %\url{http://download.eclipse.org/eclipse/downloads/drops/S-3.6RC2-201005201744/}.
-      %The file you download should be named \textit{eclipse-SDK-3.6RC2-win32.zip} or something similar.
-      %\end{itemize}
-\item \textit{(Optional)} We also recommend that you install the following Eclipse plug-ins:
-      \begin{enumerate}
-      \item \href{http://subclipse.tigris.org/}{\textbf{Subclipse}} --
-            provides Subversion support
-      \item \href{http://findbugs.sourceforge.net/}{\textbf{FindBugs}} --
-            a static analysis tool for Java
-      \item \href{http://www.eclemma.org/}{\textbf{EclEmma}} --
-            a Java code coverage tool
-      \item \href{http://metrics.sourceforge.net/}{\textbf{Metrics}} --
-            provides code metrics for Java code
-      %\item \href{http://www.eclipse.org/photran/download.php}{\textbf{Photran}} --
-      %      even though you're developing Photran, it is helpful to have Photran \textit{installed}
-      %      in your development environment.  This will allow you to use Photran to write Fortran
-      %      code for unit tests, etc.
-      \end{enumerate}
-\end{enumerate}
-
-\newcounter{running_counter}
-\textbf{Part~I.  Check out the CDT 7.0 sources from CVS}
-
-\begin{enumerate}
-	\item  In Eclipse, switch to the CVS Repository Exploring perspective.
-	\item  Right-click the CVS Repositories view; choose New, Repository Location
-	\item  In the dialog box, enter the following information, then click Finish. \\
-	\begin{tabular}{ll}
-	        Host name:       & dev.eclipse.org \\
-	        Repository path: & /cvsroot/tools \\
-	        Username:        & anonymous \\
-	        Password:        & (no password) \\
-	        Connection type: & pserver \\
-	\end{tabular}
-	\item  In the CVS Repositories view
-	       \begin{itemize}
-	       \item  Expand ``:pserver:anonymous@dev.eclipse.org:/cvsroot/tools''
-	       \item  Then expand ``HEAD''
-	%       \end{itemize}
-	%\item  Right-click on ``org.eclipse.cdt''
-	%\item  Select ``Configure Branches and Versions\ldots''
-	%\item  Under ``Browse files for tags'', expand ``all'', then expand
-	%       ``org.eclipse.cdt'', then click on the .project file
-	%\item  Under ``New tags found in the selected files'', click on the Deselect
-	%       All button, then check cdt\_6\_0 in the list above it
-	%\item	 Click Add Checked Tags
-	%\item	 Click OK
-	%\item  Now, in the CVS Repositories view
-	%			 \begin{itemize}
-	%			 \item  Expand ``:pserver:anonymous@dev.eclipse.org:/cvsroot/tools''
-	%	     \item  Then expand ``Branches''
-	%			 \item  Then expand ``cdt\_6\_0''
-	%	     \item  Then expand ``org.eclipse.cdt cdt\_6\_0''
-		     \item  Then expand ``org.eclipse.cdt''
-		     \item  Then expand ``all''
-			  \end{itemize}
-	\item  Click on the first entry under ``all''
-	       (it should be org.eclipse.cdt), then shift-click on the last entry
-	       under ``all'' (it should be org.eclipse.cdt.ui.tests).
-	       All of the intervening plug-ins should now be selected.
-	       Right-click on any of the selected plug-ins, and select
-	       Check Out from the pop-up menu.
-	       (Check out will take several minutes.)
-	\item  You now have the CDT source code.  Make sure it compiles successfully
-	       (lots of warnings, but no errors).
-	\setcounter{running_counter}{\value{enumi}}
-\end{enumerate}
-
-\vspace{1em}
-\textbf{Part~II.  Check out the Photran sources from CVS}
-\begin{enumerate}
-	\setcounter{enumi}{\value{running_counter}}
-	\item Under ``:pserver:anonymous@dev.eclipse.org:/cvsroot/tools,''
-	    expand HEAD, then expand
-	    org.eclipse.ptp, then expand
-	    photran
-	\item  Click on the first entry under ``photran''
-	       (it should be org.eclipse.photran-dev-docs), then shift-click on the last entry
-	       under ``photran'' (it should be org.eclipse.rephraserengine.ui.vpg).
-	       All of the intervening plug-ins should now be selected.
-	       Right-click on any of the selected plug-ins, and select
-	       Check Out from the pop-up menu.
-	       (Check out will take several minutes.)
-	\item \textit{(Optional)} You may also wish to switch back to the Java perspective and\dots
-      \begin{enumerate}
-      \item Close or delete the org.eclipse.photran.cmdline project.  This project contains code
-            demonstrating how to use Photran's parser outside of Eclipse; most developers won't
-            need to do this, and since it contains many classes copied from the ``real'' Photran
-            projects, it can be confusing having it in your workspace.
-      \item Delete the following projects (they are used for release engineering, so most developers
-            will never need to modify them):
-            \begin{itemize}
-            \item org.eclipse.photran-feature
-            \item org.eclipse.photran.intel-feature
-            \item org.eclipse.photran.master
-            \item org.eclipse.photran.releng
-            \item org.eclipse.photran.vpg-feature
-            \item org.eclipse.photran.xlf-feature
-            \item org.eclipse.rephraserengine-feature
-            \end{itemize}
-      \end{enumerate}
-	\setcounter{running_counter}{\value{enumi}}
-\end{enumerate}
-The sources should all compile (albeit with lots of warnings).
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/dev-guide/app-deploy.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/app-deploy.ltx-inc
deleted file mode 100644
index 0fffefc..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/app-deploy.ltx-inc
+++ /dev/null

@@ -1,104 +0,0 @@
-% Release and Deployment Procedure
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id$ $}
-
-\textit{Most contributors/committers do not need to read this.  This explains
-our entire release and deployment procedure: setting the Photran version
-number, updating the Web site, etc.}
-
-\section{Preparing for a Release Build}
-
-\begin{enumerate}
-
-\item Proofread the documentation on the wiki.  Make sure version numbers are
-      correct, screenshots and step-by-step instructions are up-to-date, and
-      UI labels are up-to-date (e.g., if the name of a refactoring changed).
-
-\item Regenerate the org.eclipse.photran.doc.user plug-in from the wiki.
-      See Appendix~\ref{app:help} for details.
-
-\item Update the plug-in version numbers in all projects.
-
-\item Update the feature.xml and feature.properties files for
-    \begin{itemize}
-    \item org.eclipse.photran-feature,
-    \item org.eclipse.photran.intel-feature,
-    \item org.eclipse.photran.xlf-feature, and
-    \item org.eclipse.rephraserengine-feature.
-    \end{itemize}
-    \begin{enumerate}
-    \item Change the feature version.
-    \item Change the versions of other features/plug-ins it depends on\dots
-    \begin{itemize}
-        \item org.eclipse.photran-feature must specify the correct versions of
-            \begin{itemize}
-            \item CDT
-            \item Rephraser Engine
-            \end{itemize}
-        \item org.eclipse.photran.intel-feature must specify the current version of Photran
-        \item org.eclipse.photran.xlf-feature must specify the current version of Photran
-    \end{itemize}
-    \item the copyright year
-    \item the update site URL
-    \end{enumerate}
-
-\item Update URLs to reflect the new version numbers...
-    \begin{enumerate}
-    \item Update the Welcome Page URL in org.eclipse.photran.ui/intro/overviewContent.xml
-    \item Note that the URL for the release notes shown when the user first installs a new
-          version of Photran is determined by the version of the org.eclipse.photran.ui
-          plug-in (see ShowReleaseNotes.java for details); this is not necessarily the same
-          as the Welcome Page URL.
-    \item Be sure the Web site actually contains pages at these URLs; add them if necessary
-    \end{enumerate}
-
-\item If the VPG database structure (or any of the serialized classes) have
-changed, update
-    \begin{itemize}
-    \item the VPG database filename in the PhotranVPGDB class constructor and
-    \item the VPG log filename in the PhotranVPGLog class constructor.
-    \end{itemize}
-For example, in Photran 4.0 beta 5, the database filename was ``photran40b5vpg''.
-
-\item Make sure the org.eclipse.photran.cmdline JAR is up-to-date.
-
-\item Make sure the org.eclipse.ptp.releng scripts have the correct versions.
-    \textit{Note that Photran is built from PTP's releng scripts; Photran's own
-    releng scripts are no longer used.}
-
-\item Greg Watson will initiate a PTP build at build.eclipse.org.
-
-\end{enumerate}
-
-\section{After the Release Has Been Built}
-
-\begin{enumerate}
-
-\item Update the timeline in this guide's Release History appendix
-(org.eclipse.photran-dev-docs/dev-guide/app-history.ltx-inc)
-
-\item Create a maintenance branch for the org.eclipse.photran module in CVS.
-      For example, a photran\_5\_0 branch was created after the Photran 5.0.0 release
-      and was subsequently used to build Photran 5.0.1, etc.
-
-\item Add a Bugzilla version for the release and a target for the next expected release
-
-\item Update the Web site:
-    \begin{enumerate}
-    \item Update the home page to mention the release
-    \item Change the update site URL and archived update site link on the Downloads page
-    \item Update the Report a Bug URL in the nav bar to default to the new release version
-    \end{enumerate}
-
-\item Announce the release, e-mailing the photran, photran-dev, and ptp-announce mailing lists
-
-\item Copy the Documentation pages on the wiki and update the version numbers for the next expected release
-
-\item Update the Project Plan at the Eclipse Foundation Portal\dots
-    \begin{enumerate}
-    \item Mark the released version as ``released'' with the correct date.
-    \item Add a planned/tentative next release at some future date.
-    \end{enumerate}
-
-\end{enumerate}

diff --git a/org.eclipse.photran-dev-docs/dev-guide/app-error-parsers.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/app-error-parsers.ltx-inc
deleted file mode 100644
index c8733ab..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/app-error-parsers.ltx-inc
+++ /dev/null

@@ -1,59 +0,0 @@
-% Creating an Error Parser
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id$ $}
-
-Error parsers scan the output of \texttt{make} for error messages for a
-particular compiler. When they see an error message they can recognize, they
-extract the filename, line number, and error message, and use it to populate the
-Problems view.
-
-For an example, see \texttt{IntelFortranErrorParser}.
-(It's a mere 60 lines.)
-
-To create a new error parser, do the following. 
-
-\begin{itemize} 
-	
-\item We will assume that your error parser class will be in the
-\texttt{errorparsers} folder in the \texttt{org.eclipse.photran.core} plug-in 
-and added to the \\\texttt{org.eclipse.photran.internal.errorparsers} package.
-
-\item Define a class implementing \texttt{IErrorParser}
-
-\item Implement \texttt{public boolean processLine(String line,
-ErrorParserManager eoParser)} which should always return false because
-ErrorParserManager appears not to use the result in a rational way
-
-\item In org.eclipse.photran.core's \texttt{plugin.xml}, find the place where we
-define all of the Fortran error parsers. Basically, copy an existing one. Your
-addition will look something like this:
-
-\pagebreak
-
-\begin{lstlisting}[frame=lines, language=xml]
-<extension
-      id="IntelFortranErrorParser"
-      name="Photran Error Parser for Some New Fortran Compiler"
-      point="org.eclipse.cdt.core.ErrorParser">
-   <errorparser
-         class="org.eclipse.photran.internal.errorparsers.MyErrorParser">
-   </errorparser>
-</extension>
-\end{lstlisting}
-
-\item Your new error parser will appear in the error parser list in the
-Preferences automatically, and it will be automatically added to new projects.
-For existing projects, you will need to open the project properties dialog and
-add the new error parser to the project manually.
-
-\end{itemize}
-
-\textbf{Note.} Error parsers do not have to be implemented in the Photran Core
-plug-in. In fact, they do not have to be implemented as part of Photran at all.
-If you create a brand new plug-in, you can specify \texttt{org.eclipse.cdt.core}
-as a dependency, include the above XML snippet in your plug-in's
-\texttt{plugin.xml}, and include your custom error parser class in that plug-in.
-The plug-in system for Eclipse will recognize your plug-in, detect that it
-extends the \texttt{org.eclipse.cdt.core.ErrorParser} extension point, and add
-it to the list of implemented error parsers automatically.

diff --git a/org.eclipse.photran-dev-docs/dev-guide/app-generating-help.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/app-generating-help.ltx-inc
deleted file mode 100644
index 94bef7a..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/app-generating-help.ltx-inc
+++ /dev/null

@@ -1,52 +0,0 @@
-% Regenerating the Help Plug-in
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id$ $}
-
-Photran's User's Guide and Advanced Features Guide are maintained on the Eclipse wiki (see the
-``Documentation'' link on Photran's Web site.)  However, to accommodate users without Internet
-access, the documentation is also available in Eclipse Online Help; Photran supplies this via
-the org.eclipse.photran.doc.user plug-in.
-
-The content in the org.eclipse.photran.doc.user plug-in is \textit{automatically generated} from
-the markup on the Eclipse wiki.  Before a release, assuming the wiki was edited, this content
-must be regenerated from the revised wiki markup according to the following procedure.
-
-\begin{enumerate}
-
-\item Check out the WikiToEclipse project from Subversion.  See Appendix~\ref{app:uiuc}.
-
-\item Go to the Eclipse wiki, and ``Edit'' the Photran User's Guide.  Copy the wiki markup into
-      \textit{input/basic} in the WikiToEclipse project.  Similarly, edit the Advanced Features
-      Guide, and copy the wiki markup into \textit{input/advanced}.  (These are both ordinary
-      text files.)
-
-\item If there are any new images, copy them into \textit{input/images} in the WikiToEclipse
-      project.  It is perhaps easiest to view the ``Printable'' version of each wiki page in
-      Firefox, and save it as ``Web Page (complete)'' (this will save it and all referenced
-      images); however, this will also include some irrelevant images from the Eclipse Wiki
-      (e.g., the ``search'' icon) and some CSS and JavaScript, so those should be deleted.
-
-\item Edit the Main class in the WikiToEclipse project.  Make sure the plug-in version number
-      is correct.
-
-\item Run the Main class.  If the parser fails, there is probably a problem with the wiki
-      markup (e.g., unclosed double-quotes for italics).
-
-\item Overwrite the contents of the org.eclipse.photran.doc.user project from CVS with the
-      generated content.  This can be done, for example, by using rsync as follows (don't
-      forget the final slashes on the end of the doc.user directory names!).
-      {\footnotesize
-      \begin{verbatim}
-      rsync -av --delete --cvs-exclude \
-          /your/workspace/WikiToEclipse/output/org.eclipse.photran.doc.user/ \
-          /your/workspace/org.eclipse.photran.doc.user/
-      \end{verbatim}}
-
-\item Proofread the generated content by launching a runtime workspace and viewing the online
-      help.  A common problem is HTML tags appearing literally in the output because, for
-      example, the tool converted ``$<$ol$>$'' to ``\&lt;ol\&gt;''.  If this happens, modify the
-      WikiToEclipse class \textit{MultiFileConverter.java} (around line 300) to make the
-      appropriate replacement.
-
-\end{enumerate}
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/dev-guide/app-history.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/app-history.ltx-inc
deleted file mode 100644
index 9cf647d..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/app-history.ltx-inc
+++ /dev/null

@@ -1,29 +0,0 @@
-% Photran Release History
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id: app-history.ltx-inc,v 1.6 2010/04/28 18:12:52 joverbey Exp $ $}
-
-{\footnotesize
-\begin{tabular}{clccl}
-Photran & Date & Platform & CDT & Notes \\
-\hline
-1.2   & Jan 2005 & 2.1     & 1.2   & First public version; hacked CDT clone \\
-2.1   & Feb 2005 & 3.0     & 2.1   & First version available at eclipse.org \\
-3.0b1 & Aug 2005 &         &       & \\
-3.0b2 & Nov 2005 &         &       & \\
-3.0   & Jan 2006 & 3.1     & 3.0   & CDT extension; required modified CDT \\
-3.1b1 & Jul 2006 &         &       & \\ 
-3.1b2 & Apr 2007 & 3.1     & 3.1.1 & Extension of stock CDT \\
-4.0b1 & Jun 2007 & 3.2.2   & 3.1.2 & \textit{Rename, intro implicit none}\\
-4.0b2 & Oct 2007 & 3.3.1   & 4.0.1 & \\
-4.0b3 & Nov 2007 & 3.3.1.1 & 4.0.1 & \\
-4.0b4 &          & 3.4     & 5.0   & First version release via an update site \\
-4.0b5 & Feb 2009 & 3.4     & 5.0.1 & \textit{Move saved vars to common} \\
-      & Mar 2009 & 3.4     & 5.0.1 & First automated integration build under PTP \\
-      & Sep 2009 & 3.5     & 6.0.0 & \\
-5.0.0 & Dec 2009 & 3.5     & 6.0.1 & First official release at eclipse.org \\
-6.0.0 & Jun 2010 & 3.6     & 7.0.0 & Part of the Helios release train \\
-7.0.0 & Jun 2011 &         &       & (Tentative) \\
-%Vers & Mon Year & Platfrm & CDT   & \\
-\end{tabular}
-}

diff --git a/org.eclipse.photran-dev-docs/dev-guide/app-launch.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/app-launch.ltx-inc
deleted file mode 100644
index 15389a1..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/app-launch.ltx-inc
+++ /dev/null

@@ -1,35 +0,0 @@
-% Creating a Photran Launch Configuration
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id: app-launch.ltx-inc,v 1.1 2010/05/19 15:05:36 joverbey Exp $ $}
-
-\begin{enumerate}
-	\setcounter{enumi}{\value{running_counter}}
-	\item In the Package Explorer view, select the \texttt{org.eclipse.photran.core} project
-	      (or any other plug-in project).
-	\item Right-click on that project and select Debug As $>$ Debug Configurations\ldots. A dialog will appear.
-	\item In that dialog, create a new \textbf{Eclipse Application} launch configuration. Call it ``Photran''.
-	\item For the configuration that you have just created, switch to the ``Arguments'' tab.
-	\item Change the ``VM arguments'' field to: \\
-	      \centerline{-ea -XX:PermSize=64m -XX:MaxPermSize=128m -Xms64m -Xmx768m}
-	      (These arguments will enable assertions, increase the amount of
-	      \href{http://wiki.eclipse.org/FAQ_How_do_I_increase_the_permgen_size_available_to_Eclipse\%3F}
-	           {PermGen space},
-	      and increate the amount of heap space available to Eclipse.)
-	\item \textit{(Optional)} If you will be developing fixed form refactorings, or if you need
-	      fixed form refactoring enabled\dots
-	      \begin{enumerate}
-	      \item Switch to the ``Environment'' tab.
-	      \item Create a new environment variable called \texttt{ENABLE\_FIXED\_FORM\_REFACTORING}
-	            with a value of 1.
-	      \end{enumerate}
-	\item Click the ``Debug'' button.  A new instance of Eclipse will open with the CDT and Photran
-	      plug-ins compiled from the code in your workspace.
-	\item To run it again later, just launch the
-	      ``Photran'' configuration from the Eclipse Run menu.
-	      Debug $>$ Debug History $>$ Photran will launch it in the debugger again
-	      (this will allow you to set breakpoints, watch expressions, etc.), while
-	      Run $>$ Run History $>$ Photran will launch it in a normal JVM (with
-	      debugging disabled).
-
-\end{enumerate}
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/dev-guide/app-new-syntax.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/app-new-syntax.ltx-inc
deleted file mode 100644
index 17eab38..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/app-new-syntax.ltx-inc
+++ /dev/null

@@ -1,63 +0,0 @@
-% Adding New Syntax
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id$ $}
-
-The process of adding new syntax to Photran is as follows.\footnote{Note that Photran
-originally handled Fortran 95, and it was later extended to work with Fortran 2003
-and then Fortran 2008; the requisite changes to the lexer, parser, and syntax
-highlighting code are fairly clearly marked.}
-
-\begin{enumerate}
-
-\item Modify the lexers and parser:
-
-  \begin{enumerate}
-  \item Modify the grammar (fortran2008.bnf) to recognize new syntactic constructs, and
-        modify the phase 1 lexers (FreeFormLexerPhase1.flex and FixedFormLexerPhase1.flex)
-        to recognize new keywords
-  \item Add new terminal symbols to Terminal.java
-  \item Run the build-lexer and build-parser scripts to regenerate the lexers and parser
-  \item Modify the phase 2 lexer (FreeFormLexerPhase2.java) to correctly resolve
-        any new keywords as identifiers
-  \end{enumerate}
-
-\item Modify the syntax highlighting for the Fortran editor:
-  \begin{enumerate}
-  \item Modify the list of keywords in FortranKeywordRuleBasedScanner
-  \item Modify the keyword/identifier resolution rules in SalesScanKeywordRule
-  \end{enumerate}
-
-\item Modify the model builder (Outline view), if necessary:
-  \begin{enumerate}
-  \item Add new model elements to FortranElement.java, if necessary, and place their
-        Outline view icons in the org.eclipse.photran.cdtinterface/icons/model folder
-  \item Modify FortranModelBuildingVisitor.java to visit the new constructs and add
-        them to the model
-  \end{enumerate}
-
-\item Modify the name binding analysis, if necessary:
-  \begin{enumerate}
-  \item \textit{IMPORTANT:}
-        If you change any classes that implement IPhotranSerializable, or if you
-        change the ScopingNode class, then be sure to change the VPG database filename
-        in PhotranVPGDB.  This will ensure that end users' code is completely
-        reindexed using the new versions of the serialized classes.
-%        Within your runtime workspace, you can simply clear and refresh the VPG
-%        database (from the Refactor $>$ Debugging menu), but end users should never be
-%        asked to do this.
-  \item If any new syntactic constructs are subclasses of ScopingNode, there are
-        several methods in the ScopingNode class that will need to be modified to
-        handle the new node type.  Currently, these are easy to identify because they
-        all contain large numbers of
-        ``instanceof'' tests (which is ugly; we will eventually do this the ``right''
-        way and dispatch dynamically to the subclasses after the parser generator
-        allows custom subclasses)
-  \item If the new syntax contains identifiers, modify the ReferenceCollector to bind
-        any identifiers in new syntactic constructs to their declarations
-  \item Similarly, if necessary, modify the DefinitionCollector to add any new
-        declarations to the VPG database
-  \item Modify the other collector classes in the same package if necessary
-  \end{enumerate}
-
-\end{enumerate}
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/dev-guide/app-obfuscate-fortran.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/app-obfuscate-fortran.ltx-inc
deleted file mode 100644
index 4c00f69..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/app-obfuscate-fortran.ltx-inc
+++ /dev/null

@@ -1,185 +0,0 @@
-% Sample Refactoring
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id$ $ - based on 2008/08/08 nchen}
-
-\section{Introduction}
-
-Contributing a new refactoring to Photran is best done by following a working
-example.
-
-This paragraph describes the general approach: First, an action must be added to
-both the editor popup menu \textbf{and} the Refactor menu in the menu bar by
-modifying the plugin.xml file. Then, the action delegate and its accompanying
-refactoring wizard have to be coded; these two classes are responsible for
-populating the user interface of the refactoring wizard dialog. Finally, the
-actual Fortran refactoring itself has to be coded.
-
-The remaining sections go into the details of each of those steps based on a
-simple (but not useful) refactoring example: obfuscating Fortran by removing the
-comments and adding redundant comments to the header. The source code is
-available from
-\url{http://photran.cs.illinois.edu/samples/obfuscator-photran5.zip}
-(UIUC personnel can find it in the Subversion repository described in the appendix).
-
-\section{Modifying the plugin.xml}
-
-There are \textbf{four} extensions points (from the Eclipse core) that our plug-in needs to extend:
-
-\begin{description}
-
- \item [\texttt{org.eclipse.ui.commands}] Creates a new command \emph{category}
-to represent our refactoring. This category will be referenced by the other
-extensions in the plugin.xml file.
-
- \item [\texttt{org.eclipse.ui.actionSets}] This extension point is used to add
-menus and menu items to the Fortran perspective.
-
- \item [\texttt{org.eclipse.ui.actionSetPartAssociations}] Allows our
-refactoring to be visible/enabled in the context of the Fortran editor.
-
- \item [\texttt{org.eclipse.ui.popupMenus}] Displays our refactoring in the
-pop-up menu that appears during a right-click.
-
- \item [\texttt{org.eclipse.ui.bindings}] (Optional) Allows our refactoring to
-be invoked via keyboard shortcuts. For instance the Fortran Rename Refactoring
-is bound to the Alt + Shift + R keyboard shortcut, which is the same as the one
-for the Java Rename Refactoring.
-
-\end{description}
-
-Please refer to the documentation and schema description for each extension point; the documentation is available from Help $>$ Help Contents in Eclipse.
-
-Fortran currently does \textbf{not} use the newer \texttt{org.eclipse.ui.menus}
-extension points (introduced in Eclipse 3.3) for adding menus, menu items and
-pop-up menus.
-
-It is possible to use the newer \texttt{org.eclipse.ui.menus} extension point if
-desired, but this chapter uses the older extension points to remain consistent
-with how Photran is doing it.
-
-For more information, see the plugin.xml file of our refactoring example.
-
-\section{Creating an Action Delegate and a Refactoring Wizard}
-
-The \texttt{org.eclipse.ui.actionSets} and \texttt{org.eclipse.ui.popupMenus}
-extension points that were extended in our plugin.xml file require a reference
-to action delegate class that we need to provide.
-
-For a Fortran refactoring, our action delegate should extend the
-\\\texttt{AbstractFortranRefactoringActionDelegate} class \textbf{and} implement
-the \\\texttt{IWorkbenchWindowActionDelegate} and \texttt{IEditorActionDelegate}
-interfaces.
-
-The most important method in our action delegate class is the
-\textbf{constructor}. The constructor has to be done in a particular way so that
-everything is setup correctly. Listing~\ref{lst:obfuscateaction} shows how the constructor needs to be setup.
-
-\begin{code}
-\begin{lstlisting}
-public class ObfuscateAction extends AbstractFortranRefactoringActionDelegate
-	implements IWorkbenchWindowActionDelegate, IEditorActionDelegate {
-
-    public ObfuscateAction() {
-			super(ObfuscateRefactoring.class, ObfuscateRefactoringWizard.class);
-    }
-		
-		...
-}
-\end{lstlisting}
-\caption{\texttt{ObfuscateAction} for our simple refactoring example}
-\label{lst:obfuscateaction}
-\end{code}
-
-Inside our constructor, we need to call the parent constructor that takes
-\textbf{two} parameters: the class of the actual refactoring object (e.g.
-ObfuscateRefactoring) and the class of the actual refactoring wizard (e.g.
-ObfuscateRefactoringWizard). The parent class will dynamically create the
-refactoring object and refactoring wizard using Java reflection.
-
-Our refactoring wizard needs to be a subclass of
-\texttt{AbstractFortranRefactoringWizard}. The only method that we are required
-to implement is the \texttt{doAddUserInputPages} method. This page is
-responsible for creating a page for the wizard. For instance, a refactoring such
-as rename refactoring requires the user to provide a new name. So the
-\texttt{doAddUserInputPages} is responsible for creating the interface for that.
-
-Ideally, if our refactoring does not require the user to provide any input, it
-should just have an empty \texttt{doAddUserInputPages} method. However, because
-of a bug in the Mac OS X version of Eclipse, it is necessary to add a
-\emph{dummy} page. Without this dummy page the refactoring will cause the entire
-Eclipse UI to lock up on Mac OS X. Listing~\ref{lst:dummy_wizard_page} shows how
-to add a dummy input page. \\
-
-\begin{code}
-\begin{lstlisting}
-protected void doAddUserInputPages() {
-    addPage(new UserInputWizardPage(refactoring.getName()) {
-
-	public void createControl(Composite parent) {
-	    Composite top = new Composite(parent, SWT.NONE);
-	    initializeDialogUnits(top);
-	    setControl(top);
-
-	    top.setLayout(new GridLayout(1, false));
-
-	    Label lbl = new Label(top, SWT.NONE);
-	    lbl.setText("Click OK to obfuscate the current Fortran file. 
-			To see what changes will be made, click Preview.");
-
-	}
-    });
-}
-\end{lstlisting}
-\caption{Adding a \texttt{dummy} wizard input page}
-\label{lst:dummy_wizard_page}
-\end{code}
-
-\section{Creating the Actual Refactoring}
-
-Section~\ref{sec:structure_of_a_fortran_refactoring} gives a good overview of
-the \textbf{four} methods that a Fortran refactoring needs to implement. And
-Section~\ref{sec:refactoring_caveats} gives an overview of things to avoid while
-performing a refactoring. Our example refactoring conforms to the lessons in
-both those sections.
-
-Here we briefly describe the four methods in our example:
-
-\begin{description}
-
- \item [getName] This just returns the text ``Obfuscate Fortran Code''
-describing our refactoring. This text will be used as the title of the
-refactoring wizard dialog.
-
- \item [doCheckInitialConditions] Our simple refactoring does not have any
-\emph{real} initial conditions. Our refactoring can proceed as long as the
-current file can be parsed as valid Fortran source code. This is automatically
-checked by the \texttt{FortranRefactoring} parent class.
-
- Instead we use this method as a hook to perform some simple program analysis --
-acquiring the names of all the functions and subroutines in the current file. We
-will print these names later as part of the header comment. 
-
-	\item [doCheckFinalConditions] Since we do not require the user to provide any
-additional input, there are no final conditions to check.
-
-	\item [doCreateChange] The actual refactoring changes are constructed in this
-method. 
-
-We iterate through every token in the current file to check if it has a comment
-string. Comment strings are acquired by calling \texttt{Token\#getWhiteBefore()}
-and \texttt{Token\#getWhiteAfter()}. Following the advice of
-Section~\ref{sec:refactoring_caveats}, we store a list of all the tokens (call
-this list TokensWithComments) that contain comment strings. Once we have
-iterated through all the tokens, we proceed to remove the comments for tokens in
-our TokensWithComments list. Removing comments is done by calling
-\texttt{Token\#setWhiteBefore()} and \texttt{Token\#setWhiteAfter()} with blank
-strings as parameters.
-
-Finally, we create a header comment that just lists all the functions and
-subroutines in the current source file and add that to the preamble of the main
-program.
-
-\end{description}
-
-For more information, please consult the source code for our example.

diff --git a/org.eclipse.photran-dev-docs/dev-guide/app-rename-tests.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/app-rename-tests.ltx-inc
deleted file mode 100644
index 3280dae..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/app-rename-tests.ltx-inc
+++ /dev/null

@@ -1,125 +0,0 @@
-% Creating a Rename Refactoring Test Case
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id$ $ - based on 2008/08/08 nchen}
-
-JUnit tests for the Rename refactoring are located in the
-\texttt{org.eclipse.photran.refactoring.tests} plug-in project. A Rename test
-has two components:
-
-\begin{enumerate}
-
-\item one or more Fortran files, which contain the code to be refactored, and
-
-\item a JUnit test suite class, which creates tests attempting to rename the
-identifiers in that file.
-
-\end{enumerate}
-
-The Fortran files are stored as .f90 files in the \emph{rename-test-code}
-folder. The JUnit tests are similarly-named Java classes in the
-\texttt{org.eclipse.photran.refactoring.tests.rename} package.
-
-A sample JUnit test suite is the following. The more complex tests follow a
-similar structure. Here, the \texttt{vars} array records all of the identifiers
-and the line/column positions on which they occur. The test suite constructor
-attempts to rename each identifier to \texttt{z} and also to
-\texttt{a\_really\_really\_long\_name}.
-
-\shabox{Because our strategy for testing requires the \emph{exact} line and
-column position, using tabs instead of spaces for indenting could interfere with
-the positioning. Therefore, for testing purposes, test cases (the Fortran test
-files) should be indented with \textbf{spaces only}. However, when an actual
-Fortran programmer invokes a refactoring through the Eclipse UI, the indentation
-with tabs or spaces is not a problem because the Eclipse editor is smart enough
-to provide the correct position (based on expanding tabs into spaces
-internally). } \\
-
-\begin{lstlisting}[frame=lines]
-public class Rename2 extends RenameTestSuite
-{
-	/////////////////////////////////////////////////////////////////////////
-	//
-	// RECORD POSITIONS OF ALL IDENTIFIERS IN RENAME2.F90, AND
-	// GROUP THEM ACCORDING TO WHICH ONES SHOULD BE RENAMED TOGETHER
-	//
-	/////////////////////////////////////////////////////////////////////////
-
-	private String filename = "rename2.f90";
-
-	private Ident[] vars = new Ident[]
-	{
-	    var(filename, "Main", new LineCol[] { lc(2,9), lc(27,13) }),
-	    var(filename, "one", new LineCol[] { lc(4,16), lc(12,14), 
-		                                       lc(16,11), lc(20,11) }),
-	    var(filename, "two", new LineCol[] { lc(5,27), lc(10,13),
-		                                       lc(13,14), lc(17,14) }),
-	    var(filename, "three", new LineCol[] { lc(6,16), lc(14,9), 
-		                                         lc(18,9) }),
-	    var(filename, "four", new LineCol[] { lc(10,21), lc(15,14),
-		                                        lc(19,14) })
-	};
-
-	/////////////////////////////////////////////////////////////////////////
-	//
-	// TEST CASES
-	//
-	/////////////////////////////////////////////////////////////////////////
-
-	public static Test suite() throws Exception
-	{
-	    return new Rename2();
-	}
-
-	public Rename2() throws Exception
-	{
-	    startTests("Renaming program with comments and line continuations");
-	    for (String name : new String[] { "z", "a_really_really_long_name" })
-	        for (Ident var : vars)
-	            addSuccessTests(var, name);
-	    endTests();
-	}
-}
-\end{lstlisting}
-
-The \texttt{addSuccessTests} method adds several test cases to the suite: it
-simulates the user clicking on each occurrence of the identifier and asking to
-rename that instance. (Of course, no matter which occurrence is clicked on, all
-instances should be renamed\ldots but this has occasionally not happened.)
-
-If the rename should not have succeeded--that is, a precondition would not be
-met--\texttt{addPreconditionTests} should have been called rather than
-\texttt{addSuccessTests}. A good testing strategy ensures that a program behaves
-correctly: it should do \textbf{only} what it is supposed to do and nothing
-more. In our case, it should rename only the identifiers that are affected and
-ensure that the other identifiers are left untouched.
-
-\texttt{Rename3} is a slightly more complicated example, which renames
-identifiers spanning multiple files. In this case, a large boolean matrix is
-used to record which identifiers should be renamable to which other identifiers:
-
-\begin{code}
-\begin{lstlisting}
-private boolean[][] expectSuccess = new boolean[][]
-{
-    
-/* vvv can be renamed to >>>    myProgram, aRenamed3, bRenamed3, contained, 
-/* myProgram */ new boolean[] { false,     true,      true,      true,  ...      
-/* aRenamed3 */ new boolean[] { true,      false,     false,     false, ...    
-/* bRenamed3 */ new boolean[] { true,      false,     false,     false, ...    
-/* contained */ new boolean[] { true,      false,     false,     false, ...    
-/* external  */ new boolean[] { false,     false,     false,     false, ...    
-/* moduleA   */ new boolean[] { false,     false,     false,     false, ...    
-/* aSub1of3  */ new boolean[] { true,      false,     false,     false, ...    
-/* aSub2of3  */ new boolean[] { true,      false,     false,     false, ...    
-/* aSub3of3  */ new boolean[] { true,      true,      true,      true,  ...    
-/* moduleB   */ new boolean[] { false,     false,     false,     false, ...    
-/* bSub1of3  */ new boolean[] { true,      true,      true,      true,  ...    
-/* bSub2of3  */ new boolean[] { true,      false,     false,     false, ...    
-/* bSub3of3  */ new boolean[] { true,      true,      true,      true,  ...    
-/* moduleC   */ new boolean[] { false,     false,     false,     false, ...    
-/* cSub      */ new boolean[] { true,      true,      true,      true,  ...    
-};
-\end{lstlisting}
-\caption{Partial representation of the boolean matrix in \texttt{Rename3}}
-\end{code}

diff --git a/org.eclipse.photran-dev-docs/dev-guide/app-tests.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/app-tests.ltx-inc
deleted file mode 100644
index 2127aab..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/app-tests.ltx-inc
+++ /dev/null

@@ -1,55 +0,0 @@
-% Running Photran's Automated Test Suite
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id: app-tests.ltx-inc,v 1.4 2010/04/28 21:05:43 joverbey Exp $ $}
-
-\begin{enumerate}
-	\setcounter{enumi}{\value{running_counter}}
-	\item In the Package Explorer view, select the \texttt{org.eclipse.photran.core.vpg.tests} project.
-	\item Right-click on that project and select Run As $>$ Run Configurations\ldots. A dialog will appear.
-	\item In that dialog, create a new \textbf{JUnit Plug-in Test} launch configuration. Call it ``Photran-Tests''.
-	\item For the configuration that you have just created, switch to the ``Arguments'' tab.
-	\item Change the ``VM arguments'' field to \texttt{-ea -Xms40m -Xmx512m}
-	\item Switch to the ``Environment'' tab.
-	\item \textit{(Optional)} If you are running Linux or Mac OS X and have gfortran installed,
-	            some of Photran's refactoring unit tests can attempt to compile
-	            and run the Fortran test programs before and after the refactoring in order
-	            to ensure that the refactoring actually preserves behavior (and produces
-	            code that compiles).  The following steps will enable this behavior.
-	            Note, however, that if the path to gfortran is incorrect, or if gfortran
-	            cannot be run successfully, it will cause the test suite to fail\dots
-	            so you might not want to do this the very first time you attempt to run
-	            the test suite.
-	      \begin{enumerate}
-	      \item Create a new environment variable called \texttt{COMPILER} with the full
-	            path to gfortran.  This will be something like
-	            \texttt{/usr/local/bin/gfortran}
-	      \item Create a new environment variable called \texttt{EXECUTABLE} with a
-	            path to some non-existent file in your home directory, e.g.,
-	            \texttt{/Users/joverbey/a.out}.  When gfortran is run, it will write
-	            the executable to this path.
-	      %\item[] \textit{When both of these environment variables are set, you will be able
-	      %      to see the output from the compiler and the Fortran program in the Console
-	      %      view as the test suite runs.  If compilation fails, or if the Fortran program
-	      %      exits with a nonzero status code, or if the Fortran program does not produce
-	      %      the same output before and after refactoring, the corresponding JUnit test
-	      %      will fail.  See the JavaDoc for the method
-	      %      \texttt{RefactoringTestCase\#compileAndRunFortranProgram} for more details.}
-	      \end{enumerate}
-	\item Click the ``Run'' button to run the tests.  It will take at least a minute to run
-	      the test suite.  When it finishes, you should get a green bar in the JUnit view.
-	      If you get a red bar, some of the tests failed; the JUnit view will have details.
-	\item To run the tests again later, just launch the
-	      ``Photran-Tests'' configuration from the Eclipse Run menu.
-
-	%\vspace{.5em}
-	%\noindent\textit{\textbf{Note.} Some parser tests will attempt to look for closed-source
-	%code that you may not have.  A warning will appear in the JUnit runner if this code is not
-	%available, but all tests should still pass.
-	%UIUC personnel: See the appendix \textit{Additional Information for UIUC Personnel} in the
-	%\textit{Photran Developer's Guide} for more information.}
-	\noindent\textit{\textbf{Note.} UIUC personnel: See the appendix
-	``Additional Information for UIUC Personnel'' in the
-	\textit{Photran Developer's Guide} for information on additional unit test cases.}
-	\setcounter{running_counter}{\value{enumi}}
-\end{enumerate}
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/dev-guide/app-uiuc.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/app-uiuc.ltx-inc
deleted file mode 100644
index acaa6cd..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/app-uiuc.ltx-inc
+++ /dev/null

@@ -1,65 +0,0 @@
-% Additional Information for UIUC Personnel
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id: app-uiuc.ltx-inc,v 1.2 2010/04/28 18:12:52 joverbey Exp $ $}
-
-\begin{center}
-\framebox{\parbox{5.5in}{\textit{The following information is only of interest
-to developers in the Department of Computer Science at the University of
-Illinois at Urbana-Champaign.}}}
-\end{center}
-
-\section{Photran Subversion Repository at UIUC}
-
-\centerline{\large https://subversion.cs.uiuc.edu/svn/Photran/}
-
-A private Subversion repository for internal testing and research work is
-provided by TSG at the above URL.  \textit{You will only be able to access
-this repository if you have specifically been granted access.}  The repository
-requires authentication using your NetID and Kerberos password.
-To access a Subversion repository from Eclipse, you must install an additional
-Eclipse plug-in (either Subclipse or Subversive).
-Currently, this repository contains the following.
-
-\begin{itemize}
-
-\item
-\textbf{Large Fortran test codes (photran-projects).}
-Checking these out into your workspace will enable about 6,000 additional
-test cases in the JUnit test suite.  \textit{These applications are PRIVATE.
-They may NOT be distributed and are intended only for testing Photran.}
-
-\item
-\textbf{Sample Obfuscation refactoring (sample-refactoring).}
-The sample refactoring described in Appendix~\ref{app:obfuscate_refactoring}.
-
-\item
-\textbf{Refactoring tools for PHP, Lua, and BC.}
-Prototype Eclipse-based refactoring tools based on the Rephraser Engine.
-
-%\item
-%\textbf{C preprocessor support (c-preprocessor).}
-%C preprocessor support, based on the C preprocessor in CDT 5.  This will
-%eventually be moved into the public CVS repository.
-
-\end{itemize}
-
-\section{Photran Web Site at UIUC}
-
-TSG provides a Web hosting infrastructure based on the popular CPanel system
-and has set up a web hosting account for Photran.
-This hosting environment supports PHP, MySQL databases, CGI
-scripts, and a number of other popular web technologies.
-Documentation for these features is provided in the control
-panel.  You can access your web content via the control panel,
-SSH, or WebDAV.
-Here are the account details:
-
-\begin{center}
-\begin{verbatim}
-        web URL: http://photran.cs.illinois.edu/
-  control panel: https://cpanel.cs.illinois.edu:2083/
-     SSH access: cpanel.cs.illinois.edu
-       web root: ~/public_html
-\end{verbatim}
-\end{center}

diff --git a/org.eclipse.photran-dev-docs/dev-guide/build.sh b/org.eclipse.photran-dev-docs/dev-guide/build.sh
deleted file mode 100644
index a014c47..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/build.sh
+++ /dev/null

@@ -1,6 +0,0 @@
-#!/bin/sh
-# Use this if you have problems running the Ant build script (build.xml)
-pdflatex dev-guide-general.ltx
-pdflatex dev-guide-specialized.ltx
-pdflatex cvs-instructions.ltx
-rm -rf *.aux *.log *.toc *.dvi *.ps *.out

diff --git a/org.eclipse.photran-dev-docs/dev-guide/build.xml b/org.eclipse.photran-dev-docs/dev-guide/build.xml
deleted file mode 100644
index 0caa9d0..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/build.xml
+++ /dev/null

@@ -1,50 +0,0 @@
-<?xml version="1.0"?>
-<project default="main" basedir=".">
-	<target name="init">
-		<tstamp/>
-	</target>
-
-	<target name="main" description="Generate PDFs using pdflatex">
-		<!-- Run find-pdflatex.sh in the build directory to find pdflatex -->
-		<exec executable="find-pdflatex.sh"
-			resolveexecutable="true"
-			outputproperty="pdflatex"
-			failonerror="true"
-			failifexecutionfails="true"/>
-		
-		<!-- Now run pdflatex -->
-		<exec executable="${pdflatex}"
-			failonerror="true"
-			failifexecutionfails="true">
-			<arg value="dev-guide-general.ltx" />
-		</exec>
-		<exec executable="${pdflatex}"
-			failonerror="true"
-			failifexecutionfails="true">
-			<arg value="dev-guide-general.ltx" />
-		</exec>
-		<exec executable="${pdflatex}"
-			failonerror="true"
-			failifexecutionfails="true">
-			<arg value="dev-guide-specialized.ltx" />
-		</exec>
-		<exec executable="${pdflatex}"
-			failonerror="true"
-			failifexecutionfails="true">
-			<arg value="dev-guide-specialized.ltx" />
-		</exec>
-		<exec executable="${pdflatex}"
-			failonerror="true"
-			failifexecutionfails="true">
-			<arg value="cvs-instructions.ltx" />
-		</exec>
-	  	<delete><fileset dir="." includes="*.aux *.log *.toc *.dvi *.ps *.out" /></delete>
-	  	<exec executable="bash"><arg value="-c" /><arg value="if [ &quot;$$LOGNAME&quot; == &quot;joverbey&quot; ]; then open dev-guide-general.pdf; fi" /></exec>
-	</target>
-
-	<target name="clean" description="Remove generated PDFs">
-		<delete><fileset dir="." includes="*.pdf" /></delete>
-	  	<delete><fileset dir="." includes="*.aux *.log *.toc *.dvi *.ps *.out" /></delete>
-	</target>
-
-</project>

diff --git a/org.eclipse.photran-dev-docs/dev-guide/cha-ast-vpg.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/cha-ast-vpg.ltx-inc
deleted file mode 100644
index 10c2558..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/cha-ast-vpg.ltx-inc
+++ /dev/null

@@ -1,530 +0,0 @@
-% The Abstract Syntax Tree and Virtual Program Graph
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id: cha-ast-vpg.ltx-inc,v 1.1 2010/05/21 20:12:20 joverbey Exp $ $ - based on 2008/08/08 nchen}
-
-\section{How to Get Acquainted with the Program Representation}
-\label{sec:how_to_get_acquainted_with_the_program_representation}
-
-\emph{These features work only on files that are located inside a Fortran
-project with analysis and refactoring enabled.  See the Photran user
-documentation \textit{(Photran Advanced Features Manual)} for instructions.}
-
-\subsection{Visualizing ASTs}
-
-When Photran parses a file, it produces an abstract syntax tree (AST).  This
-is the central data structure used when implementing refactorings, program
-analyses, etc.
-
-Photran can display its abstract syntax tree (AST) for a file in place of the
-ordinary Outline view. This behavior can be enabled from the Fortran workspace
-preferences:
-
-\begin{itemize}
-	\item Click on Window $>$ Preferences in Windows/Linux, or Eclipse $>$ Preferences in Mac OS X.
-	\item Select ``Fortran'' on the left hand side of the preference dialog (do not expand it).
-	\item Select ``(Debugging) Show entire abstract syntax tree rather than Outline view''
-\end{itemize}
-  
-Clicking on a \texttt{Token} in the Outline view will move the cursor
-to that construct's position in the source file.
-
-Figure~\ref{fig:simple_fortran_ast} is an example of this display.
-(It is explained further in Section~\ref{sec:asts}.)
-
-\subsection{Visually Resolving Bindings}
-
-Each use of an identifier in a Fortran program corresponds to a declaration.
-For example, the use of the variable \textit{count} in \texttt{print *, count}
-might correspond to a declaration like \texttt{integer~::~count}.  We say that
-the use of the identifier is \textbf{bound} to its declaration, and determining
-the declaration that corresponds to a particular use is called \textbf{resolving}
-the name binding.
-
-To visualize what declaration a particular variable use is bound to,
-click on an identifier in a Fortran editor (position the cursor over
-it), and press F3 (or click Navigate $>$ Open Declaration, or right-click and
-choose Open Declaration.) The binding will be resolved and the declaration
-highlighted. If there are multiple bindings, a pop-up window will open and one
-can be selected. If the identifier is bound to a declaration in a module defined
-in a different file, an editor will be opened on that file.
-
-\subsection{Visualizing Enclosing Scopes}
-
-Every declaration in a Fortran program exists in a particular \textit{lexical
-scope.}  For example, if a subroutine definition includes a variable declaration
-like \texttt{integer~::~i}, then that variable is only visible within the subroutine,
-and that subroutine is its \textit{enclosing scope.}
-In the AST, the subroutine is represented by a \textit{ASTSubroutineSubprogramNode},
-a class which inherits from \textit{ScopingNode}, and it would an the ancestor of the
-\textit{ASTTypeDeclarationStmtNode} representing the variable declaration.
-
-To view the enclosing scope for a particular token in the AST,
-click on any token in the Fortran editor, and click Refactor $>$ (Debugging) $>$
-Select Enclosing Scope. The entire range of source text corresponding to that token's
-enclosing \texttt{ScopingNode} will be highlighted.
-
-\subsection{Visualizing Definitions}
-
-For every declaration in a Fortran program, Photran maintains a \textit{Definition}
-object which summarizes the information available about that symbol.  For example,
-by invoking methods on the \textit{Definition} for a symbol, you could determine
-that the symbol is a local variable named \textit{matrix} and that it is a
-two-dimensional, allocatable array.  Of course, you could figure this out by
-traversing the AST, but that can be very tedious (and expensive).\footnote{Actually,
-Photran \textit{does} have to traverse the AST to figure this out, but it only does
-this once per file, and then it saves the \textit{Definition} to disk (in the
-``VPG database'').  When you ask Photran for a \textit{Definition}, it simply loads
-the information from this database.}
-
-To get a sense of what symbols have \textit{Definition} objects (these are things
-like variable declarations, subprogram declarations, common block names, etc.),
-open a file in the Fortran editor, and click Refactor $>$ (Debugging) $>$
-Display Symbol Table for Current File. Indentation shows scope nesting, and each
-line summarizes the information in a \texttt{Definition} object.
-
-\section{Abstract Syntax Trees}
-\label{sec:asts}
-
-\subsection{Simple AST Example}
-
-The Fortran grammar is very lengthy, containing
-hundreds of rules. Even the simplest Fortran program has a fairly
-non-trivial AST. For instance this simple Fortran program: \\
-
-\begin{lstlisting}[language=Fortran, frame=lines]
-program main
-    integer a
-end	
-\end{lstlisting}
-
-generates the AST shown in Figure~\ref{fig:simple_fortran_ast}.
-%As an exercise,
-%the reader is encouraged to derive the structure of the AST from the grammar
-%specifications in the \emph{fortran2008.bnf} file beginning with \# R201,
-%\verb!<ExecutableProgram>!.
-
-\begin{image}
-	\centering
-			\includegraphics[height=4in]{images/simple_fortran_AST.png}
-			\caption{AST for simple Fortran program as viewed through the Outline View}
-		\label{fig:simple_fortran_ast}
-\end{image}
-
-Fortunately, it is not necessary to know every construct in the grammar. For
-most refactoring and program analysis tasks, it is sufficient to rely on the
-information that the VPG provides (e.g., \textit{Definition} objects) and
-to construct a Visitor to visit only the nodes of interest and
-``collect'' the information that is required.
-To get a sense of what AST nodes are involved in the particular task you want to
-accomplish, we recommend enabling AST visualization (described above), writing
-some sample programs that exercise the relevant parts of the Fortran grammar, and
-then observing the AST that is displayed.
-
-\subsection{AST Structure for DO-Loops}
-
-Due to a deficiency in the parser, DO-constructs are not recognized as a single
-construct; DO and END DO statements are recognized as ordinary statements
-alongside the statements comprising their body.  There is a package in the
-core.vpg plug-in called org.eclipse.photran.internal.core.analysis.loops which
-provides machinery to fix this, giving DO-loops a ``proper'' AST structure.
-
-If you call \texttt{LoopReplacer.replaceAllLoopsIn(ast)}, it will identify all
-of the new-style DO-loops and change them to \texttt{ASTProperLoopConstructNode}s,
-which a more natural structure, with a loop header, body, and END DO statement.
-Once this is done, visitors must be implemented by subclassing one of the
-Visitor classes \emph{in the org.eclipse.photran.internal.core.analysis.loops
-package;} these have a callback method to handle
-\texttt{ASTProperLoopConstructNode}s.
-
-The AST visualization (described above) shows the AST \textit{after}
-\texttt{LoopReplacer.replaceAllLoopsIn(ast)} has been invoked.
-
-\section{Virtual Program Graph}
-\label{sec:virtual_program_graph}
-
-In Photran, it is \emph{almost} never necessary to call the lexer, parser, or
-analysis components directly. Instead, Photran uses a
-\textbf{virtual program graph}, or VPG, which provides the fa\c{c}ade of a
-whole-program abstract syntax tree (AST) with embedded analysis information.
-
-To the programmer building a refactoring, the VPG appears quite simple.
-\begin{enumerate}
-\item When the programmer requires an AST, the programmer asks the VPG to
-      provide it.  He does not parse the file directly.
-\item Methods on (certain) AST nodes provide name binding information, control flow
-      information, source/AST rewriting, etc.  For example, the programmer can
-      ask an AST node for its control flow successors, or he can tell it to
-      remove itself from the AST, to reindent itself, etc.\footnote{Control flow
-      analysis is not (yet) implemented in Photran.  But, in theory, this is
-      how it should work\dots}
-\item The VPG maintains a database containing the analysis information (e.g.,
-      what names are references to what other names).  Analyses are run when the
-      user saves a file, and the result is saved to the database.  Then, when
-      requests are made for analysis information (e.g., asking for all of the
-      references to a particular name), it can simply be loaded from the database.
-      It is the programmer's responsibility to make sure that the database is
-      up-to-date before he attempts to access it, and that any task that
-      requires database information is scheduled so that it will not attempt to
-      read from the database while analysis information is being updated.
-\end{enumerate}
-
-Photran's VPG is implemented by the class \texttt{PhotranVPG}.  This is a
-\emph{singleton} object whose instance is available via
-\texttt{PhotranVPG.getInstance()}.  The remaining subsections describe how the
-above tasks are implemented in Photran.
-
-\subsection{Acquiring and Releasing ASTs}
-
-ASTs are retrieved by invoking either of these
-methods:
-\begin{code}
-\begin{lstlisting}[numbers=none]
-public IFortranAST acquireTransientAST(IFile file)
-public IFortranAST acquirePermanentAST(IFile file)
-\end{lstlisting}
-%\caption{Acquiring the Fortran AST}
-\end{code}
-
-\vspace{-0.15in}
-
-The returned object is an \texttt{IFortranAST}, an object which has a method for
-returning the root node of the AST as well as methods to quickly locate tokens
-in the AST by offset or line information. A \emph{transient AST} can be garbage
-collected as soon as references to any of its nodes disappear. A \emph{permanent
-AST} will be explicitly kept in memory until a call is made to either of the 
-following methods:
-\begin{code}
-\begin{lstlisting}[numbers=none]
-public void releaseAST(IFile file)
-public void releaseAllASTs()
-\end{lstlisting}
-\caption{Releasing the Fortran AST}
-\end{code}
-
-Often, it is better to acquire a transient AST and rely on the garbage collector
-to reclaim the memory once we are done using it. However, there are times when
-acquiring a permanent AST would be more beneficial performance-wise. For
-instance, if we will be using the same AST multiple times during a refactoring,
-it would be better to just acquire a permanent AST. This prevents the garbage
-collector from reclaiming the memory midway through the refactoring once all
-references to the AST have been invalidated. While it is always possible to
-reacquire the same AST, doing so can be an expensive operation since it requires
-\emph{lexing}, \emph{parsing} \textbf{and} finally \emph{reconstructing} the AST
-from scratch.
-
-Only one AST for a particular file is in memory at any particular point in time,
-so successive requests for the same \texttt{IFile} will return the same
-(pointer-identical) AST until the AST is released (permanent) or garbage
-collected (transient).
-
-The \texttt{acquireTransientAST} and \texttt{acquirePermanentAST} methods return
-an object implementing \texttt{IFortranAST}.  This interface has several methods,
-notably including the following:
-
-\begin{itemize}
-
-\item
-The \texttt{getRoot} method returns the root of the AST, while the
-\texttt{find...} methods provide efficient means to search for tokens based
-on their lexical positioning in the source code.
-
-\item
-The \texttt{accept} method allows an external visitor to traverse the AST. This
-method is usually used when it is necessary to ``collect'' information about
-certain nodes.
-
-\item
-Because \texttt{IFortranAST} extends the \texttt{Iterable} interface, it is
-possible to use the \emph{foreach} loop to conveniently iterate through all the
-tokens in the AST e.g. \\ \lstinline!for (Token token : new IterableWrapper<Token>(ast))!
-
-\end{itemize}
-
-\subsection{Scope and Binding Analysis}
-
-Currently, the only semantic analysis performed by Photran is binding analysis:
-mapping \emph{identifiers} to their \emph{declarations}. Compilers usually do
-this using symbol tables but Photran uses a more IDE/refactoring-based approach.
-
-Certain nodes in a Fortran AST represent a lexical scope. All of these nodes are
-declared as subclasses of \texttt{ScopingNode}:
-
-\begin{itemize}
-\item ASTBlockDataSubprogramNode
-\item ASTDerivedTypeDefNode
-\item ASTExecutableProgramNode
-\item ASTFunctionSubprogramNode
-\item ASTInterfaceBlockNode\footnote{An interface block defines a nested scope only if it is a named interface.Anonymous (unnamed) interfaces provide signatures for subprograms in their enclosing scope.}
-\item ASTMainProgramNode
-\item ASTModuleNode
-\item ASTSubroutineSubprogramNode
-\end{itemize}
-
-Each of the subclasses of \texttt{ScopingNode} represents a scoping unit in
-Fortran. The \texttt{ScopingNode} class has several public methods that provide
-information about a scope. For example, one can retrieve a list of all of the
-symbols declared in that scope; retrieve information about its
-\texttt{IMPLICIT} specification; find its header statement (e.g. a
-\texttt{FUNCTION} or \texttt{PROGRAM} statement); and so forth.
-
-The enclosing scope of a \texttt{Token} can be retrieved by calling the
-following method on the \texttt{Token} object:
- 
-\begin{lstlisting}[numbers=none]
-public ScopingNode getEnclosingScope()
-\end{lstlisting}
-
-Identifier tokens (\texttt{Token}s for which \texttt{token.getTerminal() ==
-Terminal.T\_IDENT}), which represent functions, variables, etc. in the Fortran
-grammar, are \emph{bound} to a declaration\footnote{The introduction to VPGs
-earlier in this chapter (URL above) provides an example visually.}. Although,
-ideally, every identifier will be bound to exactly one declaration, this is not
-always the case: the programmer may have written incorrect code, or Photran may
-not have enough information to resolve the binding uniquely). So the
-\texttt{resolveBinding} method returns a \emph{list} of \texttt{Definition}
-objects:
-
-\begin{lstlisting}[numbers=none]
-public List<Definition> resolveBinding()
-\end{lstlisting}
-
-A \texttt{Definition} object contains many public methods which provide a wealth
-of information. From a \texttt{Definition} object, it is possible to get a list
-of all the references to a particular declaration (using
-\texttt{findAllReferences}) and where that particular declaration is located in
-the source code (using \texttt{getTokenRef}). Both of these methods return a
-\texttt{PhotranTokenRef} object. See Section~\ref{sub:token_or_tokenref} for a
-comparison between \texttt{Token} and \texttt{TokenRef}.
-
-\subsubsection{Obtaining the \texttt{Definition} of a variable}
-
-If you have a reference to the \texttt{Token} object of that variable (for
-instance through iterating over all \texttt{Tokens} in the current Fortran AST)
-then use:
-
-\begin{lstlisting}[numbers=none, frame=lines]
-// myToken is the reference to that variable
-List<Definition> bindings = myToken.resolveBinding();
-
-if(bindings.size() == 0)
-	throw new Exception(myToken.getText() + " is not declared");
-else if (bindings.size() > 1)
-	throw new Exception(myToken.getText() + " is an ambiguous reference");
-
-Definition definition = bindings.get(0);
-\end{lstlisting}
-
-If you do \textbf{not} have a reference to a \texttt{Token} but you know the
-name of the identifier, you can first construct a \emph{hypothetical}
-\texttt{Token} representing an identifier and search for that in a
-\emph{particular} \texttt{ScopingNode} (possibly obtained by calling the static
-method \texttt{ScopingNode.getEnclosingScope(IASTNode node)}).
-\\
-
-\begin{lstlisting}[numbers=none, frame=lines]
-Token myToken = new Token(Terminal.T_IDENT, "myNameOfIdentifier");
-List<PhotranTokenRef> definitions = myScopingNode.manuallyResolve(myToken);
-\end{lstlisting}
-
-If you want to search for the identifier in \textbf{all} \texttt{ScopingNodes}
-for the current source file, then retrieve all the \texttt{ScopingNodes} and
-manually iterate through each one. Remember that the root of the AST is a
-\texttt{ScopingNode} and you may obtain the root of the AST through the
-\texttt{getRoot} method declared in \texttt{IFortranAST}.
-\\
-
-\begin{lstlisting}[numbers=none, frame=lines]
-List<ScopingNode> scopes = myRoot.getAllContainedScopes();
-
-for (ScopingNode scopingNode : scopes)
-{
-	// search through each ScopingNode
-}
-\end{lstlisting}
-
-\subsubsection{Examples in \texttt{FortranEditorASTActionDelegate} subclasses}
-
-The following subclasses of \texttt{FortranEditorASTActionDelegate} all contain short working examples of how to use the binding analysis API in Photran:
-\begin{itemize}
-	\item DisplaySymbolTable
-	\item FindAllDeclarationsInScope
-	\item OpenDeclaration
-	\item SelectEnclosingScope
-\end{itemize}
-
-
-\subsection{Scheduling and (Avoiding) Concurrent Access}
-
-It is important to note that, because \texttt{PhotranVPG} is a singleton object,
-it may not be accessed concurrently by multiple threads.
-
-Most actions that require an AST will be subclasses of
-\texttt{FortranEditorActionDelegate}. (All refactoring actions in Photran
-are descendants of \texttt{FortranEditorActionDelegate}, for example.)
-These are always scheduled in a way that avoids this problem.
-
-Otherwise, the thread must either be scheduled using a
-\texttt{VPGSchedulingRule} or it must lock the entire workspace. See
-\texttt{EclipseVPG\#queueJobToEnsureVPGIsUpToDate} as an example on how to use
-the \texttt{VPGSchedulingRule} and \texttt{FortranEditorActionDelegate\#run} as
-an example of how to lock the entire workspace.
-
-As a guideline, contributors who are interested in accessing the VPG should
-consider structuring their contributions as descendants of
-\texttt{FortranEditorActionDelegate}. However, if that
-approach is not feasible, then they should consider using
-\texttt{VPGSchedulingRule} before resorting to locking the entire workspace.
-
-\section{Common Tasks}
-
-In the org.eclipse.photran.internal.core.refactoring package, there is a class
-called \textit{\_AST\_VPG\_HOWTO} which contains several small ``snippets''
-illustrating how to perform common tasks with the AST/VPG.  This includes how
-to traverse the AST using a visitor, how to find nodes of a particular type,
-how to find all of the references to a particular name, etc.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-\newif\ifxxxxxx
-\ifxxxxxx
-
-\section{Background: Program Graphs and the VPG}
-
-\textit{Portions of this section are excerpted from
-Jeff's dissertation proposal (2009).}
-
-\subsection{Theory: Program Graphs}
-
-According to Mens et al.,~
-a \textit{program graph} ``may be viewed, in broad lines, as an abstract syntax
-tree augmented by extra edges.''\footnote{T.~Mens, N.~Van~Eetvelde, S.~Demeyer,
-and D.~Janssens.  ``Formalizing refactorings with graph transformations.''
-\textit{J.~Softw. Maint. Evol.}, 17(4): 247--276, 2005.}  These
-``extra edges'' represent semantic information, such as variable scopes and
-bindings, control flow, inheritance relationships, and so forth.
-
-Unlike a compiler, where the AST, symbol table, and control flow graph are
-usually separate data structures, a program graph combines all such information
-into a single data structure.  In a program graph, there are no symbol tables;
-rather, some nodes in the AST correspond to declarations, and references
-contain an edge pointing to their declaration.  Scopes can similarly be
-represented by AST nodes; symbols can point to the scope in which they are
-defined.  The control flow successors of a node are other AST nodes.  A
-variable's du-chains would likely consist of AST nodes representing assignment
-statements and variable-use expressions.  And so forth.  In other words, in a
-program graph, all program analyses are stated in terms of AST nodes.
-
-Alternatively, one might think of a program graph as an AST with the graph
-structures of a control flow graph, program dependence graph, du-chains,
-etc.~``superimposed.''\footnote{M.~Verbaere, A.~Payement, O.~de~Moor.
-``Scripting refactorings with JunGL.'' In \textit{Proc.~OOPSLA~'06},
-pp.~651--652.}  The nodes of the AST also
-serve as nodes of the various graph structures; the edges connecting them are
-different.
-
-\begin{image}
-	\centering
-			\includegraphics[height=6in]{images/sample_vpg.png}
-			\caption{Sample program graph (AST with semantic edges)
-			for a Java program}
-		\label{test2before}
-\end{image}
-
-An example of a Java program and a plausible program graph representation are
-shown in Figure~\ref{test2before}.  The underlying abstract syntax tree is
-shown in outline form; the dotted lines are the extra edges that make the AST a
-program graph.  We have shown four types of edges.  \textit{Scope} edges link a
-declaration to the class or method in which it is defined.  \textit{Binding}
-edges link the use of an identifier to its corresponding declaration.  Within
-the method body, \textit{control flow} edges form the (intraprocedural) control
-flow graph; the method declaration node is used as the entry block and null as
-the exit block.  Similarly, there are two du-chains, given by \textit{def-use}
-edges.
-
-The advantages of the program graph representation are twofold.  First, it is
-generic enough that it a program graph can be built to represent virtually any
-conventional programming language.  Every program has a syntax which can be
-represented as a syntax tree, and we hypothesize that the semantics needed to
-perform common refactorings can be represented as extra edges (and node
-annotations) on this tree.  The second advantage of the program graph is that
-it summarizes the ``interesting'' aspects of both the syntax and semantics of a
-program in a single representation, obviating the need to maintain a mapping
-between several distinct representations.
-
-\subsection{Implementation: The Virtual Program Graph}
-
-Often, program graphs only conceptual: "Real" programs can be extremely large,
-spanning hundreds of files, and edges may span across these files. For example,
-a function defined in one file may be used in another, so a binding edge would
-span across files. Of course, it is inefficient--and sometimes impossible--to
-store ASTs for several hundred files in memory.
-
-The Rephraser Engine provides a base implementation for a \textit{virtual program
-graph,} which takes a different approach.  For the most part, the VPG allows the
-programmer to pretend that an AST for the entire (several-hundred-file) program
-is available in memory, with edges spanning between files when necessary.
-
-TODO
-
-Therefore, most systems cache information about externally-visible declarations
-in a program database.  Often they expose this to the programmer, so 
-it becomes the programmer's responsibility to parse individual files
-and to distinguish what is available the program database from what is available
-in the AST.
-
-The \textit{virtual program graph}, or
-VPG, provides a cross-reference database and indexing infrastructure TODO
-
-To the programmer building a refactoring, the VPG appears quite simple.
-\begin{itemize}
-\item When the programmer requires an AST, the programmer asks the VPG to
-      provide it.  He does not parse the file directly.
-\item Methods on the AST nodes provide name binding information, control flow
-      information, source/AST rewriting, etc.  For example, the programmer can
-      ask an AST node for its control flow successors, or he can tell it to
-      remove itself from the AST, to reindent itself, etc.
-\end{itemize}
-
-One advantage of the VPG architecture is that programmers developing
-refactorings are insulated from much of the underlying infrastructure.  The VPG
-acts as an AST repository, insulating the programmer from the lexer/parser and
-preprocessor, while the AST nodes insulate the programmer from the semantic
-analyses, the source rewriter, and the program database.
-
-One particularly interesting example is when a subprogram node is asked for all
-of its call sites.  Note that these are not necessarily nodes in the same AST.
-Generally, this information would be stored in the cross-reference database,
-but the programmer need not be aware of this; the VPG can simply provide an
-iterator which provides pointers to AST nodes.  As the iterator progresses,
-ASTs for the various files can be transparently loaded and unloaded from
-memory.  (Recall that the programmer always asks the VPG to provide ASTS; thus,
-careful implementation can guarantee that there are never multiple ASTs for the
-same file in memory.)  In essence, the VPG is intended to provide the illusion
-that there are always ASTs available for the whole program.\footnote{The
-``virtual'' in ``virtual program graph'' is analogous to ``virtual'' in
-``virtual memory:'' The system shields the programmer from knowing whether the
-requested data is already in memory or if it must first be loaded from disk.}
-
-\begin{image}
-	\centering
-			\includegraphics[height=2.5in]{images/vpg_db_er.png}
-			\caption{VPG database schema}
-		\label{fig:vpg_db_er}
-\end{image}
-
-\fi
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/dev-guide/cha-cdt.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/cha-cdt.ltx-inc
deleted file mode 100644
index 42398fe..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/cha-cdt.ltx-inc
+++ /dev/null

@@ -1,321 +0,0 @@
-% Interactions with CDT
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id: cha-cdt.ltx-inc,v 1.1 2010/05/21 20:12:20 joverbey Exp $ $ - based on 2008/08/08 nchen}
-
-\section{Introduction}
-
-The C/C++ Development Tools (CDT)\footnote{See
-\url{http://www.eclipse.org/cdt/}} provide support for C and C++ development
-in Eclipse. CDT uses \textit{make} to compile projects, and it includes an
-integrated debugger which is actually a graphical interface to \textit{gdb}.
-
-In 2006, we contributed a patch to CDT\footnote{See
-\url{https://bugs.eclipse.org/133386}} which provides an extension point
-allowing its core infrastructure to support languages other than C and C++.
-This is appropriate for any language for which code is compiled using
-\textit{make} and debugged using \textit{gdb}.\footnote{The exact mechanism
-is described in  J.~Overbey and C.~Rasmussen, ``Instant IDEs: Supporting New
-Languages in the CDT,'' \textit{Eclipse Technology eXchange Workshop at
-OOPSLA~2005 (eTX 2005),} San Diego, CA, October 17, 2005, and a tutorial
-on the topic was given at EclipseCon~2006.  The details (and code) are now
-outdated, but the concepts are still applicable.}
-
-Photran builds upon the CDT by
-\begin{itemize}
-\item plugging into this extension point (org.eclipse.cdt.core.language).
-      This allows CDT to recognize Fortran source files as ``valid'' source
-      files in C/C++ projects, and it allows Photran to provide the outline
-      structure for these files which is displayed in the Navigator and the
-      Outline view (this structure is called the ``model'' and is discussed
-      below).
-\item subclassing many of CDT's user interface elements (or copying and
-      modifying them when necessary) to provide an IDE for Fortran that
-      looks and works similarly to CDT.
-\item contributing \textit{error parsers} which allow CDT to recognize
-      error messages from many popular Fortran compilers and display them
-      in the Problems view.
-\item contributing new project templates and toolchains, which are shown
-      in the New C/C++ Project dialog
-      (and, of course, the New Fortran Project dialog).
-\end{itemize}
-
-\section{C Projects vs.~Photran Projects}
-
-Prior to version~6.0, C projects and Fortran projects were treated identically.
-As of version 6.0, there is an important distinction:
-\begin{itemize}
-\item every Fortran project is also a C project, but
-\item not every C project is a Fortran project.
-\end{itemize}
-
-In technical terms,
-Fortran projects are C projects that also have a Fortran nature.
-They must be C projects in order to be ``recognized'' by CDT, but
-they must also have the Fortran nature so that Photran can display
-project properties for them and index them without affecting C/C++
-projects that do not contain Fortran code.
-
-\section{CDT Terminology}
-
-The following are CDT terms that will be used extensively when discussing
-Photran.
-
-\begin{itemize}
-
-\item There are two types of projects in CDT:\footnote{In earlier versions of
-CDT, these were actually distinct.  CDT overhauled their build system in
-version~4(?), and these are now treated uniformly in implementation.
-Nevertheless, this distinction was made frequently in historical discussions
-about CDT, and it is important to be aware of.  It is also a useful distinction
-to make from the user's perspective, since the idea of hand-writing a makefile
-seems to intimidate many Fortran programmers.}
-
-\begin{itemize}
-
-\item \textbf{Standard Make projects} require users to
-supply their own Makefile, typically with targets ``clean'' and ``all.''
-CDT/Photran cleans and builds the project by running \texttt{make}.
-(``Standard Make'' is actually old terminology; recent versions of CDT
-call these ``Makefile Projects.''  They are created by choosing
-Makefile Project $>$ Empty Project and selecting ``--~Other Toolchain~--''
-in the New C/C++ Project dialog.)
-
-\item \textbf{Managed Make projects} are similar to standard make projects,
-except that CDT/Photran automatically generates a Makefile and edits the
-Makefile automatically when source files are added to or removed from the
-project. The \textbf{Managed Build System} (MBS) is the part of CDT that
-handles all of this.
-
-\end{itemize}
-
-\item \textbf{Binary parsers} are able to detect whether a file is a legal
-executable for a platform (and extract other information from it). CDT
-provides binary parsers for Windows (PE), Linux (ELF), Mac OS X (Mach~O), and
-others. Photran does not provide any additional binary parsers.
-
-\item \textbf{Error parsers} are provided for many compilers. CDT provides a gcc
-error parser, for example. Photran provides error parsers for Lahey Fortran, F,
-g95, and others. Essentially, error parsers scan the output of \texttt{make} for
-error messages for their associated compiler. When they see an error message
-that they recognize, they extract the filename, line number, and error message,
-and use it to populate the Problems View. See
-Appendix~\ref{ap:creating_an_error_parser} for an example on how to create an
-error parser.
-
-\item CDT keeps a \textbf{model} of all of the files in a project. The model is
-essentially a tree of \textbf{elements}, which all inherit the (CDT Core)
-interface \texttt{ICElement}. It is described in the next section.
-
-\end{itemize}
-
-\section{The Model}
-
-The Fortran Projects view in Photran is essentially a visualization of
-the CDT's \textit{model}, a tree data structure describing the contents
-of all Fortran Projects in the workspace as well as the high-level contents
-(functions, aggregate types, etc.) of source files.
-
-Alain Magloire (CDT) described the model, A.K.A. the \texttt{ICElement}
-hierarchy, in the thread ``Patch to create ICoreModel interface'' on the cdt-dev
-mailing list (April 1, 2005):
-
-{\footnotesize
-\begin{quote}
-\begin{verbatim}
-So I'll explain a little about the ICElement and what we get out of it for
-C/C++.
-
-The ICElement hierarchy can be separated in two:
-(1) - how the Model views the world/resources (all classes above ITranslationUnit)
-(2) - how the Model views the world/language (all classes below ITranslationUnit).
-
-How we(C/C++) view the resources:
-- ICModel  --> [root of the model]
-  - ICProject --> [IProject with special attributes/natures]
-    - ISourceRoot --> [Folder with a special attribute]
-      - ITranslationUnit --> [IFile with special attributes, e.g. extensions *.c]
-      - IBinary --> [IFile with special attributes, elf signature, coff etc]
-      - IArchive --> [IFile with special attributes, "<ar>" signature]
-      - ICContainer -> [folder]
-
-There are also some special helper classes
-  - ILibraryReference [external files use in linking ex:libsocket.so, libm.a, ...]
-  - IIncludeReference [external paths use in preprocessing i.e. /usr/include, ...]
-  - IBinaryContainer [virtual containers regrouping all the binaries found
-    in the project]
-
-This model of the resources gives advantages:
-- navigation of the binaries,
-- navigation of the include files not part of the workspace (stdio.h, socket.h, etc)
-- adding breakpoints
-- search
-- contribution on the objects
-etc.....
-
-[...]
-
-(2) How we view the language.
-
-Lets be clear this is only a simple/partial/incomplete view of the language. For
-example, we do not drill down in blocks, there are no statements(if/else
-conditions) etc .... For a complete interface/view of the language, clients
-should use the __AST__ interface.
-\end{verbatim}
-\end{quote}
-}
-
-\pagebreak
-
-From another of Alain's posts in that thread:
-
-{\footnotesize
-\begin{quote}
-\begin{verbatim}
-Lets make sure we are on the same length about the ICElement hierarchy.
-It was created for a few reasons:
-
-- To provide a simpler layer to the AST.  The AST interface is too complex
-  to handle in most UI tasks.
-- To provide objects for UI contributions/actions.
-- The glue for the Working copies in the Editor(CEditor), IWorkingCopy class
-- The interface for changed events.
-- ...
-
-Basically it was created for the UI needs: Outliner, Object action contributions,
-C/C++ Project view and more.
-
-The CoreModel uses information taken from:
-- the Binary Parser(Elf, Coff, ..)
-- the source Parser(AST parser)
-- the IPathEntry classes
-- the workspace resource tree
-- The ResolverModel (*.c, *.cc extensions), ...
-
-to build the hierarchy.
-\end{verbatim}
-\end{quote}
-}
-
-\shabox{The CDT model should \textbf{not} be confused with the Abstract Syntax
-Tree (AST) that is discussed in Chapter~\ref{cha:ast-vpg}. They are
-\textbf{not} identical. It is helpful to think of the CDT model as containing a
-\emph{partial/simplified view} of a program's structure (representing only the
-high-level/organizational elements in the source code: program units, subprogram
-declarations, etc.) \textbf{as well as} a model of the current workspace
-resources (Fortran projects, Fortran source files, binary executables). In
-other words, the CDT model knows about the resources and the organizational
-units in the source code. The AST,
-on the other hand, completely models \emph{everything} in a single source ilfe---including
-low-level elements like individual statements and expressions---but knows
-nothing about projects, folders, etc.}
-
-By conforming to the CDT model, Photran is able to reuse various UI
-elements for \emph{free}. For instance, the Outline View for Photran is managed
-by CDT; Photran just needs to provide a CDT-compatible model to represent its
-project and source files.
-
-The \texttt{FortranLanguage} class (in the org.eclipse.photran.cdtinterface
-project) is responsible for initializing concrete
-classes that will build up the model that CDT expects.
-
-There are \textbf{two} options for creating suitable \emph{model builders}:
-\begin{enumerate}
-\item The org.eclipse.photran.cdtinterface plug-in project defines the
-\\ \texttt{org.eclipse.photran.cdtinterface.modelbuilder} extension point that
-other plug-ins can extend. Plug-ins extending that extension point are
-responsible for providing a suitable model builder. Using this option, it is
-possible to have multiple model builders. The model builder to use can be
-selected in the workspace preferences (under Fortran $>$ CDT Interface).
-
-\item If there are no plug-ins that extend the
-\texttt{org.eclipse.photran.cdtinterface.modelbuilder} extension point, then
-Photran falls back on a default implementation provided by the
-\texttt{EmptyFortranModelBuilder} class (which, not surprisingly, builds
-an empty model).
-\end{enumerate}
-
-The Photran VPG (see Section~\ref{sec:virtual_program_graph}) inside the
-org.eclipse.photran.cdtinterface.vpg project uses the first option to
-contribute a model builder. The relevant classes are under the
-\texttt{org.eclipse.photran.internal.core.model} package (notably,
-\texttt{FortranModelBuilder}.)
-
-As mentioned in the post by Alain, all model elements must implement the
-\texttt{ICElement} interface for CDT to recognize them. In Photran, the
-\texttt{FortranElement} class implements the \texttt{ICElement} interface and
-serves as the base class for all Fortran elements such as subroutines,
-functions, modules, variables, etc. Each subclass of \texttt{FortranElement}
-corresponds to an element that can be displayed in the Outline View.
-
-\section{Reusing UI Elements}
-
-Various UI elements in Photran are also reused from the CDT.
-
-\begin{itemize}
-
-\item Many elements are reused directly.
-
-    \begin{itemize}
-
-    \item Photran frequently instantiates or references
-    classes from CDT and uses them as-is.  For example,
-    the \texttt{FortranProjectWizard} uses CDT's
-    \texttt{ICProjectDescription}.
-    
-    \item It is also common for plugin.xml
-    files in Photran to reference contributions from CDT.  For example, the
-    XML declaration for the Fortran perspective includes the line \\
-    \centerline{\texttt{
-    <actionSet id="org.eclipse.cdt.make.ui.makeTargetActionSet"/>
-    }} \\
-    which adds some build-related CDT actions to the menus and toolbars in
-    the Fortran perspective.
-    
-    \item In many cases, the XML describing a particular element in Photran
-    is essentially the same as the corresponding XML in CDT, except the
-    name and/or icon is changed.  This is the case for, e.g., the
-    \textit{Local Fortran Application} launch configuration. 
-    
-    \end{itemize}
-
-\item Many elements are reused through subclassing.  For example, Photran's
-\texttt{NewSourceFolderCreationWizard} subclasses an equivalent class in CDT
-but overrides a method in order to change the title and icon for the wizard.
-
-\item As a last resort, some parts of Photran are copied from CDT and then
-modified as necessary.  This is the case with the
-\texttt{FortranPerspectiveFactory} class, for example: There was no way to
-accomplish the desired effect through subclassing (without modifying CDT),
-so we (unfortunately) had to copy a class from CDT and then modify it
-appropriately for Photran.
-
-\end{itemize}
-
-\section{The CDT Debugger and \texttt{gdb}}
-
-Currently, Photran re-uses the CDT debugger as-is and does not contribute any
-enhancements to it. Here is a brief summary of how the debugger works:
-
-\begin{itemize}
-
-\item The so-called CDT debugger is actually just a graphical interface to
-\texttt{gdb}, or more specifically to \texttt{gdb/mi}. So, if something doesn't
-appear to work, it is advisable to try it in \texttt{gdb} directly or to use
-another \texttt{gdb}-based tool such as DDD.
-
-\item The debugger UI ``contributes'' breakpoint markers and actions to the
-editor. The ``set breakpoint'' action, and the breakpoint markers that appear in
-the ruler of the CDT (and Photran) editors are handled \textbf{entirely} by the
-CDT debug UI; there is no code for this in Photran. The ``set breakpoint''
-action is enabled by calling \lstinline!setRulerContextMenuId("#CEditorRulerContext");! 
-in the \texttt{AbstractFortranEditor} constructor.
-
-\item \texttt{gdb} reads debug symbols from the executable it is debugging.
-That is how it knows what line it's on, what file to open, etc.  Photran
-has \textit{nothing} to do with this: These symbols are written entirely
-by the compiler.  Moreover, the compiler determines what shows up in the
-Variables View.  If the debugger views seem to be a mess, it is the
-compiler's fault, not Photran's.
-
-\end{itemize}

diff --git a/org.eclipse.photran-dev-docs/dev-guide/cha-checklist.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/cha-checklist.ltx-inc
deleted file mode 100644
index e6c5754..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/cha-checklist.ltx-inc
+++ /dev/null

@@ -1,37 +0,0 @@
-% Checklist for New Developers
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id$ $}
-
-\begin{list}{$\bigcirc$}{}
-
-\item \textbf{Install Photran, read its documentation, and become a proficient user.}
-Generally speaking, you cannot fix or enhance a program you don't know how to use.
-
-\item \textbf{Check out Photran's source code from CVS and run the test suite.}
-See Appendices~\ref{app:cvs} and~\ref{app:testsuite}.
-
-\item \textbf{Join the \href{https://dev.eclipse.org/mailman/listinfo/photran-dev}{photran-dev mailing list}.}
-This is where discussions about Photran's development take place. Questions from developers (like you), release planning, API changes, etc.~all get discussed here.
-
-\item \textbf{Join the \href{https://dev.eclipse.org/mailman/listinfo/photran}{photran users' mailing list}.}
-It is good to keep track of what Photran's users are discussing, and as a Photran developer you will probably be able to answer many of their questions as well.
-
-\item \textbf{Create a Bugzilla account.}
-You will need to \href{https://bugs.eclipse.org/bugs/createaccount.cgi}{create an account at bugs.eclipse.org} if you don't already have one. When you eventually want to contribute code to Photran, you will need to do it by attaching a patch to a Bugzilla bug.
-
-\item \textbf{Get a book or two on Eclipse plug-in development.}
-Eventually, you'll want to buy (or check out from the library) a book on Eclipse plug-in development.
-\textit{\href{http://www.amazon.com/Java-Developers-Guide-Eclipse-2nd/dp/0321305027/}{\emph{The
-Java Developer's Guide to Eclipse}}} by D'Anjou et al.~is a good choice.
-\textit{\href{http://www.amazon.com/Eclipse-Building-Commercial-Quality-Plug-Ins/dp/0321228472}{\emph{Eclipse:
-Building Commercial-Quality Plug-ins}}} is also recommended.
-
-\item \textbf{Learn the basics of Eclipse plug-in development.}
-If you get D'Anjou's book, read Chapters 7-9 and 21.
-After you figure out the basics of Eclipse development (like how plugin.xml works), it's best to just start fixing bugs or adding features, returning to the book as a reference when you have something more specific you need to do.
-
-\item \textbf{Read the Photran Developer's Guide.}
-Chapters 1, 2, and 3 apply to everyone. The other chapters are more specialized; for example, the chapters on Parsing and Refactoring only apply to people developing refactorings, and the Photran Editors chapter applies mostly to people adding features to the Fortran editor.
-
-\end{list}
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/dev-guide/cha-editor.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/cha-editor.ltx-inc
deleted file mode 100644
index 57ba571..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/cha-editor.ltx-inc
+++ /dev/null

@@ -1,114 +0,0 @@
-% Fortran Editors
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id: cha-editor.ltx-inc,v 1.1 2010/05/21 20:12:20 joverbey Exp $ $ - based on 2008/08/08 nchen}
-
-\section{Fortran Text Editor}
-
-The Fortran code editor is implemented in a class called, not surprisingly,
-\textit{FortranEditor}. In general, \textit{FortranEditor} closely follows
-the standard implementation of text editors in Eclipse (see \textit{The
-Java Developer's Guide to Eclipse,} Chapter ?? or another reference for more
-information.)  This chapter highlights some of the Photran-specific details
-of the text editor implementation.
-
-\section{Contributed \textit{SourceViewerConfiguration}}
-
-Text editors in Eclipse rely on a \textit{SourceViewerConfiguration} to enhance
-the current editor with features such as auto indenting, syntax highlighting and
-formatting. By default, most of these features are already provided by the
-concrete \textit{SourceViewerConfiguration} class. However, it is possible to
-provide a custom implementation of a \textit{SourceViewerConfiguration}. This is
-done by calling the
-\textit{setSourceViewerConfiguration(SourceViewerConfiguration
-sourceViewerConfiguration)} method in an Eclipse text editor.
-
-Photran's text editor is contained in the org.eclipse.photran.ui plug-in.
-However, several of the features contributed by the
-\textit{SourceViewerConfiguration} require the Fortran parser, which is
-contained in the org.eclipse.photran.ui.vpg plug-in.  Therefore, the
-ui.vpg plug-in \textit{contributes} a \textit{SourceViewerConfiguration}
-to the org.eclipse.photran.ui plug-in via an extension point.  Specifically,
-it contributes the class \textit{FortranVPGSourceViewerConfigurationFactory}
-to the \textit{org.eclipse.photran.ui.sourceViewerConfig} extension point,
-and that class is responsible for creating the actual
-\textit{SourceViewerConfiguration}.
-
-\section{Fortran Editor Tasks: VPG \& AST Tasks}
-
-When the user modifies the text in an editor, often several other data
-structures and views need to be updated as well.  For example, the Outline
-view should summarize the current text in the editor, and the list of choices
-in the content assistant (auto-completion) should be consistent with the
-current text in the editor.  Both of these need to be updated as the user
-types---not just when the file is saved.
-
-Eclipse editors can have a \emph{reconciler.}  When the user has stopped typing
-for a brief period of time (usually 500ms), the reconciler is run in a background
-thread.  This when these things should be synchronized with the
-editor.\footnote{Exercise for the reader: think about (1)~why this should be done
-after a 500ms ``break'' rather than after every keystroke, and (2)~why it should
-be done in a background thread\dots}
-
-Photran maintains a list of ``tasks'' that are run when the editor is reconciled.
-The list of tasks to run is stored in the singleton \textit{FortranEditorTasks}
-object, and the tasks are actually run by the \textit{FortranVPGReconcilingStrategy}
-class.
-
-Currently, there are two kinds of tasks that can be run: Abstract Syntax Tree
-(AST) editor tasks and Virtual Program Graph (VPG) editor tasks. AST editor tasks
-depend on information from the AST of the current source file; and VPG editor
-tasks depend on information from the VPG of the current source file.
-\textit{FortranEditorTasks} automatically schedules the VPG editor tasks using
-an instance of \textit{VPGSchedulingRule} to synchronize access to the
-\textit{PhotranVPG} singleton object. The AST of the current file is computed
-on-the-fly as the user modifies the source file. The VPG of the current file is
-based off its previous saved version (so it is less up-to-date). For more
-information about the AST and VPG, see Chapter~\ref{cha:ast-vpg}.
-
-AST editor tasks must implement the \textit{IFortranEditorASTTask} interface and
-VPG editor tasks must implement the \textit{IFortranEditorVPGTask} interface.
-Additionally, each task has to register itself with the
-\textit{FortranEditorTasks} object. A task that no longer needs to run should
-also be unregistered. Since these tasks run asynchronously, it is important to
-use proper Java concurrency practices i.e. \textbf{synchronized} methods and statements.
-
-Below is the API of the \textit{FortranEditorTasks} class:
-
-\begin{code}
-\begin{lstlisting}
-public class FortranEditorTasks
-{
-	public static FortranEditorTasks instance(AbstractFortranEditor editor)
-
-	public synchronized void addASTTask(IFortranEditorASTTask task)
-
-	public synchronized void addVPGTask(IFortranEditorVPGTask task)
-
-	public synchronized void removeASTTask(IFortranEditorASTTask task)
-
-	public synchronized void removeVPGTask(IFortranEditorVPGTask task)
-
-	public Runner getRunner()
-	
-	...
-} 
-\end{lstlisting}
-\caption{API of \textit{FortranEditorTasks} (see FortranEditorTasks.java)}  
-\end{code}
-
-It is possible for a class to implement both the \textit{IFortranEditorASTTask}
-and \textit{IFortranEditorVPGTask} interfaces. For example, the
-\textit{DeclarationView} class registers itself for both kinds of editor tasks
-and makes use of the information from both as it attempts to present the
-declaration for the currently selected token of the text editor.
-
-For more information on implementation details, please refer to the following
-classes:
-
-\begin{itemize}
-	\item \textit{DeclarationView}
-	\item \textit{FortranCompletionProcessorASTTask}
-	\item \textit{FortranCompletionProcessorVPGTask}
-	\item \textit{OpenDeclarationASTTask}
-\end{itemize}

diff --git a/org.eclipse.photran-dev-docs/dev-guide/cha-intro.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/cha-intro.ltx-inc
deleted file mode 100644
index 9b29e61..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/cha-intro.ltx-inc
+++ /dev/null

@@ -1,59 +0,0 @@
-% Introduction
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id$ $ - based on 2008/08/08 nchen}
-
-Photran is an IDE for Fortran 77--2008 that is built on top of
-Eclipse. It is structured as an Eclipse feature, in other words, as a set of
-plug-ins that are designed to be used together. Starting with version 3.0, it is
-an extension of C/C++ Development Tools (CDT), the Eclipse IDE for C/C++.
-The first version of Photran was created by hacking a copy of CDT to support
-Fortran instead of C/C++, but now we have developed a mechanism for adding new
-languages into CDT, allowing the Fortran support code to be in its own set of
-plug-ins.
-
-Our purpose in writing Photran was to create a refactoring tool for Fortran.
-Thus, Photran has a complete parser and program representation. Photran also
-adds a Fortran editor and several preference pages to the CDT user interface,
-as well as Fortran-specific project wizards and support for several Fortran
-compilers.
-
-Photran is part of the Parallel Tools Platform (PTP) project at the
-Eclipse Foundation, which provides the Web site, CVS repository, and
-Bugzilla repository.  The Web site is 
-\href{http://www.eclipse.org/photran}{http://www.eclipse.org/photran},
-and bugs can be submitted at
-\href{https://bugs.eclipse.org}{https://bugs.eclipse.org}
-under Tools $>$ PTP by selecting one of the ``Photran'' components.
-
-
-\vspace{-0.2in}
-
-\section*{How To Read This Guide}
-
-The \textit{Photran Developer's Guide} is intended to complement the
-source code in the repository; it is not a substitute for reading
-the actual source code.  Rather, it contains high-level information that
-\textit{can't} easily be derived simply by reading the source code.
-
-The \textit{Photran Developer's Guide} has been divided into two documents.
-This document is Part~I: It contains general information that every developer
-should know.  Part~II gives more detail about specific components of Photran;
-it should be used as a reference, depending on what specific parts of Photran
-you want to work on.
-
-
-\vspace{-0.2in}
-
-\section*{Getting Started} 
-
-If you have not already, work through the items on the ``Checklist for New
-Developers'' at the beginning of this manual.
-In particular, \textit{please} join the photran-dev mailing list, and use it to
-ask for help!  Although Photran is better documented than many projects,
-you will probably encounter problems that you cannot resolve simply by reading
-the documentation or reverse engineering the code.
-
-When your contribution is finished, follow the procedure in
-Appendix~\ref{app:contributing} to contribute your code to the ``official''
-version of Photran.
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/dev-guide/cha-parsing.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/cha-parsing.ltx-inc
deleted file mode 100644
index 74350df..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/cha-parsing.ltx-inc
+++ /dev/null

@@ -1,317 +0,0 @@
-% Parsing and Preprocessing
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id$ $ - based on 2008/08/08 nchen}
-
-\section{Parsing}
-
-Before any program analysis can be done, the source code of the Fortran program
-has to be parsed. Photran provides support for both fixed-form (Fortran 77) and
-free-form Fortran (Fortran 90 \& 95) source code. The parser in Photran is
-generated using the Ludwig parser/AST generator by Jeff Overbey. It is based on
-the \emph{fortran2003.bnf} grammar file.
-
-Figure~\ref{fig:images_parser_chain} shows the lexer \& parser tool chain in
-Photran. Preliminary support for (\texttt{INCLUDE} directives) has also been
-implemented.
-
-\begin{image}
-	\centering
-			\includegraphics[height=3in]{images/parser_chain.png}
-			\caption{Photran preprocessor/lexer/parser chain}
-		\label{fig:images_parser_chain}
-\end{image}
-\section{AST Structure}
-\label{sec:ast_structure}
-
-\section{AST Generation}
-
-Photran's (rewritable) AST is generated along with the parser, so the structure
-of an AST is determined by the structure of the parsing grammar (see the
-\emph{fortran2003.bnf} file). The generated classes are located in the
-\texttt{org.eclipse.photran.internal.core.parser} package in the
-\texttt{org.eclipse.photran.core.vpg} project. The easiest way to visualize the
-structure of a particular file's AST is to view it in the Outline view (see
-Section~\ref{sec:how_to_get_acquainted_with_the_program_representation}).
-However determining all possible ASTs for a particular construct requires
-scrutinizing the parsing grammar file.
-
-\subsection{Ordinary AST Nodes}
-\label{sub:ordinary_ast_nodes}
-
-Generally speaking, there is one AST node for each nonterminal in the grammar
-and one accessor method for each symbol on its right-hand side (unless the
-symbol name is prefixed with a hyphen, in which case it is omitted). For
-example, the following specification\footnote{All grammar
-specifications are taken from the \emph{fortran2003.bnf} file. The \# RXXX number
-provides a reference to the actual specification in the grammar file.}
-
-{\footnotesize\begin{verbatim}
-# R533
-<DataStmtSet> ::= <DataStmtObjectList> -:T_SLASH <DataStmtValueList> -:T_SLASH
-\end{verbatim}}
-
-generates the AST node class \texttt{ASTDataStmtSetNode} shown in
-Listing~\ref{lst:astdatastmtsetnode_api}. Notice the \emph{presence} of the
-\texttt{getDataStmtObjectList} and \texttt{getDataStmtValueList} getters methods
-and the \emph{absence} of any method for accessing T\_SLASH.
-
-\shabox{The convention is to generate a class with the name
-\texttt{\color{LightMagenta}AST}$<$nonterminal
-name$>$\texttt{\color{LightMagenta}Node} that extends \texttt{ASTNode}. For
-instance \# R533 will generate the
-\texttt{{\color{LightMagenta}AST}DataStmtSet{\color{LightMagenta}Node}} class.}
-
-The following sections describe additional annotations that can be used to
-modify the standard convention when necessary. These annotations are not
-considered part of the standard BNF notation but they are supported by the
-underlying Ludwig parser generator.
-
-\begin{code}
-\begin{lstlisting}
-public class ASTDataStmtSetNode extends ASTNode
-{
-	public IASTListNode<IDataStmtObject> getDataStmtObjectList() {...}
-
-	public void setDataStmtObjectList(IASTListNode<IDataStmtObject> newValue) {...}
-
-	public IASTListNode<ASTDataStmtValueNode> getDataStmtValueList() {...}
-
-	public void setDataStmtValueList(IASTListNode<ASTDataStmtValueNode> newValue) {...}
-
-	... 
-}
-\end{lstlisting}
-\caption{\texttt{ASTDataStmtSetNode} generated from \# R533}
-\label{lst:astdatastmtsetnode_api}
-\end{code}
-
-\subsubsection{Annotation \#1: \texttt{(list)}}
-
-Recursive productions are treated specially, since they are used frequently to
-express lists in the grammar. The recursive member is labeled in the grammar
-with the \texttt{(list)} annotation. For example, the following specification
-
-{\footnotesize\begin{verbatim}
-# R538
-(list):<DataStmtValueList> ::=
-  |                               <DataStmtValue>
-  | <DataStmtValueList> -:T_COMMA <DataStmtValue>
-\end{verbatim}}
-
-means that the AST will contain an object of type
-\texttt{List$<$ASTDataStmtValueNode$>$} whenever a \verb!<DataStmtValueList>!
-appears in the grammar. For instance, \# R533 (just described in the previous
-section) uses the \texttt{DataStmtValueList} construct. Notice in
-Listing~\ref{lst:astdatastmtsetnode_api} that the return type of
-\texttt{getDataStmtValueList} is a \texttt{List}.
-
-Putting an object that implements the \texttt{java.util.List} into the tree
-(rather than having a chain of nodes) makes it easier to iterate through the
-list, determine its size and insert new child nodes.
-
-\subsubsection{Annotation \#2: \texttt{(superclass)}}
-
-The \texttt{(superclass)} annotation is used to create an interface that is
-implemented by all symbols on the right-hand side of the specification will
-implement. For example, the following specifications
-
-{\footnotesize\begin{verbatim}
-# R207
-(superclass):<DeclarationConstruct> ::=
-  | <DerivedTypeDef>
-  | <InterfaceBlock>
-  | <TypeDeclarationStmt>
-  | <SpecificationStmt>
-
-...
-
-# R214
-(superclass):<SpecificationStmt> ::=
-  | <AccessStmt>
-  | <AllocatableStmt>
-  | <CommonStmt>
-  | <DataStmt>
-  | <DimensionStmt>
-  | <EquivalenceStmt>
-  | <ExternalStmt>
-  | <IntentStmt>
-  | <IntrinsicStmt>
-  | <NamelistStmt>
-  | <OptionalStmt>
-  | <PointerStmt>
-  | <SaveStmt>
-  | <TargetStmt>
-  | <UnprocessedIncludeStmt>
-\end{verbatim}}
-
-mean that an \textbf{interface} -- not a class -- named
-\texttt{ISpecificationStmt} will be generated for \# R214, and
-\texttt{ASTAccessStmtNode}, \texttt{ASTAllocatableStmtNode},
-\texttt{ASTCommonStmtNode}, etc will implement that interface. In addition,
-because \verb!<SpecificationStmt>! is used inside \# R207 which also uses the
-\texttt{(superclass):} annotation, \texttt{ISpecificationStmt} also extends the
-\texttt{IDeclarationConstruct} interface from \# R207 i.e.
-
-\begin{lstlisting}[numbers=none]
-	public interface ISpecificationStmt extends IASTNode, IDeclarationConstruct
-\end{lstlisting}
-
-So, it is possible for an AST node to implement multiple interfaces based on the 
-specifications in the grammar.
-
-Using the \texttt{(superclass)} annotation gives those nonterminals in \# R214
-nodes a common type; most notably, a \texttt{Visitor} can override the
-\texttt{visit(ISpecificationStmt)} method to treat all three node types
-uniformly.
-
-\subsubsection{Annotation \#3: \texttt{(bool)}}
-
-The \texttt{(bool)} annotation indicates that an accessor method will return a
-\lstinline!boolean! rather than an actual AST node. For example, the following
-specification
-
-{\footnotesize\begin{verbatim}
-# R511
-<AccessSpec> ::=
-  | isPublic(bool):T_PUBLIC
-  | isPrivate(bool):T_PRIVATE
-\end{verbatim}}
-
-will generate the \texttt{ASTAccessSpecNode} class as shown in Listing~\ref{lst:astaccessspecnode_api}.
-
-\begin{code}
-\begin{lstlisting}
-public class ASTAccessSpecNode extends ASTNode
-{
-	// in ASTAccessSpecNode
-	Token isPrivate;
-	// in ASTAccessSpecNode 
-	Token isPublic; 
-	
-	public boolean isPrivate() {...}
-	
-	public void setIsPrivate(Token newValue) {...}
-	
-	public boolean isPublic() {...}
-	
-	public void setIsPublic(Token newValue) {...}
-	
-	...
-}
-\end{lstlisting}
-\caption{ASTAccessSpecNode generated from \# R511}
-\label{lst:astaccessspecnode_api}
-\end{code}
-Notice on lines 8 \& 12 that the methods return \lstinline!boolean! values
-instead of \texttt{ASTNode}s. The \lstinline!boolean! values are usually used to
-test the presence of that particular \texttt{ASTNode} in the source code.
-
-\subsubsection{Annotation \#4: Labels}
-
-Specification \# R511 also illustrates the use of \emph{labels} in the grammar
-file: \verb!isPublic(bool):T_PUBLIC! results in a method called
-\texttt{isPublic} instead of \verb!getT_PUBLIC!. The use of labels can greatly
-enhance the readability of the program by making its intent clearer.
-
-\subsubsection{Annotation \#5: \texttt{(inline)}}
-
-Consider the following specifications for a main program in Fortran:
-
-{\footnotesize\begin{verbatim}
-# R1101
-<MainProgram> ::=
-  |               <MainRange>
-  | <ProgramStmt> <MainRange>
-
-<MainRange> ::=
-  | <Body>              <EndProgramStmt>
-  | <BodyPlusInternals> <EndProgramStmt>
-  |
-\end{verbatim}}
-
-From the standpoint of a typical Fortran programmer, a main program consists of
-a Program statement, a body (list of statements), perhaps some internal
-subprograms, and an End Program statement. This does not match the definition of
-a \verb!<MainProgram>! in the parsing grammar above: \verb!<Body>! and
-\verb!<EndProgStmt>! are relegated to a separate \verb!<MainRange>! nonterminal.
-
-The solution is to label the MainRange nonterminal with the \texttt{(inline)} annotation, indicating that it is to be in-lined:
-
-{\footnotesize\begin{verbatim}
-# R1101
-(customsuperclass=ScopingNode):<MainProgram> ::=
-  |               (inline):<MainRange>
-  | <ProgramStmt> (inline):<MainRange>
-
-<MainRange> ::=
-  | <Body>                       <EndProgramStmt>
-  | (inline):<BodyPlusInternals> <EndProgramStmt>
-  |
-\end{verbatim}}
-
-This means that accessor methods that would otherwise be in a separate
-\texttt{ASTMainRangeNode} class will be placed in the
-\texttt{ASTMainProgramNode} class instead.
-Listing~\ref{lst:astmainprogramnode_api} shows that the accessors that were
-previously in \texttt{ASTMainRangeNode} have been in-lined to
-\texttt{ASTMainProgramNode}. Now there is no longer any need for a
-\texttt{ASTMainRangeNode} class.
-
-\begin{code}
-\begin{lstlisting}
-public class ASTMainProgramNode extends ScopingNode implements IProgramUnit
-{
-	public ASTProgramStmtNode getProgramStmt()
-	
-	public void setProgramStmt(ASTProgramStmtNode newValue)
-	
-	public IASTListNode<IBodyConstruct> getBody()
-	
-	public void setBody(IASTListNode<IBodyConstruct> newValue)
-	
-	public ASTContainsStmtNode getContainsStmt()
-	
-	public void setContainsStmt(ASTContainsStmtNode newValue)
-	
-	public IASTListNode<IInternalSubprogram> getInternalSubprograms()
-	
-	public void setInternalSubprograms(IASTListNode<IInternalSubprogram> newValue)
-	
-	public ASTEndProgramStmtNode getEndProgramStmt()
-	
-	public void setEndProgramStmt(ASTEndProgramStmtNode newValue)
-	
-	...
-}
-\end{lstlisting}
-\caption{\texttt{ASTMainProgramNode} generated from \# R1101}
-\label{lst:astmainprogramnode_api}
-\end{code}
-
-\subsubsection{Annotation \#6: \texttt{(customsuperclass=*)}}
-
-Specification \# R1101 in the previous section also illustrates the use of the
-\\ \texttt{(customsuperclass=ScopingNode)} annotation. This makes
-\texttt{ScopingNode} the parent of the \texttt{ASTMainProgramNode} class. Note
-that \texttt{ScopingNode} (or whichever custom super class is chosen) has to be
-a descendant of \texttt{ASTNode} because every node in the AST has to be of that
-type (either directly or as a descendant).
-
-The \texttt{(customsuperclass=*)} annotation is a useful technique for
-delegating external methods that cannot be expressed through the grammar BNF
-file into a separate hand-coded class while still having the benefits of an
-auto-generated parser and AST.
-
-\subsection{Tokens}
-\label{sub:tokens}
-
-\texttt{Token}s form the leaves of the AST.  They record, among other things,
-
-\begin{itemize}
-\item The terminal symbol in the grammar that the token is an instance of (\texttt{getTerminal()})
-\item The actual text of the token (\texttt{getText()})
-\item The line, column, offset, and length of the token text in the source file (\texttt{getLine(), getCol(), getFileOffset(), getLength()})
-\end{itemize}
-
-Most of the remaining fields are used internally for refactoring.

diff --git a/org.eclipse.photran-dev-docs/dev-guide/cha-plugins.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/cha-plugins.ltx-inc
deleted file mode 100644
index c53f748..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/cha-plugins.ltx-inc
+++ /dev/null

@@ -1,223 +0,0 @@
-% Plug-in Decomposition
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id$ $ - based on 2008/08/08 nchen}
-
-\section{Introduction}
-
-This chapter presents a high-level overview of the different projects and
-plug-ins in Photran. It serves as a guide for developers reverse-engineering
-Photran to \emph{guess-and-locate} where certain components are. It also serves
-as a guide for contributers on \emph{where} to put their contributions.
-
-\section{The Rephraser Engine}
-
-There are two major components in Photran's CVS repository: Photran itself, and another project called the Rephraser Engine.  For the most part, you will probably be able to ignore the Rephraser Engine, but it is helpful to know what it is.
-(The Rephraser Engine will contribute a Rephraser Engine Plug-in Developer Guide to the runtime
-workbench; this provides more information about these plug-ins.  Its sources are in the
-org.eclipse.rephraserengine.doc.isv project.)
-
-While developing Photran, one of our research objectives has been to create a common infrastructure that can be reused in refactoring tools for different languages. The Rephraser Engine is one part of this infrastructure: It contains base classes for refactorings, the virtual program graph (VPG), etc.  \textit{None of the classes in the Rephraser Engine know about Fortran, Photran, or CDT.}  They are completely language-independent.  However, many of the classes in Photran's refactoring engine inherit from base classes in the Rephraser Engine: They are ``specialized'' to work with Fortran.
-
-In addition to Photran, Ralph Johnson's research group at UIUC is developing prototype refactoring tools for PHP, Lua, and BC; all of these use the Rephraser Engine.  Therefore, if you ever need to change a class in the Rephraser Engine, you should be sure that the change applies to all of these tools, not just Photran.
-
-\section{Photran's Architecture: Overview and Dependencies}
-
-Figure~\ref{fig:images_architecture_overview} illustrates the plug-in
-decomposition of Photran and the Rephraser Engine, as well as their relationship
-with CDT and the Eclipse Platform.  \textit{Pay careful attention to the
-dependencies in this diagram.}  If you are implementing a feature but need to
-introduce a dependency that is not present, you are probably implementing the
-feature in the wrong component.  It may be necessary to add an extension point
-to add your feature in the ``correct'' way.  This should be discussed on the
-photran-dev mailing list.
-
-The following sections are grouped by feature. A feature is a collection of
-related Eclipse plug-ins that the user can install as a whole.
-
-%\begin{image}
-\begin{sidewaysfigure}
-	\centering
-	\includegraphics[width=\textwidth]{images/photran_architecture.png}
-	\caption{Plug-in decomposition of Photran and the Rephraser Engine}
-	\label{fig:images_architecture_overview}
-\end{sidewaysfigure}
-%\end{image}
-
-\section{Base Photran Feature: org.eclipse.photran-feature}
-
-The following projects comprise the ``base'' of Photran.
-
-\begin{itemize}
-
-\item \textbf{org.eclipse.photran.cdtinterface}
-
-This contains most of the components (core and user interface) related
-to integration with the CDT.  It includes:
-\begin{itemize}
-\item The FortranLanguage class, which adds Fortran to the list of languages
-      recognized by CDT
-\item Fortran model elements and icons for the Outline and Fortran Projects views
-\item An extension point for contributing Fortran model builders
-\item The Fortran perspective, Fortran Projects view, and other CDT-based
-      parts of the user interface
-\item New Project wizards and Fortran project templates
-\end{itemize}
-
-More information about CDT integration is provided in Part~II of the
-\textit{Photran Developer's Guide.}
-
-\item \textbf{org.eclipse.photran.core}
-
-This is the Photran Core plug-in. It contains much of the ``behind the scenes''
-functionality which allows Eclipse to support Fortran projects (although it does
-\textit{not} contain the Fortran parser/analysis infrastructure).
-
-\begin{itemize}
-\item Workspace preferences for Fortran projects
-\item Error parsers for Fortran compilers
-\item Utility classes
-\end{itemize}
-
-\item \textbf{org.eclipse.photran.managedbuilder.core}, \\
-      \textbf{org.eclipse.photran.managedbuilder.gnu.ui}, \\
-      \textbf{org.eclipse.photran.managedbuilder.ui}
-
-Support for Managed Build projects using GNU Fortran (gfortran).  Originally created by
-Craig Rasmussen at Los Alamos National Lab.
-
-\item \textbf{org.eclipse.photran.ui}
-
-This contains the Fortran-specific components of the user interface that are
-not derived from CDT and do not depend on the Fortran parser.  These are:
-
-\begin{itemize}
-\item Fortran Editors
-\item Preference pages
-\end{itemize}
-
-\end{itemize}
-
-\section{Virtual Program Graph (VPG) feature: org.eclipse.photran.vpg-feature}
-
-The following projects support parsing, analysis, and refactoring of Fortran
-sources. They are written in Java 5. The Virtual Program Graph is described in
-more detail in Part~II of the \textit{Photran Developer's Guide.}
-
-\begin{itemize}
-
-\item \textbf{org.eclipse.photran.core.vpg}
-
-This contains the parsing, analysis, and refactoring infrastructure.
-\begin{itemize}
-\item Fortran parser and abstract syntax tree (AST)
-\item Fortran preprocessor (to handle INCLUDE lines)
-\item Parser-based model builder
-\item Photran's Virtual Program Graph (VPG)
-\item Utility classes (e.g., \texttt{SemanticError}, \texttt{LineCol})
-\item Project property pages
-\item Name binding analysis (equivalent to symbol tables)
-\item Refactoring/program transformation engine
-\item Refactorings
-\end{itemize}
-
-\item \textbf{org.eclipse.photran.core.vpg.tests}, \\
-      \textbf{org.eclipse.photran.core.vpg.tests.failing}
-
-JUnit Plug-in tests for the VPG core plug-in.
-
-All tests in org.eclipse.photran.core.vpg.tests should pass. Test suites and
-test cases are placed in the ``failing'' plug-in project until all of their
-tests pass.
-
-These plug-ins \textit{must} be run as a ``JUnit Plug-in Test'' (\textbf{not} a
-``JUnit Test''). In the launch configuration, the environment variable TESTING
-must be set to some non-empty value. (This ensures that the VPG will not try to
-run in the background and interfere with testing.)
-
-\item \textbf{org.eclipse.photran.ui.vpg}
-
-UI contributions that depend on the \texttt{org.eclipse.photran.core.vpg}
-plug-in. Currently, this includes the Open Declaration action, a project
-property page where the user can customize the search path for Fortran modules
-and include files, Fortran Search support, and all of the actions in the
-Refactor menu.
-
-\item \textbf{org.eclipse.photran.cdtinterface.vpg}
-
-This contributes the Fortran model builder which constructs the model seen in
-the Outline view and Fortran Projects view.  It uses the Fortran parser
-contained in the org.eclipse.photran.core.vpg plug-in.
-
-\end{itemize}
-
-\section{XL Fortran Compiler Feature: org.eclipse.photran.xlf-feature}
-
-The following are plug-ins to support the
-\href{http://www-306.ibm.com/software/awdtools/fortran/}{XL Fortran compiler}.
-
-\begin{itemize}
-\item \textbf{org.eclipse.photran.core.errorparsers.xlf}, \\
-      \textbf{org.eclipse.photran.managedbuilder.xlf.ui}
-
-Support for Managed Build projects using XL toolchains. Originally created by Craig
-Rasmussen at LANL.
-
-\end{itemize}
-
-\section{Intel Fortran Compiler Feature: org.eclipse.photran.intel-feature}
-
-The following are plug-ins to support the \href{http://www.intel.com/cd/software/products/asmo-na/eng/compilers/284132.htm}{Intel Fortran Compiler}.
-
-\begin{itemize}
-\item \textbf{org.eclipse.photran.core.intel}, \\
-      \textbf{org.eclipse.photran.managedbuilder.intel.ui}
-
-Support for Managed Build projects using Intel toolchains. Maintained by Bill
-Hilliard at Intel.
-
-\end{itemize}
-
-%\section{Rephraser Engine}
-%
-%The following plug-ins comprise the Rephraser Engine, a language-independent indexing and
-%refactoring infrastructure that serves as the basis for Photran's refactoring engine.
-%The Rephraser Engine will contribute a Rephraser Engine Plug-in Developer Guide to the runtime
-%workbench (sourced in org.eclipse.rephraserengine.doc.isv); this provides more information about
-%these plug-ins.  Starred plug-ins are not distributed to end users.
-%
-%\begin{itemize}
-%\item \textbf{org.eclipse.rephraserengine-feature}
-%\item \textbf{org.eclipse.rephraserengine-support}*
-%\item \textbf{org.eclipse.rephraserengine.core}
-%\item \textbf{org.eclipse.rephraserengine.core.refactoring}
-%\item \textbf{org.eclipse.rephraserengine.core.vpg}
-%\item \textbf{org.eclipse.rephraserengine.core.vpg.tests}*
-%\item \textbf{org.eclipse.rephraserengine.doc.isv}*
-%\item \textbf{org.eclipse.rephraserengine.examples.text}*
-%\item \textbf{org.eclipse.rephraserengine.examples.testing}*
-%\item \textbf{org.eclipse.rephraserengine.testing.junit3}*
-%\item \textbf{org.eclipse.rephraserengine.ui}
-%\item \textbf{org.eclipse.rephraserengine.ui.refactoring}
-%\item \textbf{org.eclipse.rephraserengine.ui.vpg}
-%\end{itemize}
-
-\section{Non-plug-in projects}
-
-The following projects are in CVS but are not distributed to users:
-
-\begin{itemize}
-
-\item \textbf{org.eclipse.photran-dev-docs}
-
-Developer documentation, including this document (\texttt{dev-guide/*}), CVS
-instructions (\texttt{dev-guide/cvs-instructions.pdf}), the materials from our
-presentation at EclipseCon 2006 on adding a new language to the CDT, and a
-spreadsheet mapping features in the Fortran language to JUnit tests
-(\texttt{language-coverage/*}).
-
-\item \textbf{org.eclipse.photran-samples}
-
-A Photran project containing an assortment of Fortran code.
-
-\end{itemize}

diff --git a/org.eclipse.photran-dev-docs/dev-guide/cha-refactoring.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/cha-refactoring.ltx-inc
deleted file mode 100644
index 6d555e8..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/cha-refactoring.ltx-inc
+++ /dev/null

@@ -1,338 +0,0 @@
-% Refactoring
-\vspace{-0.5in}
-
-{\scriptsize Revision: \footnotesize \$Id: cha-refactoring.ltx-inc,v 1.3 2010/06/02 21:25:28 joverbey Exp $ $ - based on 2008/08/08 nchen}
-
-\section{Introduction}
-
-A refactoring is a program transformation to improve the quality of the source
-code by making it easier to understand and modify. A refactoring is a special
-kind of transformation because it preserves the \emph{observable behavior} of
-your program -- it neither removes nor adds any functionality.\footnote{For more
-information see
-\textit{\href{http://www.amazon.com/Refactoring-Improving-Existing-Addison-Wesley-Technology/dp/0201485672}{Refactoring:
-Improving the Design of Existing Code}}}.
-
-The main purpose of writing
-Photran was to create a refactoring tool for Fortran. The Eclipse Platform provides some
-language-neutral components that allow Photran's refactorings to resemble the
-refactorings in the Java Development Tools, at least in terms of their user interface.
-However, the \textit{language infrastructure} for refactoring---the program representation
-and the APIs for manipulating Fortran source code---are all unique to Photran.
-
-Most of the code in a refactoring is dedicated to program analysis and source code
-transformation; the APIs for doing this were described in the previous chapter on the
-AST and VPG.  In this chapter, we describe how automated refactorings are structured
-and how they can be added to the Eclipse API.
-
-\section{Overview}
-
-{\footnotesize
-\textit{This section is excerpted from
-M.~M\'endez, J.~Overbey, A.~Garrido, F.~Tinetti, and R.~Johnson,
-``A Catalog and Classification of Fortran Refactorings'' (2010).}
-}
-
-One of Photran's design objectives has been to make adding new refactorings as painless as possible.  Often, it is possible to add a new refactoring by implementing a single Java class and adding one line of XML to a configuration file.
-
-Photran divides refactorings into two categories.  An \textbf{editor-based refactoring} requires the user to select part of a Fortran program (for example, he may select the header of a do loop) in a text editor in order to initiate the refactoring.  A \textbf{resource refactoring} applies to entire files; the user can select several files at once, or even entire folders or projects, and the refactoring will be applied to all of the selected Fortran source files at once.
-
-To create a new refactoring, the developer must decide whether it will be an editor-based refactoring or a resource refactoring.  Photran provides different superclasses for each.  The developer then creates a concrete subclass and adds a line of XML to a configuration file to make Photran aware of the new refactoring.  The concrete subclass must define methods which:
-\begin{itemize}
-\item provide the name of the refactoring.  This becomes its label in the Refactor menu, and it is also used to describe the refactoring in the Edit $>$ Undo menu item and in other user interface elements.
-\item check initial preconditions.  These are usually simple checks which verify that the user selected the correct construct in the editor, that the file is not read-only, etc.
-\item acquire user input.  For example, a refactoring to add a parameter to a subprogram must ask the user to supply the new parameter's name and type.
-\item check final preconditions.  These validate user input and perform any additional checks necessary to ensure that the transformation can be performed, the resulting code will compile, and it will retain the behavior of the original program.
-\item perform the transformation.  Once all preconditions have been checked, this method determines what files will be changed, and how.
-\end{itemize}
-
-Thanks to Java's reflective facilities, much of the user interface for a refactoring comes ``for free.''  Photran automatically adds the refactoring to the appropriate parts of the Eclipse user interface, and it provides a wizard-style dialog box which allows the user to interact with the refactoring.  This dialog includes a \textit{diff}-like preview, which allows the user to see what changes the refactoring will make before committing it.
-
-\section{Getting Started}
-
-Perhaps the best way to create a new refactoring is to start with an existing refactoring and
-modify it to do what you want.  The following refactorings are very simple and should be used as
-starting points:
-
-\begin{itemize}
-\item \textit{InterchangeLoopsRefactoring} -- An editor-based refactoring that swaps the headers of two perfectly-nested \texttt{DO}-loops
-\item \textit{RepObsOpersRefactoring} -- A resource refactoring that replaces old-style operators like \texttt{.LT.} and \texttt{.EQ.} with their newer, symbolic counterparts (i.e., \texttt{$<$} and \texttt{==}).
-\item \textit{KeywordCaseRefactoring} -- A resource refactoring that changes all keywords to either upper- or lower-case.
-\end{itemize}
-
-All of these refactorings make fairly simple replacements in an AST.  A slightly less trivial
-example is \textit{IntroImplicitNoneRefactoring}, which illustrates how to insert new code into
-an AST.
-
-\textit{\textbf{Hint:} To find any of these classes quickly, click on Navigate $>$ Open Type in the
-Java perspective, and start typing the class name.}
-
-\section{How to Create a Refactoring}
-
-\begin{enumerate}
-
-\item
-Decide whether your refactoring will be an editor-based refactoring or a resource refactoring, and then
-create a new subclass of either \textit{FortranEditorRefactoring} or
-\textit{FortranResourceRefactoring}.\footnote{Both of these classes inherit from
-of an Eclipse Platform class called \textit{Refactoring}.
-The \textit{Refactoring} class is provided by a Platform
-component called the Eclipse Language ToolKit, or LTK. The
-LTK is a language-neutral API for supporting refactorings in the Eclipse
-environment. It provides the wizard dialog used by most refactorings,
-including the diff view shown in the preview page. This allows refactorings
-for Java, C/C++, and Fortran to all have the same look and feel. See
-``\href{http://www.eclipse.org/articles/Article-LTK/ltk.html}{The Language
-Toolkit: An API for Automated Refactorings in Eclipse-based IDEs}'' for an
-introduction to the LTK.}
-Use one of the simpler refactorings listed above as a starting point, and look at the JavaDoc
-for each method you must override.
-
-\item
-Add the refactoring to the \texttt{plugin.xml} file.  Be sure that you give the correct
-fully-qualified name for your refactoring class, and be sure you correctly identify it as
-either a resource refactoring or an editor refactoring based on its superclass!
-
-\item
-When you run Photran, your refactoring should now be visible in the user interface.
-
-\end{enumerate}
-
-Refactoring classes inherit a large number of
-\texttt{protected} utility methods common among refactorings, such as a method
-to determine if a token is a uniquely-bound identifier, a method to parse
-fragments of code that are not complete programs, and a \textit{fail} method
-which is simply shorthand for throwing a \textit{PreconditionFailure}.
-Before writing your own utility methods, use content assist to scan through the
-list of methods available, or look at a refactoring with similar preconditions
-to determine if the functionality you need already exists.
-
-\section{Changing Source Code: AST Rewriting}
-\label{sec:ast_rewriting}
-
-Instead of manipulating the text in the source files directly, Photran's refactorings modify
-source code by manipulating the program's abstract syntax tree (AST), and then
-reproducing source code from the modified AST.
-The previous chapter provided a general introduction to Photran's AST.  (If you have not read it,
-please do so before continuing.)  The remainder of this section will discuss how the AST
-is used in refactorings.
-
-\subsection{Whitetext Affixes}
-
-Photran's AST is \textit{concretized} as described in J.~Overbey and R.~Johnson, ``Generating
-Rewritable Abstract Syntax Trees'' (SLE 2008).  Its API appears to be that of an ordinary AST,
-but in fact every token returned by the lexer is actually stored in the AST.  Moreover, every
-token has whitetext (comments, whitespace, line continuations, etc.) affixed to it.
-
-In general, all of the comments, whitespace, etc.~are affixed to the \textit{following} token.
-(This works well in Photran since it treats a newline as its own token.)
-This whitetext can be retrieved by invoking \texttt{token.getWhiteBefore()}.  However, if there
-is whitetext at the \textit{end} of a file, it is affixed to the \textit{last} token in the file
-and can be retrieved by invoking \texttt{token.getWhiteAfter()}.
-
-\subsection{Mutable AST}
-
-Photran's AST is \textit{mutable.}  When you want to change the source code produced by the AST,
-you modify the AST itself.  That is, you add, remove, or replace parts of the AST as necessary to
-effect the change you want.  (Note that this is \textit{different} from the Eclipse JDT and CDT,
-which use an \textit{ASTRewriter} to \textit{describe} source code changes in terms of AST nodes
-but do not actually modify the AST.)
-
-Note that the \textit{toString()} method can be invoked on any AST node to display its source code.
-This means that, if you are stepping through a refactoring in the debugger, you can watch the
-AST (or any subtree) to see the effects of each change that is made to it.
-
-\subsection{Modifying, Moving, Removing, and Replacing AST Nodes}
-
-In the org.eclipse.photran.internal.core.refactoring package, there is a class
-called \textit{\_AST\_VPG\_HOWTO} which contains several small ``snippets''
-illustrating how to perform common tasks with the AST/VPG.  This includes how
-to traverse the AST using a visitor, how to find nodes of a particular type,
-how to find all of the references to a particular name, etc.  It also includes
-several examples of how to move, copy and delete nodes in an AST.
-
-\subsection{Inserting new AST Nodes} 
-
-Some refactorings require inserting new AST nodes into the current program. For
-instance, the ``Intro Implicit None Refactoring'' inserts new declaration
-statements to make the type of each variable more explicit.
-
-There are \emph{three} steps involved in inserting a new AST node:
-\begin{enumerate}
-	\item Constructing the new AST node.
-	\item Inserting the new AST node into the correct place.
-	\item Re-indenting the new AST node to fit within the current file.
-\end{enumerate}
-
-\paragraph{Constructing the new AST node} A refactoring class inherits several
-convenience methods for constructing new AST nodes. These are all named \textit{parseLiteral\dots}.
-For instance,
-the \textit{parseLiteralStatement} methods constructs a list of AST nodes for 
-use in the ``Intro Implicit None'' refactoring.
-
-\paragraph{Inserting the new AST node} Examples for how to insert the new AST node are
-included in the \textit{\_AST\_VPG\_HOWTO} class mentioned above.
-
-\paragraph{Re-indenting the new AST node} It might be necessary to re-indent the
-newly inserted AST node so that it conforms with the indentation at its
-insertion point. The \textit{Reindenter} utility class provides the static
-method \textit{reindent} to perform this task.
-
-\subsection{Committing Changes}
-
-After all of the changes have been made to a file's AST,
-\textit{addChangeFromModifiedAST} has to be invoked to %actually
-%commit the changes. This convenience function creates a new
-%\textit{TextFileChange} for the \emph{entire} content of the file. The
-%underlying Eclipse infrastructure performs a \textit{diff} internally to
-%determine what parts have actually changed and present those changes to the user
-%in the preview dialog.
-inform the Eclipse refactoring infrastructure that the source code should
-be replaced with the revised source code in the modified AST.  \textit{If
-you forget to invoke this method, your refactoring will appear to do
-nothing!}
-
-\section{Caveats}
-\label{sec:refactoring_caveats}
-
-\textbf{CAUTION:} Internally, the AST is changed only enough to reproduce
-correct source code. After making changes to an AST, most of the accessor
-methods on \textit{Token}s (\textit{getLine(), getOffset(),} etc.) will return
-\textit{incorrect} or \emph{null} values.
-
-Therefore, \textit{all program analysis should be done first}.  Affected
-\textit{Token}s should be recorded as \textit{TokenRef}s and affected
-\textit{Definition}s should be stored
-\textit{prior} to making any modifications to the AST. In general, ensure that
-all analyses (and storing of important information from \textit{Token}s) is
-done in the \textit{doCheckInitialConditions} and
-\textit{doCheckFinalConditions} methods of your refactoring \textit{before} the
-\textit{doCreateChange} method is invoked and before the AST is modified in any way.
-
-\vspace{-0.2in}
-\subsection{\textit{Token} or \textit{TokenRef}?}
-\label{sub:token_or_tokenref}
-
-\textit{Token}s form the leaves of the AST -- therefore they exist as part of
-the Fortran AST. Essentially this means that holding on to a reference to a
-\textit{Token} object requires the entire AST to be present in memory.
-
-\textit{TokenRef}s are lightweight descriptions of tokens in an AST. They
-contain only three fields: filename, offset and length. These three fields
-uniquely identify a particular token in a file. Because they are not part of the
-AST, storing a \textit{TokenRef} does not require the entire AST to be present
-in memory.
-
-If a refactoring only modifies one or two files,
-using either \textit{Token}s or \textit{TokenRef}s does
-not make much of a difference. However, in a refactoring like ``Rename''
-that could potentially modify hundreds of files, it is impractical
-to store all ASTs in memory at once. Because of the complexity of the Fortran
-language itself, its ASTs can be rather large and complex. Therefore storing
-references to \textit{TokenRef}s would minimize the number of ASTs that must be
-in memory.
-
-To retrieve an actual \textit{Token} from a \textit{TokenRef}, call the
-\textit{findToken()} method in \textit{PhotranTokenRef}, a subclass
-of \textit{TokenRef}.
-
-To create a \textit{TokenRef} from an actual \textit{Token}, call the \textit{getTokenRef} method in \textit{Token}.
-
-
-\newif\ifzzz
-\ifzzz
-\noindent \textbf{In an AST, how do I find an ancestor node that is of a
-particular type?}
-\\ Sometimes it might be necessary to traverse the AST \emph{upwards} to look
-for an ancestor node of a particular type. Instead of traversing the AST
-manually, you should call the \textit{findNearestAncestor(TargetASTNode.class)}
-method on a \textit{Token} and pass it the \textbf{class} of the ASTNode that
-you are looking for.
-
-\noindent \textbf{How would I create a new AST node from a string?} 
-\\ Call the \textit{parseLiteralStatement(String string)} or
-\textit{parseLiteralStatementSequence(String string)} method in
-\textit{AbstractFortranRefactoring}. The former takes a \textit{String} that represents
-a single statement while the latter takes a \textit{String} that represents a
-sequence of statements.
-
-\noindent \textbf{How do I print the text of an AST node and all its children
-nodes?}
-\\ Call the \textit{SourcePrinter.getSourceCodeFromASTNode(IASTNode node)}
-method. This method returns a \textit{String} representing the source code of
-its parameter; it includes the user's comments, capitalization and whitespace.
-\fi
-
-\section{Testing a Refactoring}
-
-Writing JUnit tests for a refactoring is simple (starting with Photran 6 anyway).
-Any of the tests suites in the org.eclipse.photran.internal.tests.refactoring
-package can be used as examples.
-
-Each refactoring has a corresponding test suite in that package.  The test suite
-is a class which inherits from \textit{PhotranRefactoringTestSuiteFromMarkers}.
-The test suite is constructed by importing files from a directory in the
-source tree, searching its \textit{markers} (comma-separated lines starting with
-\texttt{!$<<<<<$}), and adding one test case to the suite for each marker.
-
-Markers are expected to have one of the following forms:
-\begin{enumerate}
-\item \texttt{!$<<<<<$}) \textit{line, col, \dots}
-\item \texttt{!$<<<<<$}) \textit{fromLine, fromCol, toLine, toCol, \dots}
-\end{enumerate}
-
-That is, the first two fields in each marker are expected to be a line and column number; the
-text selection passed to the refactoring will be the offset of that line and column.  The third
-fourth fields may also be a line and column number; then, the selection passed to the refactoring
-will extend from the first line/column to the second line/column.
-
-The line and column numbers may be followed by an arbitrary number of fields that contain data
-specific to the refactoring being invoked.  Many refactorings don't require any additional data;
-the Extract Local Variable test suite uses one field for the new variable declaration; the Add
-ONLY to USE Statement test suite uses these fields to list the module entities to add; etc.
-
-The final field must be either \texttt{pass}, \texttt{fail-initial}, or
-\texttt{fail-final}, indicating whether the refactoring should succeed,
-ail its initial precondition check, or fail its final precondition check.
-If the refactoring is expected to succeed, the Fortran program will be compiled and run before
-and after the refactoring in order to ensure that the refactoring actually preserved behavior.
-
-To create a test suite for a new refactoring:
-
-\begin{enumerate}
-
-\item In the org.eclipse.photran.internal.tests.refactoring package,
-copy an existing test suite class, like DataToParameterTestSuite.java.
-
-\item Change the name of the Refactoring class in the list of type parameters and in the constructor.
-
-\item If your markers will contain information other than fromLine, fromCol, toLine, toCol, and pass/fail, override the \textit{configureRefactoring} method.
-See \textit{ExtractLocalVariableTestSuite} for an example.
-
-\item Inside the \textit{refactoring-test-code} folder, create a new subfolder named after your
-refactoring.  We will call this the \textit{base folder.}
-In the test suite class, change the string variable \texttt{DIR} to point to the
-base folder.
-
-\item Inside the base folder, create one or more subfolders.  Each subfolder will
-be imported into the runtime workspace as a single Eclipse project, so it may
-contain only one Fortran file, or it may contain several.
-The refactoring will be run according to the markers in its files.
-Remember, markers have the basic form
-\texttt{!$<<<<<$} \textit{startLine, startCol, endLine, endCol, result.}
-
-\item If there is only one marker anywhere in the subfolder, and it indicates that
-the refactoring should succeed, you may also create
-a \textit{.result} file.  For example, if the folder contains \textit{hello.f90},
-it may also contain \textit{hello.f90.result}.  This file should contain the
-\textit{exact text} the file is expected to have after the refactoring has been
-performed.  The \textit{.result} file will be compared character-by-character with
-the result of the refactoring, so spaces, tabs, and newlines \textit{do} matter;
-the test will fail even if a single space is incorrect.  (This is because
-a production refactoring tool must produce correctly-indented code and handle
-comments correctly, and this is an easy way to test for this.)  Note that you
-will probably need to include the marker in both the original file and the
-result file, based on how comments are handled by the refactoring (since it is,
-after all, simply another comment in the Fortran code).
-
-\end{enumerate}
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/dev-guide/cvs-instructions.ltx b/org.eclipse.photran-dev-docs/dev-guide/cvs-instructions.ltx
deleted file mode 100644
index b0f530e..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/cvs-instructions.ltx
+++ /dev/null

@@ -1,45 +0,0 @@
-\documentclass[10pt,letterpaper]{article}
-
-\usepackage{times} % Use Times New Roman instead of Computer Modern font
-
-%\usepackage{anysize}
-%\marginsize{1.5in}{1.5in}{1.5in}{1.5in}
-\usepackage{fullpage}
-\usepackage[pdftex]{hyperref}
-\hypersetup{
-    colorlinks,%
-    citecolor=black,%
-    filecolor=black,%
-    linkcolor=black,%
-    urlcolor=blue
-}
-
-\hyphenpenalty=5000
-\tolerance=1000
-
-% Skip a line between paragraphs, and don't indent them
-\setlength{\parskip}{10pt}  % 10 pt = space between paragraphs
-\setlength{\parindent}{0pt} % 0 pt  = indentation
-
-\begin{document}
-
-\title{\bfseries Getting the Photran 7.0 Sources from CVS \\
-       {\normalsize and Creating Launch Configurations}}
-\author{}
-\date{}
-
-\maketitle
-
-\input{app-cvs.ltx-inc}
-
-\vspace{1em}
-\noindent\textbf{Part~III.  Running the test cases}
-
-\input{app-tests.ltx-inc}
-
-\vspace{1em}
-\noindent\textbf{Part~IV.  Launching Photran in the debugger}
-
-\input{app-launch.ltx-inc}
-
-\end{document}

diff --git a/org.eclipse.photran-dev-docs/dev-guide/cvs-instructions.pdf b/org.eclipse.photran-dev-docs/dev-guide/cvs-instructions.pdf
deleted file mode 100644
index d3e14df..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/cvs-instructions.pdf
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-dev-docs/dev-guide/dev-guide-general.ltx b/org.eclipse.photran-dev-docs/dev-guide/dev-guide-general.ltx
deleted file mode 100644
index af65eba..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/dev-guide-general.ltx
+++ /dev/null

@@ -1,64 +0,0 @@
-\documentclass[10pt,letterpaper]{report}
-\input{prologue.ltx-inc}
-\begin{document}
-
-\title{
-  {\Huge\bfseries Photran 7.0 Developer's Guide} \\
-  \vspace*{1em}
-  {\LARGE Part I: General Information} \\
-  \vspace*{1em}
-  {\normalsize \today\ Revision}
-  \vspace*{3in}
-}
-\author{
-N. Chen \\
-J. Overbey \\
-}
-\date{}
-
-\maketitle
-
-\tableofcontents
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\chapter*{Checklist for New Developers}%\symbolfootnote[0]{Last significant update: 04/27/10 (JO)}
-\input{cha-checklist.ltx-inc}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\chapter{Introduction}
-\label{cha:introduction}
-\input{cha-intro.ltx-inc}
-
-\chapter{Plug-in Decomposition}
-\label{cha:plugins}
-\input{cha-plugins.ltx-inc}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\appendix
-
-\chapter{Getting the Photran Sources from CVS HEAD}
-\label{app:cvs}
-\input{app-cvs.ltx-inc}
-
-\chapter{Running Photran's Automated Test Suite}
-\label{app:testsuite}
-\setcounter{running_counter}{0}
-\input{app-tests.ltx-inc}
-
-\chapter{Creating a Launch Configuration for Photran}
-\label{app:launch}
-\setcounter{running_counter}{0}
-\input{app-launch.ltx-inc}
-
-\chapter{Additional Information for UIUC Personnel}
-\label{app:uiuc}
-\input{app-uiuc.ltx-inc}
-
-\chapter{Contributing a New Feature or Bug Fix}
-\label{app:contributing}
-\input{app-contributing.ltx-inc}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\end{document}

diff --git a/org.eclipse.photran-dev-docs/dev-guide/dev-guide-general.pdf b/org.eclipse.photran-dev-docs/dev-guide/dev-guide-general.pdf
deleted file mode 100644
index e0d5762..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/dev-guide-general.pdf
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-dev-docs/dev-guide/dev-guide-specialized.ltx b/org.eclipse.photran-dev-docs/dev-guide/dev-guide-specialized.ltx
deleted file mode 100644
index 56a7feb..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/dev-guide-specialized.ltx
+++ /dev/null

@@ -1,73 +0,0 @@
-\documentclass[10pt,letterpaper]{report}
-\input{prologue.ltx-inc}
-\begin{document}
-
-\title{
-  {\Huge\bfseries Photran 7.0 Developer's Guide} \\
-  \vspace*{1em}
-  {\LARGE Part II: Specialized Topics} \\
-  \vspace*{1em}
-  {\normalsize \today\ Revision}
-  \vspace*{3in}
-}
-\author{
-N. Chen \\
-J. Overbey \\
-}
-\date{}
-
-\maketitle
-
-\tableofcontents
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\chapter{Interactions with CDT}
-\label{cha:cdt}
-\input{cha-cdt.ltx-inc}
-
-\chapter{The Abstract Syntax Tree and Virtual Program Graph}
-\label{cha:ast-vpg}
-\input{cha-ast-vpg.ltx-inc}
-
-\chapter{Refactorings}
-\label{cha:refactoring}
-\input{cha-refactoring.ltx-inc}
-
-%\chapter{Parsing and Preprocessing}
-%\label{cha:parsing}
-%\input{cha-parsing.ltx-inc}
-
-\chapter{The Fortran Editor}
-\label{cha:editor}
-\input{cha-editor.ltx-inc}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\appendix
-
-%\chapter{Creating an Error Parser}
-%\label{app:creating_an_error_parser}
-%\input{app-error-parsers.ltx-inc}
-
-%\chapter{Simple Fortran Refactoring Example}
-%\label{app:obfuscate_refactoring}
-%\input{app-obfuscate-fortran.ltx-inc}
-
-%\chapter{Creating Tests for the Rename Refactoring}
-%\input{app-rename-tests.ltx-inc}
-
-\chapter{Adding New Fortran Syntax}
-\input{app-new-syntax.ltx-inc}
-
-\chapter{Regenerating the Help Plug-in}
-\label{app:help}
-\input{app-generating-help.ltx-inc}
-
-\chapter{Release and Deployment Procedure}
-\input{app-deploy.ltx-inc}
-
-\chapter{Release History}
-\input{app-history.ltx-inc}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\end{document}

diff --git a/org.eclipse.photran-dev-docs/dev-guide/dev-guide-specialized.pdf b/org.eclipse.photran-dev-docs/dev-guide/dev-guide-specialized.pdf
deleted file mode 100644
index cbc1f06..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/dev-guide-specialized.pdf
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-dev-docs/dev-guide/find-pdflatex.sh b/org.eclipse.photran-dev-docs/dev-guide/find-pdflatex.sh
deleted file mode 100755
index 2b0ea6b..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/find-pdflatex.sh
+++ /dev/null

@@ -1,21 +0,0 @@
-#!/bin/sh
-RESULT=`which pdflatex 2>/dev/null | grep -v "no pdflatex in"`
-if [ "$RESULT" == "" ]; then
-  OS=`uname -s`
-  if [ "$OS" == "Darwin" ]; then
-    HARDWARE=`uname -m`
-    if [ "$HARDWARE" == "i386" ]; then
-      RESULT=`find /usr/local/texlive -name pdflatex | grep i386`
-    else
-      RESULT=`find /usr/local/texlive -name pdflatex | grep ower`
-    fi
-  else
-    RESULT=`find /usr/local/tex* -name pdflatex | head -1`
-  fi
-fi
-if [ "$RESULT" == "" ]; then
-  exit 1
-else
-  echo $RESULT
-  exit 0
-fi

diff --git a/org.eclipse.photran-dev-docs/dev-guide/images/diagrams/editor_hierarchy.graffle b/org.eclipse.photran-dev-docs/dev-guide/images/diagrams/editor_hierarchy.graffle
deleted file mode 100644
index 4847a60..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/images/diagrams/editor_hierarchy.graffle
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-dev-docs/dev-guide/images/diagrams/parser_chain.graffle b/org.eclipse.photran-dev-docs/dev-guide/images/diagrams/parser_chain.graffle
deleted file mode 100644
index 5c40720..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/images/diagrams/parser_chain.graffle
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-dev-docs/dev-guide/images/diagrams/photran_architecture.graffle b/org.eclipse.photran-dev-docs/dev-guide/images/diagrams/photran_architecture.graffle
deleted file mode 100644
index f768dac..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/images/diagrams/photran_architecture.graffle
+++ /dev/null

@@ -1,7834 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>ActiveLayerIndex</key>
-	<integer>0</integer>
-	<key>ApplicationVersion</key>
-	<array>
-		<string>com.omnigroup.OmniGraffle</string>
-		<string>138.12.0.121252</string>
-	</array>
-	<key>AutoAdjust</key>
-	<false/>
-	<key>BackgroundGraphic</key>
-	<dict>
-		<key>Bounds</key>
-		<string>{{0, 0}, {1368, 900}}</string>
-		<key>Class</key>
-		<string>SolidGraphic</string>
-		<key>ID</key>
-		<integer>2</integer>
-		<key>Style</key>
-		<dict>
-			<key>shadow</key>
-			<dict>
-				<key>Draws</key>
-				<string>NO</string>
-			</dict>
-			<key>stroke</key>
-			<dict>
-				<key>Draws</key>
-				<string>NO</string>
-			</dict>
-		</dict>
-	</dict>
-	<key>CanvasOrigin</key>
-	<string>{0, 0}</string>
-	<key>CanvasSize</key>
-	<string>{1368, 900}</string>
-	<key>ColumnAlign</key>
-	<integer>1</integer>
-	<key>ColumnSpacing</key>
-	<real>36</real>
-	<key>CreationDate</key>
-	<string>2010-02-24 15:53:57 -0600</string>
-	<key>Creator</key>
-	<string>Jeffrey Overbey</string>
-	<key>DisplayScale</key>
-	<string>1 0/72 in = 1.0000 in</string>
-	<key>GraphDocumentVersion</key>
-	<integer>6</integer>
-	<key>GraphicsList</key>
-	<array>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>ID</key>
-			<integer>435</integer>
-			<key>Layer</key>
-			<integer>0</integer>
-			<key>Points</key>
-			<array>
-				<string>{1182.7, 431.551}</string>
-				<string>{1182.7, 738}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-					<key>Width</key>
-					<real>2</real>
-				</dict>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>ID</key>
-			<integer>434</integer>
-			<key>Layer</key>
-			<integer>0</integer>
-			<key>Points</key>
-			<array>
-				<string>{1125, 431.123}</string>
-				<string>{1125, 737.572}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-					<key>Width</key>
-					<real>2</real>
-				</dict>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>ID</key>
-			<integer>433</integer>
-			<key>Layer</key>
-			<integer>0</integer>
-			<key>Points</key>
-			<array>
-				<string>{69.7103, 432.215}</string>
-				<string>{69.7103, 826.908}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-					<key>Width</key>
-					<real>2</real>
-				</dict>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>ID</key>
-			<integer>432</integer>
-			<key>Layer</key>
-			<integer>0</integer>
-			<key>Points</key>
-			<array>
-				<string>{903.665, 765}</string>
-				<string>{903.665, 828}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-					<key>Width</key>
-					<real>2</real>
-				</dict>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>ID</key>
-			<integer>431</integer>
-			<key>Layer</key>
-			<integer>0</integer>
-			<key>Points</key>
-			<array>
-				<string>{676.965, 675}</string>
-				<string>{676.965, 738}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-					<key>Width</key>
-					<real>2</real>
-				</dict>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{453.703, 738}, {901.524, 27}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica-Bold</string>
-				<key>Size</key>
-				<real>14</real>
-			</dict>
-			<key>ID</key>
-			<integer>429</integer>
-			<key>Layer</key>
-			<integer>0</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>Width</key>
-					<real>2</real>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\b\fs28 \cf0 CDT}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{36.5, 828}, {1313.5, 27}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica-Bold</string>
-				<key>Size</key>
-				<real>14</real>
-			</dict>
-			<key>ID</key>
-			<integer>428</integer>
-			<key>Layer</key>
-			<integer>0</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>Width</key>
-					<real>2</real>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\b\fs28 \cf0 Eclipse Platform}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{405.707, 0}, {1, 702}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>HFlip</key>
-			<string>YES</string>
-			<key>ID</key>
-			<integer>427</integer>
-			<key>Layer</key>
-			<integer>0</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>Width</key>
-					<real>5</real>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{279.623, 37.5985}, {68, 29}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FitText</key>
-			<string>YES</string>
-			<key>Flow</key>
-			<string>Resize</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>BankGothic-Medium</string>
-				<key>Size</key>
-				<real>89</real>
-			</dict>
-			<key>ID</key>
-			<integer>426</integer>
-			<key>Layer</key>
-			<integer>0</integer>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>ShadowVector</key>
-					<string>{0, 2}</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Pad</key>
-				<integer>0</integer>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\froman\fcharset0 Times-Roman;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\i\fs48 \cf0 \kerning1\expnd2\expndtw13
-engine}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-			<key>Wrap</key>
-			<string>NO</string>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{60.9883, 6.00081}, {287, 51}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FitText</key>
-			<string>YES</string>
-			<key>Flow</key>
-			<string>Resize</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>BankGothic-Medium</string>
-				<key>Size</key>
-				<real>89</real>
-			</dict>
-			<key>ID</key>
-			<integer>425</integer>
-			<key>Layer</key>
-			<integer>0</integer>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>ShadowVector</key>
-					<string>{0, 2}</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Pad</key>
-				<integer>0</integer>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fnil\fcharset0 BankGothic-Medium;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\fs96 \cf0 Rephraser}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-			<key>Wrap</key>
-			<string>NO</string>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{46.9883, 215.123}, {315, 216}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>405</integer>
-			<key>Layer</key>
-			<integer>0</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>Width</key>
-					<real>2</real>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{46.9883, 188.123}, {315, 27}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica-Bold</string>
-				<key>Size</key>
-				<real>14</real>
-			</dict>
-			<key>ID</key>
-			<integer>404</integer>
-			<key>Layer</key>
-			<integer>0</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>Width</key>
-					<real>2</real>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\b\fs28 \cf0 Rephraser Engine End-User Runtime}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{939.965, 47.312}, {425, 94}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FitText</key>
-			<string>YES</string>
-			<key>Flow</key>
-			<string>Resize</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>BankGothic-Medium</string>
-				<key>Size</key>
-				<real>89</real>
-			</dict>
-			<key>ID</key>
-			<integer>363</integer>
-			<key>Layer</key>
-			<integer>0</integer>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>ShadowVector</key>
-					<string>{0, 2}</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Pad</key>
-				<integer>0</integer>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fnil\fcharset0 BankGothic-Medium;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\fs178 \cf0 Photran}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-			<key>Wrap</key>
-			<string>NO</string>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{453.703, 45}, {459, 630}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>289</integer>
-			<key>Layer</key>
-			<integer>0</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>Width</key>
-					<real>2</real>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{1166.23, 215.123}, {189, 216}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>291</integer>
-			<key>Layer</key>
-			<integer>0</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>Width</key>
-					<real>2</real>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{950.227, 215.123}, {189, 216}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>290</integer>
-			<key>Layer</key>
-			<integer>0</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>Width</key>
-					<real>2</real>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{1166.23, 188.123}, {189, 27}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica-Bold</string>
-				<key>Size</key>
-				<real>14</real>
-			</dict>
-			<key>ID</key>
-			<integer>221</integer>
-			<key>Layer</key>
-			<integer>0</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>Width</key>
-					<real>2</real>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\b\fs28 \cf0 XLF Feature 
-\b0 (xlf-feature)}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{950.227, 188.123}, {189, 27}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica-Bold</string>
-				<key>Size</key>
-				<real>14</real>
-			</dict>
-			<key>ID</key>
-			<integer>220</integer>
-			<key>Layer</key>
-			<integer>0</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>Width</key>
-					<real>2</real>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\b\fs28 \cf0 Intel Feature 
-\b0 (intel-feature)}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{453.703, 18}, {459, 27}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica-Bold</string>
-				<key>Size</key>
-				<real>14</real>
-			</dict>
-			<key>ID</key>
-			<integer>137</integer>
-			<key>Layer</key>
-			<integer>0</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>Width</key>
-					<real>2</real>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\b\fs28 \cf0 Photran End-User Runtime 
-\b0 (photran-feature)}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{64.9883, 395.999}, {279, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica</string>
-				<key>Size</key>
-				<real>12</real>
-			</dict>
-			<key>ID</key>
-			<integer>414</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{64.9883, 233.5}, {279, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica</string>
-				<key>Size</key>
-				<real>12</real>
-			</dict>
-			<key>ID</key>
-			<integer>413</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\b\fs24 \cf0 Language-Independent Infrastructure}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{-22.25, 346}, {80.9999, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>412</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Rotation</key>
-			<real>270</real>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\fs24 \cf0 Core}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{-13.25, 274.25}, {63, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>411</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Rotation</key>
-			<real>270</real>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\fs24 \cf0 UI}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{64.9883, 315.189}, {279, 80.9999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>380</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{64.9883, 252}, {279, 63}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>379</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{1182.7, 231.873}, {153, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica</string>
-				<key>Size</key>
-				<real>12</real>
-			</dict>
-			<key>ID</key>
-			<integer>362</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\b\fs24 \cf0 XLF Compiler Support}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{967.465, 232.623}, {152.238, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica</string>
-				<key>Size</key>
-				<real>12</real>
-			</dict>
-			<key>ID</key>
-			<integer>361</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\b\fs24 \cf0 Intel Compiler Support}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{403.538, 148.251}, {63.3771, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>360</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Rotation</key>
-			<real>270</real>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\fs24 \cf0 Core}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{403.727, 85.0618}, {63, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>359</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Rotation</key>
-			<real>270</real>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\fs24 \cf0 UI}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>346</integer>
-				<key>Info</key>
-				<integer>2</integer>
-			</dict>
-			<key>ID</key>
-			<integer>351</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Points</key>
-			<array>
-				<string>{602.965, 206.623}</string>
-				<string>{602.965, 233.376}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>209</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{472.465, 395.999}, {261, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica</string>
-				<key>Size</key>
-				<real>12</real>
-			</dict>
-			<key>ID</key>
-			<integer>350</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{741.703, 233.251}, {153, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica</string>
-				<key>Size</key>
-				<real>12</real>
-			</dict>
-			<key>ID</key>
-			<integer>347</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\b\fs24 \cf0 GNU Compiler Support**}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{472.465, 251.75}, {261, 63}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>349</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{472.465, 314.75}, {261, 90.0009}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>348</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{472.465, 233.376}, {261, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica</string>
-				<key>Size</key>
-				<real>12</real>
-			</dict>
-			<key>ID</key>
-			<integer>346</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\b\fs24 \cf0 Analysis &amp; Refactoring Support*}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{372.227, 584.439}, {126, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>93</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Rotation</key>
-			<real>270</real>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\fs24 \cf0 Core}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{399.227, 485.939}, {71.9999, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>117</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Rotation</key>
-			<real>270</real>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\fs24 \cf0 UI}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{741.703, 395.999}, {153, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica</string>
-				<key>Size</key>
-				<real>12</real>
-			</dict>
-			<key>ID</key>
-			<integer>232</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>ID</key>
-			<integer>243</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Points</key>
-			<array>
-				<string>{1259.2, 413.622}</string>
-				<string>{1259.2, 455.873}</string>
-				<string>{894.703, 455.873}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>219</integer>
-				<key>Info</key>
-				<integer>1</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>ID</key>
-			<integer>239</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Points</key>
-			<array>
-				<string>{1043.58, 413.622}</string>
-				<string>{1043.2, 445.873}</string>
-				<string>{894.703, 445.873}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>214</integer>
-				<key>Info</key>
-				<integer>1</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{1182.7, 395.122}, {153, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica</string>
-				<key>Size</key>
-				<real>12</real>
-			</dict>
-			<key>ID</key>
-			<integer>219</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{741.703, 314.75}, {153, 90.0006}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>231</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{967.465, 395.122}, {152.238, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica</string>
-				<key>Size</key>
-				<real>12</real>
-			</dict>
-			<key>ID</key>
-			<integer>214</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{472.465, 188.123}, {261, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica</string>
-				<key>Size</key>
-				<real>12</real>
-			</dict>
-			<key>ID</key>
-			<integer>209</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\b\fs24 \cf0 C Preprocessor Support**}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{472.465, 439.308}, {423, 20.3752}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica</string>
-				<key>Size</key>
-				<real>12</real>
-			</dict>
-			<key>ID</key>
-			<integer>208</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\b\fs24 \cf0 Photran Base}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{472.465, 459}, {423, 72.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>180</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{472.465, 530.875}, {423, 126.5}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>200</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{472.465, 62.1229}, {261, 63}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>204</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{472.465, 125.123}, {261, 63}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>206</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{967.465, 314.122}, {152.238, 82}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>216</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{967.465, 251.123}, {152.238, 63}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>212</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{1182.7, 314.123}, {153, 81.999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>218</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{1182.7, 242.123}, {153, 71.9999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>217</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>ID</key>
-			<integer>241</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Points</key>
-			<array>
-				<string>{818.203, 414.999}</string>
-				<string>{818.203, 439.308}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>232</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{741.703, 252.251}, {153, 62.499}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>233</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>ID</key>
-			<integer>242</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Points</key>
-			<array>
-				<string>{602.965, 414.499}</string>
-				<string>{602.965, 439.308}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>350</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>382</integer>
-			</dict>
-			<key>ID</key>
-			<integer>417</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-			<key>Points</key>
-			<array>
-				<string>{482.291, 374.347}</string>
-				<string>{330.123, 374.347}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>142</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>389</integer>
-			</dict>
-			<key>ID</key>
-			<integer>416</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-			<key>Points</key>
-			<array>
-				<string>{548.965, 286.222}</string>
-				<string>{330.123, 286.222}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>174</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>ID</key>
-			<integer>415</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-			<key>Points</key>
-			<array>
-				<string>{181.25, 355.484}</string>
-				<string>{217.623, 373.484}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>395</integer>
-			</dict>
-			<key>ID</key>
-			<integer>401</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-			<key>Points</key>
-			<array>
-				<string>{136.123, 141.812}</string>
-				<string>{136.123, 327.317}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>archive</key>
-						<data>
-						YnBsaXN0MDDUAQIDBAUGCQpYJHZl
-						cnNpb25UJHRvcFkkYXJjaGl2ZXJY
-						JG9iamVjdHMSAAGGoNEHCFRyb290
-						gAFfEA9OU0tleWVkQXJjaGl2ZXKl
-						CwwVGR5VJG51bGzUDQ4PEBESExRW
-						JGNsYXNzXE5TQ29sb3JTcGFjZV8Q
-						Ek5TQ3VzdG9tQ29sb3JTcGFjZVdO
-						U1doaXRlgAQQA4ACRDAuNQDSDRYX
-						GFROU0lEgAMQAtIaGxwOWCRjbGFz
-						c2VzWiRjbGFzc25hbWWiDh1YTlNP
-						YmplY3TSGhsfIKIgHVdOU0NvbG9y
-						CBEaHykyNzo/QVNZX2hvfJGZm52f
-						pKmusLK3wMvO19zfAAAAAAAAAQEA
-						AAAAAAAAIQAAAAAAAAAAAAAAAAAA
-						AOc=
-						</data>
-						<key>b</key>
-						<string>0.500023</string>
-						<key>g</key>
-						<string>0.500023</string>
-						<key>r</key>
-						<string>0.500023</string>
-					</dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>399</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{80.1226, 102.74}, {112, 38.5719}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>FontInfo</key>
-					<dict>
-						<key>Color</key>
-						<dict>
-							<key>w</key>
-							<string>0</string>
-						</dict>
-						<key>Font</key>
-						<string>Helvetica</string>
-						<key>Size</key>
-						<real>12</real>
-					</dict>
-					<key>ID</key>
-					<integer>399</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-						<key>stroke</key>
-						<dict>
-							<key>Color</key>
-							<dict>
-								<key>archive</key>
-								<data>
-								YnBsaXN0MDDU
-								AQIDBAUGCQpY
-								JHZlcnNpb25U
-								JHRvcFkkYXJj
-								aGl2ZXJYJG9i
-								amVjdHMSAAGG
-								oNEHCFRyb290
-								gAFfEA9OU0tl
-								eWVkQXJjaGl2
-								ZXKlCwwVGR5V
-								JG51bGzUDQ4P
-								EBESExRWJGNs
-								YXNzXE5TQ29s
-								b3JTcGFjZV8Q
-								Ek5TQ3VzdG9t
-								Q29sb3JTcGFj
-								ZVdOU1doaXRl
-								gAQQA4ACRDAu
-								NQDSDRYXGFRO
-								U0lEgAMQAtIa
-								GxwOWCRjbGFz
-								c2VzWiRjbGFz
-								c25hbWWiDh1Y
-								TlNPYmplY3TS
-								GhsfIKIgHVdO
-								U0NvbG9yCBEa
-								HykyNzo/QVNZ
-								X2hvfJGZm52f
-								pKmusLK3wMvO
-								19zfAAAAAAAA
-								AQEAAAAAAAAA
-								IQAAAAAAAAAA
-								AAAAAAAAAOc=
-								</data>
-								<key>b</key>
-								<string>0.500023</string>
-								<key>g</key>
-								<string>0.500023</string>
-								<key>r</key>
-								<string>0.500023</string>
-							</dict>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>RTFD</key>
-						<data>
-						BAtzdHJlYW10eXBlZIHoA4QBQISE
-						hBJOU0F0dHJpYnV0ZWRTdHJpbmcA
-						hIQITlNPYmplY3QAhZKEhIQITlNT
-						dHJpbmcBlIQBKxBFeGFtcGxlOgpU
-						ZXN0aW5nhoQCaUkBEJKEhIQMTlNE
-						aWN0aW9uYXJ5AJSEAWkDkoSWlgdO
-						U0NvbG9yhpKEhIQHTlNDb2xvcgCU
-						hAFjA4QCZmaDAAAAPwGGkoSWlgZO
-						U0ZvbnSGkoSEhAZOU0ZvbnQelJkc
-						hAVbMjhjXQYAAAAUAAAA//5IAGUA
-						bAB2AGUAdABpAGMAYQCEAWYMmwCb
-						AZsAmwCGkoSWlhBOU1BhcmFncmFw
-						aFN0eWxlhpKEhIQQTlNQYXJhZ3Jh
-						cGhTdHlsZQCUhARDQ0BTAgCEhIQH
-						TlNBcnJheQCUmQyShISECU5TVGV4
-						dFRhYgCUhAJDZgAchpKEpaQAOIaS
-						hKWkAFSGkoSlpABwhpKEpaQAgYwA
-						hpKEpaQAgagAhpKEpaQAgcQAhpKE
-						paQAgeAAhpKEpaQAgfwAhpKEpaQA
-						gRgBhpKEpaQAgTQBhpKEpaQAgVAB
-						hoYAhoaG
-						</data>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;\red128\green128\blue128;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf2 Example:\
-Testing}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{80.1226, 96.3121}, {32.9412, 6.42865}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>FontInfo</key>
-					<dict>
-						<key>Font</key>
-						<string>Helvetica</string>
-						<key>Size</key>
-						<real>12</real>
-					</dict>
-					<key>ID</key>
-					<integer>400</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-						<key>stroke</key>
-						<dict>
-							<key>Color</key>
-							<dict>
-								<key>archive</key>
-								<data>
-								YnBsaXN0MDDU
-								AQIDBAUGCQpY
-								JHZlcnNpb25U
-								JHRvcFkkYXJj
-								aGl2ZXJYJG9i
-								amVjdHMSAAGG
-								oNEHCFRyb290
-								gAFfEA9OU0tl
-								eWVkQXJjaGl2
-								ZXKlCwwVGR5V
-								JG51bGzUDQ4P
-								EBESExRWJGNs
-								YXNzXE5TQ29s
-								b3JTcGFjZV8Q
-								Ek5TQ3VzdG9t
-								Q29sb3JTcGFj
-								ZVdOU1doaXRl
-								gAQQA4ACRDAu
-								NQDSDRYXGFRO
-								U0lEgAMQAtIa
-								GxwOWCRjbGFz
-								c2VzWiRjbGFz
-								c25hbWWiDh1Y
-								TlNPYmplY3TS
-								GhsfIKIgHVdO
-								U0NvbG9yCBEa
-								HykyNzo/QVNZ
-								X2hvfJGZm52f
-								pKmusLK3wMvO
-								19zfAAAAAAAA
-								AQEAAAAAAAAA
-								IQAAAAAAAAAA
-								AAAAAAAAAOc=
-								</data>
-								<key>b</key>
-								<string>0.500023</string>
-								<key>g</key>
-								<string>0.500023</string>
-								<key>r</key>
-								<string>0.500023</string>
-							</dict>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>398</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>389</integer>
-			</dict>
-			<key>ID</key>
-			<integer>387</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-			<key>Points</key>
-			<array>
-				<string>{273.623, 141.812}</string>
-				<string>{273.623, 272.008}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>archive</key>
-						<data>
-						YnBsaXN0MDDUAQIDBAUGCQpYJHZl
-						cnNpb25UJHRvcFkkYXJjaGl2ZXJY
-						JG9iamVjdHMSAAGGoNEHCFRyb290
-						gAFfEA9OU0tleWVkQXJjaGl2ZXKl
-						CwwVGR5VJG51bGzUDQ4PEBESExRW
-						JGNsYXNzXE5TQ29sb3JTcGFjZV8Q
-						Ek5TQ3VzdG9tQ29sb3JTcGFjZVdO
-						U1doaXRlgAQQA4ACRDAuNQDSDRYX
-						GFROU0lEgAMQAtIaGxwOWCRjbGFz
-						c2VzWiRjbGFzc25hbWWiDh1YTlNP
-						YmplY3TSGhsfIKIgHVdOU0NvbG9y
-						CBEaHykyNzo/QVNZX2hvfJGZm52f
-						pKmusLK3wMvO19zfAAAAAAAAAQEA
-						AAAAAAAAIQAAAAAAAAAAAAAAAAAA
-						AOc=
-						</data>
-						<key>b</key>
-						<string>0.500023</string>
-						<key>g</key>
-						<string>0.500023</string>
-						<key>r</key>
-						<string>0.500023</string>
-					</dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>385</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{217.623, 102.74}, {112, 38.5719}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>FontInfo</key>
-					<dict>
-						<key>Color</key>
-						<dict>
-							<key>w</key>
-							<string>0</string>
-						</dict>
-						<key>Font</key>
-						<string>Helvetica</string>
-						<key>Size</key>
-						<real>12</real>
-					</dict>
-					<key>ID</key>
-					<integer>385</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-						<key>stroke</key>
-						<dict>
-							<key>Color</key>
-							<dict>
-								<key>archive</key>
-								<data>
-								YnBsaXN0MDDU
-								AQIDBAUGCQpY
-								JHZlcnNpb25U
-								JHRvcFkkYXJj
-								aGl2ZXJYJG9i
-								amVjdHMSAAGG
-								oNEHCFRyb290
-								gAFfEA9OU0tl
-								eWVkQXJjaGl2
-								ZXKlCwwVGR5V
-								JG51bGzUDQ4P
-								EBESExRWJGNs
-								YXNzXE5TQ29s
-								b3JTcGFjZV8Q
-								Ek5TQ3VzdG9t
-								Q29sb3JTcGFj
-								ZVdOU1doaXRl
-								gAQQA4ACRDAu
-								NQDSDRYXGFRO
-								U0lEgAMQAtIa
-								GxwOWCRjbGFz
-								c2VzWiRjbGFz
-								c25hbWWiDh1Y
-								TlNPYmplY3TS
-								GhsfIKIgHVdO
-								U0NvbG9yCBEa
-								HykyNzo/QVNZ
-								X2hvfJGZm52f
-								pKmusLK3wMvO
-								19zfAAAAAAAA
-								AQEAAAAAAAAA
-								IQAAAAAAAAAA
-								AAAAAAAAAOc=
-								</data>
-								<key>b</key>
-								<string>0.500023</string>
-								<key>g</key>
-								<string>0.500023</string>
-								<key>r</key>
-								<string>0.500023</string>
-							</dict>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>RTFD</key>
-						<data>
-						BAtzdHJlYW10eXBlZIHoA4QBQISE
-						hBJOU0F0dHJpYnV0ZWRTdHJpbmcA
-						hIQITlNPYmplY3QAhZKEhIQITlNT
-						dHJpbmcBlIQBKw1FeGFtcGxlOgpU
-						ZXh0hoQCaUkBDZKEhIQMTlNEaWN0
-						aW9uYXJ5AJSEAWkEkoSWlhBOU1Bh
-						cmFncmFwaFN0eWxlhpKEhIQQTlNQ
-						YXJhZ3JhcGhTdHlsZQCUhARDQ0BT
-						AgCEhIQHTlNBcnJheQCUmQyShISE
-						CU5TVGV4dFRhYgCUhAJDZgAchpKE
-						n54AOIaShJ+eAFSGkoSfngBwhpKE
-						n54AgYwAhpKEn54AgagAhpKEn54A
-						gcQAhpKEn54AgeAAhpKEn54AgfwA
-						hpKEn54AgRgBhpKEn54AgTQBhpKE
-						n54AgVABhoYAhpKElpYOTlNPcmln
-						aW5hbEZvbnSGkoSEhAZOU0ZvbnQe
-						lJkchAVbMjhjXQYAAAAUAAAA//5I
-						AGUAbAB2AGUAdABpAGMAYQCEAWYM
-						hAFjAKIBogCiAIaShJaWBk5TRm9u
-						dIaSrJKElpYHTlNDb2xvcoaShISE
-						B05TQ29sb3IAlKIDhAJmZoMAAAA/
-						AYaGhg==
-						</data>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;\red128\green128\blue128;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf2 Example:\
-Text}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{217.623, 96.3121}, {32.9412, 6.42865}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>FontInfo</key>
-					<dict>
-						<key>Font</key>
-						<string>Helvetica</string>
-						<key>Size</key>
-						<real>12</real>
-					</dict>
-					<key>ID</key>
-					<integer>386</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-						<key>stroke</key>
-						<dict>
-							<key>Color</key>
-							<dict>
-								<key>archive</key>
-								<data>
-								YnBsaXN0MDDU
-								AQIDBAUGCQpY
-								JHZlcnNpb25U
-								JHRvcFkkYXJj
-								aGl2ZXJYJG9i
-								amVjdHMSAAGG
-								oNEHCFRyb290
-								gAFfEA9OU0tl
-								eWVkQXJjaGl2
-								ZXKlCwwVGR5V
-								JG51bGzUDQ4P
-								EBESExRWJGNs
-								YXNzXE5TQ29s
-								b3JTcGFjZV8Q
-								Ek5TQ3VzdG9t
-								Q29sb3JTcGFj
-								ZVdOU1doaXRl
-								gAQQA4ACRDAu
-								NQDSDRYXGFRO
-								U0lEgAMQAtIa
-								GxwOWCRjbGFz
-								c2VzWiRjbGFz
-								c25hbWWiDh1Y
-								TlNPYmplY3TS
-								GhsfIKIgHVdO
-								U0NvbG9yCBEa
-								HykyNzo/QVNZ
-								X2hvfJGZm52f
-								pKmusLK3wMvO
-								19zfAAAAAAAA
-								AQEAAAAAAAAA
-								IQAAAAAAAAAA
-								AAAAAAAAAOc=
-								</data>
-								<key>b</key>
-								<string>0.500023</string>
-								<key>g</key>
-								<string>0.500023</string>
-								<key>r</key>
-								<string>0.500023</string>
-							</dict>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>384</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{80.1226, 327.817}, {112, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>395</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 testing.junit3}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{80.1226, 323.246}, {32.9412, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>396</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>394</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>382</integer>
-			</dict>
-			<key>ID</key>
-			<integer>391</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-			<key>Points</key>
-			<array>
-				<string>{273.623, 300.437}</string>
-				<string>{273.623, 360.133}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>389</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{217.623, 272.508}, {112, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>389</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 ui}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{217.623, 267.937}, {32.9412, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>390</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>388</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{217.623, 360.633}, {112, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>382</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 core}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{217.623, 356.062}, {32.9412, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>383</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>381</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>356</integer>
-			</dict>
-			<key>ID</key>
-			<integer>358</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-			<key>Points</key>
-			<array>
-				<string>{602.965, 108}</string>
-				<string>{602.965, 142.572}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>353</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{526.465, 143.072}, {153, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>356</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 core.vpg.preprocessor.c}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{526.465, 138.501}, {45, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>357</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>355</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{526.465, 80.0719}, {153, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>353</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 ui.vpg.preprocessor.c}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{526.465, 75.501}, {45, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>354</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>352</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>188</integer>
-			</dict>
-			<key>ID</key>
-			<integer>345</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-			<key>Points</key>
-			<array>
-				<string>{1259.2, 298.748}</string>
-				<string>{1259.2, 340.444}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>185</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>131</integer>
-			</dict>
-			<key>ID</key>
-			<integer>344</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-			<key>Points</key>
-			<array>
-				<string>{614.29, 300.361}</string>
-				<string>{627.57, 321.637}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>174</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{139.5, 459.189}, {198, 336}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FitText</key>
-			<string>Vertical</string>
-			<key>Flow</key>
-			<string>Resize</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>ArialNarrow</string>
-				<key>Size</key>
-				<real>12</real>
-			</dict>
-			<key>ID</key>
-			<integer>292</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Pad</key>
-				<integer>0</integer>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fswiss\fcharset0 ArialNarrow;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\i\b\fs24 \cf0 \kerning1\expnd1\expndtw6
-LEGEN\kerning1\expnd0\expndtw0 D
-\f1\i0\b0 \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
-\cf0 \
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qj\pardirnatural
-\cf0 Each folder denotes a single Eclipse plug-in.  Each plug-in consists of a single project in CVS named org.eclipse.photran.&lt;name&gt; or org.eclipse.rephraserengine.&lt;name&gt;.\
-\
-Thickly-bordered gray boxes denote Eclipse features.  The smaller gray boxes inside denote conceptual subdivisions of each feature.\
-\
-Dotted arrows denote dependencies.  To minimize clutter, arrows between gray boxes denote a dependency between components; in general, the core components of one component depend on the core components of another, and the UI components depend on both core and UI components.\
-\
-Note, in particular, that the Rephraser Engine does not depend on CDT, because it is reused in other refactoring tools that do not (and should not) require CDT.}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{36.5, 872}, {1313.5, 28}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FitText</key>
-			<string>Vertical</string>
-			<key>Flow</key>
-			<string>Resize</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>ArialNarrow</string>
-				<key>Size</key>
-				<real>12</real>
-			</dict>
-			<key>ID</key>
-			<integer>248</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Align</key>
-				<integer>3</integer>
-				<key>Pad</key>
-				<integer>0</integer>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 ArialNarrow-Italic;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qj\pardirnatural
-
-\f0\i\fs24 \cf0 * Analysis and refactoring support was originally in a separate feature but is included in the main Photran feature for convenience.  A different parser, AST, etc. could be contributed to Photran by replacing this feature with a different one.  Such a feature was prototyped at IBM Research in 2008.\uc0\u8232 ** C Preprocessor support and GNU compiler support could be in separate features but are included in the main Photran feature for convenience.}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{750.703, 273.132}, {135, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>235</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 managedbuilder.gnu.ui}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{750.703, 268.561}, {39.7059, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>236</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>234</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>ID</key>
-			<integer>207</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-			<key>Points</key>
-			<array>
-				<string>{630.315, 356.062}</string>
-				<string>{594.791, 369.05}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>152</integer>
-			</dict>
-			<key>ID</key>
-			<integer>203</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-			<key>Points</key>
-			<array>
-				<string>{818.965, 510.313}</string>
-				<string>{818.965, 542.446}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>182</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{1191.7, 340.944}, {135, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>188</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 errorparsers.xlf}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{1191.7, 336.373}, {39.7059, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>189</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>187</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{1191.7, 270.819}, {135, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>185</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 managedbuilder.xlf.ui}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{1191.7, 266.248}, {39.7059, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>186</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>184</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{751.465, 482.384}, {135, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>182</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 managedbuilder.ui}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{751.465, 477.813}, {39.7059, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>183</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>181</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>139</integer>
-			</dict>
-			<key>ID</key>
-			<integer>179</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-			<key>Points</key>
-			<array>
-				<string>{627.459, 610.635}</string>
-				<string>{597.471, 618.94}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>133</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>142</integer>
-			</dict>
-			<key>ID</key>
-			<integer>177</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-			<key>Points</key>
-			<array>
-				<string>{594.787, 300.335}</string>
-				<string>{549.468, 360.234}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>174</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{549.465, 272.508}, {112, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>174</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 ui.vpg}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{549.465, 267.937}, {32.9412, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>175</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>173</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>139</integer>
-			</dict>
-			<key>ID</key>
-			<integer>172</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-			<key>Points</key>
-			<array>
-				<string>{599.453, 510.224}</string>
-				<string>{553.477, 618.613}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>169</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>133</integer>
-			</dict>
-			<key>ID</key>
-			<integer>171</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-			<key>Points</key>
-			<array>
-				<string>{615.558, 510.17}</string>
-				<string>{667.372, 582.666}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>169</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{549.465, 482.335}, {112, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>169</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 ui}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{549.465, 477.764}, {32.9412, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>170</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>168</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>147</integer>
-			</dict>
-			<key>ID</key>
-			<integer>163</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-			<key>Points</key>
-			<array>
-				<string>{1043.96, 298.748}</string>
-				<string>{1043.96, 341.121}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>161</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{976.465, 270.819}, {135, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>161</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 managedbuilder.intel.ui}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{976.465, 266.248}, {39.7059, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>162</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>160</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>133</integer>
-			</dict>
-			<key>ID</key>
-			<integer>155</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-			<key>Points</key>
-			<array>
-				<string>{770.123, 570.511}</string>
-				<string>{726.307, 582.937}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>152</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>139</integer>
-			</dict>
-			<key>ID</key>
-			<integer>154</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-			<key>Points</key>
-			<array>
-				<string>{818.965, 570.875}</string>
-				<string>{818.965, 628.375}</string>
-				<string>{603.965, 631.869}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>152</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{751.465, 542.946}, {135, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>152</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 managedbuilder.core}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{751.465, 538.375}, {39.7059, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>153</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>151</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{976.465, 341.621}, {135, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>147</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 core.intel}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{976.465, 337.05}, {39.7059, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>148</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>146</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{482.791, 360.633}, {112, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>142</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 core.vpg}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{482.791, 356.062}, {32.9412, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>143</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>141</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{491.465, 619.073}, {112, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>139</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 core}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{491.465, 614.501}, {32.9412, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>140</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>138</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{621.465, 583.073}, {112, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>133</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 cdtinterface}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{621.465, 578.501}, {32.9412, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>134</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>132</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{612.791, 326.632}, {112, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>130</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 cdtinterface.vpg}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{612.791, 322.061}, {32.9412, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>131</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>129</integer>
-			<key>Layer</key>
-			<integer>2</integer>
-		</dict>
-	</array>
-	<key>GridInfo</key>
-	<dict>
-		<key>ShowsGrid</key>
-		<string>YES</string>
-		<key>SnapsToGrid</key>
-		<string>YES</string>
-	</dict>
-	<key>GuidesLocked</key>
-	<string>NO</string>
-	<key>GuidesVisible</key>
-	<string>YES</string>
-	<key>HPages</key>
-	<integer>3</integer>
-	<key>ImageCounter</key>
-	<integer>1</integer>
-	<key>KeepToScale</key>
-	<false/>
-	<key>Layers</key>
-	<array>
-		<dict>
-			<key>Lock</key>
-			<string>YES</string>
-			<key>Name</key>
-			<string>Feature Boxes</string>
-			<key>Print</key>
-			<string>YES</string>
-			<key>View</key>
-			<string>YES</string>
-		</dict>
-		<dict>
-			<key>Lock</key>
-			<string>YES</string>
-			<key>Name</key>
-			<string>Component Boxes</string>
-			<key>Print</key>
-			<string>YES</string>
-			<key>View</key>
-			<string>YES</string>
-		</dict>
-		<dict>
-			<key>Lock</key>
-			<string>YES</string>
-			<key>Name</key>
-			<string>Contents</string>
-			<key>Print</key>
-			<string>YES</string>
-			<key>View</key>
-			<string>YES</string>
-		</dict>
-	</array>
-	<key>LayoutInfo</key>
-	<dict>
-		<key>Animate</key>
-		<string>NO</string>
-		<key>circoMinDist</key>
-		<real>18</real>
-		<key>circoSeparation</key>
-		<real>0.0</real>
-		<key>layoutEngine</key>
-		<string>dot</string>
-		<key>neatoSeparation</key>
-		<real>0.0</real>
-		<key>twopiSeparation</key>
-		<real>0.0</real>
-	</dict>
-	<key>LinksVisible</key>
-	<string>NO</string>
-	<key>MagnetsVisible</key>
-	<string>NO</string>
-	<key>MasterSheets</key>
-	<array/>
-	<key>ModificationDate</key>
-	<string>2010-03-05 15:32:26 -0600</string>
-	<key>Modifier</key>
-	<string>Jeffrey Overbey</string>
-	<key>NotesVisible</key>
-	<string>NO</string>
-	<key>Orientation</key>
-	<integer>2</integer>
-	<key>OriginVisible</key>
-	<string>NO</string>
-	<key>PageBreaks</key>
-	<string>YES</string>
-	<key>PrintInfo</key>
-	<dict>
-		<key>NSBottomMargin</key>
-		<array>
-			<string>float</string>
-			<string>41</string>
-		</array>
-		<key>NSLeftMargin</key>
-		<array>
-			<string>float</string>
-			<string>18</string>
-		</array>
-		<key>NSPaperSize</key>
-		<array>
-			<string>size</string>
-			<string>{612, 792}</string>
-		</array>
-		<key>NSRightMargin</key>
-		<array>
-			<string>float</string>
-			<string>18</string>
-		</array>
-		<key>NSTopMargin</key>
-		<array>
-			<string>float</string>
-			<string>18</string>
-		</array>
-	</dict>
-	<key>PrintOnePage</key>
-	<false/>
-	<key>QuickLookPreview</key>
-	<data>
-	JVBERi0xLjMKJcTl8uXrp/Og0MTGCjUgMCBvYmoKPDwgL0xlbmd0aCA2IDAgUiAvRmls
-	dGVyIC9GbGF0ZURlY29kZSA+PgpzdHJlYW0KeAGtnVuPIzd2x9/1KeopGBvbct0vSRBg
-	d2wvHGwWXs84CWDnQdOtmWlHrW53q33Jp8/vzyqySkVKqubYhuGxTB6Sh+fOc079nPwj
-	+TlJ+Tsr6jbp0jR53Cb/leyTL14/Zcn1U5KZv5+uk6t0XaXmr2T802TW6n1SZ/m66bKk
-	aop1UTd1UuTrrsyyOinXVZPxJ0F/D8R/55+f+jVevzHrp8mb12wlM/9xpX+xmdX1nQNa
-	5Pk6rbMwzDecw61eVuuu6Koky/Ikb9Zl3lbdyiw8h58cwa/XdZEfzdJ2BRpk5EJGmjxd
-	ryZA6rrtD1x167oqGsH7y9uEdYXSK/59VebromrKPCmTt3fJF19na3CdvH2fvLq+Odzu
-	D9vH95vr7fqXhw+frd7+lHz1tl/uGPd1nq3LukqKrF53+WnETrY24m+YWzUtF3gOf8PA
-	vO3WZdeWR5g4gz8Lvy3WaVMczbqIv4br0bnSYp1neQh/BQjLaijoHPrOoK7shLqyTfI2
-	fTHu3OQ6g4LPIW8Y2SR5VcyxV59GnptWZ52wl70IfVUp9JUsWjen8Jdl67rJ2jaAwPvH
-	7TnEtWLmtEuqooObuYKem3NI+YibQ0RX2slFVcO1eXiuWGsY2SQVO+2KY7I7h7l+hSYp
-	6hS+PcZcfYnwqkKMm7JqXsG5QcrLoWfRpE95IO4Cw3ZNbQi7qtp10bTgrls3adUVC3Bn
-	5xZFs07hjdBMYc6OqwoIu0rh16JaI6CzBULPzi1KyCOH6uZTZwhcSfJNxXOWlsW6g3Wr
-	slzXokFf9OXluigrD4GrV9dCoGTf7rPkpMxrqkHmVUJDEUYhSmdOftqInatrLpozOLQD
-	ixwBnlcGhwvQZ6dVSPeurIU+N2uGOU9ntFlrEFeAwKLoQogTz5RZ1/mkd7fZbz5sb949
-	3+5uto8j906QcBk+Zy3qMj+WqSuppLVuZryTH9hAmfwPR7gJotkuVTXpum3Aw10y/LSq
-	8x7zO9RysW5h0KRGlDdpmyc7o1NTjIAUI+CH0/DrtGJqWa40tS2YKnPAB6ffOpRtXZSs
-	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
-	+mBx+PLYAIGjVNGOMx3Y01Fh3Q8JBHziY8aCy3eIjAU5fNNy+K9G76NeaAmsh59ABiB8
-	FxgFrzf8GRiioSox6XjMFNzJADOBwhGS4Wjuxp32C5tnZhsqOncECceOLzCZj6oqtj/5
-	Tz1/Z8sTLRwYagzMKcYfBCjZrUjqoMkiyslAPlrKTNEbDi9f+r5rP2L+hOOuIhzuo3iG
-	3DE+jESgBPFrvl1of6M/KBKY+O3yeJ+bSnCPKiGTX+9+68EpfCjUs6z2bJaoFfJz4+xc
-	7ojsVbM9O27YypJrEqXxCoFaJwYiK2L4zwa8ka7/AlITFENnJGYHoPC/eV2GjAa4dh3o
-	TBPI0yKBdV26AV7mkruiqYRwDOxiOToHH9I0b4lD5sPqhUzjYFmuGX8QE7AzfuAhBYfH
-	ss04YuAbgqS8RrkRPW384/8B8pNCsAplbmRzdHJlYW0KZW5kb2JqCjYgMCBvYmoKODA1
-	MwplbmRvYmoKMyAwIG9iago8PCAvVHlwZSAvUGFnZSAvUGFyZW50IDQgMCBSIC9SZXNv
-	dXJjZXMgNyAwIFIgL0NvbnRlbnRzIDUgMCBSIC9NZWRpYUJveCBbMCAwIDEzNjggOTAw
-	XQo+PgplbmRvYmoKNyAwIG9iago8PCAvUHJvY1NldCBbIC9QREYgL1RleHQgL0ltYWdl
-	QiAvSW1hZ2VDIC9JbWFnZUkgXSAvQ29sb3JTcGFjZSA8PCAvQ3MxIDggMCBSCi9DczIg
-	OSAwIFIgPj4gL0ZvbnQgPDwgL0Y0LjAgMTMgMCBSIC9GNy4wIDIyIDAgUiAvRjEuMCAx
-	MCAwIFIgL0YzLjAgMTIgMCBSCi9GNS4wIDE0IDAgUiAvRjYuMCAyMSAwIFIgL0YyLjAg
-	MTEgMCBSID4+IC9YT2JqZWN0IDw8IC9JbTEgMTUgMCBSIC9JbTIgMTcgMCBSCi9JbTMg
-	MTkgMCBSID4+ID4+CmVuZG9iagoxNSAwIG9iago8PCAvTGVuZ3RoIDE2IDAgUiAvVHlw
-	ZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDg4NiAvSGVpZ2h0IDIyNiAv
-	Q29sb3JTcGFjZQoyMyAwIFIgL1NNYXNrIDI0IDAgUiAvQml0c1BlckNvbXBvbmVudCA4
-	IC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Ae3QMQEAAADCoPVPbQlPiEBh
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGPgPDCsLAAEKZW5kc3RyZWFtCmVuZG9iagoxNiAwIG9iagoy
-	NjQzCmVuZG9iagoxNyAwIG9iago8PCAvTGVuZ3RoIDE4IDAgUiAvVHlwZSAvWE9iamVj
-	dCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDYxMCAvSGVpZ2h0IDE0MCAvQ29sb3JTcGFj
-	ZQoyNiAwIFIgL1NNYXNrIDI3IDAgUiAvQml0c1BlckNvbXBvbmVudCA4IC9GaWx0ZXIg
-	L0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Ae3QAQ0AAADCoPdP7ewBESgMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwY+MOj1AAEKZW5kc3RyZWFt
-	CmVuZG9iagoxOCAwIG9iagoxMTQwCmVuZG9iagoxOSAwIG9iago8PCAvTGVuZ3RoIDIw
-	IDAgUiAvVHlwZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDE3MiAvSGVp
-	Z2h0IDk0IC9Db2xvclNwYWNlCjI5IDAgUiAvU01hc2sgMzAgMCBSIC9CaXRzUGVyQ29t
-	cG9uZW50IDggL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngB7dCBAAAAAMOg
-	+VMf5IVQYcCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw
-	YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG
-	DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA
-	AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw
-	YMCAAQMGDBgwYMDA+8AAvXgAAQplbmRzdHJlYW0KZW5kb2JqCjIwIDAgb2JqCjIzNApl
-	bmRvYmoKMjcgMCBvYmoKPDwgL0xlbmd0aCAyOCAwIFIgL1R5cGUgL1hPYmplY3QgL1N1
-	YnR5cGUgL0ltYWdlIC9XaWR0aCA2MTAgL0hlaWdodCAxNDAgL0NvbG9yU3BhY2UKL0Rl
-	dmljZUdyYXkgL0JpdHNQZXJDb21wb25lbnQgOCAvRmlsdGVyIC9GbGF0ZURlY29kZSA+
-	PgpzdHJlYW0KeAHtnQd3FEnStXfHMHgPwsggJIGQQd57770XSAgnvIdh3M6s+ePfcyOy
-	uquFTDf7znfO7Kk8Z4aWVNWVGXkzzI3IrL/9LWmJBBIJJBJIJJBIIJFAIoFEAokEEgkk
-	EkgkkEggkUAigUQCiQQSCSQSSCSQSCCRQCKBRAKJBBIJJBJIJJBIIJFAIoFEAokEEgkk
-	EkgkkEggkUAigUQCiQQSCSQSSCSQSCCRQCKBRAKJBBIJJBJIJJBIIJFAIoFEAokEEgkk
-	EkgkkEggkUAigUQCiQQSCSQSSCSQSCCRQCKBRAKJBBIJ/I9I4O+0b7JquvLv/yOjTobx
-	/0UCKWx9++2331n7fpfmf/mOa741ICYw+/8yOf8DD3HVBbSEqkOHDv2gdviLZr/+4Qcu
-	0HXffWcwS3TZ/wAA/uQhGL4MXocEqyNHjh49emzPxh+PHOEygAbKTJklIPuTZ+gv/vUC
-	2LdoL+B1BGQdP37iJO3UHk1/O3Hi+LFjR4HZDwYyDGbik/3FQfBndj8ATPg6BrhOnT5z
-	5uzZc+f3bOfOnT1z5sxpcHb82NHDhwPGEjX2Z87RX/u7pcG+/97wdfLUGbB14WJe3qXL
-	l6/s2i5fvnwpL+/ihfPg7PTJE9Jkh7CVaLFEjf21cfCn9T4C2NFj4Ovc+Yt5l69czS8o
-	KCwqurZLKyoqKiwoKLh65cqlvAvnz545BcYO/4A/lkDsT5uhv/gXYyNNgx07fvLM2QvA
-	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
-	4m2XK8KvuCreIXdU0pfrS2J/T3Ur/iH9d3tkdLP9EP0v+mW2/0b36d9979nvwv3+5l+q
-	K9Ld16f4PfZ536fbH3fekv7q+HfHJcbn2FN1/86n8KvYFTvu9R/Tf9/xBfoxaju/N923
-	PW/f/ZY//bdRj/f+90/vwl/2AXvL7Atg7RzjPreGP+28I/k5kUAigUQCiQQSCSQSSCSQ
-	SCCRQCKBRAKJBBIJJBJIJJBIIJFAIoFEAokEEgkkEkgkkEggkUAigUQCiQQSCSQSSCSQ
-	SCCRQCKBRAKJBBIJJBJIJJBIIJFAIoFEAokEEgkkEkgkkEggkUAigUQCiQQSCSQSSCSQ
-	SCCRQCKBRAKJBBIJJBJIJJBIIJFAIoFEAv/bEvh/EmFATgplbmRzdHJlYW0KZW5kb2Jq
-	CjI4IDAgb2JqCjE4MTgxCmVuZG9iagoyNCAwIG9iago8PCAvTGVuZ3RoIDI1IDAgUiAv
-	VHlwZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDg4NiAvSGVpZ2h0IDIy
-	NiAvQ29sb3JTcGFjZQovRGV2aWNlR3JheSAvQml0c1BlckNvbXBvbmVudCA4IC9GaWx0
-	ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Aey9h1sV2fL9fSfcieaccwAT5hxQTGAg
-	SxRBEQQERCSDgDnnnGacPHPnht9/+H5W7e4T4JwDesf53ued3s8zIyJ0n969a1ftqrVW
-	/e1vwQhmIJiBYAaCGQhmIJiBYAaCGQhmIJiBYAaCGQhmIJiBYAaCGQhmIJiBYAaCGQhm
-	IJiBYAaCGQhmIJiBYAaCGQhmIJiBYAaCGQhmIJiBYAaCGQhmIJiBYAaCGQhmIJiBYAaC
-	GQhmIJiBYAaCGQhmIJiBYAaCGQhmIJiBYAaCGQhmIJiBYAaCGQhmIJiBYAaCGQhmIJiB
-	YAaCGQhmIJiBYAaCGQhmIJiBYAaCGQhmIJiBYAaCGQhmIJiBYAaCGQhmIJiBYAaCGQhm
-	IJiBYAaCGQhmIJiBYAaCGQhmIJiBYAaCGQhmIJiBYAaCGQhmIJiBYAaCGQhmIJiBYAaC
-	GQhmIJiBYAaCGQhmIJiBYAaCGQhmIJiBYAaCGQhmIJiBYAaCGQhmIJiBYAaCGQhmIJiB
-	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
-	mf/Wqy0f+43+6dL4XltWl1uFkMXVlKLtywXS9f9obrp2s+WodhempjSd1XavrvNzpa+0
-	AdQmbRJYH9qHEkobZ0rSodquyu34nPpTXm3VO/p2Q9L91dW9LdXppfv7v+2rH7PlfdWV
-	MNjrr4+PkvXko1W779ragSnrmX+u7N09vt5ofI8VxNcCgUAgEAgEAoFAIBAIBAKBQCAQ
-	CAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgE
-	AoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKB
-	QCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAg
-	EAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAI
-	BAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQCgUAgEAgEAoFAIBAIBAKBQCAQCAQC
-	gUAgEAgEAoFAIBAIBAKBQCAQ+H9B4H9W+sBWCmVuZHN0cmVhbQplbmRvYmoKMjUgMCBv
-	YmoKMzQ2MzAKZW5kb2JqCjMwIDAgb2JqCjw8IC9MZW5ndGggMzEgMCBSIC9UeXBlIC9Y
-	T2JqZWN0IC9TdWJ0eXBlIC9JbWFnZSAvV2lkdGggMTcyIC9IZWlnaHQgOTQgL0NvbG9y
-	U3BhY2UKL0RldmljZUdyYXkgL0JpdHNQZXJDb21wb25lbnQgOCAvRmlsdGVyIC9GbGF0
-	ZURlY29kZSA+PgpzdHJlYW0KeAHtmYlSW0sSRI0xiwEJoR3QLsAGxCKx2f7/D5uTWd1a
-	QPCYeUwML0YVgdByb3VWdlZ1d90vX1a2YmDFwIqBFQMrBlYMrBhYMbBiYMXAioEVA/9Y
-	Btb+GcjXZva5ARvn1zC9/8RoQZeA+t9nRpuhrmNTbj8ntZnU9fVv3zLaT6qDBFVIv21M
-	0X5KsAFVSDdsQptU+8lksIB0ExPeDPe/WA6UvsttCUHpQjEIp0K4ubW1vb29tQA3u1vi
-	4D/7KhxGAr/ymsecQ5iuTJNvoN8xwQ28sDvz5hsF75mnf6sUc+/Uo5NYhUemlM42vWL+
-	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
-	qHGiGko6u0Y6nQVzrps859FvEw1u1isYdZ393CN1tF9JrMBqsIGWpwRh27YtHvP46V98
-	9COr9NiiTDGDWSpPbrmxntM9JJ2FU0ThyffZY/LgxxAxhKdMOAVUD8A2UvM9KFz+ugZY
-	U5seS/rOLeHcsG1mE2wkoc43aQhY9+koYBQxyi9QK2pYB1EAwIfN7+yEjxn0/P80ltbW
-	1+pVhh5gJQTMPv2Ol2+y/EE/MlQ8ZuNBS6Wqius+rRvILudUHs/o/JO3OQeztxk7lAQn
-	73hYJMBrRquHvlNgArn+zPSrNQFcqsNBmaqjskOVik4vNdId/wRUPqZmX9NPvJnBNifr
-	IvWvWDW7CW16amm/uvW5mftEbgFqXXUolH5egVIzUnAETc8dzD4v8hDfgyLP9dv/M9yZ
-	O6JcMP1i6o3WstW6JnPxYfqlUiWJpafrY8amnvTVK6ah3ka4+OsCtJd3piy0FJRmfgym
-	AoWp+OjplNM5kuSlA4+mrxcH8qdFJB/waQGtsmxmO8+QfsBof9eFClyqcJSdKJV6VaWb
-	4/TvDvMx9we1sdRNyyWFU6XnnXXnY4C8x0ukS9Q3V8nnFfIVnb7H94dfQyqEEOZqJAXz
-	/RXywxG94TCBVTWO6q5i6VLEL2/c97/5KaM1wOnLJwQa9DyDy8fPR+ncRArf1Oa+X71d
-	MbBiYMXA/zMD/wLgP68lCmVuZHN0cmVhbQplbmRvYmoKMzEgMCBvYmoKMzM2MwplbmRv
-	YmoKMzIgMCBvYmoKPDwgL0xlbmd0aCAzMyAwIFIgL04gMyAvQWx0ZXJuYXRlIC9EZXZp
-	Y2VSR0IgL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngBrZM/aBNRHMe/SSwN
-	aqNW6WKHG6RYiPJaUdxMbVSqVc4Yqe3k5XJJTpLLcXdpDTgUJ3G3FVpcWkSl4GatU0Wo
-	OgiCYEtx1E10CGSRcn7fHSFdgosPfvc+73vf3+/d+3NAbEWz7XIUQMXynMyl88qtySml
-	exsx7EEPjqJf0117RFXHaenQml8Rka++nJC1ns+v7/398tWPt4Mf+9VfG486JLXkhMMJ
-	gUiSwpFiyCnJuZCzkmc826OnJFkvaXnyPXLSyWZGyc/IiWLIryXnQv4geVovytwtsrDy
-	pgVE4+SzecPVySlyLu/qFfIy+U2lUmX92G3ycd12mBt7QD4m94U924wAzqXpn29rk4eA
-	lSbQt9DWBuaAw9+AtUZba2wFexXpi7uFU8NBuci+VaBrzvcbE0D3ILCz6ft/Vn1/5ynn
-	3gbWm3rNmQ68XEjkE/CvcbjmsDrw+X6LOnG4L4GLa1tKAROzwBUKi4wBfl/vAqBSz6YQ
-	Pf2uFeEe0gLE06Zrl7V6MPifj0q5xnMKWhef+w3r5g32CcZ4wbmYYc9vxtQd7bLKvpfx
-	0PTG5L2RnkXDvSD9BxkvkIYJFzbK0FDHVVRhUfFgoAYHCvIkheM6PZJMvtcDl4XatZ5C
-	QljivVgSa2JT/BTLuypUma+yqsVsjfXlDAjvEmfGmcc8S1zPPvm+MXRgViq7m2fc5T0D
-	Rqt23TGLJU8Z4Z9kJJUxSz+ZVIbFkMBfxWio1gplbmRzdHJlYW0KZW5kb2JqCjMzIDAg
-	b2JqCjU1MgplbmRvYmoKMjMgMCBvYmoKWyAvSUNDQmFzZWQgMzIgMCBSIF0KZW5kb2Jq
-	CjM0IDAgb2JqCjw8IC9MZW5ndGggMzUgMCBSIC9OIDMgL0FsdGVybmF0ZSAvRGV2aWNl
-	UkdCIC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Aa2TP2gTURzHv0ksDWqj
-	VulihxukWIjyWlHcTG1UqlXOGKnt5OVySU6Sy3F3aQ04FCdxtxVaXFpEpeBmrVNFqDoI
-	gmBLcdRNdAhkkXJ+3x0hXYKLD373Pu9739/v3ftzQGxFs+1yFEDF8pzMpfPKrckppXsb
-	MexBD46iX9Nde0RVx2np0JpfEZGvvpyQtZ7Pr+/9/fLVj7eDH/vVXxuPOiS15ITDCYFI
-	ksKRYsgpybmQs5JnPNujpyRZL2l58j1y0slmRsnPyIliyK8l50L+IHlaL8rcLbKw8qYF
-	ROPks3nD1ckpci7v6hXyMvlNpVJl/dht8nHddpgbe0A+JveFPduMAM6l6Z9va5OHgJUm
-	0LfQ1gbmgMPfgLVGW2tsBXsV6Yu7hVPDQbnIvlWga873GxNA9yCws+n7f1Z9f+cp594G
-	1pt6zZkOvFxI5BPwr3G45rA68Pl+izpxuC+Bi2tbSgETs8AVCouMAX5f7wKgUs+mED39
-	rhXhHtICxNOma5e1ejD4n49KucZzCloXn/sN6+YN9gnGeMG5mGHPb8bUHe2yyr6X8dD0
-	xuS9kZ5Fw70g/QcZL5CGCRc2ytBQx1VUYVHxYKAGBwryJIXjOj2STL7XA5eF2rWeQkJY
-	4r1YEmtiU/wUy7sqVJmvsqrFbI315QwI7xJnxpnHPEtczz75vjF0YFYqu5tn3OU9A0ar
-	dt0xiyVPGeGfZCSVMUs/mVSGxZDAX8VoqNYKZW5kc3RyZWFtCmVuZG9iagozNSAwIG9i
-	ago1NTIKZW5kb2JqCjI2IDAgb2JqClsgL0lDQ0Jhc2VkIDM0IDAgUiBdCmVuZG9iagoz
-	NiAwIG9iago8PCAvTGVuZ3RoIDM3IDAgUiAvTiAxIC9BbHRlcm5hdGUgL0RldmljZUdy
-	YXkgL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngBhVJPSBRRHP7NNhKEiEGF
-	eIh3CgmVKaysoNp2dVmVbVuV0qIYZ9+6o7Mz05vZNcWTBF2iPHUPomN07NChm5eiwKxL
-	1yCpIAg8dej7zezqKIRveTvf+/39ft97RG2dpu87KUFUc0OVK6Wnbk5Ni4MfKUUd1E5Y
-	phX46WJxjLHruZK/u9fWZ9LYst7HtXb79j21lWVgIeottrcQ+iGRZgAfmZ8oZYCzwB2W
-	r9g+ATxYDqwa8COiAw+auTDT0Zx0pbItkVPmoigqr2I7Sa77+bnGvou1iYP+XI9m1o69
-	s+qq0UzUtPdEobwPrkQZz19U9mw1FKcN45xIQxop8q7V3ytMxxGRKxBKBlI1ZLmfak6d
-	deB1GLtdupPj+PYQpT7JYKiJtemymR2FfQB2KsvsEPAF6PGyYg/ngXth/1tRw5PAJ2E/
-	ZId51q0f9heuU+B7hD014M4UrsXx2oofXi0BQ/dUI2iMc03E09c5c6SI7zHUGZj3Rjmm
-	CzF3lqoTN4A7YR9ZqmYKsV37ruol7nsCd9PjO9GbOQtcoBxJcrEV2RTQPAlYFH2LsEkO
-	PD7OHlXgd6iYwBy5idzNKPce1REbZ6NSgVZ6jVfGT+O58cX4ZWwYz4B+rHbXe3z/6eMV
-	dde2Pjz5jXrcOa69nRtVYVZxZQvd/8cyhI/ZJzmmwdOhWVhr2HbkD5rMTLAMKMR/BT6X
-	+pITVdzV7u24RRLMUD4sbCW6S1RuKdTqPYNKrBwr2AB2cJLELFocuFNrujl4d9giem35
-	TVey64b++vZ6+9ryHm3KqCkoE82zRGaUsVuj5N142/1mkRGfODq+572KWsn+SUUQP4U5
-	WiryFFX0VlDWxG9nDn4btn5cP6Xn9UH9PAk9rZ/Rr+ijEb4MdEnPwnNRH6NJ8LBpIeIS
-	oIqDM9ROVGONA+Ip8fK0W2SR/Q9AGf1mCmVuZHN0cmVhbQplbmRvYmoKMzcgMCBvYmoK
-	NzA0CmVuZG9iago5IDAgb2JqClsgL0lDQ0Jhc2VkIDM2IDAgUiBdCmVuZG9iagozOCAw
-	IG9iago8PCAvTGVuZ3RoIDM5IDAgUiAvTiAzIC9BbHRlcm5hdGUgL0RldmljZVJHQiAv
-	RmlsdGVyIC9GbGF0ZURlY29kZSA+PgpzdHJlYW0KeAGFlE1IFGEYx/+zjQSxBtGXCMXQ
-	wSRUJgtSAtP1K1O2ZdVMCWKdfXedHGenmd0tRSKE6Jh1jC5WRIeITuGhQ6c6RASZdYmg
-	o0UQBV4itv87k7tjVL4wM795nv/7fL3DAFWPUo5jRTRgys67yd6Ydnp0TNv8GlWoRhRc
-	KcNzOhKJAZ+plc/1a/UtFGlZapSx1vs2fKt2mRBQNCp3ZAM+LHk84OOSL+SdPDVnJBsT
-	qTTZITe4Q8lO8i3y1myIx0OcFp4BVLVTkzMcl3EiO8gtRSMrYz4g63batMnvpT3tGVPU
-	sN/INzkL2rjy/UDbHmDTi4ptzAMe3AN211Vs9TXAzhFg8VDF9j3pz0fZ9crLHGr2wynR
-	GGv6UCp9rwM23wB+Xi+VftwulX7eYQ7W8dQyCm7R17Iw5SUQ1BvsZvzkGv2Lg558VQuw
-	wDmObAH6rwA3PwL7HwLbHwOJamCoFZHLbDe48uIi5wJ05pxp18xO5LVmXT+idfBohdZn
-	G00NWsqyNN/laa7whFsU6SZMWQXO2V/beI8Ke3iQT/YXuSS87t+szKVTXZwlmtjWp7To
-	6iY3kO9nzJ4+cj2v9xm3Zzhg5YCZ7xsKOHLKtuI8F6mJ1Njj8ZNkxldUJx+T85A85xUH
-	ZUzffi51IkGupT05meuXml3c2z4zMcQzkqxYMxOd8d/8xi0kZd591Nx1LP+bZ22RZxiF
-	BQETNu82NCTRixga4cBFDhl6TCpMWqVf0GrCw+RflRYS5V0WFb1Y4Z4Vf895FLhbxj+F
-	WBxzDeUImv5O/6Iv6wv6Xf3zfG2hvuKZc8+axqtrXxlXZpbVyLhBjTK+rCmIb7DaDnot
-	ZGmd4hX05JX1jeHqMvZ8bdmjyRzianw11KUIZWrEOOPJrmX3RbLFN+HnW8v2r+lR+3z2
-	SU0l17K6eGYp+nw2XA1r/7OrYNKyq/DkjZAuPGuh7lUPqn1qi9oKTT2mtqttahffjqoD
-	5R3DnJWJC6zbZfUp9mBjmt7KSVdmi+Dfwi+G/6VeYQvXNDT5D024uYxpCd8R3DZwh5T/
-	w1+zAw3eCmVuZHN0cmVhbQplbmRvYmoKMzkgMCBvYmoKNzkyCmVuZG9iago4IDAgb2Jq
-	ClsgL0lDQ0Jhc2VkIDM4IDAgUiBdCmVuZG9iago0MCAwIG9iago8PCAvTGVuZ3RoIDQx
-	IDAgUiAvTiAzIC9BbHRlcm5hdGUgL0RldmljZVJHQiAvRmlsdGVyIC9GbGF0ZURlY29k
-	ZSA+PgpzdHJlYW0KeAGtkz9oE1Ecx79JLA1qo1bpYocbpFiI8lpR3ExtVKpVzhip7eTl
-	cklOkstxd2kNOBQncbcVWlxaRKXgZq1TRag6CIJgS3HUTXQIZJFyft8dIV2Ciw9+9z7v
-	e9/f7937c0BsRbPtchRAxfKczKXzyq3JKaV7GzHsQQ+Ool/TXXtEVcdp6dCaXxGRr76c
-	kLWez6/v/f3y1Y+3gx/71V8bjzokteSEwwmBSJLCkWLIKcm5kLOSZzzbo6ckWS9pefI9
-	ctLJZkbJz8iJYsivJedC/iB5Wi/K3C2ysPKmBUTj5LN5w9XJKXIu7+oV8jL5TaVSZf3Y
-	bfJx3XaYG3tAPib3hT3bjADOpemfb2uTh4CVJtC30NYG5oDD34C1RltrbAV7FemLu4VT
-	w0G5yL5VoGvO9xsTQPcgsLPp+39WfX/nKefeBtabes2ZDrxcSOQT8K9xuOawOvD5fos6
-	cbgvgYtrW0oBE7PAFQqLjAF+X+8CoFLPphA9/a4V4R7SAsTTpmuXtXow+J+PSrnGcwpa
-	F5/7DevmDfYJxnjBuZhhz2/G1B3tssq+l/HQ9MbkvZGeRcO9IP0HGS+QhgkXNsrQUMdV
-	VGFR8WCgBgcK8iSF4zo9kky+1wOXhdq1nkJCWOK9WBJrYlP8FMu7KlSZr7KqxWyN9eUM
-	CO8SZ8aZxzxLXM8++b4xdGBWKrubZ9zlPQNGq3bdMYslTxnhn2QklTFLP5lUhsWQwF/F
-	aKjWCmVuZHN0cmVhbQplbmRvYmoKNDEgMCBvYmoKNTUyCmVuZG9iagoyOSAwIG9iagpb
-	IC9JQ0NCYXNlZCA0MCAwIFIgXQplbmRvYmoKNCAwIG9iago8PCAvVHlwZSAvUGFnZXMg
-	L01lZGlhQm94IFswIDAgNjEyIDc5Ml0gL0NvdW50IDEgL0tpZHMgWyAzIDAgUiBdID4+
-	CmVuZG9iago0MiAwIG9iago8PCAvVHlwZSAvQ2F0YWxvZyAvT3V0bGluZXMgMiAwIFIg
-	L1BhZ2VzIDQgMCBSIC9WZXJzaW9uIC8xLjQgPj4KZW5kb2JqCjIgMCBvYmoKPDwgL0xh
-	c3QgNDMgMCBSIC9GaXJzdCA0NCAwIFIgPj4KZW5kb2JqCjQ0IDAgb2JqCjw8IC9Db3Vu
-	dCAwIC9EZXN0IFsgMyAwIFIgL1hZWiAwIDkwMCAwIF0gL1RpdGxlIChDYW52YXMgMSkg
-	Pj4KZW5kb2JqCjQzIDAgb2JqCjw8IC9Db3VudCAwIC9EZXN0IFsgMyAwIFIgL1hZWiAw
-	IDkwMCAwIF0gL1RpdGxlIChDYW52YXMgMSkgPj4KZW5kb2JqCjQ1IDAgb2JqCjw8IC9M
-	ZW5ndGggNDYgMCBSIC9MZW5ndGgxIDE2NDY0IC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+
-	CnN0cmVhbQp4AY17C3wU1dn3OWfue529ZjcbyIYl4ZJAAiFANJoBkiBEJICBRF1IgJAE
-	AwkXIQGFoGIkqEQjIqAl3tFW2YBgQFuwWi9tUaxtrdoK9cXa1qJUUWolm+9/ZgOC7ff+
-	3tk9M+c2M895znM/ZwglhNhIKxGIsWBJdRObLYio+TVPC1atDC99ZMoaQuiDhIjzFzXV
-	Lmm67OY/ECKdQ/lwbUPLom3vX7eREMtLhAxrraupXvjVnHPzCRlTgPvH1qHCoUmNKK9E
-	eXDdkpXNW1vs21DG80hPQ+OC6nfHvnmCkLwylOcuqW5uEv4uTEE5hnJ4afWSmms6PjyL
-	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
-	vXZiIDY+sxREPjM2LrM0ppRdX9FN6T34NOVO8/ujHhrk5Y0h/unRQULpoI13h/i1b+Pd
-	lZXEz6O6PzgCF8q0tKzlIHA+84CS+qWSWq+gpXQWqjp4VceXSodZFRgQe6B0VkXsmQGV
-	sdE80zegsjTWOCt8Q8VBfDjxTXHRQXqWXyorDjJC/4Vvl1DPCD6JKsVWfbMfqaJn0Y+0
-	8Av6SaNJFe9HqqTRiX7TEv2iuB/9avkF/SCro2a/qJx4HtvB+3VvqC0u6q7FCX1sE8kG
-	s88G20TzWdKYBGyFuLeoO4oTeiV9TAtNyAqTPkYvUhobaz5pzhz0qcSpsqL76zno0T3n
-	a/6U2NTvm9eazQfpTMI7HAT5zTS7HP6+S1uii9B4vovQiC60CRj4albF3pK0kuLNRcCH
-	8CkvVZulvS1VJcV1EXz39r93q43+X7odIhtoIenviZ13/3mY4f3/rP5hTc3EfXPf2txV
-	jI/MqiLFNUhVsc2r6gKx1vnhcPfmt3gDvvXKqJq/oI5fq2tib0VqimKbI0Xh7rnmfT9o
-	7uLNcyNF3aSr+NqK7i6jpmjvXGNucaS6qHLf/Dsat1/yrk0X3tV4x3951x38YY38XfPN
-	+37wru28eT5/13b+ru38XfON+ea7aHE957eyim6VTKycBDri133MagH3VIXSKif69aYr
-	TVa6PC2wLnQIu4t2Eyu+BLPhA0I7EueyERNGTOBNIixoNDn4t4X9TYF1l6eFDtHd/U06
-	ql3g5X7Ek7krVuC/cuX5603nj7kr5mZm3oQzT5mZvA+9aeWKS/+8eeWKTKQV5pRB9RfX
-	9TBbcV3M2IyP7iJFMZlX2PsrBkWKVhDy/wBbf+x2CmVuZHN0cmVhbQplbmRvYmoKNDYg
-	MCBvYmoKMTIxNjAKZW5kb2JqCjQ3IDAgb2JqCjw8IC9UeXBlIC9Gb250RGVzY3JpcHRv
-	ciAvQXNjZW50IDkzNiAvQ2FwSGVpZ2h0IDgzMiAvRGVzY2VudCAtMjEyIC9GbGFncyAz
-	MgovRm9udEJCb3ggWy0zOSAtMjEwIDYzMCA3MjhdIC9Gb250TmFtZSAvVlJPWFVQK0Fy
-	aWFsTmFycm93IC9JdGFsaWNBbmdsZSAwCi9TdGVtViAwIC9NYXhXaWR0aCAxMDUyIC9Y
-	SGVpZ2h0IDYyNCAvRm9udEZpbGUyIDQ1IDAgUiA+PgplbmRvYmoKNDggMCBvYmoKWyAy
-	MjggMCAwIDAgMCAwIDAgMCAyNzMgMjczIDAgMCAyMjggMjczIDIyOCAwIDAgMCAwIDAg
-	MCAwIDAgMCAwIDAgMCAyMjggNDc5CjAgNDc5IDAgMCAwIDAgNTkyIDU5MiA1NDcgMCAw
-	IDAgMjI4IDAgMCAwIDAgNTkyIDAgMCAwIDU5MiA1NDcgNTAxIDU5MiA1NDcKMCAwIDAg
-	MCAwIDAgMCAwIDAgMCA0NTYgNDU2IDQxMCA0NTYgNDU2IDIyOCA0NTYgNDU2IDE4MiAx
-	ODIgNDEwIDE4MiA2ODMgNDU2CjQ1NiA0NTYgNDU2IDI3MyA0MTAgMjI4IDQ1NiA0MTAg
-	NTkyIDQxMCA0MTAgNDEwIF0KZW5kb2JqCjEzIDAgb2JqCjw8IC9UeXBlIC9Gb250IC9T
-	dWJ0eXBlIC9UcnVlVHlwZSAvQmFzZUZvbnQgL1ZST1hVUCtBcmlhbE5hcnJvdyAvRm9u
-	dERlc2NyaXB0b3IKNDcgMCBSIC9XaWR0aHMgNDggMCBSIC9GaXJzdENoYXIgMzIgL0xh
-	c3RDaGFyIDEyMiAvRW5jb2RpbmcgL01hY1JvbWFuRW5jb2RpbmcKPj4KZW5kb2JqCjQ5
-	IDAgb2JqCjw8IC9MZW5ndGggNTAgMCBSIC9MZW5ndGgxIDcyODggL0ZpbHRlciAvRmxh
-	dGVEZWNvZGUgPj4Kc3RyZWFtCngBvVkLeBvFtT4zu9LKD9myLduyHWlXlmTZluT3U/Fj
-	bUu240eiOA+kgBM7joMTCDFJPpMEnLokJkEOuYJCUtKmFHrL5WXYmJSuy6Mp5JaUJryb
-	29KQ0q+m5QsY+iD0Abbu2bWTkH69fPS7/brjmTNnzpkzZ/4zM9odAwGAeBgBBsS+Tb2D
-	kAoHseUU5vy+oW3Cm9od72P9LwAa3/rBazfd3tFwPYC2BoA7c+31O9Zv/vCVLIAEI7bF
-	D/T3rrvwncP7AYwC9qkYwAb9lGEf8kHk7QObtm1PfgReQP4W5I3Xb+7rpWfY57EaQT5+
-	U+/2QV13TBHy30ReuKF3U//zo9/5JfLPIO8Y3Lx1W/QPisPGKSzcg1v6Bz/7kwvtpxrQ
-	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
-	Qvc2GWzmvHJLscm9cPWhk9UpgTS79YEfMKzZnJ7dtezb27+3Z83c+uyNnqcLNCLE4Tf4
-	QdFx2PSwSTYxMQsm3dTtHnSYrBl3ZJCMjEUJjoQMxuiyOzSBOJmsFD3FLpu7vZgzNlni
-	qKDT6RMS+GS73WHPLXEYqD3ZTu+yP2D/o52x22NLSwpPuWpIYfeNrhqD6xSnKXANG940
-	keOFKvYXpg2fTFNdEiJMDEMnC7tNuGhPGciFwnm451FUEEvjmDmU1ZWrLFVl6ZZVVKbU
-	IeY5tvI6UllHyH94vXl5CxfmWchLCVqNMbvKWpQZ217cuchVrYvbz7Dli5ctchStZPtF
-	T4EoFhTUn9PMVFTHJcbFL7Q1pCVsKGhtLTa78imNN8bak6yxcVodXgIpNzCO6HnmZ7iW
-	RZIkPqRxWupznQ5vtbEib2Ptvc6HnZPOnzh/vPAXzjeqzyxMZGvZOueCipry2pb6UNzK
-	2psse5O/lhoXVxFTaSJptazoFHJbcs3uOFJrTY7bHGuLa08sLbGYSbK22p5UnZgrOq25
-	i3IbLaUlJXyyxWypT0oWRT4Z/aiuTEvkxFyItTe543zmdeY9ZsZst/gsay17LKylpdFs
-	MVgsjbHEAI2tDYVDp0yFrhoXGGrIcCEeZScMmqGT3Se7TcradynH2fRejErCsOHEiRN7
-	EwpMGKATyh4YUkJhynRhVYmPCQwXpskFQ+ZJwyllVwwV1maiuKiY3Ij7onQ+CHiGYBzq
-	SVo6U6GcOMrnkpZj5o+cyyfO5bDhnuASCOcYT+OsRfHpCQ2VwpNaOrqzK7LFLdTG6naz
-	sQmGTF+nuauoqz27XsPuiuXSze1bmvzltY1042JritnK0OzYWM7Jama7nr76/iTrSlOZ
-	Zdaa6IpJNNWuy9zsWeJZmJSTQH6bWxpnsu1bOnjVd38xf58Gq/2Hl61JrLlAknRKlOHF
-	7+d+epFGp2eD+Gsh4lkec1FfoVqYRZX4X888MPOALlMH1KH0uPRo2N9Ep5k7QGQBDLQa
-	epEqGhUgk9uohdGqtjR4m8TgTQh2x5sqA94rAPcedwZYVUrwG3Xuxk+rfNe2LlnlCwZd
-	yzds6t/qWbSt9/oNfcpwVLnVw9yP94H/6NFgYyveXnXAUhmaXfgWh7nE9Qz9JonHSzOe
-	3jMRqOZlerfoQhrRRjh6ZNH4Ijq+ZXyMHtlyZIyO8+NeeoQ/4qXjwniAHhGOBKhMI096
-	y/hUmY5NtPBGmYaRpMj0diTJMt2HJEmme5EYZHobkkSZjiJJkOkeJHqZ7kYSL9NbkcTJ
-	9KtIYmU6giRGpl9BopPpLiScTIeRaGV6CxKNTG9Gwsp0JxJGpjuQoDPbkeDv901IQKZD
-	YiJSQgjEEIrg6sQGI60lN8Ag6MlGtbxaLZeppVEtDWrJHhvUbx7UN8SSV/BeUE9eVMs+
-	tUwREwb0Hw3opwb0Lw7o/3tA/xwZwEtRPTGrpUY0dupPd+qlTn24U1/TqS/p1Od3Kqb+
-	iPDryZRaWtXSIqa36T9p0/+sTf9am368Td/Xpi9r0zva9DL5HzFpVP/2qP7hUX3OqN42
-	qjePYuvjxxLbEyHmabwLaUdjr04E3Pwz5AUQcJY8+dGE8DTfkEGOg5dV+Ofm6STwKv8U
-	NBEHtj8By1X6KDh1il7PRKCcl8nqiUAtkmsmAquQrJoIrEYSmgisxSGugoDaZfmEMMU3
-	JJEuEFSTi+eH6IQxvPrgSQfSR5G2TvDXYm/fRNNaviGGNECTql6HI69E8QLF8QY9SZ03
-	kzTvYQLKFLn+GH+an/bib8wEfx7tOCb4d5fLLJngf+WU6aNiHH/OOcWfCnyN/2lAptj8
-	/HJsnuB/6MQuT/GP89/iH1IUJ/jvKi0T/JE5tW8Ksg61D85p35Ormrw7VyaHn+Lvcp7m
-	dylDovVhNLAz9zR/Q5M69qY5cm0u9kbp+twpfi3/Vb7LqfZfgnct6GDHcnXsRd7TfEuu
-	OnYzukCe4v3Cab5R6TrBi7jF0Kn6Oa5yzmzFHFfKq9aKx1RrhXMz8eAU3egt9nWhmw4x
-	kbfzW3hr07X8Cj6Gj4k8TXbjC2yE7BKruch9XGSEi2zlItdxkY1cZCUXaeUiVVykgItk
-	cxELZ9Ql6wy6BF28Llan02l1rI7ivjDK0XfEfOV3zajF/zIQ0OIxRYBV6wY8WYhyvGAJ
-	FG/Ooa3BRMOgo/sw34Z5D+ZbMY9g3oX5Fsw7MW/HPIQ5HH3nSaX3JA3TW46pRifpLXTn
-	fONOett87Ta6fb62nQ6pNdzETypjIp1oAzw0o6MSuUPS7sPrB4kcyJLwuuNAyJSWNlRv
-	qk+uS6pu9v2Dokdt7PG5Lj+mf7rD5b5YI+2BHT/EZfohQs+TH6rl0ac4/mWOf4xTNduX
-	oUJEVYioChGCCpGXuci8gsksHcSvaukRc0gqUSpRc6hdKlDuqSZpPa31+yZpnUJCwUk4
-	R+v9XUo7nPOFUG2Vqoandj2qgVchqEYeAV5RQ5ceUdX65tQEWqeoBRSCavQmEFQ1gd6k
-	qk0pake3eP2+o14sUIV9FraoKlvYZz+nMnalypiqMjavkqVacTrRShMWoeDRbCcqHHVm
-	qxbsl8XL58QFc+ICVVx5WZw7J26ZE7eg+Ars/59Mf+M/Y8C/YVljGtTX49sSvrpy8ZIW
-	bzM52/9lY+v8g0MA/C+8E1N1CmVuZHN0cmVhbQplbmRvYmoKNTAgMCBvYmoKNDg5NQpl
-	bmRvYmoKNTEgMCBvYmoKPDwgL1R5cGUgL0ZvbnREZXNjcmlwdG9yIC9Bc2NlbnQgNzUw
-	IC9DYXBIZWlnaHQgNjY3IC9EZXNjZW50IC0yNTAgL0ZsYWdzIDk2Ci9Gb250QkJveCBb
-	LTkgLTIwNyA3NjcgNjU2XSAvRm9udE5hbWUgL0hPWkRYWCtUaW1lcy1JdGFsaWMgL0l0
-	YWxpY0FuZ2xlIC0xNQovU3RlbVYgMCAvTWF4V2lkdGggMTYxMCAvWEhlaWdodCA1MDAg
-	L0ZvbnRGaWxlMiA0OSAwIFIgPj4KZW5kb2JqCjUyIDAgb2JqClsgNDQ0IDAgNTAwIDAg
-	Mjc4IDAgMCAwIDAgNTAwIF0KZW5kb2JqCjIyIDAgb2JqCjw8IC9UeXBlIC9Gb250IC9T
-	dWJ0eXBlIC9UcnVlVHlwZSAvQmFzZUZvbnQgL0hPWkRYWCtUaW1lcy1JdGFsaWMgL0Zv
-	bnREZXNjcmlwdG9yCjUxIDAgUiAvV2lkdGhzIDUyIDAgUiAvRmlyc3RDaGFyIDEwMSAv
-	TGFzdENoYXIgMTEwIC9FbmNvZGluZyAvTWFjUm9tYW5FbmNvZGluZwo+PgplbmRvYmoK
-	NTMgMCBvYmoKPDwgL0xlbmd0aCA1NCAwIFIgL0xlbmd0aDEgMTE1ODAgL0ZpbHRlciAv
-	RmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngBvVp5eFRFtq+6ey/p9L5vN53esi9kI4E0IQkE
-	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
-	2zpAO+GqE1w1CtSFq6bMrIcbfQ3lEbyT3H9ahv4PMNuZgAplbmRzdHJlYW0KZW5kb2Jq
-	CjU0IDAgb2JqCjc4NjYKZW5kb2JqCjU1IDAgb2JqCjw8IC9UeXBlIC9Gb250RGVzY3Jp
-	cHRvciAvQXNjZW50IDc3MCAvQ2FwSGVpZ2h0IDY4NCAvRGVzY2VudCAtMjMwIC9GbGFn
-	cyAzMgovRm9udEJCb3ggWy0xOSAtMjIxIDc2OCA3MzddIC9Gb250TmFtZSAvUlhTWURS
-	K0hlbHZldGljYSAvSXRhbGljQW5nbGUgMCAvU3RlbVYKMCAvTWF4V2lkdGggMTUwMCAv
-	WEhlaWdodCA1MTMgL0ZvbnRGaWxlMiA1MyAwIFIgPj4KZW5kb2JqCjU2IDAgb2JqClsg
-	MzMzIDMzMyAwIDAgMCAzMzMgMjc4IDAgMCAwIDAgNTU2IDAgMCAwIDAgMCAwIDI3OCAw
-	IDAgMCAwIDAgMCAwIDAgNzIyIDAKNjY3IDAgMCAwIDI3OCAwIDAgMCAwIDAgMCAwIDAg
-	MCAwIDYxMSA3MjIgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDU1NiA1NTYgNTAwCjU1NiA1
-	NTYgMjc4IDU1NiA1NTYgMjIyIDIyMiAwIDIyMiA4MzMgNTU2IDU1NiA1NTYgMCAzMzMg
-	NTAwIDI3OCA1NTYgNTAwIDAKNTAwIF0KZW5kb2JqCjEwIDAgb2JqCjw8IC9UeXBlIC9G
-	b250IC9TdWJ0eXBlIC9UcnVlVHlwZSAvQmFzZUZvbnQgL1JYU1lEUitIZWx2ZXRpY2Eg
-	L0ZvbnREZXNjcmlwdG9yCjU1IDAgUiAvV2lkdGhzIDU2IDAgUiAvRmlyc3RDaGFyIDQw
-	IC9MYXN0Q2hhciAxMjAgL0VuY29kaW5nIC9NYWNSb21hbkVuY29kaW5nCj4+CmVuZG9i
-	ago1NyAwIG9iago8PCAvTGVuZ3RoIDU4IDAgUiAvTGVuZ3RoMSA1NjE2IC9GaWx0ZXIg
-	L0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Ab1YC3CTVRY+538kaanQB9AUGv+EP23pIxQK
-	NBRqm5akFAu1tIAJgiZtgy22WHexK8uiyGOF4LI4KmAXRRYcHRjdvylCwMXpIjvoWmd9
-	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
-	la7YQwZ0jJS+tz4uXaJ+0VosXbCOk94hv7ft06S3Smg+KL2ZFeJI/MMaEtAxRHrd+rD0
-	sj1T2mOfIgUzyBaU2ktI7JV22h+WdqzWLH/O0sR2awjbgtKzTOyVtlH8Tau0iScjC1dG
-	RMtqLdG9HZpY3BHidu+Vmq3pUi0tRMcgaYG1SZpvLZBml4QwLSjNZMv2SjMy3pIqWOqg
-	5Igkyo9En2jVEOdF0uZYX5FGRzKMYt6OJMlsnSGZKH7Os5ukHOudUklWCF/YVz46y1qe
-	sSk/hOe1HEwQUCYWR0RdxkF8nn4NycR5kIZPdZRnEmbcGJRWkWjrKB9tTwvxZxyJUkdG
-	ecZq6vnU06jPCeFsR45+s75eP0c/Xp+tz9Sn6y36m/Uj9UMNiYZ4w2BDnCHWYDDoDIKB
-	M4BhaEj92JHNzt9QXTwTOoG9BW0cT+cs8sMbHVEODRzcCiEdrBneWmwsTixKKChz/sTL
-	qxm9zuwfHvpojz5GNCmb6Au7ssvkUfLYQDV5orP/38BfSusrqpd2VC/9aq5255Ndfi9d
-	/ZT1rXQ1X1FrNrd/tZRNsNuHt7augUmfX1kq+53KV7LT3F6trfvR9Fw2XS0722Gua7a7
-	fa7D7wxWO6rZnc7TUeUqrxyQa100V7nrJ3K5WLBylqtKW/ejXJVsuorlqmS5KlmuKkeV
-	lis729VYUwr/AwuzIlYKZW5kc3RyZWFtCmVuZG9iago1OCAwIG9iagozMjA0CmVuZG9i
-	ago1OSAwIG9iago8PCAvVHlwZSAvRm9udERlc2NyaXB0b3IgL0FzY2VudCA3NzAgL0Nh
-	cEhlaWdodCA2ODQgL0Rlc2NlbnQgLTIzMCAvRmxhZ3MgOTYKL0ZvbnRCQm94IFs3NCAt
-	MTkgODIzIDczOF0gL0ZvbnROYW1lIC9SQkJFWFgrSGVsdmV0aWNhLUJvbGRPYmxpcXVl
-	IC9JdGFsaWNBbmdsZQotMTIgL1N0ZW1WIDAgL01heFdpZHRoIDE1MDAgL1hIZWlnaHQg
-	NTEzIC9Gb250RmlsZTIgNTcgMCBSID4+CmVuZG9iago2MCAwIG9iagpbIDcyMiA2Njcg
-	MCA3NzggMCAwIDAgMCA2MTEgMCA3MjIgXQplbmRvYmoKMTIgMCBvYmoKPDwgL1R5cGUg
-	L0ZvbnQgL1N1YnR5cGUgL1RydWVUeXBlIC9CYXNlRm9udCAvUkJCRVhYK0hlbHZldGlj
-	YS1Cb2xkT2JsaXF1ZQovRm9udERlc2NyaXB0b3IgNTkgMCBSIC9XaWR0aHMgNjAgMCBS
-	IC9GaXJzdENoYXIgNjggL0xhc3RDaGFyIDc4IC9FbmNvZGluZwovTWFjUm9tYW5FbmNv
-	ZGluZyA+PgplbmRvYmoKNjEgMCBvYmoKPDwgL0xlbmd0aCA2MiAwIFIgL0xlbmd0aDEg
-	MTMwMTYgL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngBvXoJeFTV2f85d50t
-	k5lJJrNkmZnMJJNMlsk+CQQyCUkIhEAIWwKJJkAQEBSUgoBYlD1oxbYCIq1asVqsbQgW
-	BxE/PorFBfq54Kcibi2iFlOrRVFh7vx/505A6NN//z7Pv09zc+as95z3vNt53/ceQgkh
-	BrKa8CQ8a2HPInqSm4aWY0gvzlq6xH1dbW6YELqdEH79nEXXLXy596NdhIhuQnRJ1y1Y
-	Pqdr5Q0vE5JYRkj6ibm9PbO/rL8/i5ACDd6vmIsG7Xq5AHXMQXxzFy655ckziQmoz0Z9
-	54IbZ/VscW/PJqQQVdK6sOeWRZrNuouot6LuvqFnYe+zZ//+AuqLUPcvuvHmJfyLwnOo
-	Ax6yaNFNvYuibZvmEBLEevz/oI3iYX8GIpFnkbvJ9KEWtZlw8Qy7ZX/CUO3/lYmYTSYa
-	oiU6osdgg/oC9kGMSIlIJmImFpKktierv1f+WFFJITZiJw7iJKkkTe1MJxnEBQg9qGUS
-	L/ERYE79A0bEQ8QsHiYF4jaSLtSRdEJiJ5HeZrkyKfaZ+DLRxaKxQR6Yp5ksvXeBJpPf
-	As6nyG3Y2atkN9Vi1kFaQt6i6TRA3iQKeZv8CRBsJg/it4F8TL/Cnj6hORhTQe4gPycP
-	xBaRRaQGz8dUJFZSST6JrYw9H/uG1JE+coTKNImmx/aTINmAZwfZSQ3czNge7GwcWUZW
-	Y44XyMnYQOwvmL+CfEjNNCgMj70DvItoqSKbyG7yFPVQLw3QGbEP0W4HjJ1kd6wlthTv
-	fYZRQTKerMRqH1AXzaZ5dAd9lx+MrY79CHtLQ98UMgvPQnI72U52kifUUTOFNNGK+etJ
-	M/p+BP79mHwBZsildfQW7nX+L/zfhOHCjtgRwDEF63WTBygPrPjoFDqbLqJP0Cfp7+lX
-	XIjr4av414VFwkOAbQrZSB4iB8lR8hp5h5wlg+RbEqUCYBpJJ9CV9Gd4709cKdfFreLu
-	5E5yn/HF/LuCLGwW14kHYkLs9di3gDmDBMhwMppMJO2kF88ccgP5AfkhWUtlso3sIb8H
-	tO+R96iOmmiQFtPRdDKdQa+ny8k9dBd9mp6ip+kZ+gmgS+JcnJcLckux3h3cJu4JboDb
-	zw3yZn4Jv4o/xL/LfyVYhS7hEJ73xAJxiZQmNcsTlZ8q78UKYltiO0CXFDw+kksKyEgq
-	AIsLyVpQchNwtpPsIo+T35ABMhC7QKvIEfIK4PqAfEbOg2JpeDy0hFbSVjoREC6gC+kP
-	6XZAuJvuA5QH6AHyBn2DXsCjEAen5Qq4GVwPtxzPDrKde03Fj4H38Dl8Ad/MT4p9zj/B
-	7+G/ELKE6cJiYaXQJ2wXHhDTxBHiNHG6uEi8V9wnviT+r/iZeE5KlzZIu6QnpddkjVwm
-	b5cVmglY3DSLPAk5v4Ns5Reh7iOj6FpQdSo5Bu4dJM+RC+Qbcog8StOJwjNqZsceIpHY
-	RlDzIPkdfyupJvdwP+HGxmr4x3gtLYmdx1xFoNelh4QDuTn+7CyfN9PjdmWkp6U6HXZb
-	ijU5yWI2JRoTDHqdViNLosBzlOQ3eBu73f3Z3f1CtrepqYDVvT1o6LmiobvfjabGq8f0
-	u9l7Pei6amQYI+f8w8hwfGT48khqcleT6oJ8d4PX3X+83uuO0OkT21G+q97b4e4fVMst
-	anmLWk5A2ePBC+4G+9x6dz/tdjf0Ny6d29fQXV+QT/eHoYN0BflkPyFhomcT95NRPavm
-	2pGxEQ39Tm99Q7/DizL6+KyGntn9rRPbG+pTPZ6Ogvx+OmqWd2Y/8db1J+YNvc7ec2No
-	WzvWLsif1w/4yWbDbO/szZEwmdnNSj2d7f18T0c/183WMOf127z1/bYVH9q/q14qNdx5
-	RWc/l9XY09vX2B/u3gyks2o3q/XciVrzJDem5dZ1tPfTdQCOAaHCHt9Fr7eBtXTPd/dr
-	vXXeuX3zu4Fz0to+4Aw7G7zd9R39pK19wBF2qJWC/P3224Z7gJT9BbUFtSwf7rHfFs8/
-	WhNvf/UQy+23HXkfeXPbZbxQtpJ3DMDsd8/CIsAFYK1kP72VpG9WJdCHvw6KXc4DPKP6
-	ObASn9UvZo3p6V89aQiMnrn1Q8DNrx/QOpwN2EN3XQfGd/eZhoGAGG/yuvu+JKCsd/DT
-	q1t6hlqkLNOXhHUy+l9moX7ac6m8VEVMg7dnrt07l5FvqUpq1L32hisaUMeg+oIICeQ3
-	R4i2tX0PpT/qiNDYugipT9+PA4a/9hp05zGGm1eP5VDJz0dDwIMSIGjEJhsZZ7j73H1j
-	Zve5G91zwVJClpqjo7evIwiETWoHWsjkdk9/uCP1crG3o2MY5ilk8+AVDO/rwAzzh2ZA
-	rjYFoxgUzG8GEbJb2ye296+uT+0P13cA6WDiQ63t/YfAvx0dGFV0GVJAvGqefQjmYsBc
-	FEB/SXyWSZgDU3T09bE5J7V7Pf2H+vpS+5jUxesRSv6xITzUECFsCDbeEKGrW/EuMq8n
-	lTV4PV4PwOpgOC0FA19ioAgp+9cYLr8MN96sALTlKoZD/yYMV34fDFd9LwwPuwzpVRge
-	DpiHMQxX/+cwPOIqDI/81xiuuQw3gAwD2hoVw7X/JgzXfR8Mj/peGK6/DOlVGG4AzPUM
-	w43/OQyPvgrDTf8aw2Muww0gxwLaMSqGm/9NGB73fTDc8r0wPP4ypFdheAJgHs8w3Pqf
-	w/DEqzDc9q8xPOky3AByMqCdpGJ4yr8Jw1O/D4anfS8Mt1+G9CoMdwDmdobh6f85DM+4
-	AsMEnsEOeGgj4J/xsO9Hhj2ilA77T5DTeaIThXSe55xaSU6nxKHR7vYsqLbn5Y0/V90S
-	rR5v+qq6xRStJjXV0WqWiotKzR6zH2mH8HDk4nHx8LcjI0Lbhd/ACMPsN8ZOiTvFg/AP
-	i8lw+rPaB3GcppIZSFPgN16HtBTpOfifx+FJyahlw9+V4KXqUQvirRqkDhIiW+B/bsWY
-	F9WxZvIHlD9G+zdIBswagm8aggdqxgw2eIil8K5KMVMqPLIQUqVacgKmRJRMaGHebDYe
-	B9qGIy9GuwGWsx19yfCF2Zt2UobebHgbyXgnES2J2IsFs1Vi1lT8FiNnPbz6Lms1oVyG
-	FvbO2/CQC+Aja4ENJ7zvMlKCFj1mn4zeNHioI7C+Aa0BakLJiXox+iRyF2C6AWs5YOOP
-	oB5gaQtpJCohWqLRQRCiJTpoOndukNQM1tQMmgbNVWZbFTVbbFWWqrwNhXl5q0zPEbOl
-	ClUza6+qQmLlDaa8I3nVedXI8ZsHEtLFXWRxl6WihhbS8rKK0hI4CJKcNJKGSiVZkqnH
-	j8ybyZUTW4qtIlRRXpbtzZQlK5dSWlIRokZqvXHtVle48c1f/+z4ymWv+Pw0Kg1zN1GD
-	8ss5Y8M33fv+Rbo/zVJd7SypHpHtKfnZsq7GVX7li+sbON2zXUlNWyc+9Lv9W+74RYOi
-	lK2oX7+ppUt5dlWDZzjVPMQdyU8fG0ivqClssrpGXTyxojaHjh+9oJaAS4J8FndKfAkx
-	jLfCm64n14vXS9cbV5AV4gpphfF27Trd7fqtukd0+3Uv6N6S3jKaR+sm68DlJGgxGhOI
-	UQfXRx+0GAwJeoNOq9NrgxaNRtZoRUGUhKBFliXJKItEoA9xJo1Bq0+QJbhLqBvhMYmC
-	JJgkQadrFboFbovwoMAJRpq4qtGeZzpx5J2uxSOqgnbTkSOMHCxBXt7BUzNYDTJUVVEB
-	BNKAQHbNPy0I6CouAk2SbOWl1pBNtsl+2R/yX/PKE68EX9+8evPdq+98Xcyo//zz+nvr
-	js545pkZR+vAYcAJfZJbyDG59oQtJJOnTvE9NDsE8XUPAy5v/Oku05kWEhwsLkrymD1B
-	bmT0MHdY+ULlWSI+Bp3AqVGiU+Hr53LUL+boKqWQtkmaq7tFt1HYKO3g7xW2S7v5R4TH
-	pAiN6J6nz+ve5N/UWSkQxhGNVosfHZVFLlmny7KgmiyKWRb0yZoAsM/p9HA2Ja2OFzX6
-	BJvNqdcJkhihyQNankO2T+cw9P7gJnve0vGmc/aWaFUV/s1VjvENvfVn7EFSY6tuqamu
-	BjsHoX5EoG+VqRnmsHAotV840rGh0D7UwKOBP9IRlwAwfXW1jARm7yJd1KNHMMADZ95D
-	uSBdGnmcdnI6ZeDa6AdzlGe5p+H719OJ346kQeUVVUs+BH3Zg5IWUptLOsL5vxIelR+1
-	8MtSNqRwaboApX4SyOH0Ab8mzSRW2CeYQi5nHtFn+R2BvGdoBsS3DSGsIfFlarRl8Nyg
-	BXwxWBO1VAWjVUOAmT0lEC9/tpeixCTNn+2H1FmTIYcZVM2M1AvK0aN0fs/y1obrlWdQ
-	qJh5bXk3bVxcX589dvHNdYGa0f+9ODqbOyYcVg6M6brOY4seVZY5izbenGenfPl916zZ
-	0FaYnTvwwzVzG4IVOdgYqN4Ze0NcKX6mRvWWhHOn6X4q/1TDz+A6UtvT5wjL6CbxV8kD
-	wlO6PwhH9Se5t5Pfsb+X+rXdZItQfdjr1GichloXz1tqnVpXSsimCbkyZKcnMZThcHvu
-	8zwxNb53VXGZqwZPDIKUgzXVwEHQBGZkVLGEKjxuaBhPNvafyVmToV5CFSGPRDxuf7aZ
-	dv7PkzSFLvn1tbJyLCM4+ZHHDh//+S+mBF20OEd5Sokph/ftgyhOe2XfuU198yu6lc+/
-	/vr8/KqbPldePXac9vJO7HEn6LhSpaONTAqXLLNQWQPJMrRb5ltWCnfyfUKfZTu/Xdhu
-	eYJP4AJWbSCFs2qkkMnpoFlWh90Roe69nrahzURVOhJV/X5Hv7h+rMBGUixWk8zlgpSg
-	VtrJqcG7Xj044/7ulsqlDyoD0XXcSuHwxZFvLH34g8+VjNKNN8TIEuXkMWWQkQNC+whg
-	5VDWk2CENOU9jUNBS5rzIkQyRQh9mTyNE1KDhqcxgqg5j7hpc15RMQV/XHqEdy+e445F
-	y/iiCw8LVcJB5WiMKOuU82wRyvAh7BEPsfMzbJMDgqDlA4TTaqSl1KnnNVlah04foWnY
-	8uNX8u5p7Fll27gWia+1U7BG07kN0eXKH8VDSlR5IkaiW4HzKbG3xN+KH6sx4nXh5uc1
-	b2u+dX7jEXK5HE9VUrO9w7rd8wfH4fSvtdoknSXzhMsYSEy0CLVeF2/R6GptWm+SJcmS
-	wGcSEvKmZv460eTMkkOpDl9WhP5wr+eJ5Vdw1vFz4C2mcIMjgkxZ4GhUWSyK89GCpiEq
-	xRnMbFLPL0+5x+xVTzjGZSbGhMRGhZXejeO6Bj78+uf3/8GmPM7NOebqGL1iQHn7wO+f
-	e47WUwed4ojewn+1rdqj/F35Qvnbn/be89XFTyLz8ppfOkZn0jlvvqn8+XX6BUgDHKwF
-	svdBFTMKFYXNAsdRjSBB+wkkizpE6WnaTDy0fM/QXqJVqrrDBmqgsRgD+ek+5Y+05D7x
-	MELpcbrtBglFkhtOJBxXK2p4p8xlEYckX02v8aYzpKYlWnOJUjtpGXfywhfi4QujlfMq
-	bNvAZ/Xic+ABHZkWDmq4aRzH4dSXAxZKOahtHU85jaTR6aik4fyi0wCZ0Tr0hkOetkvw
-	qhotipOtCjDDMGT6mZ1xpg2rjuAg60ryYA8QA/xvo6O4ZupSjkV/qXzAzQQgFwTx25GC
-	7cInAAK4ehjw6LE3DaykkeG0bXSbxBnAmkY+kMgZNZpQktPKJ2QZHcnWCE2/QhrjapWJ
-	I5RKXKdkM1UJjUoEVkBRsPInly9UEJtfuJwWK19/qRxV/sjd8S7I0T1TGT//ZiX6ZvSv
-	4uHTn6m4YbAsBiw62IXt4YDbm2q3iv6kbCj8dBLI5fzpmnR3ZpJky5RCttRpJmc+8Wfl
-	OPLyIzTjHyE7fSQKe4Ad/wxFDMYoM9nAkpdVvbcixca0PNP16TQZKsTKlGEQdlkcfvoy
-	7Zpb1tlRMvvtR4cVVc5fMWeKxpCvPGGUDCDVrI3KYeU17jVo/SX2wK3rC53RxvrKjdPm
-	vRTI3Xb/rF5fVWpWccbI2k13XRN9FrtisnlSNELnF8LWfjg8X5Moe+Rsh96RaPPYsucY
-	ehPmZX5YoM815VpznNn+YdZK537ri9ZT1lfzzyadTfkm6duUbwoSjcSsz7S7smyarEyj
-	XrAXnsizn0irDSbzQm2eNmjfGjTbJmi25jiLXRXmaaSi0FFUrOLn8qFwTj0WBpnwDh0L
-	zKBVzVlmtbI0JLlQquxQYOdikAI15WUERB06MiQrUOaiGGNNxplByildacxt3rew/vZw
-	eNPOM+33Uje1fULHaJQ3NQuarl/2o8aCnyiPTlmrvKScUd5X9nET6dHekhn2wlVjcvwZ
-	3rIRc976A5XOn11XmdU9dYLf6R2RM2rucy8qX1L5jJADOfRAf74ETMqkMmygUkDmBI0W
-	Yk0itH2Ay4Jd0x7WSvCiDnmYTQMvquVcNKoKdwvTocweYXyJR3hJGa28qDSIh5ULF0YJ
-	B/EFAOcV6MP8NCu+epSGU1NAZanWrE1JsepCCU47F7I6bPbv5DCORnCWerZicth4QImK
-	MSwBI4KdpOV0J63yVT5zoNJHq8ZsVG5Xbt80hpsoHr64dHvjrbc2buf7Li49u+Zvf1tz
-	lu+DGMT3qcKhp3x4Rzs3l99G7hV2Stt10nqyTtgsbdSt14teMaAvFkfo+/RbxAf0u8Td
-	+r3i0/rfiy/q3xDPiOdF03pxk557WXxPz4l2ZmVnWeBpinZ8fpCyLPgyorfr9ARGI4xI
-	vZ3odSTLQjnKwVAUiCzBbNRpKYxLjSQLHNGLel7W8pTZkNr7qMPAEOyIG41xa7HFZD9i
-	OgJ5AwcxsWNyV82UUzUOCGrakKdhluOKjiN2k/h/q4jwki4NgyK7aXEXnKVcqqWe+D+l
-	G5Qd9KQyAh/hZHhCs1F6T+lTPuY+415TPPS9aFVUxGdKaP7hsXeFSuFa+CtVZBi5Ozxh
-	OFdesZxuosKbGTT772cCH3mNCSK+NCY58/C9RsguzC4MsAYhVZ+ZmpI/zCUHdPr8Ev2w
-	pBbSUjisPDAy21ntbEkt0LSUO4ZXP0Md4Mcm+pshMxMGJrNPTpurjn/4ocoRcNiPq+4I
-	EKJ6iuykzBuSLLgvFG6eanVVhPzfuXmyB2VPCYQKvJRBoZIKqXpcZkL6YJ8lce+mhorC
-	0/11E4d13s8/MSFzRNf03kCGThnUjl5Mk/Zu3szxaWnKiwk6fnhL55Kf/vf9Ux5ZxFnM
-	Vq3BZPO3jaldcPdnukRnaFRpSVbN3Z1bRo9+TjGUja3MSQh4hmWFC8p/df8L04ut9ATj
-	RY6Mjp0UyoBH9v35hnDDfSmPpXAb0ugYa7tlruUW3XJLxHo06Xmrxs5JQvqrgi/DKacY
-	dQbTUwZfsj7DVJHoIhUZtnSnW1Nhc7jcGzxN46+wIMxV0XOqEoJDXVUF60HNGY4Ww29Q
-	DQeGJCZUzDRlEsWVm0gplBDlTRpPUe+W8rS00rtmT9ZSr27yeuUb5ZuvqeXz41S0K6nc
-	gRHFdXePu+2WMRsXTL1jyQFa+Q0sicrIJ3SXurca8Egv7DETdjchnP+xAV6VNZ0z8cTm
-	M8mSLt2n01t5Z5JLcvF+welyViQ4MlzbPU0NV2wheu40FKZq/AzWICwA/mdnMEmxMUVT
-	Dv8hkzCQLXFPI1OlObdiRxH1KGdH7FzyX8oFSt946rbekW2rfrBsudA5rYXTfBve1tNO
-	y7+gNhq+eNOTdz8/tezgndt+B74Oxk4Jw0APmOmw8R4Pj2nUbEjeRu+DX0e1omQSnc1i
-	o2mMez1dl7jBpeNTeFtSSpKtSTMuZZxtjLMzpdM23XmKvi18kv6R+7zbNJY2mjaKa0wC
-	3MF7w6UTjNcabzTyRmOq5Mv0yDZLfqo+hecy+QrbysyMbsNqA2dw+jiX8d4Mh9cHVAxR
-	M3oa3N/VYq46PRiMo+N43BbsiqquNQt6SDJ4mR26eGTP0NmiUhUoMpsQsqIvLzTSA/LK
-	GRtPjg4n6bloitQzfFJ7KMNGvfrpd158WTlMXR8m80tunb/4B2fn3NCzuvmuXXW5JalF
-	PbMfoAYc3KlUvR1CocMJt1l8BdGp22uDqPEkH9zsIhNgE16LBEFHiw3aVg/6dyLKpAVO
-	jbA9HGi1qfEjF95KUE8DLfGjzwUb6ccY7WDRLGoEBbrxfX7ooDkNz7n6xDn1tGGWJOJ3
-	NYNd5wYZN8CyKKQgvLXU6gVXeMtLmSyXciX52fbFeQcOKKcf2Dl85KD4Cs9/zPPlbnf1
-	Cxfv4W98ofG3dTMBQ51SJ1wDmifAbigi08OmvgwoFNFXFJQtUlaCLzdCa8LuNHe+PbGI
-	c1lcWf6i/CRnSdra1AJtRb6juOQKlo2rKSZ3p6GlosdrBquY1W5Wj3wfeDQebGIiZwGh
-	YK2zcyzT579EsBFMb7HwVJmlNMQd7Ftzw9aqDPewrfoRc8PUOnqF8stXlK+NtMKQWrhw
-	R1lmbnDKxlcvfPHujL9se+T+X9zVfMO1Y/v4mxx5N//swlevXR/Z9XBJiv+6up2Njd5a
-	6r/4d9rMM71DccuACNeIB0GJmnCWyPm5duNco5BssxCDzyabZJ2mQnQ6kkx+M/zEZz2t
-	QyKpBk1bEKYD8iGNqrZVrTygnTn6ED8mluaRtJQf9Uh5QbLyToZ/4eIfKKdp2siHpwvX
-	NDaNuP3H0dXctvaKcdvujA6IB6Pnr21mMHG490DobsTAWBx3eDhzHBlHO0knrnjsATdJ
-	sk61RSQ/lWGCDFwCSQ3ksnAKmKKmBYYyC4jAMmdpt/IetICaBFyXUZZdwDUkingqoSw2
-	xJOscBJHqE5kRo6fIrB0edqWuF2DSeMuC31M+TNNx0t4fzUh0k5hOmKhh2tbECPFFOBt
-	DlYNh5gtR+YhXjofHL4c+Qrkm5D3Ib8P+X3If4W0H+kjyIYR4z2IwvDg/gTcBSkA77Pf
-	LODAhVnTITkaSE1wSGok3OTR0kS8YSYtJBmlDOLGKD9yB7N8qRfzteI+UVxuokdMkJFz
-	l3YDiwGiE7dH40clhAePlR+iHzT0JVLGix4rDsxSHJgsVloq3n1nVaFJxymnkrPnLC2w
-	KR8k++atCNiAZGt5cNLaVS0j3ZWT2hcI0ysbqyaF5kcncvtG5oybWTYmuozb1JM/YUJB
-	R3SREH5gii8cKm3tLijA/hkv9kD+2K2s5nCBSK00i4Zou36uXqIWk6T1QaEZBZ1NrLAl
-	ck6H2ehPvJorjzDbIG5vwyQarKka4sx/uhc/3/eGcsoWWHpPRRr4MilU3L5hntC553g0
-	k9s2tXDyytre6ABAnJxVx4QF+gFn9E6hF9Rit8Zawjk2nmoMGw0bTbwtwZ44J4EXffZk
-	We8z6u12DVdhczo1FWaHwxmhS/deVuFxc9Y8ZM4yj+4mWGBDKkE9tXyqmQ8fwE2slDu7
-	fv2qVRs2rOIKlU+Vj/B8SpNxvDpocvS1FwZ27dqzZ9eugTnK43TK3z6l05VffsqFgctV
-	yiRhB3gzAVwxNpxrS9Lo0pyczy07JZ0vSe8wahLsCRUmZ6bkSnXZ/Q6HJ3O7p/XSKXOO
-	HTMtiC7gwGXhBuitoQP3O7UFB9TCjhNvJqJ5TNhVBuGX3Hz7/cMyeqvblq1Kp1oleuyO
-	qcEC5Qw1F5Zdu4Z74PBPxt/ybEtB5D6uCt7JZ/BPXq31NUSfFz97aHTuGKAZMnQHlMAF
-	oROnwNj9hKej93KJCQjLjg47kuQEyaBzc0VcmOOtkFbOqPcbVJ959l5P65xLvH4i7ox0
-	MV0A2E8wdQBDAccii/BfBpZ7R5+UGkj49XAPfGdTXXHraqGTUuUUzy2qWRM9L9Q9uzBn
-	FIOJA+3fxp2oHpKH0+y28AStScp2JPBawaPXN+vG6Ed76t1NuW/wmvRMt0EnpOQJKc78
-	fIss5Ofo8/MTrTp3ekpLpmwtkFuynIUGkt6SWEBa8hwFhVdYaix2quJdjfeoDmLc54ke
-	Nx1Xnepruq6hXcwVhJ3GvMUs1VmEWF7lLKqCnCx53XCK6CxtRvndk2fl5Cix/ePGDb5x
-	jNIk5c+SI7i4a0IgENs9ZfLnF5XYl7gg1jnOXVVSUuRwjChsqF+97a2Hnw+5hw3zF6fY
-	KnMmtq38xfG3HuMhCDjzY3/hbhHnQk7H7jPlJ7oM+ean6WJ8ROgMp8ikU6KSHaRJlM4J
-	Wj/5Mehkj1DjXk83I8+J6tPR6nPVjD5/hbOIaDdixedOw6krZ9/c2MHNIqQVIasswakz
-	W7dT5549mdMS0o0bXhxbxC98iRYpL78UPTTKQ+nrotxSPId7gPF77GNhCnQH+9o0Llyo
-	S3GmBFIqU6bKvbLklHVESjEm6ETYys4End9p1zvTaIXdkZr23ZHG5NJS1RI9oeKcWclQ
-	+cD2lb4mszNlZmoy0LLoQyn+m35cgSt4ylnBnTJq1eQvJgfpp0Jd9Mau4KSl4XncxAvP
-	7hBLkqrzf9N9gLsnHXBaldFCK+BMQsz9rfAiv26qbo7uXt0u3Ws6SUQsSkqTzQkFsjth
-	hFyc0Cx3yUz7LZOXJyTYEisSNmg36rfrI3opOdmgSeDcBoPfotfrJJlzaTR+fJdgxQSd
-	1aBHtFPWEheXn+QyJSbLKSCIEd+EItSwFx065GFD0o81jl5ryq/ilFkKN/60/SL8A5aG
-	Pk1AgFpOR0/jsFCjX1AIFAEwEV8n2m5Z8Vzp0IcJVmYf44IMYYvxhQfhiorQSOqnnlR8
-	kuBgx2T76R5fYJzTkScoi+iIv36ArxB9C247mF1YSO94heN0FvMCg3DTxVO878LLyov3
-	Ul7ClV2q6gNy87Hi5dcmVn9JzOwKMyFHn8q5cDm3KnXSTkR7KCxLNp79IZdylVxcCqbn
-	T118W3/b5Z54P+4ti0fJDq4KkbCj5EY+nQS53SSIchnSQ0idSDvFqeQR4c9kp1RFpmDs
-	WlZG+za0P4z8YeRT0OYZGusRbibDkUajrQY5m9OKch3SBry/CWmznE5Ws/pQ+yqsfQfG
-	1g2NXYUyu5lcRsoQb/2U03HbeR1/K/+qIAgVQkR4X5TE8eJPJQE3L0/IdvlpzTWaY9ps
-	7dM6t26H7rTerq/Uv28oMqw3nE4oTHgyQTG2Gf+i7t4PW4QnC2BFcLCtmS1O5I91SbDP
-	41i2DOFIYuvXjxnbXt+W19S7YGnvknmzegrqblwwm+lB9S/Gbsz+sz8/GnnQIQHzs5vT
-	2bBHcmCjBKA12XfvUlIOuyWEL8zDcSu4Efdvm8gYMhb3g8fBY2jFbdw2Mglf0aeSabiX
-	2xkhbfgy0IQ0EqkMKZC3RxN+mm4hyV3nwlrqEoje9abjr8/CHUkgZ9TffloYNiQQ7aw1
-	1a5Za9Y05dZqEYcOCZS4aAPxqXn9gO9xV4SOHPB5kY2IZ9xAKB01EtaGfK5oaKbrYiii
-	oeFU19e+n7jOI33lq3F96St2vYJxL4dGu47Xon/A9VIgwiF70RcRaDjR9bzvdtfvQrmu
-	J0PDXQN+tA249tQi2+faFbrd9fBateUXATV7yBehOwZcD7Jsn+sBzL91jdpxb/zFO+LZ
-	orXqQjfuVbMb9ka4x/e5FvqyXTPxIg3rXV2+Ba5OX5Vrcm2EZg24Wthr+1zj/MddzWzp
-	AVc4vlBFfPZynwpxSXzZfN8BV058hUw2OpzkcvvGudIxf/6DW135vmtctYEIfeypppyA
-	r8m/tSJCz6lrsAyAsuyGeDbLf5A+Cqrm0un4BHDf3qZcwEy3DLjWINuxtyknlBXhPw5b
-	XHv9Tf61SBVIWUhTInRyOF/eJs+Wp8ilcp6cK2cjapshp8rJGovGpDFqDIiRaRCxFzSc
-	hmiSI7H3w3lM0pMlE8skgf0KatkEPqUqs4K18VGCA4tFJLIuZWmNvcYy0lzVWP9PfrrV
-	xu76vO/+cGBd/rPT9P6tuPjXvzu9o7+EFWLpHZd7//8KvXV4v7lt+d625WenqndHvQ29
-	3d6G7v7NS3HFd/VMt3vP2eWsg91i7J45ay7Le3r7l3t76/vPeuvde9rU9/6heyrrbvPW
-	7yFTGya375ka7q0faAu3sbuhHXtbG5pwDGORS2tturxWU8M/WauBTdbE1mpV3/uHtcaz
-	7la21ni21ni2Vmu4VV0rL69h3qQ68n8A3OoMbAplbmRzdHJlYW0KZW5kb2JqCjYyIDAg
-	b2JqCjkwMTgKZW5kb2JqCjYzIDAgb2JqCjw8IC9UeXBlIC9Gb250RGVzY3JpcHRvciAv
-	QXNjZW50IDc3MCAvQ2FwSGVpZ2h0IDY4NCAvRGVzY2VudCAtMjMwIC9GbGFncyAzMgov
-	Rm9udEJCb3ggWzEwIC0yMTggODI2IDc0MV0gL0ZvbnROYW1lIC9ESUpYRFIrSGVsdmV0
-	aWNhLUJvbGQgL0l0YWxpY0FuZ2xlCjAgL1N0ZW1WIDAgL01heFdpZHRoIDE1MDAgL1hI
-	ZWlnaHQgNTEzIC9Gb250RmlsZTIgNjEgMCBSID4+CmVuZG9iago2NCAwIG9iagpbIDI3
-	OCAwIDAgMCAwIDAgNzIyIDAgMCAwIDM4OSAwIDAgMzMzIDAgMCAwIDAgMCAwIDAgMCAw
-	IDAgMCAwIDAgMCAwIDAgMCAwCjAgNzIyIDcyMiA3MjIgNzIyIDY2NyA2MTEgNzc4IDAg
-	Mjc4IDAgMCA2MTEgMCA3MjIgMCA2NjcgMCA3MjIgNjY3IDYxMSA3MjIKMCAwIDY2NyAw
-	IDAgMCAwIDAgMCAwIDAgNTU2IDAgNTU2IDYxMSA1NTYgMzMzIDYxMSA2MTEgMjc4IDAg
-	MCAyNzggODg5IDYxMQo2MTEgNjExIDAgMzg5IDU1NiAzMzMgNjExIDAgMCAwIDU1NiBd
-	CmVuZG9iagoxNCAwIG9iago8PCAvVHlwZSAvRm9udCAvU3VidHlwZSAvVHJ1ZVR5cGUg
-	L0Jhc2VGb250IC9ESUpYRFIrSGVsdmV0aWNhLUJvbGQgL0ZvbnREZXNjcmlwdG9yCjYz
-	IDAgUiAvV2lkdGhzIDY0IDAgUiAvRmlyc3RDaGFyIDMyIC9MYXN0Q2hhciAxMjEgL0Vu
-	Y29kaW5nIC9NYWNSb21hbkVuY29kaW5nCj4+CmVuZG9iago2NSAwIG9iago8PCAvTGVu
-	Z3RoIDY2IDAgUiAvTGVuZ3RoMSAzMjY0IC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0
-	cmVhbQp4AY1Xa2wU1xU+Z2b2vX6sF8fAQrLjrW2Ml13jB6bY4MFe21ATB2xIdngYNrbx
-	OsVgEUOIUhQqOTTZKilq0iaKUoVESRyVVFlo1K6hVLQ0DVFQhNJWaktfUh7Q0qKmTfsD
-	43G/OzteG4VIXXxn7rl35t7vO+c75w7EROSlIyST1jecGKEYXcbIRbRdfQdHg8/+9pv3
-	EXEY9vHdI4PDu15/zQkb8zw4uOfh3Z1/eX8/kVxH5LiQHEj0f/rcdz4gct/E8yuSGJDe
-	s71C5ME8fSk5PHrorgrFBTsOu3rPvr5E3gYP3vc8DnvhcOLQiFQnjcHGOxTcmxgesIfD
-	a2H/AvbSkX0PjvIjfBb2P2GvGtk/MFL+3++9CQIC39NojH/i5yU7bcZ9I5WZI5I5+kUX
-	2ZpQzLttzmN2chD4kovc5LkxPc6KtIO66IOtZxesvP6rr3V+cuKFbw//+q0DV7Y8M9l4
-	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
-	bUvGsn8nZRmdk4qCK/0PdaDXwgplbmRzdHJlYW0KZW5kb2JqCjY2IDAgb2JqCjIxMDUK
-	ZW5kb2JqCjY3IDAgb2JqCjw8IC9UeXBlIC9Gb250RGVzY3JpcHRvciAvQXNjZW50IDgw
-	MCAvQ2FwSGVpZ2h0IDcxMSAvRGVzY2VudCAtMjM2IC9GbGFncyAzMgovRm9udEJCb3gg
-	WzMwIDAgNzQ0IDc2NF0gL0ZvbnROYW1lIC9QV0ROQ1grQmFua0dvdGhpYy1NZWRpdW0g
-	L0l0YWxpY0FuZ2xlCjAgL1N0ZW1WIDAgL01heFdpZHRoIDE4MzMgL1hIZWlnaHQgNTMz
-	IC9Gb250RmlsZTIgNjUgMCBSID4+CmVuZG9iago2OCAwIG9iagpbIDc0MyAwIDgwMiAw
-	IDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgNjQ2IDAgMCAwIDYwOCAwIDAgNzE4IDAg
-	MCAwIDAgMCA3MTIKNzE1IDYyOCAwIDY1MCA2NjMgNTkwIF0KZW5kb2JqCjIxIDAgb2Jq
-	Cjw8IC9UeXBlIC9Gb250IC9TdWJ0eXBlIC9UcnVlVHlwZSAvQmFzZUZvbnQgL1BXRE5D
-	WCtCYW5rR290aGljLU1lZGl1bSAvRm9udERlc2NyaXB0b3IKNjcgMCBSIC9XaWR0aHMg
-	NjggMCBSIC9GaXJzdENoYXIgODAgL0xhc3RDaGFyIDExNiAvRW5jb2RpbmcgL01hY1Jv
-	bWFuRW5jb2RpbmcKPj4KZW5kb2JqCjY5IDAgb2JqCjw8IC9MZW5ndGggNzAgMCBSIC9M
-	ZW5ndGgxIDE3MTIwIC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4AZ18CVwU
-	R9p3VfU9Z889A8gMDHKNCIpyGCLtASpoxAMEBAFFI/ECQVETDestGsXEI2qM5vLI5SjR
-	DBojOdfNJhuTmF1jNqvJarIXb9wsZpNVZr6nesCY/fZ73/f3TdPTXdXVPVXP83+eeo5q
-	EEYI6VALYpAya0FNPRHJMqh5H/b3Zi1t8hwS9hUhhB9HiLPOqb9/wdUn31mAEP8iQuz7
-	989fPmdGbeYshLRwT4o8d3ZNbXfm7ZkIZW2E+zPmQoXBx/8Dyp1Qjpu7oGnZ1sH6e6F8
-	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
-	HUUvcC/onrWJ2X01ZWg6N1031bYP7eP26XbYPuc+1100XbRddJpAiQlGkXOMlseY8h2X
-	8OfcZzrNGKaQGycU6vJso+0b8WZurU36jP9cuCJekC+YLjr56WKxaaqTKRTzTHlO5h5x
-	qGmIk/GJ/U1xTmYPj02yXGzUQSpFJ0Hue75OAu0pOTlRnG9zWm02509Etp2XjRIssOJ1
-	K7nzTrMJaYywMELSiU4bpbSLU6xyhK6ctVlt5JjtnO1bG/OxqmrrlBiZw/XcQVjacJ67
-	wH3J3eAECRY4pHFt3BUOvih3YpELHAqYLyG2Bss0IGutpkqBV9RCpclSiLTBd05O3/RB
-	kfZ/Za+ptNIPJK0XU+RCbLIhvZeZar6UZkv70tZfTN+aaOATsz98uh9PkirO7AyW7PWw
-	OHbg12x80PvSpQN7SHJPV8PHG7rwV7cuk0Ujnpr/YM8uOveg4CTmZeC7FW1WBkhGO6xb
-	BZVmMAgiyKpUrNFD1kFvBNoKBtBrBv15UWM0aCQen8YBuF9SHIxfsRgNRiwAQmUIxNqM
-	9kV6WKKFLx23eeh6XACqE9aq0PA3yo3ougkBcBr1uFvOVJOeld8Wez0sU2avp64OGKfD
-	6z9eyLz6UiLjk1O3PzrSasDr9vV8OuXh8UOCc56XnbHT57JJPd88tZ+ZdmvCqfl0XIjU
-	jN1fZC2vMubcRJEi1Vjol68m3uo7hq4EJ8GKkE/AVtWq7ekFuE94KHgfvP83Lziu57wQ
-	IuPAGrr7k4Q/QQNgR+QR9DocabmGOYSaYZ8F+0q2OnSFrYYlt6+hx7lI9Axcr+aaUQGU
-	J/XWT4RjM0vQR1D3NNxTAHsWMxbNgGMp7NPgnglwHEDr8RI0GPYB8IwMWoZ9MnMo9C1J
-	Ve9RoC29rw7uXwvPWw1H+hkGWydmcTTeCG9EdTL3MUF2L6zDaePfFFpEnXhKWiFd1szR
-	DtBe1E2G8MHjBqvhY2O18V1ZI79pGmu6aF5h/oPlaesw60Wbxx5l36jSKAkC7wwEuTig
-	mgweqwIZuAJYZ8CoVzG8M0UpD4ufYA5F+feNmjh+km/E4rqa+ffVLF68qDllXFPN/LpZ
-	1D9Aoe/HfxBK+H+8CZgEz2DgjTwj2MkWeN8xsvd9xmTwrdMg75oO78xlwNtrWeAz54HF
-	OgaNhRUABWDLjYc3/4pgOdFkNAX6WYKmoVJUBu9tVgTImlO1te53is+7A2R1+/xB7kUj
-	9KQenYOdoInwvQ32EOwMOkbqFTc+eN1/vfM6U3+95frB64z7etr1ouuwbh2OJFsvBUR0
-	ws0x6oEl6gGHS4iWlJBbMjJuJpXJZSYyVcwiRsg+wBxjzjEfMleYb+E9J0Gi8VGPlCYp
-	UhFkI4XsNjXx0SldkK5KNyS4rpW1Hlh0o2iLtBD0z27THtT6tZ3aC9qr2htaQTIKbiFV
-	yBUmgtGwSIDnC8eEc8KHsNjxWyEkCG7XRBdxOyc6CWgkV65LcdW7YDmoDKaC4qx3cnRR
-	Guh7scq2yEaqrIusBNlkW65NsdXbIPwpW3OtirXeCu1sNF8jnp95aSZZXrWpak/V0Sr2
-	SFWgipyvulRFlvs3+ff4j/rZI/6An5z3X/KT5d2blM3de7qPdrNHugPd5Hz3pW6yfMmm
-	JXuWHF3CHlkSWELOL7m0hCzfvWn3nt1Hd7NHdgd2k/O7L+0my6s3Ve+pPlrNHqkOVJPz
-	1ZeqyfLGTY17Go82skcaA43kfOOlRrK8eVPznuajzeyR5kAzOd98qZlIXIWtgmQvr9hU
-	safiaMXNCu5IRaCCnK+4VEECeNqJL1j3WTwNfRHqQiyy4+9OnGXcAfyd4jgrMvZVG2cZ
-	w191XcPcdV33DIPsaGr7eydFelSc9AReB8ZIwvAuFMrPB4CaTaJyhlCoSvj1EyVZ8LQz
-	J0oUOHScKFnhHqHFL6Mm/AykqOz4JThbC0C04+fbm/xJ8NCyE7CCEN6VAJCSvRA8mQAt
-	RgKE7bigvekvGdBiXHvTmylwdCr6kmT39/Dkr0uS3F/VBrghJ9yfNNH1mfIi+ztQ91bJ
-	KPebJTvcZ2ll+yL7saYA2XvC/fTFDkcHN+SUfU9JinsnXFvYPtW+Fo72dsX+IG3zqntF
-	05dD7EtL1PYL4ZK3fZR9Phyfaa+239/UYf8z/Jh9BlSIr95rn15y2F0e/v3SWrjlFfe0
-	knPuEdEwFVTAANz4VVShXwHDseNTqJkbhWGJDbwA0oi/BDfBjovunN0HZ/Mg2mXHhe2N
-	f8+yn8YWVE32nnLfrLjf3d3coU+A/tv/0dihrYRO2v/eeGWI/VpFB332KfvbFcPcbzR3
-	0MefsPubO8S38Gsn7Lsb1TFsaOywn6N9XlPdwWvwhBP2JX0ni0AHwE/MrPC6qxoDeLBi
-	GGPPB+WRj4ph2ZXUdoZoIfjYhh9SCoS2kNB2WWhrF9qeFdo2CW2rhbZlQtsCoW220DZL
-	aCsT4sRY0SNGi1FihOiENKhVNIsyLKbTiRqYQXmRhUW4AJRlHQAQjP0WppAUThmJlxT6
-	O2ehwpke//dTvAGsmVTu57wjsd9ciAqnjnT6s3yFoDwm+zN9hX6xaHrpcYy3wqtRG9X3
-	3wLYRcvrIumrbx3w2Nh1j0TSY2jdI2WALbB0//1DfdefPriwaHkHsKm2XXD/IPh8hVOg
-	2EaLbbTo7OffVTil1P98vzL/YHoS6ldW6F80xVNR2kF8JClvdAe8eQqHstIO3EN88N4c
-	1OMeeB2v0P8HtRlqgmpo5qMHaMb8EzXRZqiJ+SdtBhwItytW26Ha3nbab1Gx2q5Y+63a
-	jsXhdiUkGZ6HGugBnme5ikrUdiWWq2o7bghtd/xibd7o47XwBW0cX6GLapuLjq+gDSr0
-	h9s0NkKbCvgqKz1+pRFaHG+8Qp/hv1d9hHq5Wb3cgQVEG3QATAW1yY6fmlSHm5A1fU3I
-	GmiC6wsD+B9TSk/kx+TnbR4NI2W+oaUatXSioSQ/b64XXrr875vVFv+vmjVd7G0Gi33/
-	4wcWrP/Pn9kjcV4dYLKwqPS4iEaWjQI60mM70WoAYNWRMWUj7XL9cBVtmg9ybZGn0UvM
-	35EWXtbTwDueWu9IlJsLL2Hl4FRe5+ehSoCdYvOeGOeqyNMswkfU1jqo1vdeShmRMoJe
-	YuEfPcCDDFBt7L3kXHVPTORpfKT3kgzVJhCOuwaDGpuWzGicAd//+Q/NaISrjU1NfUfa
-	+u5dpQqta2qEPyghP8mbGyD35c31K5vhZUp485SnFRN7K2K9owFAtZP9Lhjt/wE/2Oay
-	CmVuZHN0cmVhbQplbmRvYmoKNzAgMCBvYmoKMTMwNjMKZW5kb2JqCjcxIDAgb2JqCjw8
-	IC9UeXBlIC9Gb250RGVzY3JpcHRvciAvQXNjZW50IDkzNiAvQ2FwSGVpZ2h0IDgzMiAv
-	RGVzY2VudCAtMjEyIC9GbGFncyA5NgovRm9udEJCb3ggWy0xNiAtMjEwIDcxNSA3Mjhd
-	IC9Gb250TmFtZSAvRk5DT0xRK0FyaWFsTmFycm93LUl0YWxpYyAvSXRhbGljQW5nbGUK
-	LTkuNjk5OTk3IC9TdGVtViAwIC9NYXhXaWR0aCAxMDUyIC9YSGVpZ2h0IDYyNCAvRm9u
-	dEZpbGUyIDY5IDAgUiA+PgplbmRvYmoKNzIgMCBvYmoKWyAyMjggMCAwIDAgMCAwIDAg
-	MCAwIDAgMzE5IDAgMjI4IDAgMjI4IDAgNDU2IDAgNDU2IDAgMCAwIDAgMCA0NTYgMCAw
-	IDAgMAowIDAgMCAwIDU0NyA1NDcgNTkyIDAgMCAwIDYzOCAwIDIyOCAwIDAgMCA2ODMg
-	NTkyIDAgNTQ3IDAgNTkyIDU0NyA1MDEgNTkyCjAgMCAwIDAgMCAwIDAgMCAwIDAgMCA0
-	NTYgNDU2IDQxMCA0NTYgNDU2IDIyOCA0NTYgNDU2IDE4MiAwIDAgMTgyIDY4MyA0NTYK
-	NDU2IDQ1NiAwIDI3MyA0MTAgMjI4IDQ1NiA0MTAgNTkyIDAgNDEwIF0KZW5kb2JqCjEx
-	IDAgb2JqCjw8IC9UeXBlIC9Gb250IC9TdWJ0eXBlIC9UcnVlVHlwZSAvQmFzZUZvbnQg
-	L0ZOQ09MUStBcmlhbE5hcnJvdy1JdGFsaWMgL0ZvbnREZXNjcmlwdG9yCjcxIDAgUiAv
-	V2lkdGhzIDcyIDAgUiAvRmlyc3RDaGFyIDMyIC9MYXN0Q2hhciAxMjEgL0VuY29kaW5n
-	IC9NYWNSb21hbkVuY29kaW5nCj4+CmVuZG9iagoxIDAgb2JqCjw8IC9UaXRsZSAoVW50
-	aXRsZWQpIC9BdXRob3IgKEplZmZyZXkgT3ZlcmJleSkgL0NyZWF0b3IgKE9tbmlHcmFm
-	ZmxlKSAvUHJvZHVjZXIKKE1hYyBPUyBYIDEwLjUuOCBRdWFydHogUERGQ29udGV4dCkg
-	L0NyZWF0aW9uRGF0ZSAoRDoyMDEwMDMwNTIxMzI0M1owMCcwMCcpCi9Nb2REYXRlIChE
-	OjIwMTAwMzA1MjEzMjQzWjAwJzAwJykgPj4KZW5kb2JqCnhyZWYKMCA3MwowMDAwMDAw
-	MDAwIDY1NTM1IGYgCjAwMDAxMzE1MDcgMDAwMDAgbiAKMDAwMDA3NDAzOCAwMDAwMCBu
-	IAowMDAwMDA4MTY5IDAwMDAwIG4gCjAwMDAwNzM4NzUgMDAwMDAgbiAKMDAwMDAwMDAy
-	MiAwMDAwMCBuIAowMDAwMDA4MTQ5IDAwMDAwIG4gCjAwMDAwMDgyNzQgMDAwMDAgbiAK
-	MDAwMDA3MzEyNyAwMDAwMCBuIAowMDAwMDcyMTc2IDAwMDAwIG4gCjAwMDAxMDExMTMg
-	MDAwMDAgbiAKMDAwMDEzMTMyMyAwMDAwMCBuIAowMDAwMTA0ODg5IDAwMDAwIG4gCjAw
-	MDAwODcwMzEgMDAwMDAgbiAKMDAwMDExNDcwNyAwMDAwMCBuIAowMDAwMDA4NTM3IDAw
-	MDAwIG4gCjAwMDAwMTEzNjMgMDAwMDAgbiAKMDAwMDAxMTM4NCAwMDAwMCBuIAowMDAw
-	MDEyNzA3IDAwMDAwIG4gCjAwMDAwMTI3MjggMDAwMDAgbiAKMDAwMDAxMzE0NCAwMDAw
-	MCBuIAowMDAwMTE3NDQ1IDAwMDAwIG4gCjAwMDAwOTI0ODggMDAwMDAgbiAKMDAwMDA3
-	MDU5OSAwMDAwMCBuIAowMDAwMDMxNTQxIDAwMDAwIG4gCjAwMDAwNjYzNDUgMDAwMDAg
-	biAKMDAwMDA3MTMxMSAwMDAwMCBuIAowMDAwMDEzMTY0IDAwMDAwIG4gCjAwMDAwMzE1
-	MTkgMDAwMDAgbiAKMDAwMDA3MzgzOCAwMDAwMCBuIAowMDAwMDY2MzY3IDAwMDAwIG4g
-	CjAwMDAwNjk5MDMgMDAwMDAgbiAKMDAwMDA2OTkyNCAwMDAwMCBuIAowMDAwMDcwNTc5
-	IDAwMDAwIG4gCjAwMDAwNzA2MzYgMDAwMDAgbiAKMDAwMDA3MTI5MSAwMDAwMCBuIAow
-	MDAwMDcxMzQ4IDAwMDAwIG4gCjAwMDAwNzIxNTYgMDAwMDAgbiAKMDAwMDA3MjIxMiAw
-	MDAwMCBuIAowMDAwMDczMTA3IDAwMDAwIG4gCjAwMDAwNzMxNjMgMDAwMDAgbiAKMDAw
-	MDA3MzgxOCAwMDAwMCBuIAowMDAwMDczOTU4IDAwMDAwIG4gCjAwMDAwNzQxNjQgMDAw
-	MDAgbiAKMDAwMDA3NDA4NiAwMDAwMCBuIAowMDAwMDc0MjQyIDAwMDAwIG4gCjAwMDAw
-	ODY0OTMgMDAwMDAgbiAKMDAwMDA4NjUxNSAwMDAwMCBuIAowMDAwMDg2NzM5IDAwMDAw
-	IG4gCjAwMDAwODcyMDggMDAwMDAgbiAKMDAwMDA5MjE5MyAwMDAwMCBuIAowMDAwMDky
-	MjE0IDAwMDAwIG4gCjAwMDAwOTI0NDAgMDAwMDAgbiAKMDAwMDA5MjY2NyAwMDAwMCBu
-	IAowMDAwMTAwNjI0IDAwMDAwIG4gCjAwMDAxMDA2NDUgMDAwMDAgbiAKMDAwMDEwMDg2
-	NyAwMDAwMCBuIAowMDAwMTAxMjg4IDAwMDAwIG4gCjAwMDAxMDQ1ODIgMDAwMDAgbiAK
-	MDAwMDEwNDYwMyAwMDAwMCBuIAowMDAwMTA0ODM3IDAwMDAwIG4gCjAwMDAxMDUwNzUg
-	MDAwMDAgbiAKMDAwMDExNDE4NCAwMDAwMCBuIAowMDAwMTE0MjA1IDAwMDAwIG4gCjAw
-	MDAxMTQ0MzEgMDAwMDAgbiAKMDAwMDExNDg4NyAwMDAwMCBuIAowMDAwMTE3MDgyIDAw
-	MDAwIG4gCjAwMDAxMTcxMDMgMDAwMDAgbiAKMDAwMDExNzMyOSAwMDAwMCBuIAowMDAw
-	MTE3NjI4IDAwMDAwIG4gCjAwMDAxMzA3ODIgMDAwMDAgbiAKMDAwMDEzMDgwNCAwMDAw
-	MCBuIAowMDAwMTMxMDQzIDAwMDAwIG4gCnRyYWlsZXIKPDwgL1NpemUgNzMgL1Jvb3Qg
-	NDIgMCBSIC9JbmZvIDEgMCBSIC9JRCBbIDw3YjI2NmE4Y2FiYmM0YTI4ZWUyMzAzMWNm
-	MTQwNTdhZj4KPDdiMjY2YThjYWJiYzRhMjhlZTIzMDMxY2YxNDA1N2FmPiBdID4+CnN0
-	YXJ0eHJlZgoxMzE3MTYKJSVFT0YKMSAwIG9iago8PC9BdXRob3IgKEplZmZyZXkgT3Zl
-	cmJleSkvQ3JlYXRpb25EYXRlIChEOjIwMTAwMjI0MjE1MzAwWikvQ3JlYXRvciAoT21u
-	aUdyYWZmbGUgNS4yLjEpL01vZERhdGUgKEQ6MjAxMDAzMDUyMTMyMDBaKS9Qcm9kdWNl
-	ciAoTWFjIE9TIFggMTAuNS44IFF1YXJ0eiBQREZDb250ZXh0KS9UaXRsZSAocGhvdHJh
-	bl9hcmNoaXRlY3R1cmUuZ3JhZmZsZSk+PgplbmRvYmoKeHJlZgoxIDEKMDAwMDEzMzMz
-	NSAwMDAwMCBuIAp0cmFpbGVyCjw8L0lEIFs8N2IyNjZhOGNhYmJjNGEyOGVlMjMwMzFj
-	ZjE0MDU3YWY+IDw3YjI2NmE4Y2FiYmM0YTI4ZWUyMzAzMWNmMTQwNTdhZj5dIC9JbmZv
-	IDEgMCBSIC9QcmV2IDEzMTcxNiAvUm9vdCA0MiAwIFIgL1NpemUgNzM+PgpzdGFydHhy
-	ZWYKMTMzNTUxCiUlRU9GCg==
-	</data>
-	<key>QuickLookThumbnail</key>
-	<data>
-	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
-	AAABAAAAANCCAAAAAAABAAAAANCCAAAAAAABAABuZGluAAAAAAAAADAAAKNAAABXgAAA
-	SwAAAJwAAAAmtwAAEpsAAFBAAABUQAACNcMAAjXDAAI1w2Rlc2MAAAAAAAAACERpc3Bs
-	YXkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-	AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABtbHVjAAAAAAAAAAUAAAAMZW5V
-	UwAAAA4AAABMZnJGUgAAADAAAABaamFKUAAAABIAAACKaXRJVAAAAA4AAACcZXNFUwAA
-	ABAAAACqAEQAaQBzAHAAbABhAHkATQBvAG4AaQB0AGUAdQByACAAZABlACAAdAB5AHAA
-	ZQAgAGkAbgBjAG8AbgBuAHVODWYOMG4wxzCjMLkw1zDsMKQATQBvAG4AaQB0AG8AcgBQ
-	AGEAbgB0AGEAbABsAGEAAG1tb2QAAAAAAAA2mAAAAwBRVJ7kxjEPgAAAAAAAAAAAAAAA
-	AAAAAAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSwgSW5jLiwgMjAxMAA=
-	</data>
-	<key>ReadOnly</key>
-	<string>NO</string>
-	<key>RowAlign</key>
-	<integer>1</integer>
-	<key>RowSpacing</key>
-	<real>36</real>
-	<key>SheetTitle</key>
-	<string>Canvas 1</string>
-	<key>SmartAlignmentGuidesActive</key>
-	<string>YES</string>
-	<key>SmartDistanceGuidesActive</key>
-	<string>YES</string>
-	<key>UniqueID</key>
-	<integer>1</integer>
-	<key>UseEntirePage</key>
-	<false/>
-	<key>VPages</key>
-	<integer>2</integer>
-	<key>WindowInfo</key>
-	<dict>
-		<key>CurrentSheet</key>
-		<integer>0</integer>
-		<key>ExpandedCanvases</key>
-		<array>
-			<dict>
-				<key>name</key>
-				<string>Canvas 1</string>
-			</dict>
-		</array>
-		<key>FitInWindow</key>
-		<true/>
-		<key>Frame</key>
-		<string>{{0, 42}, {1024, 704}}</string>
-		<key>ListView</key>
-		<true/>
-		<key>OutlineWidth</key>
-		<integer>142</integer>
-		<key>RightSidebar</key>
-		<false/>
-		<key>ShowRuler</key>
-		<true/>
-		<key>Sidebar</key>
-		<true/>
-		<key>SidebarWidth</key>
-		<integer>120</integer>
-		<key>VisibleRegion</key>
-		<string>{{-64, -11.9999}, {1495.51, 925.234}}</string>
-		<key>Zoom</key>
-		<real>0.59444445371627808</real>
-		<key>ZoomValues</key>
-		<array>
-			<array>
-				<string>Canvas 1</string>
-				<real>0.0</real>
-				<real>5.070000171661377</real>
-			</array>
-		</array>
-	</dict>
-	<key>saveQuickLookFiles</key>
-	<string>YES</string>
-</dict>
-</plist>

diff --git a/org.eclipse.photran-dev-docs/dev-guide/images/editor_hierarchy.png b/org.eclipse.photran-dev-docs/dev-guide/images/editor_hierarchy.png
deleted file mode 100644
index 22fce3a..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/images/editor_hierarchy.png
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-dev-docs/dev-guide/images/parser_chain.png b/org.eclipse.photran-dev-docs/dev-guide/images/parser_chain.png
deleted file mode 100644
index d70d8aa..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/images/parser_chain.png
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-dev-docs/dev-guide/images/parsetree1.png b/org.eclipse.photran-dev-docs/dev-guide/images/parsetree1.png
deleted file mode 100644
index 3fef6fc..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/images/parsetree1.png
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-dev-docs/dev-guide/images/photran_architecture.pdf b/org.eclipse.photran-dev-docs/dev-guide/images/photran_architecture.pdf
deleted file mode 100644
index 6ef6a59..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/images/photran_architecture.pdf
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-dev-docs/dev-guide/images/photran_architecture.png b/org.eclipse.photran-dev-docs/dev-guide/images/photran_architecture.png
deleted file mode 100644
index 3842074..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/images/photran_architecture.png
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-dev-docs/dev-guide/images/sample_vpg.png b/org.eclipse.photran-dev-docs/dev-guide/images/sample_vpg.png
deleted file mode 100644
index 2fa759e..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/images/sample_vpg.png
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-dev-docs/dev-guide/images/simple_fortran_AST.png b/org.eclipse.photran-dev-docs/dev-guide/images/simple_fortran_AST.png
deleted file mode 100644
index de23b89..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/images/simple_fortran_AST.png
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-dev-docs/dev-guide/images/vpg_db_er.png b/org.eclipse.photran-dev-docs/dev-guide/images/vpg_db_er.png
deleted file mode 100644
index 12c45c7..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/images/vpg_db_er.png
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-dev-docs/dev-guide/prologue.ltx-inc b/org.eclipse.photran-dev-docs/dev-guide/prologue.ltx-inc
deleted file mode 100644
index 86057ec..0000000
--- a/org.eclipse.photran-dev-docs/dev-guide/prologue.ltx-inc
+++ /dev/null

@@ -1,49 +0,0 @@
-% Use Times New Roman instead of Computer Modern
-\usepackage{times}
-
-% Unnumbered footnotes
-\long\def\symbolfootnote[#1]#2{\begingroup\def\thefootnote{\fnsymbol{footnote}}
-\footnote[#1]{#2}\endgroup}
-
-% Use 1-inch margins
-\usepackage{fullpage}
-
-% Image/graphics support
-\usepackage[pdftex]{graphicx}
-\usepackage{rotating} % for sidewaysfigure
-\usepackage{color} 
-\definecolor{LightMagenta}{cmyk}{0.1,0.8,0,0.1} 
-
-% For nicely-formatted source code displays
-\usepackage{listings}
-\lstset{numbers=left, numberstyle=\tiny, tabsize=2, numbersep=5pt, captionpos=b,
-basicstyle=\footnotesize, showstringspaces=false,
-emphstyle=\color{LightMagenta}\bfseries, language=Java}
-
-% Hyperlinks
-\usepackage[pdftex]{hyperref}
-\hypersetup{
-    colorlinks,%
-    citecolor=black,%
-    filecolor=black,%
-    linkcolor=black,%
-    urlcolor=blue
-}
-
-\usepackage{float}
-\floatstyle{ruled}
-\newfloat{image}{htp}{lop}[chapter]
-\floatname{image}{Figure}
-
-\newfloat{code}{htp}{lop}[chapter]
-\floatname{code}{Listing}
-
-\usepackage{shadow}
-
-% Adjust spacing to minimize the amount of hyphenation
-\hyphenpenalty=5000
-\tolerance=1000
-
-% Skip a line between paragraphs, and don't indent them
-\setlength{\parskip}{10pt}  % 10 pt = space between paragraphs
-\setlength{\parindent}{0pt} % 0 pt  = indentation
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/eclipse-config/photran-code-formatter-settings.xml b/org.eclipse.photran-dev-docs/eclipse-config/photran-code-formatter-settings.xml
deleted file mode 100755
index c98606f..0000000
--- a/org.eclipse.photran-dev-docs/eclipse-config/photran-code-formatter-settings.xml
+++ /dev/null

@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<profiles version="8">
-<profile name="Jeff" version="8">
-<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="20"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="18"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="18"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="20"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="20"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="20"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_comments" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
-<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="100"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
-<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-</profile>
-</profiles>

diff --git a/org.eclipse.photran-dev-docs/eclipse-config/photran-ibm-codetemplates.xml b/org.eclipse.photran-dev-docs/eclipse-config/photran-ibm-codetemplates.xml
deleted file mode 100644
index 4d6c3b4..0000000
--- a/org.eclipse.photran-dev-docs/eclipse-config/photran-ibm-codetemplates.xml
+++ /dev/null

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><templates><template autoinsert="true" context="gettercomment_context" deleted="false" description="Comment for getter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name="gettercomment">/**
- * @return the ${bare_field_name}
- */</template><template autoinsert="true" context="settercomment_context" deleted="false" description="Comment for setter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.settercomment" name="settercomment">/**
- * @param ${param} the ${bare_field_name} to set
- */</template><template autoinsert="true" context="constructorcomment_context" deleted="false" description="Comment for created constructors" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name="constructorcomment">/**
- * ${tags}
- */</template><template autoinsert="false" context="filecomment_context" deleted="false" description="Comment for created Java files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.filecomment" name="filecomment">/*******************************************************************************
- * Copyright (c) ${year} IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    IBM Research - Initial API and implementation
- *******************************************************************************/</template><template autoinsert="false" context="typecomment_context" deleted="false" description="Comment for created types" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.typecomment" name="typecomment">/**
- * 
- * @author ${user}
- */</template><template autoinsert="true" context="fieldcomment_context" deleted="false" description="Comment for fields" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name="fieldcomment">/**
- * 
- */</template><template autoinsert="true" context="methodcomment_context" deleted="false" description="Comment for non-overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name="methodcomment">/**
- * ${tags}
- */</template><template autoinsert="true" context="overridecomment_context" deleted="false" description="Comment for overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name="overridecomment">/* (non-Javadoc)
- * ${see_to_overridden}
- */</template><template autoinsert="true" context="delegatecomment_context" deleted="false" description="Comment for delegate methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name="delegatecomment">/**
- * ${tags}
- * ${see_to_target}
- */</template><template autoinsert="true" context="newtype_context" deleted="false" description="Newly created files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.newtype" name="newtype">${filecomment}
-${package_declaration}
-
-${typecomment}
-${type_declaration}</template><template autoinsert="true" context="classbody_context" deleted="false" description="Code in new class type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.classbody" name="classbody">
-</template><template autoinsert="true" context="interfacebody_context" deleted="false" description="Code in new interface type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name="interfacebody">
-</template><template autoinsert="true" context="enumbody_context" deleted="false" description="Code in new enum type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.enumbody" name="enumbody">
-</template><template autoinsert="true" context="annotationbody_context" deleted="false" description="Code in new annotation type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name="annotationbody">
-</template><template autoinsert="true" context="catchblock_context" deleted="false" description="Code in new catch blocks" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.catchblock" name="catchblock">// ${todo} Auto-generated catch block
-${exception_var}.printStackTrace();</template><template autoinsert="true" context="methodbody_context" deleted="false" description="Code in created method stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodbody" name="methodbody">// ${todo} Auto-generated method stub
-${body_statement}</template><template autoinsert="true" context="constructorbody_context" deleted="false" description="Code in created constructor stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name="constructorbody">${body_statement}
-// ${todo} Auto-generated constructor stub</template><template autoinsert="true" context="getterbody_context" deleted="false" description="Code in created getters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template><template autoinsert="true" context="setterbody_context" deleted="false" description="Code in created setters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${param};</template></templates>
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/eclipse-config/photran-uiuc-codetemplates.xml b/org.eclipse.photran-dev-docs/eclipse-config/photran-uiuc-codetemplates.xml
deleted file mode 100644
index 03a2384..0000000
--- a/org.eclipse.photran-dev-docs/eclipse-config/photran-uiuc-codetemplates.xml
+++ /dev/null

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><templates><template autoinsert="true" context="gettercomment_context" deleted="true" description="Comment for getter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name="gettercomment">/**
- * @return the ${bare_field_name}
- */</template><template autoinsert="true" context="settercomment_context" deleted="true" description="Comment for setter method" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.settercomment" name="settercomment">/**
- * @param ${param} the ${bare_field_name} to set
- */</template><template autoinsert="true" context="constructorcomment_context" deleted="true" description="Comment for created constructors" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name="constructorcomment">/**
- * ${tags}
- */</template><template autoinsert="false" context="filecomment_context" deleted="true" description="Comment for created Java files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.filecomment" name="filecomment">/*******************************************************************************
- * Copyright (c) ${year} University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/</template><template autoinsert="false" context="typecomment_context" deleted="true" description="Comment for created types" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.typecomment" name="typecomment">/**
- * 
- * @author ${user}
- */</template><template autoinsert="true" context="fieldcomment_context" deleted="true" description="Comment for fields" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name="fieldcomment">/**
- * 
- */</template><template autoinsert="true" context="methodcomment_context" deleted="true" description="Comment for non-overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name="methodcomment">/**
- * ${tags}
- */</template><template autoinsert="true" context="overridecomment_context" deleted="true" description="Comment for overriding methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name="overridecomment">/* (non-Javadoc)
- * ${see_to_overridden}
- */</template><template autoinsert="true" context="delegatecomment_context" deleted="true" description="Comment for delegate methods" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name="delegatecomment">/**
- * ${tags}
- * ${see_to_target}
- */</template><template autoinsert="true" context="newtype_context" deleted="true" description="Newly created files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.newtype" name="newtype">${filecomment}
-${package_declaration}
-
-${typecomment}
-${type_declaration}</template><template autoinsert="true" context="classbody_context" deleted="true" description="Code in new class type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.classbody" name="classbody">
-</template><template autoinsert="true" context="interfacebody_context" deleted="true" description="Code in new interface type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name="interfacebody">
-</template><template autoinsert="true" context="enumbody_context" deleted="true" description="Code in new enum type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.enumbody" name="enumbody">
-</template><template autoinsert="true" context="annotationbody_context" deleted="true" description="Code in new annotation type bodies" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name="annotationbody">
-</template><template autoinsert="true" context="catchblock_context" deleted="true" description="Code in new catch blocks" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.catchblock" name="catchblock">// ${todo} Auto-generated catch block
-${exception_var}.printStackTrace();</template><template autoinsert="true" context="methodbody_context" deleted="true" description="Code in created method stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.methodbody" name="methodbody">// ${todo} Auto-generated method stub
-${body_statement}</template><template autoinsert="true" context="constructorbody_context" deleted="true" description="Code in created constructor stubs" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name="constructorbody">${body_statement}
-// ${todo} Auto-generated constructor stub</template><template autoinsert="true" context="getterbody_context" deleted="true" description="Code in created getters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.getterbody" name="getterbody">return ${field};</template><template autoinsert="true" context="setterbody_context" deleted="true" description="Code in created setters" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.setterbody" name="setterbody">${field} = ${param};</template></templates>
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/misc-notes/Fortran 95 Feature Coverage.xls b/org.eclipse.photran-dev-docs/misc-notes/Fortran 95 Feature Coverage.xls
deleted file mode 100644
index 2ed49b2..0000000
--- a/org.eclipse.photran-dev-docs/misc-notes/Fortran 95 Feature Coverage.xls
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-dev-docs/misc-notes/cdt-outline-view-icons.txt b/org.eclipse.photran-dev-docs/misc-notes/cdt-outline-view-icons.txt
deleted file mode 100644
index 74a6013..0000000
--- a/org.eclipse.photran-dev-docs/misc-notes/cdt-outline-view-icons.txt
+++ /dev/null

@@ -1,18 +0,0 @@
-How do icons make their way into the CDT Outline view?
-
-The Outline view basically displays one translation unit's (file's) part
-of the CModel (ICElement hierarchy).  The icons displayed are based on
-the types of the individual ICElements in the hierarchy (see
-ICElement.getElementType()).
-
-CContentOutlinePage creates a DecoratingCLabelProvider around a
-StandardCElementLabelProvider, which inherits from an
-AppearanceAwareLabelProvider, which inherits from CUILabelProvider,
-which uses a CElementImageProvider to load icons from the resource bundle
-for the UI plugin by creating URLs to the individual icons.
-
-See CElementImageProvider#getImageLabel, which calls
-getCImageDescriptor, which calls getBaseImageDescriptor, which is where
-there lies a giant case statement lies, which returns the ImageDescriptor.
-
---JO 6/28/05

diff --git a/org.eclipse.photran-dev-docs/misc-notes/cs427fa08-mp5-summary.pdf b/org.eclipse.photran-dev-docs/misc-notes/cs427fa08-mp5-summary.pdf
deleted file mode 100644
index 0c95543..0000000
--- a/org.eclipse.photran-dev-docs/misc-notes/cs427fa08-mp5-summary.pdf
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/deployment.txt b/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/deployment.txt
deleted file mode 100644
index e72669a..0000000
--- a/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/deployment.txt
+++ /dev/null

@@ -1,28 +0,0 @@
-% removed from app-cvs.ltx-inc
-
-\vspace{1em}
-\noindent\textbf{Part~IV. Deploying Photran Feature}
-\begin{enumerate}
-	\setcounter{enumi}{\value{running_counter}}
-	\item If you are interested in creating a \emph{deployable feature} for
-        Photran, you also need to check out these \textbf{additional} four 
-        projects from CVS:
-				\begin{itemize}
-					\item org.eclipse.photran-feature
-          \item org.eclipse.photran.intel-feature
-					\item org.eclipse.photran.vpg-feature
-					\item org.eclipse.photran.xlf-feature
-				\end{itemize}
-	\item In Eclipse, select File $>$ Export\ldots
-	\item In the dialog that pops-up, select Plug-in Development $>$ Deployable features.
-	\item Click next.
-	\item In the list, select
-		\begin{itemize}
-			\item org.eclipse.photran\_feature (4.0.4)
-			\item org.eclipse.photran.intel (4.0.4)
-			\item org.eclipse.photran.vpg\_feature (4.0.4)
-			\item org.eclipse.photran.xlf\_feature (4.0.4)
-		\end{itemize}		
-	\item Specify a destination folder to export those features. Click Finish.
-	\item The Photran features are ready for deployment.
-\end{enumerate}
\ No newline at end of file

diff --git a/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-03-cdt.tex b/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-03-cdt.tex
deleted file mode 100644
index d9a7cf5..0000000
--- a/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-03-cdt.tex
+++ /dev/null

@@ -1,191 +0,0 @@
-% CDT Integration
-
-Previous versions of Photran were developed by hacking the CDT: essentially,
-we made the user interface say ``Fortran'' instead of ``C/C++,'' we replaced the
-model builder (which creates the Outline view, among other things) with one
-that ran a Fortran parser, we changed the list of file extensions, and we
-modified the syntax highlighting code to recognize Fortran comments and
-keywords.
-
-Starting with Photran 3.0, we are taking a fundamentally different approach:
-\begin{itemize}
-\item We rename the C/C++ Perspective to the Make Perspective.  We replace
-the four project types (C Standard Make Project, C++ Standard Make Project,
-C Managed Make Project, and C++ Managed Make Project) with two generic
-project types (Standard Make Project and Managed Make Project).  We also
-change the launcher's menu item to read ``Run Local Application'' rather
-than ``Run Local C Application.''  These are all superficial changes
-(i.e., changes to labels and icons, not to the underlying code).  The
-Make project types use the natures formerly used for C projects.
-\item We add an extension point to the CDT which allows it to recognize
-other languages besides C and C++.
-\end{itemize}
-
-\section{Integrating with the CDT: The \texttt{AdditionalLanguages}
-            Extension Point}
-
-The org.eclipse.photran.xyzsamplelang project is a simple example of how
-to integrate a new language into the CDT.  Its README is included in an
-appendix.
-
-Essentially, the process of integrating a new language into the CDT works
-as follows:
-\begin{itemize}
-
-\item Create a new plug-in with an editor.  (Obviously, you will eventually
-want to customize the editor for your language.)
-
-\item For each filename extension supported by your editor (i.e., each
-filename extension for files in your language), declare a (text) content type.
-\begin{verbatim}
-   <extension point="org.eclipse.core.runtime.contentTypes">
-      <content-type id="xyzSource" name="XYZ Language Source File"
-            base-type="org.eclipse.core.runtime.text"
-            priority="high"/>
-      <file-association
-            content-type="xyzSource"
-            file-extensions="xyz"/>
-   </extension>
-\end{verbatim}
-
-\item Specify org.eclipse.cdt.core as a dependency of your plug-in, and
-declare in your \texttt{plugin.xml} that you are extending the
-org.eclipse.cdt.core.AdditionalLanguages extension point.
-\begin{verbatim}
-   <extension point="org.eclipse.cdt.core.AdditionalLanguages">
-      <language class="addl_langs.XYZLanguage"/>
-   </extension>
-\end{verbatim}
-You must provide the fully-qualified name of a class
-(\texttt{addl\_langs.XYZLanguage}, in this case which implements the
-\texttt{org.eclipse.cdt.core.addl\_langs.IAdditionalLanguage} interface.
-
-\item Fill in the definition of that class.  See the JavaDoc in
-\texttt{IAdditionalLanguage} for more information.
-\begin{itemize}
-\item \texttt{getName} just returns the name of the language
-(Fortran, XYZ Sample Language, etc.)
-\item \texttt{getRegisteredContentTypeIds} returns a list of all of
-the content types you declared above.  The content type names must
-be fully qualified, i.e., the name of the plug-in followed by the name
-of the content type, e.g., \texttt{XyzLanguagePlugIn.xyzSource}
-or \texttt{org.eclipse.photran.core.fortranSource}.
-\item \texttt{createModelBuilder} returns a model builder for your
-language.  Look at the \texttt{ToyModelBuilder} in the XYZ Sample Language
-project for a (trivial) example of how a model builder works, and
-see the JavaDoc for \texttt{IModelBuilder} for a more complete description.
-In essence,
-\begin{itemize}
-\item It must implement \texttt{IModelBuilder}.
-\item Its constructor takes a \texttt{TranslationUnit}, i.e., the file
-for which a model needs to be created.
-\item The \texttt{parse} method return a Map taking
-\texttt{ICElement}s to \texttt{CElementInfo}s, which contains all of the
-elements that should appear in the Outline for the translation unit
-specified in the constructor.  Use can either reuse the various implementations
-of \texttt{ICElement} in the CDT (\texttt{Macro, Namespace,
-FunctionDeclaration,} etc.), or you can create your own (with their own
-icons) by implementing \texttt{IAdditionalLanguageElement}.
-\end{itemize}
-\end{itemize}
-
-\item In the constructor for your editor, use the CDT UI plug-in's document
-provider rather than your own, i.e.,
-\begin{verbatim}
-setDocumentProvider(CUIPlugin.getDefault().getDocumentProvider());
-\end{verbatim}
-
-\item Since you don't have your own document provider anymore, set up
-your partitioner by overriding
-\begin{verbatim}
-protected void doSetInput(IEditorInput input)
-\end{verbatim}
-and setting it up there.
-
-\item Reuse the Outline page provided by CDT by copying the following
-field and methods from \texttt{FortranEditor} into
-your editor (notice that we are passing \texttt{null} into the
-constructor for \texttt{CEditorOutlinePage}; this doesn't seem to hurt
-anything):
-\begin{verbatim}
-    protected CContentOutlinePage fOutlinePage;
-
-    public Object getAdapter(Class required) { ... }
-
-    public CContentOutlinePage getOutlinePage() { ... }
-
-    public static void setOutlinePageInput(CContentOutlinePage page,
-            IEditorInput input) { ... }
-\end{verbatim}
-
-\item If you want your editor to jump to the correct location when something
-is selected in the Outline view, it needs to implement
-\texttt{ISelectionChangedListener}.  (If you don't require this, remove
-the line ``\texttt{fOutlinePage.addSelectionChangedListener(this);}''
-from the code copied above.)  We implemented \texttt{ISelectionChangedListener}
-by copying the following methods verbatim from \texttt{CEditor}:
-\begin{verbatim}
-    public void selectionChanged(SelectionChangedEvent event) { ... }
-
-    private boolean isActivePart() { ... }
-
-    public void setSelection(ISourceRange element, boolean moveCursor) { ... }
-\end{verbatim}
-
-\item If you want to be able to set breakpoints in your editor, add this
-line to the constructor for your editor class:
-\begin{verbatim}
-    // JO: This gives you a "Toggle Breakpoint" action (and others)
-    // when you right-click the Fortran editor's ruler
-    setRulerContextMenuId("#CEditorRulerContext"); //$NON-NLS-1$
-\end{verbatim}
-
-\item If you want the CDT's Refactor menu to appear in your editor, add this
-line to the constructor for your editor class:
-\begin{verbatim}
-    // JO: This will put the Refactor menu in the editor's
-    // context menu, among other things
-    setEditorContextMenuId("#CEditorContext"); //$NON-NLS-1$
-\end{verbatim}
-
-\end{itemize}
-
-\section{Photran-CDT Integration}
-
-Photran is integrated into the CDT in the same way described above.
-\begin{itemize}
-
-\item The Photran Core plug-in
-defines a class \texttt{FortranLanguage}, which implements
-\texttt{IAdditionalLanguage}, and hooks it into the (new)
-\texttt{AdditionalLanguages} extension point in the CDT core.
-
-\item Photran's Core plugin.xml defines a content type
-\texttt{org.eclipse.photran.core.fortranSource}; \texttt{FortranLanguage}
-notifies the CDT that we want it to treat this content type as a valid
-source language.
-
-\item We provide a \texttt{FortranModelBuilder}, which
-runs our Fortran parser over a source file to create a CDT-compatible
-model.
-
-\begin{itemize}
-
-\item Rather than using the CDT's model elements, we provide our own
-model elements, which are all subclasses of \texttt{FortranElement}.
-(\texttt{FortranElement} implements \texttt{IAdditionalLanguageElement}.)
-
-\item The icons corresponding to \texttt{FortranElement}s
-are stored in the org.eclipse.photran.cdtinterface plug-in.\footnote{
-The Photran UI plug-in would be the logical place to store these icons.
-However, the UI already has the Core as a dependency.  The icon requests
-come from the \texttt{FortranElement}s in the Core, so if they had to be
-retrieved from the UI, we would introduce a circular dependency.  So we put
-them in their own plug-in.}
-
-\end{itemize}
-
-\item The Core plug-in also contributes several error parsers,
-which are described in the next section.
-
-\end{itemize}

diff --git a/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-06-parser.tex b/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-06-parser.tex
deleted file mode 100644
index 8a0cf42..0000000
--- a/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-06-parser.tex
+++ /dev/null

@@ -1,185 +0,0 @@
-% The Photran Lexers and Parser
-
-The Fortran 95 lexers and parser are stored in the org.eclipse.photran.parser
-project.  Because this project takes several minutes and a lot of memory
-(600-800 MB) to compile, it is exported as a (non-sealed) JAR archive,
-\texttt{f95parser.jar}, which is stored in the Core plug-in.  The Core,
-Managed Builder, and UI use classes from this JAR file, not from the
-org.eclipse.photran.parser project.  So you do \textit{not} need the
-org.eclipse.photran.parser project in your workspace unless you will be
-regenerating this JAR file.
-
-\section{Accessing the Lexers and Parser from Photran: The
-         \texttt{FortranProcessor}}
-
-(The following does \textit{not} apply to JUnit tests.)
-
-To scan or parse a file, or to build a symbol table from a parse tree,
-create a \texttt{FortranProcessor} and use it.  It knows how to distinguish
-between fixed and free form file extensions based on the user's workspace
-preferences and can determine whether or not parser debugging has been
-enabled (also in the workspace preferences).
-
-Examples:
-\begin{itemize}
-\item Parsing a file: See \texttt{FortranModelBuilder\#parse}
-\item Lexing a file without parsing:
-      See \texttt{FortranPartitionScanner\#documentChanged}
-\item Creating a symbol table after a file has been parsed:
-      (TODO-Jeff: No good examples yet)
-\end{itemize}
-
-\section{Structure of the Lexers and Parser}
-
-Unfortunately, Fortran is not an easy language to process.  It has two
-\textit{source forms,} and keywords are not reserved (so it's fine to call a
-variable ``if'').  This greatly complicates lexical analysis.  To make
-things as simple as possible, we have separated the lexical analysis into
-several phases, depending on whether the input is in free form or fixed
-form.
-
-When a free form source file is being parsed...
-\begin{itemize}
-
-\item \texttt{FreeFormLexerPhase1}, which is generated from
-\texttt{FreeFormLexerPhase1.flex} by JFlex, splits the input into tokens.
-Tokens such as ``if,'' ``do,'' ``len=,'' etc. are labeled as keywords,
-even if they are being used as identifiers (it doesn't know any better).
-
-\item \texttt{FreeFormLexerPhase2} reads the token stream from
-\texttt{FreeFormLexerPhase1} and buffers an entire statement worth of
-tokens.  It then uses Sale's algorithm and an elaborate set of rules
-(specified in the method \texttt{buildAdditionalRules}) to determine which
-keyword tokens should be kept as keywords and which ones should actually
-be identifiers.  In the case of ``keywords'' with an equal sign on the end
-(such as ``len=''), if that token should really be an identifier, it is
-split into two tokens: the identifier ``len'' and the = token T\_EQUALS.
-
-\item The \texttt{Parser}, which is generated from \texttt{Fortran95.bnf}
-by my parser generator, reads the tokens from \texttt{FreeFormLexerPhase2}
-and parses the token stream, returning a parse tree.  The parse tree is
-described in more detail later.
-
-\end{itemize}
-
-When a fixed form source file is being parsed...
-\begin{itemize}
-
-\item \texttt{FixedFormLexerPrepass} discards whitespace and comments
-and concatenates continuation lines.
-
-\item \texttt{FixedFormLexerPhase1}, which is generated from
-\texttt{FreeFormLexerPhase1.flex} by JFlex, splits the input into tokens.
-Essentially, it is identical to \texttt{FreeFormLexerPhase1}, except that
-there are no rules for whitespace, comments, or line continuations.
-
-\item \texttt{FreeFormLexerPhase2} reads the token stream from
-\texttt{FixedFormLexerPhase1}, resolving identifiers as it does for free form
-input.
-
-\item \texttt{FixedFormLexerPhase2} reads the token stream from
-\texttt{FreeFormLexerPhase2} and concatenates consecutive identifiers.
-
-\item The \texttt{Parser} reads the tokens from \texttt{FixedFormLexerPhase2}.
-
-\end{itemize}
-
-\section{Parse Trees}
-
-\subsection{Overview}
-\textit{
-\textbf{NOTE.}
-We expect that you already know what a parse tree is and what the difference
-is between abstract and concrete syntax.  Terms like ``terminal,''
-``nonterminal,'' and ``token'' should be familiar.  If they are not,
-you will need to spend some time with the Dragon book\footnote{Aho, Sethi,
-and Ullman, \textit{Compilers: Principles, Techniques, and Tools}} before
-tackling this section.}
-
-When you call one of the \texttt{parse} methods on a \texttt{FortranProcessor},
-either an exception will be thrown (if the lexer or parser encounters an
-error), or the method will return a (non-null) parse tree.
-
-A parse tree is just a tree of \texttt{ParseTreeNode}s with \texttt{Token}s
-as leaves.  The \texttt{ParseTreeNode} returned by the \texttt{parse} method
-is the root of the parse tree.
-
-The parse tree for a program \textit{exactly} follows the derivation of the
-program from the grammar in \texttt{Fortran95.bnf}.  It is literally a
-parse tree, also known as a concrete syntax tree; it is \textit{not} an
-abstract syntax tree (AST).\footnote{If you want to know why we didn't use an
-abstract syntax tree, see the appendix on Miscellaneous Parser and Language
-Processing Notes.} 
-
-It is important to remember that the grammar in
-\texttt{Fortran95.bnf} is different than the one in the Fortran standard.
-The grammar in the Fortran standard is \textit{not} LALR(1)---not even
-close---and so it had to be modified (quite heavily) to successfully
-generate a parser from it.  So the parse trees you get from our parser are
-\textit{not} always going to match what the Fortran standard grammar would
-lead you to expect.  For example, there is no SFExpr in the Fortran standard
-grammar, but you will find them popping up in your parse trees.
-
-\textbf{TIP.}
-When running Photran, go into your workspace preferences; in the Fortran Parser
-section, there is an (very useful) option to ``display parse tree rather
-than normal Outline view.''
-
-\subsection{An Example}
-
-\begin{figure}[h]
-\centering
-\includegraphics[width=5in]{images/parsetree1.png}
-\caption{Sample program and its parse tree}
-\label{parsetree}
-\end{figure}
-
-Figure \ref{parsetree} shows a trivial program and its parse tree.
-
-\begin{itemize}
-
-\item The node labels in angle brackets, such as $<$xExecutableProgram$>$ and
-$<$xProgramStmt$>$, are nonterminals in the grammar and correspond to
-\texttt{ParseTreeNodes} in the parse tree.\footnote{Note that $<$Free Form
-Source$>$ (at the top of the Outline view) is just a label and not part of
-the parse tree.}
-
-\item Terminals in the grammar have names starting with T\_: for example,
-T\_PROGRAM is the ``program'' keyword and T\_IDENT is an identifier.
-Notice that the carriage return is also a token: end-of-statement (T\_EOS).
-In the figure, these identify \texttt{Token}s in the parse
-tree.\footnote{The distinction between terminals and tokens is somewhat
-subtle.  Terminals are things like ``identifier,'' ``plus sign,'' and
-``float'' that appear in a grammar.  Tokens are the actual chunks of text
-from your input file, such as ``hello,'' ``+,'' and ``3.14.''  Every token
-\textit{corresponds} to a terminal, e.g., ``hello'' is an identifier,
-``+'' is (the only representation of) a plus sign, and ``3.14'' is a
-float.}
-
-\end{itemize}
-
-Recall that each parse tree node corresponds to a nonterminal (on the
-left-hand side of a production in the grammar) and each token corresponds
-to a terminal.  
-
-You can determine the nonterminal corresponding to a \texttt{ParseTreeNode}
-by invoking \texttt{ParseTreeNode\#getRootNonterminal}.  (This method name
-will soon be changed to \texttt{getCorrespondingNonterminal} or something
-more intuitive like that.)  This will return a \texttt{Nonterminal}.  The
-only valid \texttt{Nonterminal}s are all constants in the \texttt{Nonterminal}
-class, so you can do identity comparisons like this:
-\begin{verbatim}
-if (parseTreeNode.getRootNonterminal() == Nonterminal.XEXECUTABLEPROGRAM) ...
-\end{verbatim}
-
-Similarly, you can determine the terminal corresponding to a token by
-calling \texttt{Token\#getTerminal} and doing an identity comparison, as in
-\begin{verbatim}
-if (token.getTerminal() == Terminal.T_IDENT) ...
-\end{verbatim}
-You can get the text of the token (``Hello'' for the only T\_IDENT in
-Figure \ref{parsetree}) by calling \texttt{Token\#getText}.
-
-\texttt{Terminal}s and \texttt{Nonterminal}s both have a
-\texttt{getDescription} method which returns a (String) description of that
-terminal or nonterminal, e.g., ``T\_IDENT'' or ``$<$xExecutableProgram$>$.''

diff --git a/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-07-analysis.tex b/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-07-analysis.tex
deleted file mode 100644
index 114ab68..0000000
--- a/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-07-analysis.tex
+++ /dev/null

@@ -1,194 +0,0 @@
-% Parse Tree Analysis
-
-\textit{NOTE.  This section assumes that you are familiar with the Visitor
-pattern\footnote{See Gamma, Helm, Johnson, and Vlissides, \textit{Design
-Patterns}} and are familiar with symbol tables\footnote{See Aho, Sethi, and
-Ullman, \textit{Compilers: Principles, Techniques, and Tools}}.}
-
-\section{Visitors}
-
-When you want to retrieve structural information about a program, typically
-it will be done using a Visitor on the parse tree.
-
-There are two types of Visitors available in Photran.
-\begin{itemize}
-
-\item A \texttt{ParseTreeVisitor} has a ``callback'' method for each nonterminal
-in the grammar.  The tree is traversed in preorder, and as each node is visited,
-a call is made to the Visitor method corresponding to the nonterminal for that node.
-This is usually the preferred Visitor to use.
-
-\item A \texttt{GenericParseTreeVisitor} only distinguishes between
-\texttt{ParseTreeNode}s and \texttt{Token}s.  This Visitor should only be used
-when all internal nodes are treated similarly.  If you need to distinguish between
-the types of internal nodes, use a \texttt{ParseTreeVisitor} instead.
-
-\end{itemize}
-
-(\texttt{ParseTreeVisitor} is generated by the parser generator and should not
-be modified.)
-
-In addition to the visit methods, both types of Visitors have a
-\texttt{preparingToVisitChildrenOf} method, which is called after a node has
-been visited but before its children have, and a \texttt{doneVisitingChildrenOf}
-method, which is called immediately after its children have been visited but
-before any sibling nodes have.
-
-\subsection{Creating and Using a Visitor}
-
-Create a visitor by subclassing \texttt{ParseTreeVisitor} or
-\texttt{GenericParseTreeVisitor}.  By default, all of the visit methods do
-nothing, so you only have to override the methods that are useful to you.
-
-Given the root of the parse tree (i.e., the \texttt{ParseTreeNode} returned
-by \texttt{FortranProcessor\#parse}), use the \texttt{visitUsing} method
-to traverse the parse tree; pass your visitor as the only argument.
-
-\subsection{Sample Traversals}
-
-As an example, consider again the ``do nothing'' program from Figure \ref{parsetree}.
-
-When it is visited using a \texttt{GenericParseTreeVisitor}, the Visitor
-methods are called in this order (methods called between \texttt{preparingToVisitChildrenOf}
-and \texttt{doneVisitingChildrenOf} are indented to illustrate that child nodes
-are being visited):
-
-\begin{verbatim}
-visitParseTreeNode(<xExecutableProgram>)
-preparingToVisitChildrenOf(<xExecutableProgram>)
-  visitParseTreeNode(<xProgramUnit>)
-  preparingToVisitChildrenOf(<xProgramUnit>)
-    visitParseTreeNode(<xMainProgram>)
-    preparingToVisitChildrenOf(<xMainProgram>)
-      visitParseTreeNode(<xProgramStmt>)
-      preparingToVisitChildrenOf(<xProgramStmt>)
-        visitToken(T_PROGRAM: "program")
-        visitParseTreeNode(<xProgramName>)
-        preparingToVisitChildrenOf(<xProgramName>)
-          visitToken(T_IDENT: "Hello")
-        doneVisitingChildrenOf(<xProgramName>)
-        visitToken(T_EOS: (end of line))
-      doneVisitingChildrenOf(<xProgramStmt>)
-      visitParseTreeNode(<xMainRange>)
-      preparingToVisitChildrenOf(<xMainRange>)
-        visitParseTreeNode(<xEndProgramStmt>)
-        preparingToVisitChildrenOf(<xEndProgramStmt>)
-          visitToken(T_END: "end")
-          visitToken(T_PROGRAM: "program")
-          visitToken(T_EOS: (end of line))
-        doneVisitingChildrenOf(<xEndProgramStmt>)
-      doneVisitingChildrenOf(<xMainRange>)
-    doneVisitingChildrenOf(<xMainProgram>)
-  doneVisitingChildrenOf(<xProgramUnit>)
-doneVisitingChildrenOf(<xExecutableProgram>)
-\end{verbatim}
-
-When it is visited using a \texttt{ParseTreeVisitor}, the Visitor
-methods are called in this order:
-
-\begin{verbatim}
-visitXexecutableprogram(<xExecutableProgram>)
-preparingToVisitChildrenOf(<xExecutableProgram>)
-  visitXprogramunit(<xProgramUnit>)
-  preparingToVisitChildrenOf(<xProgramUnit>)
-    visitXmainprogram(<xMainProgram>)
-    preparingToVisitChildrenOf(<xMainProgram>)
-      visitXprogramstmt(<xProgramStmt>)
-      preparingToVisitChildrenOf(<xProgramStmt>)
-        visitXprogramname(<xProgramName>)
-        preparingToVisitChildrenOf(<xProgramName>)
-        doneVisitingChildrenOf(<xProgramName>)
-      doneVisitingChildrenOf(<xProgramStmt>)
-      visitXmainrange(<xMainRange>)
-      preparingToVisitChildrenOf(<xMainRange>)
-        visitXendprogramstmt(<xEndProgramStmt>)
-        preparingToVisitChildrenOf(<xEndProgramStmt>)
-        doneVisitingChildrenOf(<xEndProgramStmt>)
-      doneVisitingChildrenOf(<xMainRange>)
-    doneVisitingChildrenOf(<xMainProgram>)
-  doneVisitingChildrenOf(<xProgramUnit>)
-doneVisitingChildrenOf(<xExecutableProgram>)
-\end{verbatim}
-
-(The Visitors used to generate the output above are stored in
-a JUnit test class called \texttt{ExampleVisitor}.)
-
-\section{The \texttt{ParseTreeSearcher}}
-
-Inside Visitor methods, typically you will want to look for particular tokens
-or syntactic structures.
-
-\subsection{An Example}
-
-Consider the following (randomly selected) method from \texttt{DeclarationCollector},
-one of the classes used for building symbol tables.
-This class scans a program's parse tree, looking for declarations of programs, functions,
-block data, namelists, etc., and inserts declarations for them into a symbol table.
-
-\begin{verbatim}
-    public void visitXmainprogram(ParseTreeNode node)
-    {
-        // # R1101 desn"t ensure ordering as the standard requires;
-        // <xMainProgram> ::=
-        //   <xMainRange> |
-        //   <xProgramStmt> <xMainRange> ;
-        // # R1102
-        // <xProgramStmt> ::=
-        //   <xLblDef> T_PROGRAM <xProgramName> T_EOS ;
-        ParseTreeNode programStmt = ParseTreeSearcher.findFirstNodeIn(node, Nonterminal.XPROGRAMSTMT);
-        Token name;
-        if (programStmt != null)
-	        name = ParseTreeSearcher.findFirstIdentifierIn(node);
-        else
-        {
-	        name = new Token();
-	        name.setText("(Anonymous Main Program)");
-        }
-        ...
-\end{verbatim}
-
-(The comment lines are copied from the parser generation grammar, \texttt{Fortran95.bnf}.)
-
-In Fortran, a main program can either start with a program statement, or it
-can not.  So both of these are valid programs:
-\begin{verbatim}
-program SayHi
-  print *, 'Hello!'                             print *, 'Hello!'
-end program SayHi                             end program SayHi
-\end{verbatim}
-
-In this Visitor method, \texttt{node} is guaranteed to be a $<$xMainProgram$>$,
-due to the name of the method.  As shown, by looking at the grammar, we can
-determine that it will either have one child (a \texttt{ParseTreeNode} corresponding
-to an $<$xMainRange$>$) or two children (both \texttt{ParseTreeNode}s, the
-first corresponding to an $<$xProgramStmt$>$ and the second corresponding to
-an $<$xMainRange$>$.
-
-If it \textit{does} have an $<$xProgramStmt$>$, then, a quick look at the rules for
-$<$xLblDef$>$ (an optional integer label that can appear at the beginning of any
-Fortran statement) and $<$xProgramName$>$ will make it evident that the first
-identifier token (T\_IDENT) under the $<$xProgramStmt$>$ is the name of the program.
-
-So now we can understand what this method does.
-\begin{itemize}
-
-\item It checks to see if the main program has a $<$xProgramStmt$>$.  This is done
-by calling \texttt{ParseTreeSearcher\#findFirstNodeIn}, and telling it we want to
-find the first $<$xProgramStmt$>$ that is a child of \texttt{node}.  It will either
-return a \texttt{ParseTreeNode} corresponding to an $<$xProgramStmt$>$, or if it
-can't find one, it will return \texttt{null}.
-
-\item If there is an $<$xProgramStmt$>$, it grabs the first T\_IDENT token, which
-tells the name the user gave to the program.
-
-\item If there was no $<$xProgramStmt$>$, the program does not have a name, so we
-``fake'' a token and name the program ``(Anonymous Main Program).''
-\end{itemize}
-
-\subsection{For More Information}
-
-So, essentially, anytime you have a parse tree (or a subtree of the parse tree)
-and you want to find a particular node or token, use one of the methods in
-\texttt{ParseTreeSearcher}.  If there isn't one, you may have to write one yourself.
-Be sure to look at the JavaDoc for the methods in that class; unless you are
-doing something bizarre, one of the existing methods should work.

diff --git a/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-08-symtbls.tex b/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-08-symtbls.tex
deleted file mode 100644
index 90b3835..0000000
--- a/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-08-symtbls.tex
+++ /dev/null

@@ -1,103 +0,0 @@
-% Symbol Tables
-
-All of the symbol table routines are stored in the ``parser'' folder under the
-Core plug-in.
-
-After you have parsed a file, you can create a symbol table for it by calling
-\texttt{FortranProcessor\#createSymbolTableFromParseTree}.  This, in turn calls
-the static method \texttt{SymbolTable\#createSymbolTableFor}, which is intended
-to be the sole entrypoint for symbol table building.
-
-\section{Contents of a Symbol Table}
-
-The classes representing symbol table entries are stored in the
-\texttt{org.eclipse.photran.internal.core.f95parser.symboltable.entries}
-package.  Currently, the following are allowed.
-\begin{itemize}
-\item Main Programs
-\item Modules
-\item Functions
-\item Subroutines
-\item Derived Types
-\item Block Data
-\item Namelists
-\item Common Blocks
-\item Interfaces
-\item Externals
-\item Intrinsics
-\item Variables
-\end{itemize}
-
-\texttt{FortranProcessor\#createSymbolTableFromParseTree} returns a
-\texttt{SymbolTable}, which represents the global symbol table for
-the program that was parsed.
-
-A \texttt{SymbolTable} is essentially just a collection of
-\texttt{SymbolTableEntry} objects.  Each \texttt{SymbolTableEntry} has
-a child symbol table.  For \texttt{FunctionEntry} objects, this child
-table contains all of the parameters, the return variable, and any
-local variables declared inside the function.  For \texttt{VariableEntry}
-objects, which represent local variables, the child table will always
-be empty (it is there only for uniformity).
-
-Symbol tables also keep track of whether an ``implicit'' rule applies,
-what external modules are being used (via USE statements), etc.
-
-To see what's in a symbol table, just use the \texttt{toString} method.
-Child tables will be indented in the output.
-
-The symbol table-related classes are JavaDoc'd, so additional information
-is available there.
-
-\section{\texttt{SymbolTableVisitor}s}
-
-You can also create a Visitor for a program's symbol table hierarchy
-by subclassing \texttt{SymbolTableVisitor}, which has a visit method
-for each type of \texttt{SymbolTableEntry}.
-
-\section{The Module Database}
-
-Similar to \textit{import} statements in Java, Fortran programs can USE a
-module defined in a different Fortran file.  Unfortunately, there is no
-easy way to tell where this module might be defined.  The user simply specifies
-a list of ``module paths'' which are searched for Fortran source files.
-Each Fortran source file must be checked to see if it contains a module
-with the given name.
-
-In Photran, the list of modules paths is stored in a workspace preference,
-although we plan to convert this to a project property.
-
-The class \texttt{ModuleLoader} is responsible for locating modules in this
-way.  The \texttt{ModuleDB} caches the symbol tables for files on the module
-path so they don't all have to be reparsed every time a module is searched for.
-Neither of these is complete yet, but they will be soon.
-
-\section{How Symbol Tables are Built}
-
-A quick look at \texttt{FortranProcessor\#createSymbolTableFromParseTree}
-explains how symbol tables are built:
-\begin{verbatim}
-    public static SymbolTable createSymbolTableFor(ParseTreeNode parseTree) throws Exception
-    {
-        SymbolTable tbl = (new DeclarationCollector(parseTree)).getSymbolTable();
-        Intrinsics.fill(tbl);
-        return (new ReferenceCollector(tbl, parseTree)).getSymbolTable();
-    }
-\end{verbatim}
-
-\begin{itemize}
-
-\item A Visitor is run over the parse tree to collect declarations of
-programs, modules, functions, subroutines, block data, derived types,
-namelists, etc.---anything that can be stored in the symbol table.
-
-\item The names of all Fortran 95 intrinsic functions and subroutines
-are inserted into the table.
-
-\item Now that declarations have been inserted, the parse tree is scanned
-for references (i.e., uses of a function, variable, namelist, etc.).
-If implicit variables have been allowed, the \texttt{ReferenceCollector} will
-detect those (since they are used but not declared) and insert them into the
-symbol table.
-
-\end{itemize}

diff --git a/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-09-refac-suppt.tex b/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-09-refac-suppt.tex
deleted file mode 100644
index f49a4f0..0000000
--- a/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-09-refac-suppt.tex
+++ /dev/null

@@ -1,123 +0,0 @@
-% Refactoring Support: Source Printing and Program Editing
-
-Aside from the usual front end components (parser and symbol tables), a
-refactoring tool requires
-\begin{itemize}
-\item a means of manipulating the parse tree, i.e., moving nodes around,
-deleting them, and inserting new ones; and
-\item a means of outputting ``revised'' source code after a parse tree has
-been manipulated.
-\end{itemize}
-
-We will look at the means of outputting source code first, discussing
-the \texttt{Presentation} and \texttt{SourcePrinter} classes.
-We will then discuss the \texttt{ProgramEditor}, which allows you to
-manipulate the parse tree and \texttt{Presentation}.
-
-\section{The \texttt{Presentation} and the \texttt{Program}}
-
-While the parse tree for a program stores all of the ``important'' tokens
-(identifiers, parentheses, etc.), other things---comments, line continuations,
-and C preprocessor directives---are not in the Fortran grammar.  However,
-when the source printer produces source code from a parse tree, it needs to
-include these as well.
-
-We refer to these things (comments, line continuations, C preprocessor
-directives, Fortran INCLUDE statements, and anything else that does not
-end up in a parse tree) as \textit{non-tree tokens}, and we represent them
-by the class \texttt{NonTreeToken}.  A \texttt{Presentation} is essentially
-a list of all the non-tree tokens that appeared in a parse.
-
-A \texttt{Presentation} can be created from a parse by calling the
-\texttt{getNonTreeTokens} method on the lexer and passing the resulting
-\texttt{List<NonTreeToken>} to the \texttt{Presentation} constructor.
-
-A \texttt{Program} is just parse tree paired with a symbol table and a
-\texttt{Presentation}.
-
-\section{Presentation Blocks}
-
-Since \texttt{Token}s in the parse tree and \texttt{NonTreeToken}s in
-a program's \texttt{Presentation} have a lot in common, we will refer to
-them collectively as ``presentation blocks.''  Not surprisingly, they
-share a common superclass (interface, rather): \texttt{IPresentationBlock}.
-JavaDoc removed, it looks like this:
-
-\begin{verbatim}
-public interface IPresentationBlock
-{
-    public abstract String getFilename();
-    public abstract void setFilename(String value);
-
-    public abstract int getStartLine();
-    public abstract void setStartLine(int value);
-
-    public abstract int getStartCol();
-    public abstract void setStartCol(int value);
-
-    public abstract int getEndLine();
-    public abstract void setEndLine(int value);
-
-    public abstract int getEndCol();
-    public abstract void setEndCol(int value);
-
-    public abstract int getOffset();
-    public abstract void setOffset(int value);
-
-    public abstract int getLength();
-    public abstract void setLength(int value);
-
-    public abstract String getText();
-    public abstract void setText(String value);
-}
-\end{verbatim}
-
-Intuitively, then, all presentation blocks know what file they originated from,
-where they were in the file (both in terms of line/column and offset/length),
-and exactly what their text looked like.  (This is important since capitalization
-does not matter in Fortran.)
-
-Most importantly, this means that reproduce the source code of a program verbatim
-from a parse tree and a \texttt{Presentation}.  (The only difference will be the
-use of spaces vs. tabs to make sure tokens appear in the correct column on a line.)
-All comments and formatting will be retained.
-
-\section{The \texttt{SourcePrinter}}
-
-The job of the source printer (class \texttt{SourcePrinter}) is to take a
-a parse tree and corresponding \texttt{Presentation}
-and produce source code from it.
-
-Since every \texttt{Token} in the parse tree and every \texttt{NonTreeToken}
-in the \texttt{Presentation} knows what line and column it should appear on,
-this is easy.
-
-\section{The \texttt{ProgramEditor}}
-
-Essentially, a refactoring needs to change the parse tree for a program.  It
-may change existing nodes, move them around, remove them altogether, or insert
-new nodes.
-
-As described above, though, source code is produced by looking at the line/column
-offsets of the \texttt{Token}s in the parse tree and interleaving comments and
-other non-tree tokens from a program's \texttt{Presentation}.
-
-When we add, move, change, or delete a subtree of the parse tree, then,
-we must do three things:
-\begin{itemize}
-\item adjust the positions of the \texttt{Token}s in that subtree,
-\item adjust the positions of the related \texttt{NonTreeToken}s
-(e.g., the comments describing a method and C preprocessor directives in its
-definition)
-\item adjust the positions of all of the presentation blocks that appear after
-the modified subtree.  For example, if you change an token's text from
-``Hello'' to ``Goodbye,'' every presentation block after that one will have
-its offset incremented by 2, and every presentation block to the right of
-that token on the same line will also have its starting column number incremented
-by 2.
-\end{itemize}
-
-The (static) methods in \texttt{ProgramEditor} are used to add, move, modify,
-and delete subtrees.
-
-This class will be described more as it stabilizes.

diff --git a/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-10-refactoring.tex b/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-10-refactoring.tex
deleted file mode 100644
index b3b147c..0000000
--- a/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-10-refactoring.tex
+++ /dev/null

@@ -1,153 +0,0 @@
-% Refactoring: Preconditions and Implementation
-
-From an implementation standpoint, a refactoring consists of
-\begin{itemize}
-\item a set of \textit{initial preconditions},
-\item input from the user,
-\item a set of \textit{final preconditions}, and
-\item a program manipulation.
-\end{itemize}
-
-As an example, consider the easiest of all refactorings: Rename.
-\begin{itemize}
-\item \textbf{Initial preconditions:}
-    \begin{itemize}
-    \item The token to rename should be an identifier.
-    \item The identifier must correspond to an entry in the symbol table.
-    \item If Rename is limited to certain entities, say, variables and subprograms,
-          the symbol table entry should indicate that the identifier corresponds
-          to a variable or subprogram.
-    \end{itemize}
-\item \textbf{User input:}
-    \begin{itemize}
-    \item New name for the variable or subprogram
-    \end{itemize}
-\item \textbf{Final preconditions:}
-    \begin{itemize}
-    \item The new name must be a valid identifier.
-    \item The new name must be different from the old name.
-    \item The new name must not already exist in its namespace.
-    \item For every reference to the old name, a change to the new name should uniquely
-          identify the same variable or function.  For example, if you are renaming a
-          global variable from \texttt{a} to \texttt{b}, but a local variable \texttt{b}
-          will end up shadowing the global variable and cause one of its references to
-          ``go wrong,'' then the rename cannot continue.
-    \end{itemize}
-\item \textbf{Program manipulation:}
-    \begin{itemize}
-    \item Locate the declaration of the entity being renamed, and locate all
-          references in all files in the workspace, and change the token text
-          to the new name.
-    \end{itemize}
-\end{itemize}
-
-The distinction between initial and final preconditions, then, is that
-initial preconditions must be satisfied before the user is asked for input,
-while final preconditions depend on the user's input.  If a refactoring does
-not require user input, it will have no final preconditions.
-
-\section{Running a Refactoring}
-
-Running a refactoring looks something like this.\footnote{The
-\texttt{if (!...) throw ...} is an obvious code smell that makes it look like
-the various methods in \texttt{RenameRefactoring} should be throwing exceptions
-rather than returning booleans.  The current structure makes more sense in
-``real'' code, where the user is being assaulted with dialog boxes and other
-things happen between each of the steps.}
-
-\begin{verbatim}
-        RenameRefactoring r = new RenameRefactoring(getProgram(), targetToken);
-        if (!r.checkInitialPreconditions()) throw new Error(r.getErrorMessage());
-        r.setNewName("Whatever");
-        if (!r.checkFinalPreconditions()) throw new Error(r.getErrorMessage());
-        if (!r.perform()) throw new Error(r.getErrorMessage());
-\end{verbatim}
-
-In other words, you
-\begin{itemize}
-\item check the initial preconditions,
-\item get input from the user,
-\item check the final preconditions, and
-\item finally perform the refactoring.
-\end{itemize}
-At any point, if a step has failed, you can call \texttt{r.getErrorMessage()}
-to get an explanation suitable for displaying to the user.
-
-\section{The \texttt{FortranRefactoring} Class}
-
-All Fortran refactorings must be subclasses of \texttt{FortranRefactoring}.
-\texttt{FortranRefactoring} (or its superclass) provides
-\begin{itemize}
-\item an instance variable \texttt{error}, the contents of which will be
-      returned
-      when the user calls \texttt{getErrorMessage()}.  If the refactoring fails,
-      before returning false, be sure to set this so the user knows why.
-\item Two \texttt{List}s of \texttt{Precondition}s:
-      \texttt{initialPreconditions}
-      and \texttt{finalPreconditions}.  Add preconditions to the former in the
-      constructor and the latter after input has been received from the user.
-\item Two fields, \texttt{initialPreconditionsCheckedAndPassed} and
-      \texttt{finalPreconditionsCheckedAndPassed}.  For example, you will want
-      to assert that the initial preconditions have been checked and passed
-      before checking the final preconditions.
-\end{itemize}
-
-\section{Preconditions}
-
-Refactoring preconditions are stored in the package
-\texttt{org.eclipse.photran.internal.core.refactoring.preconditions}.
-They are all derived from the class \texttt{AbstractPrecondition}.
-
-A precondition (i.e., a class derived from \texttt{AbstractPrecondition})
-has:
-\begin{itemize}
-\item a \texttt{List} of prerequisite preconditions, and
-\item a method for checking this precondition.
-\end{itemize}
-
-To check a precondition, call its \texttt{check} method.  After this method
-has been called once, it ``remembers'' whether it succeeded or failed, so
-future calls to \texttt{check} will just return the stored result rather than
-performing the entire check again.\footnote{It is very possible that a
-precondition will be checked manually, and then it will be checked again
-because it is a prerequisite for another precondition.  This resolves any
-inefficiences that might result because of this.}
-
-To implement how a precondition is checked, override the abstract method
-\texttt{checkThisPrecondition} method.  If any other preconditions need
-to be checked before this one, add them to the \texttt{prereqPreconditions}
-list in the constructor.  If the code in \texttt{checkThisPrecondition} is
-called, they have all been satisfied.
-
-The fields \texttt{parseTree}, \texttt{presentation}, and \texttt{symbolTable}
-will be populated when the constructor is called.  You will almost definitely
-need to use these in your implementation of \texttt{checkThisPrecondition}.
-
-\section{Implementing a Refactoring}
-
-\begin{itemize}
-
-\item If you need any preconditions that don't exist yet, implement them
-      as described above.
-
-\item Create a subclass of \texttt{FortranRefactoring}.
-
-\item In the constructor, call \texttt{super} and add preconditions
-      to the \texttt{initialPreconditions} field.
-
-\item Implement any methods to store input from the user.  At the beginning
-      of these methods, you will probably want to assert
-      \texttt{initialPreconditionsCheckedAndPassed}.
-
-\item Implement \texttt{perform}.  You will want to assert that all user
-      input is in place as well as asserting
-      \texttt{finalPreconditionsCheckedAndPassed}.  Use the
-      \texttt{ProgramEditor} to modify the parse tree and presentation.
-      If your changes might possibly affect the program's symbol table,
-      call the (inherited) \texttt{rebuildSymbolTable} method after all
-      transformations have been completed.
-
-\end{itemize}
-
-TODO-Jeff: Figure out and document how to integrate a refactoring into the
-(CDT) UI.

diff --git a/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-a2-xyz.tex b/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-a2-xyz.tex
deleted file mode 100644
index 766084f..0000000
--- a/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-a2-xyz.tex
+++ /dev/null

@@ -1,156 +0,0 @@
-% XYZ Language Plug-in README
-
-The org.eclipse.photran.xyzsamplelang project demonstrates
-how to use the \texttt{AdditionalLanguages} extension point.
-It is just the sample XML editor plug-in that gets created when you choose
-to create a new plug-in project and select the ``plug-in with an editor''
-template.  However, it has been modified to integrate with the CDT.
-Here is the README from that project, which is a cursory description of
-how the CDT was modified and how the XYZ language was integrated.  The
-specific changes to the editor are documented in its code, so be sure
-to read that too!
-
-\begin{verbatim}
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-
-   HOW TO TIE A NEW SOURCE FILE TYPE, PARSER, AND MODEL BUILDER INTO THE CDT
-                     (AND HOW TO MAKE THE CDT ALLOW IT)
-
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-If you create your own editor, model builder, and ICElement-derived elements,
-some simple changes to the CDT source code will make the CDT
-integrate your parser and the elements it produces into its model.
-
-We add an AdditionalLanguages extension point to the CDT Core and change a
-couple of methods to make use of it.
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-NOTE ON INCLUDED SOURCE CODE:
-
-All files in the CDT Integration Proof-of-Concept - Phase 1 source folder were
-generated by the New Plug-In wizard EXCEPT:
-
-- Several changes were made to the editor's main class (XyzLanguageEditor) and
-  are commented there
-- I added FortranContentOutlinePage
-- I added the ToyElement and ToyModelBuilder classes (based on Photran's
-  FortranElement hierarchy and its (hidden) ToyModelBuilder)
-- I added XyzLanguagePerspective, which gives us our own perspective and adds
-  a shortcut for our new file wizard to the New File menu
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-This is NOT well-written, and it is NOT a tutorial.  It assumes you have some
-idea of how the CDT works (e.g., what the Model is), and it assumes that you
-will look at my code to see all the details.
-
-The XYZ Sample Language code is documented, so that should be read in addition
-to this README.
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-First, I checked out the CDT source (most of it, anyway) from CVS.
-
-I created a basic editor and a New wizard to complement it
-using the New Plugin wizard.  I just called it XyzLanguageEditor
-rather than XMLEditor or whatever the default is.  The filename extension
-is .xyz.
-
-I added the CDT Core and UI plugins as dependencies of my new plugin.
-
-After the wizard finished, I declared an xyzSource content type (text) to
-match the .xyz filename extension that the editor uses.
-
-(I also created an XYZ Language perspective by subclassing CPerspective, although
-that has only cosmetic value and isn't necessary for what I describe below.)
-
------
-
-Before we can add additional languages to the CDT, we must make the following
-changes to the CDT itself:
-
-Add an AdditionalLanguages extension point to the Core's plugin.xml
-Add AdditionalLanguages.exsd to the Core's schema folder
-Add org.eclipse.cdt.core.addl_langs package to the Core's src folder, containing:
-	IAdditionalLanguage -- Each extension language must implement this
-	AdditionalLanguagesExtension.java -- Provides access to extension point; iterable
-	AdditionalLanguagesIterator.java -- Iterates through contributed IAdditionalLanguages
-	IAdditionalLanguageCallback -- For performing an action on each contributed language
-	IModelBuilder -- Extension languages provide their model builder this way
-	IAdditionalLanguageElement -- ICElement extensions must implement this
-
-Now we need to make the CDT recognize our additional content types as 
-valid TranslationUnits in its model.
-
-These changes make sure CoreModel#getRegistedContentTypeId works for
-additional content types.  This function is called by CContainer
-and, if it returns a valid (registerd-with-the-CDT) content type,
-makes a TranslationUnit out of the file being processed.
-
-Essentially, we just add a line or two to each of the following which asks the
-AdditionalLanguagesExtension to check whether some extension plug-in (like our
-XYZ Language Plug-in) supports a given content type.
-
-	1.	CoreModel#getRegistedContentTypeIds
-	2.	CCorePlugin#getContentType
-	3.	TranslationUnit#isSourceUnit
-	4.	CoreModel#isValidSourceUnitName
-	5.	CoreModel#isValidTranslationUnitName
-
-	NOTE:
-	The following are places where the CCorePlugin.CONTENT_TYPE_CSOURCE
-	content type is checked for but I elected not to check for
-	extension content types:
-		TranslationUnit#isCLanguage
-		CoreModel#isValidCSourceUnitName
-		AbstractIndexerRunner#shouldIndex
-			...the following two methods are identical...
-		DOMSearchUtil#getLanguage
-		InternalASTServiceProvider#getLanguage
-
-Next, we want to allow additional languages to be parsed by their own parser,
-and they should be able to build their own models for the Outline and Make
-Projects views.
-
-The CModelBuilder is called by TranslationUnit#parse.  We will make
-TranslationUnit#parse call our own model builder (ToyModelBuilder), which
-will use some special ICElements (base class ToyElement) to extend the C Model.
-Again, this is done through the extension point, so it can apply to any language.
-
-- CModelBuilder changed to implement IModelBuilder
-- Added extension point checking to TranslationUnit#parse
-- Made CElementInfo public (rather than default)
-- Made CElementInfo#setIsStructureKnown public (rather than protected)
-- Added extension point checking to CElementImageProvider#getBaseImageDescriptor
-
-The last point is important.  Additional languages can reuse the CDT's model elements
-(for functions, classes, etc. -- all the things that show up in the Outline), or
-they can create their own (e.g., Fortran has Modules and Block Data, neither of
-which have direct analogs in C/C++).  These new elements can be created by implementing
-IAdditionalLanguageElement.  IAdditionalLanguageElements must implement a
-method getBaseImageDescriptor() which provides an Outline icon for that element.
-
------
-
-To integrate our XYZ language into the CDT...
-
-First, we add the following to our plugin.xml:
-
-   <extension point="org.eclipse.cdt.core.AdditionalLanguages">
-      <language class="addl_langs.XYZLanguage"/>
-   </extension>
-
-We provide a class addl_langs.XYZLanguage which implements IAdditionalLanguage.
-See the JavaDoc for IAdditionalLanguage.  Essentially, we claim to support
-the XyzLanguagePlugIn.xyzSource content type, and we provide a ToyModelBuilder
-which will provide a (static, and very boring) Outline of XYZ Language source files.
-
-Next, I added Outline support to the editor by making a tiny subclass of
-CContentOutlinePage.  See several relevant notes in XyzLanguageEditor.java.
-See also FortranContentOutlinePage.  We are telling CContentOutlinePage
-its editor is null, since it doesn't do anything useful with it.
-\end{verbatim}

diff --git a/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-a3-cdt-ext-pt.tex b/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-a3-cdt-ext-pt.tex
deleted file mode 100644
index 0641a9c..0000000
--- a/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-a3-cdt-ext-pt.tex
+++ /dev/null

@@ -1,85 +0,0 @@
-% Overview of Implementation of the CDT AdditionalLanguages Extension Point
-
-The following, from an e-mail to the CDT copied to photran-dev, is an
-alternative description of how we modified the CDT to include this
-extension point.
-
-\begin{verbatim}
-1. Add an AdditionalLanguages extension point to the Core's plugin.xml and AdditionalLanguages.exsd to the Core's schema folder
-
-   Extend via <language class="my.plugin.XyzLanguage">
-   where XyzLanguage implements IAdditionalLanguage (see below)
-
-2. Add a package org.eclipse.cdt.core.addl_langs containing:
-
-   IAdditionalLanguage
-        public interface IAdditionalLanguage {
-          public String getName();
-          public boolean matchesSourceContentType(String contentTypeID);
-          public Collection/*<String>*/ getRegistedContentTypeIds();
-          public IModelBuilder createModelBuilder(TranslationUnit tu,
-              Map newElements);
-        }
-
-   AdditionalLanguagesExtension.java
-        Singleton; provides access to the extension point
-        Methods:
-            public Iterator/*<IAdditionalLanguage>*/ iterator()
-            public void processAdditionalLanguages(
-                IAdditionalLanguageCallback callback)
-            public boolean someAdditionalLanguageMatchesContentType(
-                String contentTypeID)
-            public IAdditionalLanguage getLanguageForContentType(
-                String contentTypeID)
-
-   AdditionalLanguagesIterator.java -- see iterator() above
-        Implements Iterable/*<IAdditionalLanguage>*/
-
-   IAdditionalLanguageCallback -- see processAdditionalLanguages() above
-        Allows you to perform some arbitrary action on each contributed
-            IAdditionalLanguage
-
-   IModelBuilder
-        Each extension language provides a model builder this way
-        Single method:
-            public abstract Map parse(boolean quickParseMode)
-                throws Exception;
-
-   IAdditionalLanguageElement (extends ICElement)
-        Allows you to extend the ICElement hierarchy
-        Methods:
-            public abstract Object getBaseImageDescriptor();
-            - The return type should really be ImageDescriptor,
-              but I don't want to make the Core depend on JFace
-
-3. Change content type checking to use extension point...
-   i.   CoreModel#getRegistedContentTypeIds
-   ii.  CCorePlugin#getContentType
-   iii. TranslationUnit#isSourceUnit
-   iv.  CoreModel#isValidSourceUnitName
-   v.   CoreModel#isValidTranslationUnitName
-
-   The change each of these is just a line or two -- usually a call to
-   AdditionalLanguagesExtension#someAdditionalLanguageMatchesContentType
-
-4. Make CModelBuilder implement IModelBuilder (no substantive change)
-
-5. Change the beginning of TranslationUnit#parse(Map):
-        IModelBuilder modelBuilder;
-        IAdditionalLanguage lang = AdditionalLanguagesExtension
-            .getInstance()
-            .getLanguageForSourceContentType(fContentTypeID);
-        if (lang != null)
-            modelBuilder = lang.createModelBuilder(this, newElements);
-        else
-            modelBuilder = new CModelBuilder(this, newElements);
-
-6. Make CElementInfo public (rather than default)
-
-7. Make CElementInfo#setIsStructureKnown public (rather than protected)
-
-8. Add this to the top of CElementImageProvider#getBaseImageDescriptor:
-   if (celement instanceof IAdditionalLanguageElement)
-     return (ImageDescriptor)
-       ((IAdditionalLanguageElement)celement).getBaseImageDescriptor();
-\end{verbatim}

diff --git a/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-a4-misc-notes.tex b/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-a4-misc-notes.tex
deleted file mode 100644
index 2c9d93c..0000000
--- a/org.eclipse.photran-dev-docs/misc-notes/old-dev-guide-chapters/inc-a4-misc-notes.tex
+++ /dev/null

@@ -1,57 +0,0 @@
-% Miscellaneous Parser and Language Processing Notes
-
-\section{Notes on the (almost-)LALR(1) Grammar}
-
-The current grammar is based on an Eli grammar that has been worked on
-for several years.  All of the lexer work is totally original, and we fixed
-several bugs in the Eli grammar, but for the most part the grammar in
-\texttt{Fortran95.bnf} is the work of other people.  We have invested
-several months of work in it---but that does not compare to the years of
-work invested by the previous authors of that grammar.
-
-More information on the Eli grammar is available at
-http://members.aol.com/wclodius/eli\_f95\_parser.html
-
-\section{Why not an abstract syntax tree?}
-
-We started by building an AST for Fortran by hand.  For a compiler, this
-wouldn't be a big deal.  The purpose of an AST is provide a tree that only
-contains ``useful'' information from the parse, so superfluous tokens like
-parentheses never end up in an AST.  For a refactoring tool, though,
-it is important to remember every token in the parse, because you need to
-reproduce code that looks similar to the user's original code.  Fortran
-has a number of cases where there are several different ways to specify the
-same thing.  For example, you can end a program with ``end,'' ``end program,''
-or ``end program'' followed by the name of the program.  Other cases, with
-several optional tokens in the middle of statements, are trickier.  So,
-long story short, after a couple of months, we had about 600 AST classes and
-were nowhere near finished.
-
-So we needed a different alternative.
-
-One would be to have the parser generator generate the AST stuff for us.
-However, aside from the fact that it would require lots of tedious annotations
-in the grammar, we would still be in a place of having several hundred AST
-classes and a Visitor with several hundred methods.
-
-Instead, we\footnote{Actually, ``I'' is more correct... Spiros was leaving
-for Google, Brian was indifferent, and I think Dr. Johnson still would
-have preferred an AST... so now you know where to put the blame...} decided
-to use a good old-fashioned parse tree.
-
-Here's why.
-
-First, it made the ``superfluous token'' problem go away.
-Since each node just had a \texttt{List} of child nodes (either tokens or
-other parse tree nodes), we did not have to do anything extra to accommodate
-all of the variations of a statement.  All the tokens were there when we
-needed them (e.g., for prettyprinting), and they could be ignored when we
-didn't need them.
-
-Second, it gave us two possible Visitors, as described above.  More
-importantly, unlike visiting an AST, these Visitors could just do a ``dumb''
-recursive traversal of the tree, totally ignorant of the underlying grammar.
-This also made parse tree searches and grammar modifications easier.
-
-There are probably other reasons as well which I can try to remember if
-someone is still not convinced that this was a good idea.

diff --git a/org.eclipse.photran-samples/.cdtproject b/org.eclipse.photran-samples/.cdtproject
deleted file mode 100644
index 8802934..0000000
--- a/org.eclipse.photran-samples/.cdtproject
+++ /dev/null

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse-cdt version="2.0"?>
-
-<cdtproject id="org.eclipse.cdt.make.core.make">
-<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.XCOFF32" point="org.eclipse.cdt.core.BinaryParser">
-<attribute key="addr2line" value="addr2line"/>
-<attribute key="c++filt" value="c++filt"/>
-</extension>
-<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser">
-<attribute key="addr2line" value="addr2line"/>
-<attribute key="c++filt" value="c++filt"/>
-</extension>
-<extension id="org.eclipse.cdt.core.Cygwin_PE" point="org.eclipse.cdt.core.BinaryParser">
-<attribute key="addr2line" value="addr2line"/>
-<attribute key="cygpath" value="cygpath"/>
-<attribute key="c++filt" value="c++filt"/>
-<attribute key="nm" value="nm"/>
-</extension>
-<extension id="org.eclipse.cdt.core.MachO" point="org.eclipse.cdt.core.BinaryParser">
-<attribute key="c++filt" value="c++filt"/>
-</extension>
-<extension id="org.eclipse.cdt.core.nullindexer" point="org.eclipse.cdt.core.CIndexer"/>
-<data>
-<item id="scannerConfiguration">
-<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-<buildOutputProvider>
-<openAction enabled="false" filePath=""/>
-<parser enabled="true"/>
-</buildOutputProvider>
-<scannerInfoProvider id="specsFile">
-<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-<parser enabled="true"/>
-</scannerInfoProvider>
-</profile>
-</item>
-<item id="org.eclipse.cdt.core.pathentry">
-<pathentry kind="out" path=""/>
-<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
-<pathentry kind="src" path="src-fixed-form"/>
-<pathentry kind="src" path="src-fortran-and-c"/>
-<pathentry kind="src" path="src-gaussian-elimination"/>
-<pathentry kind="src" path="src-includes"/>
-<pathentry kind="src" path="src-language-features"/>
-<pathentry kind="src" path="src-line-fitting"/>
-<pathentry kind="src" path="src-modules"/>
-<pathentry kind="src" path="src-scoping"/>
-<pathentry kind="src" path="src-implicits-1"/>
-<pathentry kind="src" path="src-implicits-2"/>
-<pathentry kind="src" path="src-implicits-3"/>
-</item>
-<item id="org.eclipse.cdt.make.core.buildtargets">
-<buildTargets>
-<target name="all" path="" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
-<buildCommand>make</buildCommand>
-<buildArguments></buildArguments>
-<buildTarget>all</buildTarget>
-<stopOnError>false</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-</target>
-<target name="clean" path="" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
-<buildCommand>make</buildCommand>
-<buildArguments></buildArguments>
-<buildTarget>clean</buildTarget>
-<stopOnError>false</stopOnError>
-<useDefaultCommand>true</useDefaultCommand>
-</target>
-</buildTargets>
-</item>
-</data>
-</cdtproject>

diff --git a/org.eclipse.photran-samples/.cproject b/org.eclipse.photran-samples/.cproject
deleted file mode 100644
index f2a40d4..0000000
--- a/org.eclipse.photran-samples/.cproject
+++ /dev/null

@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?fileVersion 4.0.0?>
-
-<cproject>
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="converted.config.1543524045">
-			<storageModule moduleId="scannerConfiguration">
-				<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
-				<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
-					<buildOutputProvider>
-						<openAction enabled="false" filePath=""/>
-						<parser enabled="true"/>
-					</buildOutputProvider>
-					<scannerInfoProvider id="specsFile">
-						<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
-						<parser enabled="true"/>
-					</scannerInfoProvider>
-				</profile>
-			</storageModule>
-			<storageModule buildSystemId="org.eclipse.cdt.core.defaultConfigDataProvider" id="converted.config.1543524045" moduleId="org.eclipse.cdt.core.settings" name="convertedConfig">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.nullindexer" point="org.eclipse.cdt.core.CIndexer"/>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.XCOFF32" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.Cygwin_PE" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.MachO" point="org.eclipse.cdt.core.BinaryParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-			<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
-			<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
-				<buildTargets>
-					<target name="all" path="" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
-						<buildCommand>make</buildCommand>
-						<buildArguments/>
-						<buildTarget>all</buildTarget>
-						<stopOnError>false</stopOnError>
-						<useDefaultCommand>true</useDefaultCommand>
-						<runAllBuilders>true</runAllBuilders>
-					</target>
-					<target name="clean" path="" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
-						<buildCommand>make</buildCommand>
-						<buildArguments/>
-						<buildTarget>clean</buildTarget>
-						<stopOnError>false</stopOnError>
-						<useDefaultCommand>true</useDefaultCommand>
-						<runAllBuilders>true</runAllBuilders>
-					</target>
-					<target name="all" path="src-fortran2003" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
-						<buildCommand>make</buildCommand>
-						<buildArguments/>
-						<buildTarget>all</buildTarget>
-						<stopOnError>false</stopOnError>
-						<useDefaultCommand>true</useDefaultCommand>
-						<runAllBuilders>true</runAllBuilders>
-					</target>
-					<target name="clean" path="src-fortran2003" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
-						<buildCommand>make</buildCommand>
-						<buildArguments/>
-						<buildTarget>clean</buildTarget>
-						<stopOnError>false</stopOnError>
-						<useDefaultCommand>true</useDefaultCommand>
-						<runAllBuilders>true</runAllBuilders>
-					</target>
-				</buildTargets>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.pathentry">
-				<pathentry kind="out" path=""/>
-				<pathentry kind="con" path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
-				<pathentry kind="src" path="src-fixed-form-1"/>
-				<pathentry kind="src" path="src-fixed-form-2"/>
-				<pathentry kind="src" path="src-fortran-and-c"/>
-				<pathentry kind="src" path="src-fortran2003"/>
-				<pathentry kind="src" path="src-gaussian-elimination"/>
-				<pathentry kind="src" path="src-includes"/>
-				<pathentry kind="src" path="src-language-features"/>
-				<pathentry kind="src" path="src-liebmann-1-eoshift"/>
-				<pathentry kind="src" path="src-liebmann-2-arrays"/>
-				<pathentry kind="src" path="src-liebmann-3-loops"/>
-				<pathentry kind="src" path="src-line-fitting"/>
-				<pathentry kind="src" path="src-modules"/>
-				<pathentry kind="src" path="src-scoping"/>
-				<pathentry kind="src" path="src-implicits-1"/>
-				<pathentry kind="src" path="src-implicits-2"/>
-				<pathentry kind="src" path="src-implicits-3"/>
-				<pathentry kind="src" path="src-common"/>
-				<pathentry kind="src" path="src-cray-pointers"/>
-				<pathentry kind="src" path="src-interfaces"/>
-				<pathentry kind="src" path="src-fortran2008"/>
-				<pathentry kind="src" path="src-op-overload"/>
-				<pathentry kind="src" path="src-types"/>
-			</storageModule>
-		</cconfiguration>
-	</storageModule>
-</cproject>

diff --git a/org.eclipse.photran-samples/.project b/org.eclipse.photran-samples/.project
deleted file mode 100644
index 8586c28..0000000
--- a/org.eclipse.photran-samples/.project
+++ /dev/null

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.photran-samples</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.make.core.makeBuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-				<dictionary>
-					<key>org.eclipse.cdt.core.errorOutputParser</key>
-					<value>org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.VCErrorParser;org.eclipse.photran.core.intel.IntelCompilerErrorParser;org.eclipse.photran.core.AbsoftErrorParser;org.eclipse.photran.core.XLFErrorParser;org.eclipse.photran.core.GFortranErrorParser;org.eclipse.photran.core.IntelFortranErrorParser;org.eclipse.photran.core.LaheyFortranErrorParser;org.eclipse.photran.core.G95FortranErrorParser;org.eclipse.photran.core.NAGErrorParser;org.eclipse.photran.core.PGIErrorParser;org.eclipse.photran.errorparsers.xlf.XLFCompilerErrorParser;</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.append_environment</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.arguments</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.command</key>
-					<value>make</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.location</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.auto</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.clean</key>
-					<value>clean</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.build.target.inc</key>
-					<value>all</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
-					<value>false</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key>
-					<value>true</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.environment</key>
-					<value></value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.stopOnError</key>
-					<value>false</value>
-				</dictionary>
-				<dictionary>
-					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
-					<value>true</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.make.core.ScannerConfigBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.photran.core.fnature</nature>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.make.core.makeNature</nature>
-		<nature>org.eclipse.cdt.make.core.ScannerConfigNature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.photran-samples/.settings/org.eclipse.cdt.core.prefs b/org.eclipse.photran-samples/.settings/org.eclipse.cdt.core.prefs
deleted file mode 100644
index b208aeb..0000000
--- a/org.eclipse.photran-samples/.settings/org.eclipse.cdt.core.prefs
+++ /dev/null

@@ -1,4 +0,0 @@
-#Wed Aug 15 15:14:22 MDT 2007
-eclipse.preferences.version=1
-indexer/indexerId=org.eclipse.cdt.core.nullindexer
-indexerId=org.eclipse.cdt.core.nullindexer

diff --git a/org.eclipse.photran-samples/.settings/org.eclipse.photran.core.prefs b/org.eclipse.photran-samples/.settings/org.eclipse.photran.core.prefs
deleted file mode 100644
index 4c6156b..0000000
--- a/org.eclipse.photran-samples/.settings/org.eclipse.photran.core.prefs
+++ /dev/null

@@ -1,8 +0,0 @@
-#Tue May 18 02:43:35 CDT 2010
-EnableContentAssist=true
-EnableDeclView=true
-EnableHoverTip=true
-EnableVPG=true
-FortranIncludePaths=/org.eclipse.photran-samples\n
-FortranModulePaths=/org.eclipse.photran-samples\n
-eclipse.preferences.version=1

diff --git a/org.eclipse.photran-samples/.settings/scoped_pref_store.prefs b/org.eclipse.photran-samples/.settings/scoped_pref_store.prefs
deleted file mode 100644
index 40c0f9b..0000000
--- a/org.eclipse.photran-samples/.settings/scoped_pref_store.prefs
+++ /dev/null

@@ -1,6 +0,0 @@
-#Mon Jul 27 12:02:55 CDT 2009
-EnableContentAssist=true
-EnableDeclView=true
-EnableHoverTip=true
-EnableVPG=true
-eclipse.preferences.version=1

diff --git a/org.eclipse.photran-samples/Makefile b/org.eclipse.photran-samples/Makefile
deleted file mode 100644
index 35b9b86..0000000
--- a/org.eclipse.photran-samples/Makefile
+++ /dev/null

@@ -1,63 +0,0 @@
-# Generic makefile deletes all programs corresponding to .f90 files and rebuilds them
-# Expects to run under bash
-#
-# Jeff Overbey
-#
-# Note - pattern substitution: $(patsubst %.f90,%.exe,$(wildcard *.f90))
-
-# Command to run your Fortran compiler
-FORTRAN=`which gfortran ifort 2>/dev/null | head -1`
-DEBUGSWITCH=-g
-INCLUDESWITCH=-I
-LIBSWITCH=-L
-CRAYSWITCH=-fcray-pointer
-OPTSWITCH=-O4
-OUTSWITCH=-o
-EXEFILE=a.exe
-
-# In each of these directories, all of the sources will be compiled into a single executable
-#SRCDIRS=$(filter-out src-fortran2003, $(wildcard src-*))
-SRCDIRS=$(wildcard src-*)
-
-# Here we do not use $(wildcard) to delay expansion until the shell is invoked
-SRCFILES=*.f*
-OBJFILES=*.o *.obj
-OTHERFILES=*.mod *.fwd *.map *.ydg
-EXEFILES=$(EXEFILE) *.exe
-
-all:	clean build
-
-clean:
-	for dir in $(SRCDIRS) .; do \
-	  cd $$dir; \
-	  rm -f $(OBJFILES) >/dev/null 2>&1; \
-	  rm -f $(OTHERFILES) >/dev/null 2>&1; \
-	  rm -f $(EXEFILES) >/dev/null 2>&1; \
-	  cd ..; \
-	done
-
-build:
-	@echo "=====>" Using compiler $(FORTRAN)
-	@for dir in $(SRCDIRS); do \
-	  if [ -e $$dir/Makefile ]; then \
-	    $(MAKE) -C $$dir; \
-	  else \
-	    echo "=====>" Begin compiling sources in $$dir; \
-	    $(FORTRAN) $(DEBUGSWITCH) \
-	               $(OUTSWITCH) $$dir/$(EXEFILE) \
-	               $(INCLUDESWITCH). \
-	               $(INCLUDESWITCH)$$dir \
-	               $(LIBSWITCH). \
-	               $(LIBSWITCH)$$dir \
-	               $(OPTSWITCH) \
-	               $(CRAYSWITCH) \
-	               $$dir/$(SRCFILES); \
-	    echo "<=====" Done compiling sources in $$dir; \
-	  fi \
-	done
-	@for dir in $(SRCDIRS) .; do \
-	  cd $$dir; \
-	  rm -f $(OBJFILES) >/dev/null 2>&1; \
-	  rm -f $(OTHERFILES) >/dev/null 2>&1; \
-	  cd ..; \
-	done

diff --git a/org.eclipse.photran-samples/liebmann-viz.gif b/org.eclipse.photran-samples/liebmann-viz.gif
deleted file mode 100644
index f0a3886..0000000
--- a/org.eclipse.photran-samples/liebmann-viz.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.photran-samples/liebmann-viz.sh b/org.eclipse.photran-samples/liebmann-viz.sh
deleted file mode 100644
index c8216af..0000000
--- a/org.eclipse.photran-samples/liebmann-viz.sh
+++ /dev/null

@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# Runs src-liebmann-3-loops/a.exe, which outputs a 2-D matrix of real numbers,
-# and then feeds this matrix to gnuplot to generate a visualization, which
-# is saved as liebmann-viz.gif.
-#
-# J. Overbey 8/27/08
-#
-
-src-liebmann-3*/a.exe >data
-
-cat <<EOF | gnuplot
-#==GNUPLOT INPUT=================================================================
-set term gif
-set output "liebmann-viz.gif"
-
-#set pm3d       # 1a. Normal
- set pm3d map   # 1b. Display a 2-D color gradient rather than the 3-D visualization
-#set pm3d at b  # 1c. Display a 2-D color gradient under the 3-D visualization
-
-#                                                                  # 2a. Nothing = Black to yellow via blue and red
-#set palette model XYZ functions gray**0.35, gray**0.5, gray**0.8  # 2b. Brown to yellow
- set palette model XYZ functions gray**0.3, gray**0.5, 0           # 2b. Dark red to yellow (Jeff)
-#set palette model XYZ functions gray**0.8, gray**0.5, gray**0.35  # 2c. Green to yellow
-#set palette rgbformulae 21,22,23                                  # 2d. Black to red to yellow to white
-#set palette rgbformulae 22,13,-31                                 # 2e. Blue to green to yellow to red
-#set palette defined (0 "black", 2.5 "red", 5 "yellow")
-
- splot 'data' matrix notitle             # 3a. Plot normally
-#splot 'data' matrix notitle with pm3d   # 3b. Colorize the 3-D visualization (set 1a above)
-
-#================================================================================
-EOF
-
-rm -f data
-
-echo "Visualization saved as liebmann-viz.gif"
-
-if [ `uname -s` == "Darwin" ]; then
-	open liebmann-viz.gif
-elif [ `which eog` != "" ]; then
-	eog liebmann-viz.gif
-fi

diff --git a/org.eclipse.photran-samples/src-common/.cvsignore b/org.eclipse.photran-samples/src-common/.cvsignore
deleted file mode 100644
index 2e87cbd..0000000
--- a/org.eclipse.photran-samples/src-common/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-a.exe

diff --git a/org.eclipse.photran-samples/src-common/change_c.f90 b/org.eclipse.photran-samples/src-common/change_c.f90
deleted file mode 100644
index d028d90..0000000
--- a/org.eclipse.photran-samples/src-common/change_c.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-subroutine change_c
-    implicit none
-
-    ! Now k is the same as c in main.f90
-    common /common/ k
-    complex :: k
-
-    k = (5,6)
-end subroutine

diff --git a/org.eclipse.photran-samples/src-common/main.f90 b/org.eclipse.photran-samples/src-common/main.f90
deleted file mode 100644
index d322922..0000000
--- a/org.eclipse.photran-samples/src-common/main.f90
+++ /dev/null

@@ -1,50 +0,0 @@
-!!
-!! Demonstrates COMMON block nightmare
-!!
-!! J. Overbey 8/18/08
-!!
-program main
-    implicit none
-
-    external change_c
-
-    common a, b
-    integer :: a
-    real    :: b
-
-    common /common/ c, d, e /common2/ f, g, /common3/ h
-    complex :: c
-    dimension c(3)
-    ! double precision :: d, e, f, g, h
-    double precision :: d
-    double precision :: e
-    double precision :: f
-    double precision :: g
-    double precision :: h
-
-    a = 1
-    b = 2.3
-    c = (4,5)
-    print *, a, b, c
-
-    call change_ab
-    call change_c
-
-    print *, "Now the first two variables below should have garbage values"
-    print *, "and the third should be (5,6):"
-    print *, a, b, c
-end program
-
-subroutine change_ab
-    implicit none
-
-    ! q and r are stored at the same place in memory as a and b above,
-    ! but they have the wrong types
-    common q, r
-    real    :: q
-    integer :: r
-
-    q = 4.5
-    r = 6
-    print *, q, r
-end subroutine

diff --git a/org.eclipse.photran-samples/src-cray-pointers/.cvsignore b/org.eclipse.photran-samples/src-cray-pointers/.cvsignore
deleted file mode 100644
index 2e87cbd..0000000
--- a/org.eclipse.photran-samples/src-cray-pointers/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-a.exe

diff --git a/org.eclipse.photran-samples/src-cray-pointers/cray-pointers.f90 b/org.eclipse.photran-samples/src-cray-pointers/cray-pointers.f90
deleted file mode 100644
index cc6ac70..0000000
--- a/org.eclipse.photran-samples/src-cray-pointers/cray-pointers.f90
+++ /dev/null

@@ -1,46 +0,0 @@
-! Examples using Cray pointers (non-standard extension)
-! Jeff Overbey 8/27/08
-
-implicit none
-
-call example1
-call example2
-call example3
-end
-
-! Example 1: Pointer to scalar
-subroutine example1()
-	integer :: pointer           ! A Cray pointer is just an integer
-	pointer (pointer, pointee)   ! We associate the pointer variable with another variable
-	real    :: pointee           ! To dereference the pointer, we read this variable
-
-	real :: value = 5.0
-
-	pointer = loc(value)
-	print *, pointee  ! = 5.0
-end subroutine
-
-! Example 2: Pointer to array, constant size
-subroutine example2()
-    integer :: pointer
-    real    :: pointee
-    pointer (pointer, pointee(5))
-
-    real :: array(5) = (/ 1.1, 2.2, 3.3, 4.4, 5.5 /)
-
-    pointer = loc(array)
-    print *, pointee(3)  ! = 3.3
-end subroutine
-
-! Example 3: Pointer to array, arbitrary size
-subroutine example3()
-    integer :: pointer
-    real    :: pointee
-    pointer (pointer, pointee(*))
-
-    real :: array(5) = (/ 1.1, 2.2, 3.3, 4.4, 5.5 /)
-
-    pointer = loc(array)
-    print *, pointee(-2)  ! = 3.3
-    print *, pointee(3)   ! = 3.3
-end subroutine

diff --git a/org.eclipse.photran-samples/src-fixed-form-1/.cvsignore b/org.eclipse.photran-samples/src-fixed-form-1/.cvsignore
deleted file mode 100644
index 2e87cbd..0000000
--- a/org.eclipse.photran-samples/src-fixed-form-1/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-a.exe

diff --git a/org.eclipse.photran-samples/src-fixed-form-1/hello.f b/org.eclipse.photran-samples/src-fixed-form-1/hello.f
deleted file mode 100755
index 5e515bd..0000000
--- a/org.eclipse.photran-samples/src-fixed-form-1/hello.f
+++ /dev/null

@@ -1,14 +0,0 @@
-c Ugly fixed form hello world program demonstrates intelligent syntax highlighting
-      programasampleprogram
-        implicitreal(i)
-        if=0.0
-        if(sine(if).lt..00001)then                                      Variable if
-          print*,'Hello, old-school Fortran!'
-        endif
-        stop
-      c  o  n  t  a  i  n  s
-        realfunctionsine(x)
-          real,intent(in)::x
-          sine=sin(x)
-        endfunction
-      endprogramasampleprogram
\ No newline at end of file

diff --git a/org.eclipse.photran-samples/src-fixed-form-2/.cvsignore b/org.eclipse.photran-samples/src-fixed-form-2/.cvsignore
deleted file mode 100644
index 66fec5b..0000000
--- a/org.eclipse.photran-samples/src-fixed-form-2/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-*.exe
-*.mod

diff --git a/org.eclipse.photran-samples/src-fixed-form-2/Makefile b/org.eclipse.photran-samples/src-fixed-form-2/Makefile
deleted file mode 100644
index 8eb26a6..0000000
--- a/org.eclipse.photran-samples/src-fixed-form-2/Makefile
+++ /dev/null

@@ -1,23 +0,0 @@
-# gfortran 4.4.0 cannot parse sample.f, so only compile if Intel Fortran is available
-
-.PHONY: all clean
-
-SRC=sample.f
-
-IFORT=`which ifort    2>/dev/null | head -1`
-DEBUGSWITCH=-g
-OPTSWITCH=-O4
-OUTSWITCH=-o
-
-all:
-	@if [ "$(IFORT)" != "" ]; then \
-	    for file in $(SRC); do \
-	        $(IFORT)  $(DEBUGSWITCH) \
-	                  $(OUTSWITCH) `echo $$file | sed -e 's/.f/.exe/'` \
-	                  $(OPTSWITCH) \
-	                  $$file; \
-	    done; \
-	fi
-
-clean:
-	rm -f *.exe *.mod
\ No newline at end of file

diff --git a/org.eclipse.photran-samples/src-fixed-form-2/sample.f b/org.eclipse.photran-samples/src-fixed-form-2/sample.f
deleted file mode 100644
index ea1288d..0000000
--- a/org.eclipse.photran-samples/src-fixed-form-2/sample.f
+++ /dev/null

@@ -1,14 +0,0 @@
-      program blah

-        integer :: xyz,y

-        xy                                                              sdfgsdfgsd

-     $  z = 3

-        y = 5

-        if(sin(y+0.0)

-     $  .lt.x)then                                                            Variable cr

-         print*,'Hello, old-school Fortran!'

-        endif

-      end pro

-     $      gram

-

-

-


diff --git a/org.eclipse.photran-samples/src-fortran-and-c/Makefile b/org.eclipse.photran-samples/src-fortran-and-c/Makefile
deleted file mode 100644
index 99ecf1a..0000000
--- a/org.eclipse.photran-samples/src-fortran-and-c/Makefile
+++ /dev/null

@@ -1,10 +0,0 @@
-# Requires g95 under Windows (since calling a C function; proprietary)
-
-clean:
-	rm -f a.exe *.o
-
-all:
-	gcc -g -c c.c
-	g95 -g -c fortran.f90
-	g95 -o a.exe c.o fortran.o
-	rm *.o

diff --git a/org.eclipse.photran-samples/src-fortran-and-c/c.c b/org.eclipse.photran-samples/src-fortran-and-c/c.c
deleted file mode 100644
index b21f9c1..0000000
--- a/org.eclipse.photran-samples/src-fortran-and-c/c.c
+++ /dev/null

@@ -1,6 +0,0 @@
-#include <stdio.h>
-
-void cfunction_()
-{
-	printf(" This is the C function\n");
-}

diff --git a/org.eclipse.photran-samples/src-fortran-and-c/fortran.f90 b/org.eclipse.photran-samples/src-fortran-and-c/fortran.f90
deleted file mode 100644
index eef8e42..0000000
--- a/org.eclipse.photran-samples/src-fortran-and-c/fortran.f90
+++ /dev/null

@@ -1,38 +0,0 @@
-  external cfunction  ! Defined in c.c
-
-  print *, 'This is the Fortran program; I am going to call the C function now...'
-  call cfunction()
-  call sum(1.0,2.0,3.0)
-  call factorial(3)
-  print *, 'Now we are back in Fortran again'
-
-contains
-
-  subroutine sum(x,y,z)
-
-  x = x+y+z
-
-  print *, x
-
-  end subroutine sum
-
-  subroutine factorial(j)
-
-  p=1
-  i=1
-  do i=1,j
-    p=p*i
-  end do
-
-  print *, j, "! = ", p
-
-  end subroutine factorial
-
-  subroutine sum2(x,y)
-
-  p = x+y
-
-  end subroutine sum2
-
-
-end

diff --git a/org.eclipse.photran-samples/src-fortran2003/.cvsignore b/org.eclipse.photran-samples/src-fortran2003/.cvsignore
deleted file mode 100644
index 66fec5b..0000000
--- a/org.eclipse.photran-samples/src-fortran2003/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-*.exe
-*.mod

diff --git a/org.eclipse.photran-samples/src-fortran2003/01-class.f03 b/org.eclipse.photran-samples/src-fortran2003/01-class.f03
deleted file mode 100644
index cb50da6..0000000
--- a/org.eclipse.photran-samples/src-fortran2003/01-class.f03
+++ /dev/null

@@ -1,23 +0,0 @@
-! Simple class -- JO 1/28/09
-module m
-	implicit none
-
-	type c
-	contains
-		procedure :: p
-	end type
-contains
-	subroutine p(self)
-		class(c), intent(in) :: self
-		print *, 'Hi'
-	end subroutine
-end module
-
-program Fortran2003
-	use m
-	implicit none
-
-	type(c) :: t
-	call t%p
-	stop
-end program

diff --git a/org.eclipse.photran-samples/src-fortran2003/02-inheritance.f03 b/org.eclipse.photran-samples/src-fortran2003/02-inheritance.f03
deleted file mode 100644
index 5bf83e0..0000000
--- a/org.eclipse.photran-samples/src-fortran2003/02-inheritance.f03
+++ /dev/null

@@ -1,40 +0,0 @@
-! Inheritance -- JO 1/28/09
-module m1
-	implicit none
-
-	type c
-		character(20) :: STR = 'Hey there'
-	contains
-		procedure :: p
-	end type
-contains
-	subroutine p(self)
-		class(c), intent(in) :: self
-		print *, 'Hi'
-	end subroutine
-end module
-
-module m2
-	use m1
-	implicit none
-
-	type, extends(c) :: c2
-	contains
-		procedure :: p => c2_p
-	end type
-contains
-	! Can't call this p
-	subroutine c2_p(self)
-		class(c2), intent(in) :: self
-		print *, self%STR
-	end subroutine
-end module
-
-program Fortran2003
-	use m2
-	implicit none
-
-	type(c2) :: t
-	call t%p
-	stop
-end program

diff --git a/org.eclipse.photran-samples/src-fortran2003/03-destructor.f03 b/org.eclipse.photran-samples/src-fortran2003/03-destructor.f03
deleted file mode 100644
index b82eb20..0000000
--- a/org.eclipse.photran-samples/src-fortran2003/03-destructor.f03
+++ /dev/null

@@ -1,66 +0,0 @@
-! Destructor -- JO 1/28/09
-module m1
-	implicit none
-	private
-
-	type, public :: c1
-		character(20) :: STR = 'Hey there'
-	contains
-		procedure :: p
-		final :: destructor
-	end type
-contains
-	subroutine p(self)
-		class(c1), intent(in) :: self
-		print *, 'Hi'
-	end subroutine
-
-	subroutine destructor(self)
-		type(c1), intent(in) :: self
-		print *, 'Bye'
-	end subroutine
-end module
-
-module m2
-	use m1
-	implicit none
-	private
-
-	type, extends(c1), public :: c2
-	contains
-		procedure :: p
-	end type
-contains
-	subroutine p(self)
-		class(c2), intent(in) :: self
-		print *, self%STR
-	end subroutine
-end module
-
-program Fortran2003
-	use m1
-	use m2
-	implicit none
-
-	type(c1), target :: c1obj
-	type(c2), target :: c2obj
-
-	class(c1), pointer :: c1ptr => null()
-	class(c2), pointer :: c2ptr => null()
-
-	allocate(c1ptr)
-	allocate(c2ptr)
-
-	c1ptr => c1obj
-	c2ptr => c2obj
-
-	call c1ptr%p
-	call c2ptr%p
-	c1ptr => c2ptr
-	call c1ptr%p
-
-	deallocate(c1ptr)
-	deallocate(c2ptr)
-
-	stop
-end program

diff --git a/org.eclipse.photran-samples/src-fortran2003/Makefile b/org.eclipse.photran-samples/src-fortran2003/Makefile
deleted file mode 100644
index 303029a..0000000
--- a/org.eclipse.photran-samples/src-fortran2003/Makefile
+++ /dev/null

@@ -1,36 +0,0 @@
-.PHONY: all clean
-ALL_SRC=$(filter-out xlf-bug.f03 xlf-crash.f03, $(wildcard *.f03))
-
-############ WHICH FILES ARE COMPILED DEPENDS ON THE COMPILER #############
-
-XLF_SRC=$(ALL_SRC)
-
-NAGFOR_SRC=$(filter-out 03-destructor.f03 string.f03, $(ALL_SRC))
-
-###########################################################################
-
-XLF   =`which xlf    2>/dev/null | head -1`
-NAGFOR=`which nagfor 2>/dev/null | head -1`
-DEBUGSWITCH=-g
-OPTSWITCH=-O4
-OUTSWITCH=-o
-
-all:
-	@if [ "$(NAGFOR)" != "" ]; then \
-	    for file in $(NAGFOR_SRC); do \
-	        $(NAGFOR)  $(DEBUGSWITCH) \
-	                   $(OUTSWITCH) `echo $$file | sed -e 's/.f03/.exe/'` \
-	                   $(OPTSWITCH) \
-	                   $$file; \
-	    done; \
-	elif [ "$(XLF)" != "" ]; then \
-	    for file in $(XLF_SRC); do \
-	        $(XLF)     $(DEBUGSWITCH) \
-	                   $(OUTSWITCH) `echo $$file | sed -e 's/.f03/.exe/'` \
-	                   $(OPTSWITCH) \
-	                   $$file; \
-	    done; \
-	fi
-
-clean:
-	rm -f *.exe *.mod
\ No newline at end of file

diff --git a/org.eclipse.photran-samples/src-fortran2003/char-fn-test.f03 b/org.eclipse.photran-samples/src-fortran2003/char-fn-test.f03
deleted file mode 100644
index ba14363..0000000
--- a/org.eclipse.photran-samples/src-fortran2003/char-fn-test.f03
+++ /dev/null

@@ -1,7 +0,0 @@
-! Test of a function returning a string -- JO 1/29/09
-  print *, c()
-contains
-  character(len=len("Hello")) function c()
-  	c = "Hello"
-  end function
-end program

diff --git a/org.eclipse.photran-samples/src-fortran2003/nag-bug.f03 b/org.eclipse.photran-samples/src-fortran2003/nag-bug.f03
deleted file mode 100644
index df6837d..0000000
--- a/org.eclipse.photran-samples/src-fortran2003/nag-bug.f03
+++ /dev/null

@@ -1,35 +0,0 @@
-! Demonstrates a parser bug in NAG Fortran Compiler Release 5.2(649)
-! NPLUX52NA for x86-32 Linux
-!
-! Line 34 reports a syntax error due to the empty parentheses ()
-! However, the statement should parse with
-!   pointer-assignment-stmt (R735)
-!     > data-target (R739)
-!     > expr (R722)
-!     > ...
-!     > primary (R701)
-!     > function-reference (R1217)
-!     > procedure-designator  "("  [actual-arg-spec-list]  ")"
-! where actual-arg-spec-list is marked as being optional and
-! procedure-designator (R1219) > data-ref "%" binding-name
-!
-! J. Overbey 2/23/09 - overbey2@illinois.edu
-module m
-    type t; contains; procedure :: ptr; end type
-contains
-    function ptr(self)
-        class(t), intent(in) :: self
-        class(*), pointer :: ptr
-        ptr => null()
-    end function
-end module
-
-program program
-    use m
-
-    class(t), pointer :: t_ptr
-    class(*), pointer :: any_ptr
-
-    allocate (t_ptr)
-    any_ptr => t_ptr%ptr()  ! <<<<<<<<<< Reported syntax error
-end program

diff --git a/org.eclipse.photran-samples/src-fortran2003/params.f03 b/org.eclipse.photran-samples/src-fortran2003/params.f03
deleted file mode 100644
index 5f52560..0000000
--- a/org.eclipse.photran-samples/src-fortran2003/params.f03
+++ /dev/null

@@ -1,22 +0,0 @@
-! Testing behavior of pass-by-reference
-
-integer, parameter :: q = 1
-
-call s(1)  ! Can't byref (literal)
-
-n = 1
-call s(n)  ! Can byref (variable)
-print *, "Expected:", 2, "Actual:", n
-
-call s(q)  ! Can't byref (parameter)
-print *, "Expected:", 1, "Actual:", q
-
-stop
-
-contains
-	subroutine s(p)
-		integer :: p
-		p = 2
-		print *, "Expected:", 2, "Actual:", p
-	end subroutine
-end

diff --git a/org.eclipse.photran-samples/src-fortran2003/stream-io.f03 b/org.eclipse.photran-samples/src-fortran2003/stream-io.f03
deleted file mode 100644
index c7637ea..0000000
--- a/org.eclipse.photran-samples/src-fortran2003/stream-io.f03
+++ /dev/null

@@ -1,59 +0,0 @@
-!>
-!! Sample program demonstrates stream I/O in Fortran 2003.
-!!
-!! Jeff Overbey (2/22/09)
-!<
-program stream_io
-    implicit none
-
-    integer, parameter :: FILE = 2
-
-    call check_byte_kind
-    call create_file
-    call read_file
-    stop
-
-contains
-    subroutine check_byte_kind
-        integer(kind=1) :: byte = 127 + 1
-        integer         :: int  = 127 + 1
-        if (byte .ne. -128 .or. int .ne. 128) &
-            stop "integer(kind=1) is not one byte"
-    end subroutine
-
-    subroutine create_file
-        integer(kind=1) byte
-
-	    open (FILE, status='replace', action='write', access='stream', form='unformatted', file='bytes')
-	    write (FILE) transfer("A", byte)
-	    write (FILE) transfer("B", byte)
-	    write (FILE) new_line("x")
-	    write (FILE) transfer("C", byte)
-	    close (FILE)
-    end subroutine
-
-    subroutine read_file
-        integer(kind=1) byte
-        integer pos, status
-        character*256 :: errmsg
-
-	    open (FILE, status='old', action='read', access='stream', form='unformatted', file='bytes')
-	    do
-	        inquire (FILE, pos=pos)
-	        print *, "Position is", pos
-
-	        !read (FILE, pos=pos, iostat=status, iomsg=errmsg) byte
-	        read (FILE, iostat=status, iomsg=errmsg) byte
-	        if (status .eq. 0) then
-	            print '("Read byte ", i5, ", status is ", i5)', byte, status
-	        else if (is_iostat_end(status)) then
-	            exit
-	        else
-	            print *, errmsg
-	            stop "I/O error"
-	        end if
-	    end do
-	    print '("Read ", i5, " bytes")', pos-1
-	    close (FILE)
-    end subroutine
-end program

diff --git a/org.eclipse.photran-samples/src-fortran2003/string.f03 b/org.eclipse.photran-samples/src-fortran2003/string.f03
deleted file mode 100644
index d66440d..0000000
--- a/org.eclipse.photran-samples/src-fortran2003/string.f03
+++ /dev/null

@@ -1,411 +0,0 @@
-!>
-!! Definition of a string class for Fortran.
-!!
-!! Jeff Overbey (1/29/09)
-!<
-module string_module
-    implicit none
-    private
-
-    public :: new_string
-
-    interface new_string
-        module procedure &
-            new_string_string, &
-            new_string_integer, &
-            new_string_logical
-    end interface
-
-    type, public :: string
-        private
-        character, dimension(:), allocatable :: data
-        integer :: length = 0
-    contains
-        procedure :: initialize
-        generic   :: operator(+) => concat1, concat2
-        generic   :: concat => concat1, concat2  ! Photran doesn't parse - R1207
-        procedure :: substring
-        procedure :: char_at
-        procedure :: map
-        procedure :: to_uppercase
-        procedure :: to_lowercase
-        generic   :: write(formatted) => write_formatted    ! Photran doesn't parse
-        generic   :: write(unformatted) => write_unformatted
-        procedure :: value
-        generic   :: operator(==) => equals
-        generic   :: operator(.eqic.) => equals_ignore_case
-        final     :: destructor
-
-        procedure, private :: concat1
-        procedure, private :: concat2
-        procedure, private :: write_formatted
-        procedure, private :: write_unformatted
-        procedure, private :: all_satisfy
-        procedure, private :: equals
-        procedure, private :: equals_ignore_case
-    end type string
-
-contains
-
-    type(string) function new_string_string(string) result(return)
-        character(len=*), intent(in) :: string
-        call return%initialize(string)
-    end function
-
-    type(string) function new_string_integer(integer) result(return)
-        integer, intent(in) :: integer
-        return = new_string_nat(abs(integer))
-        if (integer < 0) return = new_string("-") + return
-    end function
-
-    type(string) function new_string_logical(logical) result(return)
-        logical, intent(in) :: logical
-        if (logical) then
-            return = new_string('.true.')
-        else
-            return = new_string('.false.')
-        end if
-    end function
-
-    type(string) recursive function new_string_nat(absval) result(return)
-        integer, intent(in) :: absval
-
-        if (0 <= absval .and. absval <= 9) then
-            call return%initialize(digit_string(absval))
-        else
-            return = new_string_nat(absval / 10) + digit_string(mod(absval, 10))
-        end if
-    end function
-
-    character(len=1) function digit_string(digit)
-        integer, intent(in) :: digit
-        select case (digit)
-            case (0); digit_string = '0'
-            case (1); digit_string = '1'
-            case (2); digit_string = '2'
-            case (3); digit_string = '3'
-            case (4); digit_string = '4'
-            case (5); digit_string = '5'
-            case (6); digit_string = '6'
-            case (7); digit_string = '7'
-            case (8); digit_string = '8'
-            case (9); digit_string = '9'
-        end select
-    end function
-
-    subroutine initialize(self, data)
-        class(string), intent(inout) :: self
-        character(len=*), intent(in) :: data
-        integer :: i
-
-        self%length = len(data)
-        allocate(self%data(self%length))
-        do i = 1, len(data)
-            self%data(i) = data(i:i)
-           end do
-    end subroutine
-
-    ! XLF parses class(string) but gives semantic error; Photran doesn't parse
-    type(string) function concat1(self, other) result(return)
-        class(string), intent(in) :: self
-        class(string), intent(in) :: other
-
-        return = concat2(self, other%value())
-    end function
-
-    type(string) function concat2(self, other) result(return)
-        class(string), intent(in) :: self
-        character(len=*), intent(in) :: other
-        integer :: i
-
-        return%length = self%length + len(other)
-        allocate(return%data(return%length))
-        return%data(1:self%length) = self%data
-        do i = 1, len(other); return%data(i + self%length) = other(i:i); end do
-    end function
-
-    type(string) function substring(self, start, thru) result(return)
-        class(string), intent(in) :: self
-        integer, intent(in) :: start, thru
-
-        if (thru < start) return
-
-        return%length = thru - start + 1
-        allocate(return%data(return%length))
-        return%data(1:self%length) = self%data(start:thru)
-    end function
-
-    character(len=1) function char_at(self, index) result(return)
-        class(string), intent(in) :: self
-        integer, intent(in) :: index
-        return = self%data(index)
-    end function
-
-    type(string) function map(self, function) result(return)
-        class(string), intent(in) :: self
-        interface
-            character(len=1) function function(string)
-              character(len=1), intent(in) :: string
-            end function
-        end interface
-        integer :: i
-
-        return%length = self%length
-        allocate(return%data(return%length))
-        do i = 1, self%length
-             return%data(i) = function(self%data(i))
-        end do
-    end function
-
-    type(string) function to_uppercase(self) result(return)
-        class(string), intent(in) :: self
-        return = self%map(to_upper)
-    !contains ! Causes XLF compiler bug -- see xlf-bug.f03
-    end function
-        character(len=1) function to_upper(ch) result(return)
-            character(len=1), intent(in) :: ch
-            integer, parameter :: diff = iachar('a') - iachar('A')
-
-            if (lle('a', ch) .and. lle(ch, 'z')) then
-                return = achar(iachar(ch) - diff)
-            else
-                return = ch
-            end if
-        end function
-    !end function
-
-    type(string) function to_lowercase(self) result(return)
-        class(string), intent(in) :: self
-        return = self%map(to_lower)
-    !contains ! Causes XLF compiler bug -- see xlf-bug.f03
-    end function
-        character(len=1) function to_lower(ch) result(return)
-            character(len=1), intent(in) :: ch
-            integer, parameter :: diff = iachar('a') - iachar('A')
-
-            if (lle('A', ch) .and. lle(ch, 'Z')) then
-                return = achar(iachar(ch) + diff)
-            else
-                return = ch
-            end if
-        end function
-    !end function
-
-    subroutine write_formatted(self, unit, iotype, v_list, iostat, iomsg)
-        class(string), intent(in) :: self
-        integer, intent(in) :: unit
-        character(*), intent(in) :: iotype
-        integer, dimension(:), intent(in) :: v_list
-        integer, intent(out) :: iostat
-        character(*), intent(inout) :: iomsg
-        ! TODO Incomplete
-        write (unit=unit, fmt=*, iostat=iostat, iomsg=iomsg) self%value()
-    end subroutine
-
-    subroutine write_unformatted(self, unit, iostat, iomsg)
-        class(string), intent(in) :: self
-        integer, intent(in) :: unit
-        integer, intent(out) :: iostat
-        character(*), intent(inout) :: iomsg
-        ! TODO Incomplete
-        write (unit=unit, fmt=*, iostat=iostat, iomsg=iomsg) self%value()
-    end subroutine
-
-    character(len=self%length) function value(self) result(result)
-        class(string), intent(in) :: self
-        integer :: i
-
-        do i = 1, ubound(self%data, 1)
-            result(i:i) = self%data(i)
-        end do
-    end function
-
-    logical function all_satisfy(self, function, other) result(return)
-        class(string), intent(in) :: self
-        interface
-            logical function function(ch1, ch2)
-                character(len=1), intent(in) :: ch1, ch2
-            end function
-        end interface
-        class(string), intent(in) :: other
-        integer :: i
-
-        if (self%length <> other%length) then
-            return = .false.
-        else
-            return = .true.
-            do i = 1, self%length
-                if (function(self%data(i), other%data(i)) .eqv. .false.) then
-                    return = .false.
-                    return
-                end if
-            end do
-        end if
-    end function
-
-    logical function equals(self, other) result(return)
-        class(string), intent(in) :: self
-        class(string), intent(in) :: other
-        return = self%all_satisfy(ch_eq, other)
-    end function
-
-    logical function ch_eq(ch1, ch2) result(return)
-        character(len=1), intent(in) :: ch1, ch2
-        return = ch1 .eq. ch2
-    end function
-
-    logical function equals_ignore_case(self, other) result(return)
-        class(string), intent(in) :: self
-        class(string), intent(in) :: other
-        return = self%all_satisfy(ch_eqic, other)
-    end function
-
-    logical function ch_eqic(ch1, ch2) result(return)
-        character(len=1), intent(in) :: ch1, ch2
-        return = to_upper(ch1) .eq. to_upper(ch2)
-    end function
-
-    subroutine destructor(self)
-        type(string), intent(inout) :: self
-    end subroutine
-
-end module string_module
-
-module test_util
-    implicit none
-contains
-    character(len=1) function identity(string) result(return)
-        character(len=1), intent(in) :: string
-        return = string
-    end function
-
-    character(len=1) function always_a(string) result(return)
-        character(len=1), intent(in) :: string
-        return = 'a'
-    end function
-end module test_util
-
-program string_test
-    use string_module
-    use test_util
-    implicit none
-
-    type(string) :: s1, s2
-
-    print *, "Expected: "
-    print *, "Actual:   ", s1%value()
-
-    call s1%initialize('Hello')
-    call s2%initialize('!')
-
-    print *, "Expected: Hello"
-    print *, "Actual:   ", s1%value()
-
-    s1 = new_string("HeLlOoO!")
-    print *, "Expected: HeLlOoO!"
-    print *, "Actual:   ", s1%value()
-    s1 = new_string("Hello")
-
-    s1 = s1%concat(', world')
-    print *, "Expected: Hello, world"
-    print *, "Actual:   ", s1%value()
-
-    s1 = s1%concat(s2)
-    print *, "Expected: Hello, world!"
-    print *, "Actual:   ", s1%value()
-
-    s1 = s1 + '!'
-    !print *, (s1 + '!')%value()
-    print *, "Expected: Hello, world!!"
-    print *, "Actual:   ", s1%value()
-
-    print *, "Expected: -9876x"
-    print *, "Actual:   ", new_string("-") + new_string("9876x")
-
-    print *, "Expected: ell"
-    print *, "Actual:   ", "Hello, world!!"(2:4)
-    print *, "Expected: ell"
-    print *, "Actual:   ", s1%substring(2, 4)
-
-    print *, "Expected: He"
-    print *, "Actual:   ", s1%substring(0, 2)
-
-    print *, "Expected: "
-    print *, "Actual:   ", "Hello, world!!"(5:1)
-    print *, "Expected: "
-    print *, "Actual:   ", s1%substring(5, 1)
-
-    print *, "Expected: e"
-    print *, "Actual:   ", s1%char_at(2)
-
-    print *, "Expected: ", "Hello, world!!"
-    print *, "Actual:   ", s1%map(identity)
-
-    print *, "Expected: ", "aaaaaaaaaaaaaa"
-    print *, "Actual:   ", s1%map(always_a)
-
-    print *, "Expected: HELLO, WORLD!!"
-    print *, "Actual:   ", s1%to_uppercase()
-
-    print *, "Expected: hello, world!!"
-    print *, "Actual:   ", s1%to_lowercase()
-
-    print *, "Expected: Hello, world!!"
-    print *, "Actual:   ", s1
-
-    print *, "Expected: 0"
-    print *, "Actual:   ", new_string(0)
-
-    print *, "Expected: 5"
-    print *, "Actual:   ", new_string(5)
-
-    print *, "Expected: 12345"
-    print *, "Actual:   ", new_string(12345)
-
-    print *, "Expected: -8"
-    print *, "Actual:   ", new_string(-8)
-
-    print *, "Expected: -98765"
-    print *, "Actual:   ", new_string(-98765)
-
-    print *, "Expected: .true."
-    print *, "Actual:   ", new_string(.true.)
-
-    print *, "Expected: .false."
-    print *, "Actual:   ", new_string(.false.)
-
-    print *, "Expected:  T"
-    print *, "Actual:   ", new_string(.false.) == new_string(".false.")
-
-    print *, "Expected:  T"
-    print *, "Actual:   ", new_string("") == new_string("")
-
-    print *, "Expected:  F"
-    print *, "Actual:   ", new_string("") == new_string("true")
-
-    print *, "Expected:  F"
-    print *, "Actual:   ", new_string("true") == new_string("")
-
-    print *, "Expected:  F"
-    print *, "Actual:   ", new_string("true") == new_string("truE")
-
-    print *, "Expected:  T"
-    print *, "Actual:   ", new_string(.false.) .eqic. new_string(".false.")
-
-    print *, "Expected:  T"
-    print *, "Actual:   ", new_string("") .eqic. new_string("")
-
-    print *, "Expected:  F"
-    print *, "Actual:   ", new_string("") .eqic. new_string("true")
-
-    print *, "Expected:  F"
-    print *, "Actual:   ", new_string("true") .eqic. new_string("")
-
-    print *, "Expected:  T"
-    print *, "Actual:   ", new_string("true") .eqic. new_string("truE")
-
-    print *, "Expected:  T"
-    print *, "Actual:   ", new_string("tRUe") .eqic. new_string("TrUe")
-
-    print *, "Done"
-end program string_test

diff --git a/org.eclipse.photran-samples/src-fortran2003/xlf-bug.f03 b/org.eclipse.photran-samples/src-fortran2003/xlf-bug.f03
deleted file mode 100644
index 31776da..0000000
--- a/org.eclipse.photran-samples/src-fortran2003/xlf-bug.f03
+++ /dev/null

@@ -1,62 +0,0 @@
-!>
-!! Illustrates a bug in IBM XL Fortran for AIX, V12.1 (5724-U82)
-!!
-!! The function "identity" is an internal function which
-!! is passed as a parameter to the "map" routine.  However, when it is invoked as a callback,
-!! the string it receives as its first parameter is not the string that was actually passed
-!! as the first parameter by the invoking function.
-!!
-!! Jeff Overbey (1/29/09)
-!<
-module string_module
-    implicit none
-    private
-
-    type, public :: string
-    contains
-        procedure :: map
-        procedure :: copy
-    end type string
-
-contains
-
-	! Applies function to each of the strings 'H', 'e', 'l', 'l', 'o'
-    subroutine map(self, function)
-    	class(string), intent(in) :: self
-    	interface
-    		character(len=1) function function(string)
-    		  character(len=1), intent(in) :: string
-    		end function
-    	end interface
-
-		character, dimension(5) :: hello = (/ 'H', 'e', 'l', 'l', 'o' /)
-    	integer :: i
-
-		do i = 1, 5
-        	print *, "Invoking callback with parameter ", hello(i)
-        	hello(i) = function(hello(i))
-        end do
-    end subroutine
-
-    ! Invokes map with the identity function (defined below)
-    subroutine copy(self)
-    	class(string), intent(in) :: self
-    	call self%map(identity)
-    contains
-        !!!!! Error is demonstrated when this (internal) function is
-        !!!!! passed as an argument to the map procedure: The "ch"
-        !!!!! argument is a garbage string, not the one actually
-        !!!!! passed by map
-	    character(len=1) function identity(ch) result(return)
-	    	character(len=1), intent(in) :: ch
-            print *, "Callback invoked with parameter ", ch
-            return = ch
-		end function
-    end subroutine
-end module string_module
-
-program string_test
-	use string_module
-	type(string) :: s
-	call s%copy()
-end program string_test

diff --git a/org.eclipse.photran-samples/src-fortran2003/xlf-bug2.f03 b/org.eclipse.photran-samples/src-fortran2003/xlf-bug2.f03
deleted file mode 100644
index 91ace76..0000000
--- a/org.eclipse.photran-samples/src-fortran2003/xlf-bug2.f03
+++ /dev/null

@@ -1,55 +0,0 @@
-!>
-!! Illustrates a bug in IBM XL Fortran for AIX, V12.1 (5724-U82)
-!!
-!! XLF reports errors when a subclass, whose parent class is in a different
-!! module, overrides a procedure with a pointer to class(*) as either an
-!! argument or a return type.  If both modules are combined into a single
-!! module, the code compiles successfully.
-!!
-!! Jeff Overbey (2/24/09)
-!<
-module mod_base
-    implicit none
-    private
-    ! Abstract class "base" contains two routines
-    ! * accept_any accepts a pointer to class(*)
-    ! * return_any returns a pointer to class(*)
-    type, public, abstract :: base
-    contains
-        procedure(accept_any), deferred :: accept_any
-        procedure(return_any), deferred :: return_any
-    end type
-    abstract interface
-        subroutine accept_any(self, arg)
-            import base
-            class(base), intent(in) :: self
-            class(*), pointer, intent(in) :: arg
-        end subroutine
-        function return_any(self) result(return)
-            import base
-            class(base), intent(in) :: self
-            class(*), pointer :: return
-        end function
-    end interface
-end module
-module mod_extended
-    use mod_base
-    implicit none
-    private
-    type, public, extends(base) :: extended
-    contains
-        procedure :: accept_any => extended_accept_any  ! XLF reports Dummy argument arg of overridden binding accept_any and the corresponding dummy argument of overriding binding accept_any must have the same type and type parameters.
-        procedure :: return_any => extended_return_any  ! XLF reports The function results of the overridden binding return_any and overridding binding return_any must have the same type and type parameters.
-    end type
-contains
-    subroutine extended_accept_any(self, arg)
-        class(extended), intent(in) :: self
-        class(*), pointer, intent(in) :: arg
-    end subroutine
-    function extended_return_any(self) result(return)
-        class(extended), intent(in) :: self
-        class(*), pointer :: return
-        return => null()
-    end function
-end module
-program p; end program

diff --git a/org.eclipse.photran-samples/src-fortran2003/xlf-crash.f03 b/org.eclipse.photran-samples/src-fortran2003/xlf-crash.f03
deleted file mode 100644
index ad259b3..0000000
--- a/org.eclipse.photran-samples/src-fortran2003/xlf-crash.f03
+++ /dev/null

@@ -1,20 +0,0 @@
-!>
-!! Example program causes an internal compiler error in
-!! IBM XL Fortran for AIX, V12.1 (5724-U82)
-!!
-!! Jeff Overbey (1/29/09)
-!<
-module m
-  type string
-    character, dimension(:), pointer :: data
-  contains
-    procedure value
-  end type
-contains
-  ! XLF internal compiler error due to this expression
-  !             vvvvvvvvvvvvvvvvvvvv
-  character(len=ubound(self%data, 1)) function value(self) !result(result)
-    class(string), intent(in) :: self
-    value = ''
-  end function
-end module

diff --git a/org.eclipse.photran-samples/src-fortran2008/.cvsignore b/org.eclipse.photran-samples/src-fortran2008/.cvsignore
deleted file mode 100644
index 66fec5b..0000000
--- a/org.eclipse.photran-samples/src-fortran2008/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-*.exe
-*.mod

diff --git a/org.eclipse.photran-samples/src-fortran2008/01-submodules.f08 b/org.eclipse.photran-samples/src-fortran2008/01-submodules.f08
deleted file mode 100644
index ff37d15..0000000
--- a/org.eclipse.photran-samples/src-fortran2008/01-submodules.f08
+++ /dev/null

@@ -1,38 +0,0 @@
-! Demonstration of Fortran 2008 submodules
-! J. Overbey - 1 Dec 2009
-
-! The module and submodules have the following hierarchy:
-!
-!               module
-!                  |
-!                  |
-!             submodule1
-!                  |
-!                  |
-!             submodule2
-!                 /|\
-!               /  |  \
-!             /    |    \
-!           /      |      \
-! submodule3  submodule4  submodule5
-
-module module
-  implicit none
-contains ! Empty contains section allowed in Fortran 2008
-end module module
-
-submodule (module) submodule1
-  implicit none
-end
-
-submodule (module : submodule1) submodule2
-end submodule
-
-submodule (module : submodule2) submodule3
-end submodule submodule3
-
-submodule (module : submodule2) submodule4
-endsubmodule
-
-submodule (module : submodule2) submodule5
-endsubmodule submodule3

diff --git a/org.eclipse.photran-samples/src-fortran2008/02-mpsubprog.f08 b/org.eclipse.photran-samples/src-fortran2008/02-mpsubprog.f08
deleted file mode 100644
index 3550309..0000000
--- a/org.eclipse.photran-samples/src-fortran2008/02-mpsubprog.f08
+++ /dev/null

@@ -1,44 +0,0 @@
-! Demonstration of separate module subprograms in Fortran 2008
-! Exercises R214, R1108, 1226, 1237-1239
-! J. Overbey - 2 Dec 2009
-
-module module
-  implicit none
-
-  interface
-
-    integer function twice(n)
-      integer, intent(in) :: n
-    end function twice
-    integer function one(); end function
-    integer function two(); end function
-    integer function three(); end function
-    integer function four(); end function
-    integer function five(); end function
-    subroutine noop; end subroutine
-
-  end interface
-
-end module module
-
-submodule (module) submodule1
-  implicit none
-contains
-
-  module procedure twice
-                   twice = 2 * n  ! I guess n exists here...  (??)
-                                     end
-  module procedure one;   one = 1;   endprocedure
-  module procedure two;   two = 2;   end procedure
-  module procedure three; three = 3; endprocedure three
-  module procedure four;  four = 4;  end procedure four
-  module function five()
-    five = 5
-  end function
-  module subroutine noop
-  end subroutine
-
-  impure function impure()
-  end function
-
-end

diff --git a/org.eclipse.photran-samples/src-fortran2008/03-block-construct.f08 b/org.eclipse.photran-samples/src-fortran2008/03-block-construct.f08
deleted file mode 100644
index 818c2cc..0000000
--- a/org.eclipse.photran-samples/src-fortran2008/03-block-construct.f08
+++ /dev/null

@@ -1,37 +0,0 @@
-! Demonstrates the Fortran 2008 BLOCK construct
-! Exercises R213, 807, 808, 809
-! J. Overbey - 1 Dec 2009
-implicit none
-
-integer :: n = 1
-print *, n  ! Prints 1
-
-block
-end block
-
-name: block
-end block
-
-name: block
-end block name
-
-block
-endblock
-
-name: block
-endblock
-
-name: block
-endblock name
-
-!block: block
-!end block block
-
-block
-    integer :: n = 2  ! Shadows the above
-    print *, n   ! Prints 2
-end block
-
-print *, n  ! Prints 1
-
-end program

diff --git a/org.eclipse.photran-samples/src-fortran2008/04-coarray-decl-1.f08 b/org.eclipse.photran-samples/src-fortran2008/04-coarray-decl-1.f08
deleted file mode 100644
index e56e535..0000000
--- a/org.eclipse.photran-samples/src-fortran2008/04-coarray-decl-1.f08
+++ /dev/null

@@ -1,45 +0,0 @@
-! Exercises the following rules for co-array declarations:
-! R437, 438, 502, 503, 509-513
-! J. Overbey - 7 Dec 2009
-
-implicit none
-
-integer, parameter :: FIVE = 5
-
-type t
-  integer, allocatable :: n
-  ! R437
-  integer, codimension[*] :: ar1
-  integer, contiguous     :: ar2
-  integer                 :: ar3
-  ! R438
-  integer                 :: ar4(5,5)[*]*7
-  integer                 :: ar5     [*]
-end type
-
-  ! R502
-  integer, codimension[*] :: ar1
-  integer, contiguous     :: ar2
-  integer                 :: ar3
-  ! R503
-  integer                 :: ar4(5,5)[*]*7
-  integer                 :: ar5     [*]
-
-  ! R509 handled via tests for R510 and R511
-
-  ! R510
-  integer, codimension[:] :: deferred1
-  integer, codimension[:,:] :: deferred2
-  integer, codimension[:,:,:] :: deferred3
-  integer, codimension[:,:,:,:] :: deferred4
-  integer, codimension[:,:,:,:,:] :: deferred5
-
-  ! R511
-  integer, codimension[3:5, 7, 9:*] :: explicit1
-  integer, codimension[3:5, 7,   *] :: explicit2
-  integer, codimension[  5, 7,   *] :: explicit3
-  integer, codimension[     7,   *] :: explicit4
-  integer, codimension[   3+7,   *] :: explicit5
-  integer, codimension[(FIVE+1)*2, (FIVE+1)*2:*] :: explicit6
-
-end program

diff --git a/org.eclipse.photran-samples/src-fortran2008/05-coarray-decl-2.f08 b/org.eclipse.photran-samples/src-fortran2008/05-coarray-decl-2.f08
deleted file mode 100644
index 4431485..0000000
--- a/org.eclipse.photran-samples/src-fortran2008/05-coarray-decl-2.f08
+++ /dev/null

@@ -1,33 +0,0 @@
-! Exercises the following rules for co-array declarations:
-! R531-533
-! J. Overbey - 7 Dec 2009
-
-  implicit none
-
-  integer, parameter :: FIVE = 5
-
-  integer :: ar1, ar2, ar3, ar4, ar5, ar6, ar7, ar8, ar9, ar10, &
-             deferred1, deferred2, deferred3, deferred4, deferred5, &
-             explicit1, explicit2, explicit3, explicit4, explicit5, explicit6
-
-  codimension :: ar1[*]
-  codimension    ar2[*]
-
-  contiguous :: ar3
-  contiguous    ar4
-
-  contiguous :: ar5, ar6, ar7
-  contiguous    ar8, ar9, ar10
-
-  codimension :: deferred1[:], deferred2[:,:], deferred3[:,:,:]
-  codimension    deferred4[:,:,:,:], &
-                 deferred5[:,:,:,:,:]
-
-  codimension :: explicit1[3:5, 7, 9:*]
-  codimension :: explicit2[3:5, 7,   *]
-  codimension :: explicit3[  5, 7,   *]
-  codimension :: explicit4[     7,   *]
-  codimension :: explicit5[   3+7,   *], &
-                 explicit6[(FIVE+1)*2, (FIVE+1)*2:*]
-
-end program

diff --git a/org.eclipse.photran-samples/src-fortran2008/06-coarray-target.f08 b/org.eclipse.photran-samples/src-fortran2008/06-coarray-target.f08
deleted file mode 100644
index ea7a02a..0000000
--- a/org.eclipse.photran-samples/src-fortran2008/06-coarray-target.f08
+++ /dev/null

@@ -1,10 +0,0 @@
-! Exercises the following rules for co-array declarations:
-! R557
-! J. Overbey - 7 Dec 2009
-
-  implicit none
-
-  ! R557
-  target :: a, b(3), c[*]
-  target    d(3)[*], e[4, 1*2:*]
-end program

diff --git a/org.eclipse.photran-samples/src-fortran2008/07-coarray-exprs.f08 b/org.eclipse.photran-samples/src-fortran2008/07-coarray-exprs.f08
deleted file mode 100644
index 5e444e2..0000000
--- a/org.eclipse.photran-samples/src-fortran2008/07-coarray-exprs.f08
+++ /dev/null

@@ -1,14 +0,0 @@
-! Exercises the Section 6 rules for co-array expressions
-! J. Overbey - 7 Dec 2009
-
-! This is obviously not semantically legal
-
-! TODO: Finish this
-
-a[3,4] = 7
-b(1,2)[3,4] = a[3,4]
-b(1,2)[3,4] = a[3,4:8] * b(3)%c[3,4]
-
-allocate (a[3:4,*])
-
-end program

diff --git a/org.eclipse.photran-samples/src-fortran2008/08-complex-part-desig.f08 b/org.eclipse.photran-samples/src-fortran2008/08-complex-part-desig.f08
deleted file mode 100644
index da00b92..0000000
--- a/org.eclipse.photran-samples/src-fortran2008/08-complex-part-desig.f08
+++ /dev/null

@@ -1,13 +0,0 @@
-! Exercises Fortran 2008 complex part designators (R615)
-! J. Overbey - 7 Dec 2009
-
-implicit none
-
-complex :: cmplx = (3.0, 4.0)
-print *, cmplx
-print *, cmplx%re
-print *, cmplx%im
-print *, cmplx%RE
-print *, cmplx%IM
-
-end program

diff --git a/org.eclipse.photran-samples/src-fortran2008/09-critical-construct.f08 b/org.eclipse.photran-samples/src-fortran2008/09-critical-construct.f08
deleted file mode 100644
index 21c8ac3..0000000
--- a/org.eclipse.photran-samples/src-fortran2008/09-critical-construct.f08
+++ /dev/null

@@ -1,27 +0,0 @@
-! Demonstrates the Fortran 2008 CRITICAL construct
-! Exercises R213, 810-812
-! J. Overbey - 8 Dec 2009
-implicit none
-
-critical
-end critical
-
-name: critical
-end critical
-
-name: critical
-end critical name
-
-critical
-endcritical
-
-name: critical
-endcritical
-
-name: critical
-endcritical name
-
-!critical: critical
-!end critical critical
-
-end program

diff --git a/org.eclipse.photran-samples/src-fortran2008/10-allstop-stmt.f08 b/org.eclipse.photran-samples/src-fortran2008/10-allstop-stmt.f08
deleted file mode 100644
index f58b340..0000000
--- a/org.eclipse.photran-samples/src-fortran2008/10-allstop-stmt.f08
+++ /dev/null

@@ -1,22 +0,0 @@
-! Demonstrates the Fortran 2008 ALLSTOP statement
-! Exercises R214 and R856
-! J. Overbey - 8 Dec 2009
-implicit none
-
-stop=3
-all=5
-allstop=8
-stop=all
-
-stop "X"
-stop 3
-stop
-
-all stop "X"
-all stop 3
-all stop
-allstop "X"
-allstop 3
-allstop
-
-end program

diff --git a/org.eclipse.photran-samples/src-fortran2008/11-sync-stmts.f08 b/org.eclipse.photran-samples/src-fortran2008/11-sync-stmts.f08
deleted file mode 100644
index 8bfcca6..0000000
--- a/org.eclipse.photran-samples/src-fortran2008/11-sync-stmts.f08
+++ /dev/null

@@ -1,59 +0,0 @@
-! Demonstrates the Fortran 2008 SYNC statements
-! Exercises R214, 858-862
-! J. Overbey - 8 Dec 2009
-
-integer, parameter :: THREE = 3
-
-sync=7
-all=9
-images=13
-memory=12
-sync=all
-syncall=15
-syncimages=32+syncall
-syncmemory=syncimages
-stat=3
-errmsg="Hello"
-
-sync all
-sync all (stat=s)
-sync all (errmsg=e)
-sync all (stat=s, errmsg=e)
-sync all (errmsg=e, stat=s)
-syncall
-syncall (stat=s)
-syncall (errmsg=e)
-syncall (stat=s, errmsg=e)
-syncall (errmsg=e, stat=s)
-
-sync images (3)
-sync images (THREE)
-sync images (1*(2*THREE))
-sync images (*)
-syncimages  (3)
-syncimages  (THREE)
-syncimages  (1*(2*THREE))
-syncimages  (*)
-
-sync images (1*(2*THREE), stat=s)
-sync images (*,           stat=s)
-syncimages  (1*(2*THREE), stat=s)
-syncimages  (*,           stat=s)
-
-sync images (1*(2*THREE), stat=s, errmsg=e)
-sync images (*,           stat=s, errmsg=e)
-syncimages  (1*(2*THREE), stat=s, errmsg=e)
-syncimages  (*,           stat=s, errmsg=e)
-
-sync memory
-sync memory (stat=s)
-sync memory (errmsg=e)
-sync memory (stat=s, errmsg=e)
-sync memory (errmsg=e, stat=s)
-syncmemory
-syncmemory (stat=s)
-syncmemory (errmsg=e)
-syncmemory (stat=s, errmsg=e)
-syncmemory (errmsg=e, stat=s)
-
-end program

diff --git a/org.eclipse.photran-samples/src-fortran2008/12-lock-stmts.f08 b/org.eclipse.photran-samples/src-fortran2008/12-lock-stmts.f08
deleted file mode 100644
index ed6efe9..0000000
--- a/org.eclipse.photran-samples/src-fortran2008/12-lock-stmts.f08
+++ /dev/null

@@ -1,29 +0,0 @@
-! Demonstrates the Fortran 2008 LOCK statements
-! Exercises R214, 863-866
-! J. Overbey - 8 Dec 2009
-
-integer, parameter :: THREE = 3
-
-lock (l)
-lock (l, acquired_lock=q)
-lock (l, acquired_lock=q, errmsg=e)
-lock (l,                  errmsg=e, stat=s)
-lock (l, acquired_lock=q,           stat=s)
-lock (l,                  errmsg=e)
-lock (l,                            stat=s)
-lock (l, acquired_lock=q, errmsg=e, stat=s)
-lock (l, stat=s, errmsg=e, acquired_lock=q)
-
-unlock (l)
-unlock (l, stat=s)
-unlock (l, errmsg=e)
-unlock (l, stat=s, errmsg=e)
-unlock (l, errmsg=e, stat=s)
-
-lock=3
-acquired_lock=3
-stat=3
-errmsg="Hello"
-unlock=3 * lock + acquired_lock
-
-end program

diff --git a/org.eclipse.photran-samples/src-fortran2008/Makefile b/org.eclipse.photran-samples/src-fortran2008/Makefile
deleted file mode 100644
index 936b28a..0000000
--- a/org.eclipse.photran-samples/src-fortran2008/Makefile
+++ /dev/null

@@ -1,7 +0,0 @@
-.PHONY: all clean
-
-all:
-	@echo Fortran 2008 programs will not be compiled.
-
-clean:
-	rm -f *.exe *.mod
\ No newline at end of file

diff --git a/org.eclipse.photran-samples/src-gaussian-elimination/.cvsignore b/org.eclipse.photran-samples/src-gaussian-elimination/.cvsignore
deleted file mode 100644
index 2e87cbd..0000000
--- a/org.eclipse.photran-samples/src-gaussian-elimination/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-a.exe

diff --git a/org.eclipse.photran-samples/src-gaussian-elimination/gauselim.f90 b/org.eclipse.photran-samples/src-gaussian-elimination/gauselim.f90
deleted file mode 100755
index f193e2d..0000000
--- a/org.eclipse.photran-samples/src-gaussian-elimination/gauselim.f90
+++ /dev/null

@@ -1,239 +0,0 @@
-program GaussianElimination
-! Solve a linear system of equations with Gaussian Elimination
-!   and Back Substitution
-
-! SUBROUTINES: mtxrd,mtxwrt,mtxmlt
-
-! Always declare ALL variables
-  implicit none
-  INTEGER :: indx,jndx,kndx,lndx ! loop counters
-  INTEGER :: nsize               ! # of equations (size of the A matrix)
-  REAL :: amtx(10,10)            ! A matrix in Ax=B
-  REAL :: bvct(10)               ! B vector in Ax=B
-  REAL :: xvct(10)               ! x vector in Ax=B
-  REAL :: scl(10)                ! Scale factors
-  INTEGER :: irow(10)            ! Row numbers (for swapping rows)
-  INTEGER :: ipivot              ! Pivot row
-  INTEGER :: itemp               ! Temporary value while swapping
-  REAL :: tmpval                 ! Temporary value while pivoting
-  REAL :: pival                  ! Pivot value
-  REAL :: fctr                   ! Multiplication factor for row reduction
-  CHARACTER(len = 64) :: filein  ! Input file name
-  INTEGER :: ieof                ! Flag to ensure the file opens correctly
-
-! Initially, no row swaps
-  do indx = 1, 10
-    irow(indx) = indx
-  end do
-
-! Introduce the program
-  write (*, *) &
-    'Program to solve a linear system of equations using'
-  write (*, *) &
-    '  Gaussian Elimination and Back Substitution'
-  write (*, *) ! A Blank Line
-
-! Read from a file (we don't have to type all those numbers)
-  write (*, *) 'Enter the input file name: '
-  read (*, *) filein
-  open (10, file = filein, status = 'old', iostat = ieof)
-
-! If I have trouble opening the file, blow me out of the program!
-  if (ieof .ne. 0) then
-    write (*, *) 'File error!'
-    stop
-  end if
-
-! Input the A matrix - write it out for the user
-  write (*, *) 'A Matrix:'
-  call mtxrd(amtx,nsize,nsize)
-  call mtxwrt(amtx,irow,nsize,nsize)
-! Input the B vector - write it out for the user
-  write (*, *) ! Blank line
-  write (*, *) 'B Vector:'
-  call vctrd(bvct,nsize)
-  call vctwrt(bvct,nsize)
-  
-! *** FIND SCALE FACTORS *** !
-
-  do indx = 1,nsize
-    scl(indx) = abs(amtx(indx,1))
-    do jndx = 2, nsize
-      if (abs(amtx(indx,jndx)) > scl(indx)) then
-        scl(indx) = abs(amtx(indx,jndx))
-      end if
-    end do
-  end do
-  
-  write (*, *) ! Blank line
-  write (*, *) 'Scale factors:'
-  call vctwrt(scl,nsize)
-  
-! *** BEGIN GAUSSIAN ELIMINATION (ROW REDUCTION) *** !
-
-  do kndx = 1, nsize-1  ! For each column k...
-
-    ! Choose the pivot element
-    ipivot = kndx   ! WAS ipivot = irow(kndx)
-    pival = abs(amtx(irow(ipivot), kndx) / scl(irow(ipivot)))
-    do lndx = kndx+1, nsize
-      tmpval = abs(amtx(irow(lndx), kndx) / scl(irow(lndx)))
-      if (tmpval > pival) then
-        pival = tmpval
-        ipivot = lndx   ! WAS ipivot = irow(lndx)
-      end if
-    end do
-    
-    !write (*, *) ! Blank line
-    !write (*, *) 'Swapping rows ', kndx, ' and ', ipivot, ' -- pival is ', pival
-    
-    ! Row swap
-    itemp = irow(kndx)
-    irow(kndx) = irow(ipivot)
-    irow(ipivot) = itemp
-
-    !call augwrt(amtx,irow,bvct,nsize)
-    
-    ! Row reduce
-    do indx = kndx+1, nsize  ! For each row i > k...
-      fctr = amtx(irow(indx),kndx) / amtx(irow(kndx),kndx)
-      amtx(irow(indx),kndx) = 0.0      ! We're zeroing out a(i,k)
-      do jndx = kndx+1,nsize     ! Scale & subtract the rest of the row
-        amtx(irow(indx),jndx) = amtx(irow(indx),jndx) - fctr * amtx(irow(kndx),jndx)
-      end do
-      bvct(irow(indx)) = bvct(irow(indx)) - fctr * bvct(irow(kndx))
-    end do
-    
-    !write (*, *) 'Reduction:'
-    !call augwrt(amtx,irow,bvct,nsize)
-    
-  end do
-
-! *** END GAUSSIAN ELIMINATION (ROW REDUCTION) *** !
-
-
-  write (*, *) ! Blank line
-  write (*, *) 'Reduced, Augmented Matrix:'
-  call augwrt(amtx,irow,bvct,nsize)
-
-! Back Substitute
-  do indx = nsize, 1, -1  ! Start at lower right and work upwards
-    xvct(indx) = bvct(irow(indx))
-! Subtract the previous x-values times their respective coefficients
-    do jndx = indx+1, nsize
-      xvct(indx) = xvct(indx) - amtx(irow(indx),jndx) * xvct(jndx)
-    end do
-! Divide by the current coefficient
-    xvct(indx) = xvct(indx) / amtx(irow(indx),indx)
-  end do
-
-  write (*, *) ! Blank line
-  write (*, *) 'Solution Vector:'
-  call vctwrt(xvct,nsize)
-
-  stop
-
-contains
-
-  subroutine mtxrd(amtx,mrow,ncol)
-
-! ABSTRACT: Subroutine to read an m x n matrix from a file
-!   FORMAT: first line has the dimensions
-!           each following line has a row of the matrix
-
-! Always declare ALL variables
-    implicit none
-    INTEGER :: irow,jcol               ! row, column loop counters
-    INTEGER, INTENT(OUT) :: mrow,ncol  ! # rows, columns
-    REAL, INTENT(OUT) :: amtx(:,:)     ! matrix
-
-! Read the size of the matrix
-    read (10, *) mrow,ncol
-
-! Read the matrix, one row at a time
-    do irow = 1,mrow
-      read (10, *) (amtx(irow,jcol),jcol=1,ncol)
-    end do
-
-    return
-  end subroutine mtxrd
-
-  subroutine mtxwrt(amtx,irow,mrow,ncol)
-
-! ABSTRACT: Subroutine to write an m x n matrix to the screen
-
-! Always declare ALL variables
-    implicit none
-    INTEGER :: indx,jcol              ! row, column loop counters
-    INTEGER, INTENT(IN) :: mrow,ncol  ! # rows, columns
-    INTEGER, INTENT(IN) :: irow(:)    ! For row swapping
-    REAL, INTENT(IN) :: amtx(:,:)     ! matrix
-
-! Write the matrix, one row at a time
-    do indx = 1,mrow
-      write (*, '('' '',10g10.4)') (amtx(irow(indx),jcol),jcol=1,ncol)
-    end do
-    return
-  end subroutine mtxwrt
-
-  subroutine augwrt(amtx,irow,bvct,nsize)
-
-! ABSTRACT: Subroutine to write an n x n matrix with a vector augmented to it
-
-! Always declare ALL variables
-    implicit none
-    INTEGER :: indx,jcol            ! row, column loop counters
-    INTEGER, INTENT(IN) :: nsize   ! # rows
-    INTEGER, INTENT(IN) :: irow(:)    ! For row swapping
-    REAL, INTENT(IN) :: amtx(:,:)  ! matrix
-    REAL, INTENT(IN) :: bvct(:)    ! vector
-
-! Write the matrix, one row at a time
-    do indx = 1,nsize
-      write (*, '('' '',10g10.4)') &
-        (amtx(irow(indx),jcol),jcol=1,nsize),bvct(irow(indx))
-    end do
-    return
-  end subroutine augwrt
-
-  subroutine vctrd(vctr,nsize)
-
-! ABSTRACT: Subroutine to read a vector from a file
-!   FORMAT: first line has the dimensions
-!           each following line has a row of the vector
-
-! Always declare ALL variables
-    implicit none
-    INTEGER :: irow               ! row loop counters
-    INTEGER, INTENT(OUT) :: nsize ! # rows
-    REAL, INTENT(OUT) :: vctr(:)  ! vector
-
-! Read the size of the matrix
-    read (10, *) nsize
-
-! Read the matrix, one row at a time
-    do irow = 1,nsize
-      read (10, *) vctr(irow)
-    end do
-
-    return
-  end subroutine vctrd
-
-  subroutine vctwrt(vctr,nsize)
-
-! ABSTRACT: Subroutine to write a vector to the screen
-
-! Always declare ALL variables
-    implicit none
-    INTEGER :: irow               ! row loop counters
-    INTEGER, INTENT(IN) :: nsize ! # rows
-    REAL, INTENT(IN) :: vctr(:)  ! vector
-
-! Write the matrix, one row at a time
-    do irow = 1,nsize
-      write (*, *) vctr(irow)
-    end do
-    return
-  end subroutine vctwrt
-
-end program GaussianElimination

diff --git a/org.eclipse.photran-samples/src-implicits-1/.cvsignore b/org.eclipse.photran-samples/src-implicits-1/.cvsignore
deleted file mode 100644
index 2e87cbd..0000000
--- a/org.eclipse.photran-samples/src-implicits-1/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-a.exe

diff --git a/org.eclipse.photran-samples/src-implicits-1/hello.f90 b/org.eclipse.photran-samples/src-implicits-1/hello.f90
deleted file mode 100644
index f5dfb76..0000000
--- a/org.eclipse.photran-samples/src-implicits-1/hello.f90
+++ /dev/null

@@ -1,22 +0,0 @@
-! This is a sample program
-
-program Hello
-  integer :: i = 3 !!! a variable !!!
-
-  call Sub(Fn(i) + 1)
-
-  print *, "The integer is ", i
-
-contains ! a comment
-
-subroutine Sub(x) ! start
-
-  print *, "In the subroutine, the integer is ", x
-end subroutine Sub   ! end
-
-end program
-
-integer function Fn(n) result(y)
-  print *, "You sent", n, "to the function"
-  y = n
-end function

diff --git a/org.eclipse.photran-samples/src-implicits-2/.cvsignore b/org.eclipse.photran-samples/src-implicits-2/.cvsignore
deleted file mode 100644
index 2e87cbd..0000000
--- a/org.eclipse.photran-samples/src-implicits-2/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-a.exe

diff --git a/org.eclipse.photran-samples/src-implicits-2/fortran.f90 b/org.eclipse.photran-samples/src-implicits-2/fortran.f90
deleted file mode 100644
index 8240a04..0000000
--- a/org.eclipse.photran-samples/src-implicits-2/fortran.f90
+++ /dev/null

@@ -1,37 +0,0 @@
-program functioncalling
-    
-  print *, 'This is the Fortran program; I am going to call some functions now...'
-  call sum(1.0,2.0,3.0)
-  call factorial(3)
-  print *, 'Done'
-
-contains
-
-  subroutine sum(x,y,z)
-
-  x = x+y+z
-
-  print *, x
-
-  end subroutine sum
-
-  subroutine factorial(j)
-
-  p=1
-  i=1
-  do i=1,j
-    p=p*i
-  end do
-
-  print *, j, "! = ", p
-
-  end subroutine factorial
-
-  subroutine sum2(x,y)
-
-  p = x+y
-
-  end subroutine sum2
-
-
-end

diff --git a/org.eclipse.photran-samples/src-implicits-3/.cvsignore b/org.eclipse.photran-samples/src-implicits-3/.cvsignore
deleted file mode 100644
index 2e87cbd..0000000
--- a/org.eclipse.photran-samples/src-implicits-3/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-a.exe

diff --git a/org.eclipse.photran-samples/src-implicits-3/crazyimplicits.f90 b/org.eclipse.photran-samples/src-implicits-3/crazyimplicits.f90
deleted file mode 100644
index 8a82a84..0000000
--- a/org.eclipse.photran-samples/src-implicits-3/crazyimplicits.f90
+++ /dev/null

@@ -1,21 +0,0 @@
-program p
-    a = 3
-    d = 4
-    stop
-contains
-subroutine s
-    implicit integer (a-c,g), real (d-e), type(t) (f), complex (h)
-    type t
-        integer n
-    end type
-    
-    a = 3
-    b = 3
-    c = 3
-    d = 3.0
-    e = 3.0
-    f%n = 3
-    g = 3
-    h = (3, 4)
-end subroutine
-end program

diff --git a/org.eclipse.photran-samples/src-includes/.cvsignore b/org.eclipse.photran-samples/src-includes/.cvsignore
deleted file mode 100644
index 2e87cbd..0000000
--- a/org.eclipse.photran-samples/src-includes/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-a.exe

diff --git a/org.eclipse.photran-samples/src-includes/inc.h b/org.eclipse.photran-samples/src-includes/inc.h
deleted file mode 100644
index 32cff95..0000000
--- a/org.eclipse.photran-samples/src-includes/inc.h
+++ /dev/null

@@ -1 +0,0 @@
-  integer :: i

diff --git a/org.eclipse.photran-samples/src-includes/innocuous.f90 b/org.eclipse.photran-samples/src-includes/innocuous.f90
deleted file mode 100644
index a6a9baf..0000000
--- a/org.eclipse.photran-samples/src-includes/innocuous.f90
+++ /dev/null

@@ -1 +0,0 @@
-end

diff --git a/org.eclipse.photran-samples/src-includes/main.doesnotcompile b/org.eclipse.photran-samples/src-includes/main.doesnotcompile
deleted file mode 100644
index fcc082c..0000000
--- a/org.eclipse.photran-samples/src-includes/main.doesnotcompile
+++ /dev/null

@@ -1,6 +0,0 @@
-! Compilers have all sorts of trouble with this...
-! gfortran segfaulted, and ifort does not allow it
-program p
-    include "inc.h"
-    print i
-end program p

diff --git a/org.eclipse.photran-samples/src-interfaces/.cvsignore b/org.eclipse.photran-samples/src-interfaces/.cvsignore
deleted file mode 100644
index 2e87cbd..0000000
--- a/org.eclipse.photran-samples/src-interfaces/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-a.exe

diff --git a/org.eclipse.photran-samples/src-interfaces/gfortran_compile_error.txt b/org.eclipse.photran-samples/src-interfaces/gfortran_compile_error.txt
deleted file mode 100644
index 6bed12b..0000000
--- a/org.eclipse.photran-samples/src-interfaces/gfortran_compile_error.txt
+++ /dev/null

@@ -1,59 +0,0 @@
-!!
-!! Examples of using INTERFACE blocks in Fortran
-!!
-!! INTERFACE blocks have two different uses:
-!!
-!!     1. Declaring the interface of an external subprogram
-!!        (as an alternative to the EXTERNAL statement, which
-!!        declares that the subprogram is external but says nothing
-!!        about its signature)
-!!
-!!     2. Overloading
-!!
-!! J. Overbey 9/15/08
-!!
-module interface_example
-    implicit none
-
-    !! USAGE 1: Declaring the interface of an external subprogram
-    interface
-        integer function one()
-        end function
-
-        integer function two()
-        end function
-    end interface
-
-    ! Note that one and two are exported and can be made private
-    private :: two
-
-    !! USAGE 2: Overloading
-    interface description
-        character(len=*) function description_int(value)
-            integer, intent(in) :: value
-        end function description_int
-        module procedure description_real
-    end interface
-
-contains
-    character(len=50) function description_real(value)
-        real, intent(in) :: value
-        write (description_real, *) "REAL:", value
-    end function
-end module interface_example
-
-program program
-    use interface_example
-    integer :: one, two = 2  ! Note that "two" is hidden in the module
-    print *, one()
-    print *, description(2)
-    print *, description(3.0)
-end program program
-
-!! EXTERNAL SUBPROGRAMS
-integer function one(); one = 1; end function
-integer function two(); two = 2; end function
-character(len=50) function description_int(value)
-    integer, intent(in) :: value
-    write (description_real, *) "INTEGER:", value
-end function

diff --git a/org.eclipse.photran-samples/src-interfaces/interfaces.f90 b/org.eclipse.photran-samples/src-interfaces/interfaces.f90
deleted file mode 100644
index 5cac592..0000000
--- a/org.eclipse.photran-samples/src-interfaces/interfaces.f90
+++ /dev/null

@@ -1,85 +0,0 @@
-!!
-!! Examples of using INTERFACE blocks in Fortran
-!!
-!! INTERFACE blocks have two different uses:
-!!
-!!     1. Declaring the interface of an external subprogram
-!!        (as an alternative to the EXTERNAL statement, which
-!!        declares that the subprogram is external but says nothing
-!!        about its signature)
-!!
-!!     2. Overloading
-!!
-!! J. Overbey 9/15/08
-!!
-module interface_example
-    implicit none
-
-    ! USAGE 1: Declaring the interface of an external subprogram
-
-    ! This declares two functions in the module, named "one" and "two"
-    ! They will be resolved to the corresponding external functions at link time
-    interface
-        integer function one()
-        end function
-
-        integer function two()
-        end function
-    end interface
-
-    ! Since "one" and "two" are in the module, they can be made private; we'll
-    ! hide "two" from the outside world
-    private :: two
-
-    ! USAGE 2: Overloading
-
-    ! This declares a function named "description" which can be called with
-    ! either an integer or real parameter;
-    !     description(1)
-    ! will actually invoke description_int(1), while
-    !     description(2.0)
-    ! will actually invoke description_real(2.0)
-    interface description
-        ! This overload is an external function; we'll use the same syntax as
-        ! above, simply declaring its interface
-        character(len=50) function description_int(value)
-            integer, intent(in) :: value
-        end function description_int
-
-        ! This overload is a procedure in the module, so we can use a
-        ! MODULE PROCEDURE statement since we already know its interface
-        module procedure description_real
-    end interface
-
-    ! INTERFACE blocks can also be used for operator overloading, but I won't
-    ! demonstrate that here
-
-contains
-    character(len=50) function description_real(value)
-        real, intent(in) :: value
-        write (description_real, *) "REAL:", value
-    end function
-end module interface_example
-
-program program
-    use interface_example, only: one, description
-    implicit none
-    integer :: two = 2  ! Note that "two" is hidden in the module,
-                        ! so we can declare a "two" variable here
-
-    ! Call the function declared in the INTERFACE block
-    print *, one()
-
-    ! Call the overloaded "description" function
-    print *, description(two)
-    print *, description(3.0)
-end program program
-
-!! EXTERNAL SUBPROGRAMS
-integer function one(); one = 1; end function
-integer function two(); two = 2; end function
-character(len=50) function description_int(value)
-    implicit none
-    integer, intent(in) :: value
-    write (description_int, *) "INTEGER:", value
-end function

diff --git a/org.eclipse.photran-samples/src-language-features/.cvsignore b/org.eclipse.photran-samples/src-language-features/.cvsignore
deleted file mode 100644
index 2e87cbd..0000000
--- a/org.eclipse.photran-samples/src-language-features/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-a.exe

diff --git a/org.eclipse.photran-samples/src-language-features/almost-exhaustive.f90 b/org.eclipse.photran-samples/src-language-features/almost-exhaustive.f90
deleted file mode 100644
index ae0bf9f..0000000
--- a/org.eclipse.photran-samples/src-language-features/almost-exhaustive.f90
+++ /dev/null

@@ -1,225 +0,0 @@
-module indirect
-    integer :: included_indirectly_in_points
-contains
-    subroutine indirect_subroutine
-        print *, included_indirectly_in_points
-    end subroutine
-end module
-
-module points
-    use indirect
-    implicit none
-    type point
-        doubleprecision  :: x
-        double precision :: y
-    end type
-
-    interface operator(+)
-        module procedure add
-    end interface
-
-    interface operator(.norm.)
-        module procedure norm
-    end interface
-
-    interface assignment(=)
-        module procedure point_from_int, point_from_complex
-    end interface
-
-    private :: add, norm
-contains
-    type(point) function add(p1, p2) result(result)
-        type(point), intent(in) :: p1, p2
-        result = point(p1%x+p2%x, p1%y+p2%y)
-    end function
-
-    function norm(p)
-        type(point), intent(in) :: p
-        integer :: norm
-        norm = abs(p%x**2 + p%y**2)
-    end function
-!
-!    function point_from_int(n)
-!        integer, intent(in) :: n
-!        type(point) :: point_from_int
-!        point_from_int = point(n, 0)
-!    end function
-
-    subroutine point_from_int(p, n)
-        integer, intent(in) :: n
-        type(point), intent(out) :: p
-        p = point(n, 0)
-    end subroutine
-
-    subroutine point_from_complex(p, c)
-        complex, intent(in) :: c
-        type(point), intent(out) :: p
-        p = point(real(c), aimag(c))
-    end subroutine
-end module
-
-program Main
-	implicit none
-
-	call expressions
-	call pointers
-	call control
-	stop 'Program terminated normally'
-
-contains
-
-    subroutine expressions
-	    use points
-	    implicit none
-
-	    type(point) :: pt
-
-	    integer, parameter :: kind6=selected_int_kind(6) ! Kind for range [-999999,999999]
-	    integer, parameter :: n1 = -123456_kind6
-	    integer, parameter :: n2 = -123456_4
-	    integer, parameter :: long = selected_real_kind(9, 99) ! 9 sig decimals, exponent
-	                                                           ! range 10^-99 to 10^99
-	    integer, parameter :: asci = kind('ASCII')
-	    integer(kind=long) :: a
-	    character(len=20, kind=1) :: english_word
-	    character(20) :: length_twenty
-
-	    type person
-	        character(10) :: name
-	        real          :: age
-	        integer       :: id
-	    end type
-	    type(person) :: me = person('Jeff', 23, 12345)
-	    type(person) :: you
-
-		integer i
-
-	    real, dimension(10) :: array1thru10
-	    real, dimension(-10:5, 5) :: matrixneg10and5
-	    real, dimension(-10:5, -20:-1, 2) :: threedarray
-	    real, dimension(5) :: arrayconst
-
-	    character(len=10) :: ten = "1234567890"
-
-	    real, pointer :: realptr => null()
-
-	    you%name = 'Bob'
-	    you%age  = 17.25
-	    you%id   = 18
-
-	    print *, "Kinds:", kind(kind6), kind(n1), kind(n2), kind(1.0)
-	    print *, "Precision:", precision(1.0_long) ! will be at least 9
-	    print *, "Num decimal digits supported:", range(2_kind6)
-	    print *, "Num decimal digits supported:", range(1.0_long) ! will be at least 99
-	    !ERROR!print *, "Bin/octal/hex:", b'01100110', o'076543', z'10fa'
-	    print *, "Real literal constant:", -10.6e-11, 1., -0.1, 1e-1, 3.141592653
-	    print *, "Complex:", (1., 3.2), (1, .99e-2), (1.0, 3.7_8)
-	    print *, 'He said "Hello"', "This contains an '", 'Isn''t it a nice day'
-	    print *, 'This is a long string     &
-	            & which spans several lines &
-	            & unnecessarily.'
-	    print *, asci_"String"
-	    print *, .false._1, .true._long
-	    print *, ten(:5), ten(6:), ten(3:7), ten(:), you%name(1:2), 'Hello'(:2)
-
-	    print *, 2**3*4/5+6-7.8
-
-	    if (1 .lt. 2) print *, "1"; if (1 <  2) print *, "1"
-	    if (1 .le. 2) print *, "2"; if (1 <= 2) print *, "2"
-	    if (1 .eq. 2) print *, "3"; if (1 == 2) print *, "3"
-	    if (1 .ne. 2) print *, "4"; if (1 /= 2) print *, "4"
-	    if (1 .gt. 2) print *, "5"; if (1 >  2) print *, "5"
-	    if (1 .ge. 2) print *, "6"; if (1 >= 2) print *, "6"
-
-	    print *, .not. .false. .and. (.true. .eqv. .false. .or. .false. .neqv. .true.)
-	    print *, "Hello" // "HelloWorld"(6:10)
-	    print *, point(1.2d0, 3.4)
-	    print *, point(1,2) + point(3,4)
-	    print *, .norm. point(5,6)
-
-	    pt = 3; print *, pt
-	    pt = (5,6); print *, pt
-
- 		arrayconst = (/ 1, 2, (i+2, i=1,3) /)
-		print *, arrayconst
-
-	    matrixneg10and5 = -5; print *, matrixneg10and5(-10,1)
-	    matrixneg10and5(-9:-7,1) = -3; print *, matrixneg10and5(-10:-5,1)
-
-	    included_indirectly_in_points = 12
-	    call indirect_subroutine()
-    end subroutine
-
-    subroutine pointers
-		integer, target :: array
-		dimension :: array(3)
-
-		integer, dimension(:), pointer :: pointer
-
-		pointer => null()
-		print *, associated(pointer)
-
-		pointer => array
-		print *, associated(pointer)
-		print *, associated(pointer, array)
-
-		nullify (pointer)
-		print *, associated(pointer)
-
-		allocate (pointer(5:10))
-		print *, associated(pointer)
-		print *, associated(pointer, array)
-		deallocate (pointer)
-    end subroutine
-
-    subroutine control
-		integer i, j
-
-    	go to 100
-
-100		continue
-
-		if (sin(3.1415) < 2) print *, "!"
-
-		if (.true.) then
-			print *, "if1"
-		end if
-
-if2:	if (.true.) then
-			print *, "if2"
-		end if if2
-
-if3:	if (.false.) then
-			print *, "X"
-		else if (cos(0.0) == 0) then
-			print *, "X"
-		else
-			print *, "if3"
-		end if if3
-
-sc1:	select case (int(cos(0.0)))
-		case (-5:0) sc1
-			print *, "X"
-		case (1)
-			print *, "sc1"
-		case default sc1
-			print *, "X"
-		end select sc1
-
-		do 200 i = 1, 3
-			do 200 j = 1, 5, 2
-				print *, i*10 + j
-200		continue
-
-do1:	do i = 1, -3, -1
-			if (i == 1) cycle
-			do, j = 100, 100
-				if (i == 2) cycle do1
-				print *, i + j
-				if (i == -2) exit do1
-				print *, "..."
-			end do
-		enddo do1
-    end subroutine
-
-end program

diff --git a/org.eclipse.photran-samples/src-liebmann-1-eoshift/.cvsignore b/org.eclipse.photran-samples/src-liebmann-1-eoshift/.cvsignore
deleted file mode 100644
index 2e87cbd..0000000
--- a/org.eclipse.photran-samples/src-liebmann-1-eoshift/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-a.exe

diff --git a/org.eclipse.photran-samples/src-liebmann-1-eoshift/liebmann.f90 b/org.eclipse.photran-samples/src-liebmann-1-eoshift/liebmann.f90
deleted file mode 100644
index f603aca..0000000
--- a/org.eclipse.photran-samples/src-liebmann-1-eoshift/liebmann.f90
+++ /dev/null

@@ -1,50 +0,0 @@
-!!
-!! Liebmann's method to compute heat transfer across a 2-D surface
-!! J. Overbey 8/27/08
-!!
-!! Use liebmann-viz.sh in the main project directory to visualize the resulting
-!! table using gnuplot
-!!
-!! This version looks the nicest and uses the eoshift intrinsic
-!!
-program liebmann_example
-    implicit none
-
-    integer, parameter :: SIZE = 200
-    integer, parameter :: INTERIOR_SIZE = SIZE - 2
-    real, parameter    :: BOUNDARY_VALUE = 5.0
-    real, parameter    :: EPSILON = 0.001
-
-    call main()
-
-contains
-
-subroutine main()
-    integer :: i
-    real :: surface(INTERIOR_SIZE, INTERIOR_SIZE)
-
-    surface = 0.0
-    surface = iterate(surface)
-
-    print *, (BOUNDARY_VALUE, i=1,SIZE)
-    do i = 1, INTERIOR_SIZE; print *, BOUNDARY_VALUE, surface(i, :), BOUNDARY_VALUE; end do
-    print *, (BOUNDARY_VALUE, i=1,SIZE)
-end subroutine
-
-function iterate(initial) result(result)
-    intent(in) :: initial
-    real, dimension(INTERIOR_SIZE, INTERIOR_SIZE) :: initial, previous, up, down, left, right, result
-
-    result = initial
-    do
-        previous = result
-        up     = eoshift(previous, +1, boundary_value, 1)
-        down   = eoshift(previous, -1, boundary_value, 1)
-        left   = eoshift(previous, +1, boundary_value, 2)
-        right  = eoshift(previous, -1, boundary_value, 2)
-        result = (up + down + left + right) / 4.0
-        if (maxval(abs(result - previous)) .lt. EPSILON) exit
-    end do
-end function
-
-end program

diff --git a/org.eclipse.photran-samples/src-liebmann-2-arrays/.cvsignore b/org.eclipse.photran-samples/src-liebmann-2-arrays/.cvsignore
deleted file mode 100644
index 2e87cbd..0000000
--- a/org.eclipse.photran-samples/src-liebmann-2-arrays/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-a.exe

diff --git a/org.eclipse.photran-samples/src-liebmann-2-arrays/liebmann.f90 b/org.eclipse.photran-samples/src-liebmann-2-arrays/liebmann.f90
deleted file mode 100644
index 1ddab15..0000000
--- a/org.eclipse.photran-samples/src-liebmann-2-arrays/liebmann.f90
+++ /dev/null

@@ -1,77 +0,0 @@
-!!
-!! Liebmann's method to compute heat transfer across a 2-D surface
-!! J. Overbey 8/27/08
-!!
-!! Use liebmann-viz.sh in the main project directory to visualize the resulting
-!! table using gnuplot
-!!
-!! This version uses array sections to compute each iteration and the delta
-!!
-program liebmann_example
-    implicit none
-
-    integer, parameter :: SIZE = 200
-    integer, parameter :: INTERIOR_SIZE = SIZE - 2
-    real, parameter    :: BOUNDARY_VALUE = 5.0
-    real, parameter    :: EPSILON = 0.001
-
-    call main()
-
-contains
-
-subroutine main()
-    real :: surface(SIZE, SIZE)
-    integer :: i
-
-    call liebmann(surface)
-
-    do i = 1, SIZE; print *, surface(i, :); end do
-end subroutine
-
-subroutine liebmann(surface)
-    real, intent(out) :: surface(SIZE, SIZE)
-    real, dimension(SIZE, SIZE) :: prev, next
-    real :: delta
-
-    call init_with_boundaries(prev)
-    call init_with_boundaries(next)
-
-    do
-        delta = iterate(prev, next)
-        if (delta < EPSILON) then
-            surface = next
-            return
-        end if
-
-        delta = iterate(next, prev)
-        if (delta < EPSILON) then
-            surface = prev
-            return
-        end if
-    end do
-end subroutine
-
-subroutine init_with_boundaries(surface)
-    real, dimension(SIZE, SIZE), intent(in out) :: surface
-
-    surface          = 0.0
-    surface(1, :)    = BOUNDARY_VALUE
-    surface(SIZE, :) = BOUNDARY_VALUE
-    surface(:, 1)    = BOUNDARY_VALUE
-    surface(:, SIZE) = BOUNDARY_VALUE
-end subroutine
-
-function iterate(prev, next) result(epsilon)
-    real, dimension(SIZE, SIZE), intent(in)  :: prev
-    real, dimension(SIZE, SIZE), intent(in out) :: next
-    real :: epsilon
-
-    next(2:SIZE-1, 2:SIZE-1) = &
-        (prev(1:SIZE-2, 2:SIZE-1) + &
-         prev(3:SIZE,   2:SIZE-1) + &
-         prev(2:SIZE-1, 1:SIZE-2) + &
-         prev(2:SIZE-1, 3:SIZE  )) / 4.0
-    epsilon = maxval(abs(next(2:SIZE-1,2:SIZE-1) - prev(2:SIZE-1,2:SIZE-1)))
-end function
-
-end program

diff --git a/org.eclipse.photran-samples/src-liebmann-3-loops/.cvsignore b/org.eclipse.photran-samples/src-liebmann-3-loops/.cvsignore
deleted file mode 100644
index 2e87cbd..0000000
--- a/org.eclipse.photran-samples/src-liebmann-3-loops/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-a.exe

diff --git a/org.eclipse.photran-samples/src-liebmann-3-loops/liebmann.f90 b/org.eclipse.photran-samples/src-liebmann-3-loops/liebmann.f90
deleted file mode 100644
index 8b41de9..0000000
--- a/org.eclipse.photran-samples/src-liebmann-3-loops/liebmann.f90
+++ /dev/null

@@ -1,84 +0,0 @@
-!!
-!! Liebmann's method to compute heat transfer across a 2-D surface
-!! J. Overbey 8/27/08
-!!
-!! Use liebmann-viz.sh in the main project directory to visualize the resulting
-!! table using gnuplot
-!!
-!! This version uses explicit loops through the array elements
-!!
-program liebmann_example
-    implicit none
-
-    integer, parameter :: SIZE = 200
-    integer, parameter :: INTERIOR_SIZE = SIZE - 2
-    real, parameter    :: BOUNDARY_VALUE = 5.0
-    real, parameter    :: EPSILON = 0.001
-
-    call main()
-
-contains
-
-subroutine main()
-    real :: surface(SIZE, SIZE)
-    integer :: i
-
-    call liebmann(surface)
-
-    do i = 1, SIZE; print *, surface(i, :); end do
-end subroutine
-
-subroutine liebmann(surface)
-    real, dimension(SIZE, SIZE), intent(out) :: surface
-    real, dimension(SIZE, SIZE) :: prev, next
-    real :: delta
-
-    call init_with_boundaries(prev)
-    call init_with_boundaries(next)
-
-    do
-        delta = iterate(prev, next)
-        if (delta < EPSILON) then
-            surface = next
-            return
-        end if
-
-        delta = iterate(next, prev)
-        if (delta < EPSILON) then
-            surface = prev
-            return
-        end if
-    end do
-end subroutine
-
-subroutine init_with_boundaries(surface)
-    real, dimension(SIZE, SIZE), intent(out) :: surface
-
-    surface          = 0.0
-    surface(1, :)    = BOUNDARY_VALUE
-    surface(SIZE, :) = BOUNDARY_VALUE
-    surface(:, 1)    = BOUNDARY_VALUE
-    surface(:, SIZE) = BOUNDARY_VALUE
-end subroutine
-
-function iterate(prev, next) result(delta)
-    real, dimension(SIZE, SIZE), intent(in)  :: prev
-    real, dimension(SIZE, SIZE), intent(out) :: next
-    real :: delta
-
-    integer :: i, j
-
-    delta = 0.0
-    do j = 2, SIZE-1
-        do i = 2, SIZE-1
-            next(i,j) = &
-                (prev(i-1, j) + &
-                 prev(i+1, j) + &
-                 prev(i, j-1) + &
-                 prev(i, j+1)) / 4.0
-             delta = max(delta, abs(next(i,j)-prev(i,j)))
-        end do
-    end do
-end function
-
-end program

diff --git a/org.eclipse.photran-samples/src-line-fitting/.cvsignore b/org.eclipse.photran-samples/src-line-fitting/.cvsignore
deleted file mode 100644
index 2e87cbd..0000000
--- a/org.eclipse.photran-samples/src-line-fitting/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-a.exe

diff --git a/org.eclipse.photran-samples/src-line-fitting/bstfit.f90 b/org.eclipse.photran-samples/src-line-fitting/bstfit.f90
deleted file mode 100755
index 3647396..0000000
--- a/org.eclipse.photran-samples/src-line-fitting/bstfit.f90
+++ /dev/null

@@ -1,863 +0,0 @@
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!
-! BstFit
-!
-! This program provides the user with three options:
-! (1) Compute least-squares lines using vertical, horizontal, and
-!     perpendicular distances
-! (2) Show the distances between points and a given line
-! (3) Compute linear, exponential, and power least-squares curves
-! 
-! Points are read from an ASCII text file, where each line contains a x-value
-! followed by a space and a y-value.  Values are expected to be real numbers.
-! The number of points is not specified; the program reads data from each line
-! until the end of the file (or 1,000 points, whichever comes first).
-!
-! Output is displayed to the screen.
-!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-module Mdataset
-
-  ! Declare all variables
-  implicit none
-
-  ! Declare a Tdataset type to hold data points, count, sums, etc.
-  type :: Tdataset
-    real             :: datapt(4,1000)    ! (x,y) data points from input file
-                                          !    stored as (x, y, ln x, ln y)
-    integer          :: npts              ! Number of points in input file
-    real             :: valsum(4)         ! Sums of values of
-                                          !    x, y, ln x, and ln y
-    real             :: sqsum(4)          ! Sums of values of x**2, y**2,
-                                          !    (ln x)**2, and (ln y)**2
-    real             :: xysum(3)          ! Sums of products
-                                          !    (xy, x ln y, ln x ln y)
-    logical          :: has_np(2)         ! Are any x- or y-values nonpositive?
-  end type Tdataset
-
-end module Mdataset
-
-program BstFitProj
-
-  use Mdataset
-
-  ! Declare all variables
-  implicit none
-
-  ! Type                Name(s)             Description
-  integer			 :: if
-  integer            :: ichoice           ! The user's choice from the menu
-  type(Tdataset)     :: ds                ! Points and computed values
-  real               :: aval, bval        ! Values of a and b (in y=ax+b)
-  real               :: slopem, intrcpt   ! Slope and y-intercept of a line
-                                          !   supplied by the user
-  real               :: ssvd, sshd, sspd  ! Sum of squares of horiz, vert, and
-                                          !   perpendicular distances
-  logical            :: suces             ! Exponential or power fit success?
-  integer            :: outu              ! Output file unit number
-
-  ! Introduce the program
-  write (*, *) 'This program performs least-squares fitting on ', &
-                            'a set of n (x,y) pairs'
-  write (*, *) ! Blank line
-
-  ! Ask the user for the input file, and read the data from it  
-  call LoadDataSet(ds)
-  write (*, *) ! Blank line
-  
-  ! Show the list of points
-  write (*, *) 'Data points are:'
-  call ShowDataPoints(ds)
-  write (*, *) ! Blank line
-  
-  ! Ask the user for the name of the output file, and open it
-  outu = OpenOutput()
-  write (*, *) ! Blank line
-  
-  ! The user hasn't chosen anything from the menu yet
-  ichoice = 0
-  
-  ! Let the user continue choosing from the menu until s/he chooses to exit
-  do while (ichoice .ne. 4)
-  
-    ! Display a list of options, and allow the user to select one
-    write (*, *) ! Blank line
-    write (*, *) '===================================================='
-    write (*, *) 'MENU'
-    write (*, *) '===================================================='
-    write (*, *) '1. Compute three linear least squares lines'
-    write (*, *) '2. Compute distances between points and a given line'
-    write (*, *) '3. Find linear, exponential, and power least squares'
-    write (*, *) '4. Exit'
-    write (*, *) '===================================================='
-    write (*, *) ! Blank line
-    write (*, *) 'Choose an option: '
-    read  (*, *) ichoice
-    
-    if (if .eq. 5) then
-      print *, 'Why did you name a variable "if" anyway?'
-    end if
-
-    select case (ichoice)
-      case (1) ! Option 1 - Three linear least squares lines
-
-        write (outu, *) 'THREE LEAST SQUARES LINES:'
-
-        ! Linear least squares, vertical distances
-        call LinearLeastSquares(ds, 1, 2, aval, bval)
-        write (outu, *) ! Blank line
-        write (outu, *) 'Using vertical distances:'
-        write (outu, *) 'y = ', trim(real2str(aval)), &
-                                     'x + ', trim(real2str(bval))
-
-        ! Linear least squares, horizontal distances
-        call LinearLeastSquares(ds, 2, 1, aval, bval)
-        write (outu, *) ! Blank line
-        write (outu, *) 'Using horizontal distances:'
-        write (outu, *) 'y = ', trim(real2str(aval)), &
-                                     'x + ', trim(real2str(bval))
-
-        ! Linear least squares, perpendicular distances
-        call PerpLeastSquares(ds, 0, aval, bval)
-        write (outu, *) ! Blank line
-        write (outu, *) 'Using perpendicular distances:'
-        write (outu, *) 'y = ', trim(real2str(aval)), &
-                                     'x + ', trim(real2str(bval))
-        
-        write (outu, *) '--OR--'
-
-        call PerpLeastSquares(ds, 1, aval, bval)
-        write (outu, *) 'y = ', trim(real2str(aval)), &
-                                     'x + ', trim(real2str(bval))
-
-        write (outu, *) ! Blank line
-
-      case (2) ! Option 2 - Distances between points and a given line
-
-        write (outu, *) 'SUM OF SQUARES OF DISTANCES BETWEEN ', &
-                                     'POINTS AND A GIVEN LINE:'
-      
-        write (*, *) ! Blank line
-        write (*, *) 'Enter the line''s slope and y-intercept: '
-        read (*, *) slopem, intrcpt
-        
-        write (outu, *) ! Blank line
-        write (outu, *) 'Using f(x) = ', trim(real2str(slopem)), &
-                                     'x + ', trim(real2str(intrcpt))
-
-        write (outu, *) ! Blank line
-        call SquareDistances(ds, slopem, intrcpt, ssvd, sshd, sspd)
-
-        write (outu, *) 'Sum of squares of vertical distances:      ', &
-                                      ssvd
-        write (outu, *) ! Blank line
-        write (outu, *) 'Sum of squares of horizontal distances:    ', &
-                                      sshd
-        write (outu, *) ! Blank line
-        write (outu, *) 'Sum of squares of perpendicular distances: ', &
-                                      sspd
-        write (outu, *) ! Blank line
-
-      case (3) ! Option 3 - Linear, exponential, and power least squares
-
-        write (outu, *) 'LINEAR, EXPONENTIAL, AND POWER LEAST SQUARES:'
-      
-        call LinearLeastSquares(ds, 1, 2, aval, bval)
-        write (outu, *) ! Blank line
-        write (outu, *) 'Linear fit:       y = ', trim(real2str(aval)), &
-                                     'x + ', trim(real2str(bval))
-
-        call ExpLeastSquares(ds, aval, bval, suces)
-        write (outu, *) ! Blank line
-        if (suces .eqv. .true.) then
-          write (outu, *) 'Exponential fit:  y = ', trim(real2str(bval)), &
-                                       ' * e^(', trim(real2str(aval)), 'x)'
-        else
-          write (outu, *) 'Unable to perform exponential fit: ', &
-                                       'there is at least one nonpositive y-value'
-        end if
-
-        call PowerLeastSquares(ds, aval, bval, suces)
-        write (outu, *) ! Blank line
-        if (suces .eqv. .true.) then
-          write (outu, *) 'Power fit:        y = ', trim(real2str(bval)), &
-                                       ' * x^', trim(real2str(aval))
-        else
-          write (outu, *) 'Unable to perform power fit: ', &
-                                       'there is at least one nonpositive x- or y-value'
-        end if
-
-        write (outu, *) ! Blank line
-        
-      case (4) ! Option 4 - Exit
-        ! Allow loop to stop
-
-      case default
-        write (*, *) 'The option you chose is not valid.'
-    end select
-    
-  end do
-  
-  stop
-  
-contains
-  
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  !
-  ! LoadDataSet - Ask the user for an input filename, and read data points from
-  !               that file into the ds%datapt array, storing the number
-  !               of points in ds%npts and computing sums
-  !
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  subroutine LoadDataSet(ds)
-  
-    ! Declare all variables
-    implicit none
-    ! Type                         Name(s)             Description
-    type(Tdataset), intent(out) :: ds                ! Data points and sums
-    character (len=64)          :: infile            ! Input filename
-    integer                     :: ieof              ! File status
-    integer                     :: indx              ! Loop counter
-    integer                     :: inu               ! Input file unit number
-    integer                     :: imaxpairs         ! Maximum number of pairs
-    
-    ! Default maximum number of pairs to array size
-    imaxpairs = ubound(ds%datapt,2)
-    
-    ! Ask the user for the name of the input file
-    write (*, *) 'Enter the input filename or - for keyboard input: '
-    read (*, *) infile
-    
-    ! Determine the input unit number
-    if (infile .eq. '-') then
-    
-      inu = 5     ! Read from keyboard (standard input)
-      
-      write (*, *) 'How many pairs? '
-      read (*, *) imaxpairs
-      
-      ! Make sure this number is legal
-      if (imaxpairs .lt. 1 .or. imaxpairs .gt. ubound(ds%datapt,2)) then
-        write (*, *) 'Number of pairs must be between 1 and ', &
-          trim(int2str(ubound(ds%datapt,2)))
-        stop
-      end if
-      
-      write (*, *) 'Enter pairs, one per line'
-      write (*, *) ! End line before input
-      
-    else
-    
-      inu = 10    ! Read from file
-    
-      ! Open the file
-      open (10, file = infile, status = 'old', iostat = ieof)
-      if (ieof .ne. 0) then
-        write (*, *) 'The specified file could not be opened.'
-        stop
-      end if
-      
-    end if
-
-    ! Initialize the members of the dataset structure
-    ds%npts      = 0
-    ds%valsum(1) = 0.0
-    ds%valsum(2) = 0.0
-    ds%valsum(3) = 0.0
-    ds%valsum(4) = 0.0
-    ds%sqsum(1)  = 0.0
-    ds%sqsum(2)  = 0.0
-    ds%sqsum(3)  = 0.0
-    ds%sqsum(4)  = 0.0
-    ds%xysum(1)  = 0.0
-    ds%xysum(2)  = 0.0
-    ds%xysum(3)  = 0.0
-    ds%has_np(1) = .false.
-    ds%has_np(2) = .false.
-
-    ! Read data points until EOF or imaxpairs reached
-    do while (ds%npts < imaxpairs)
-    
-      ! Load the points into the datapt array, 
-      read (inu, *, end = 110) &
-        ds%datapt(1, ds%npts + 1), &
-        ds%datapt(2, ds%npts + 1)
-      
-      ! Calculate ln x, or set has_np if the value is nonpositive
-      if (ds%datapt(1, ds%npts + 1) .le. 0) then
-        ds%datapt(3, ds%npts + 1) = 0
-        ds%has_np(1) = .true.
-      else
-        ds%datapt(3, ds%npts + 1) = log(ds%datapt(1, ds%npts + 1))
-      end if
-      
-      ! Calculate ln y, or set has_np if the value is nonpositive
-      if (ds%datapt(2, ds%npts + 1) .le. 0) then
-        ds%datapt(4, ds%npts + 1) = 0
-        ds%has_np(2) = .true.
-      else
-        ds%datapt(4, ds%npts + 1) = log(ds%datapt(2, ds%npts + 1))
-      end if
-        
-      ! Update the number of points
-      ds%npts      = ds%npts      + 1
-
-      ! Update the value sums and square sums
-      do indx = 1,4
-        ds%valsum(indx) = ds%valsum(indx) + ds%datapt(indx, ds%npts)
-        ds%sqsum(indx)  = ds%sqsum(indx)  + ds%datapt(indx, ds%npts)**2
-      end do
-      
-      ! Update the xy sums (xy, x ln y, ln x ln y)
-      ds%xysum(1)  = ds%xysum(1) + &
-        ds%datapt(1, ds%npts) * ds%datapt(2, ds%npts)
-      ds%xysum(2)  = ds%xysum(2) + &
-        ds%datapt(1, ds%npts) * ds%datapt(4, ds%npts)
-      ds%xysum(3)  = ds%xysum(3) + &
-        ds%datapt(3, ds%npts) * ds%datapt(4, ds%npts)
-      
-    end do
-    
-    ! If we get here and we're reading from a file, there are more than
-    ! ubound(ds%datapt,2) points in the file, so display a warning
-    if (inu .eq. 10) then
-      write (*, *) 'WARNING: Only the first ', &
-        trim(int2str(ubound(ds%datapt,2))), ' points will be used'
-    end if
-
-    ! We have read all points from the file; close it
-110 if (inu .eq. 10) then
-      close (10)
-    end if
-    
-    return
-
-  end subroutine LoadDataSet
-  
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  !
-  ! ShowDataPoints - Display the list of data points
-  !
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  subroutine ShowDataPoints(ds)
-  
-    ! Declare all variables
-    implicit none
-    ! Type                         Name(s)      Description
-    type(Tdataset), intent(in)  :: ds         ! Data points and sums
-    integer                     :: indx       ! Loop counter
-  
-    ! Display a header
-    write (*, '(a5,a2,2a10)') '=====', '==', '==========', &
-                                                          '=========='
-    write (*, '(a5,2x,2a10)') 'i', 'x_i', 'y_i'
-    write (*, '(a5,a2,2a10)') '=====', '==', '==========', &
-                                                          '=========='
-
-    ! Display the list of points
-    do indx = 1,ds%npts
-      write (*, '(i5,a,2f10.4)') &
-        indx, ': ', ds%datapt(1,indx), ds%datapt(2,indx)
-    end do
-    
-    ! Display a footer
-    write (*, '(a5,a2,2a10)') '=====', '==', '==========', &
-                                                          '=========='
-    
-    return
-    
-  end subroutine ShowDataPoints
-  
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  !
-  ! SquareDistances - Calculate the sums of squares of distances of a set of
-  !                   points from a given line f(x) = mx + b
-  !
-  ! finv denotes the inverse of the function f
-  !
-  ! Sum of squares of vertical distances is returned in ssvd
-  ! Sum of squares of horizontal distances is returned in sshd
-  ! Sum of squares of perpendicular distances is returned in sspd
-  !
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  subroutine SquareDistances(ds, slopem, intrcpt, ssvd, sshd, sspd)
-  
-    ! Declare all variables
-    implicit none
-    ! Type                         Name(s)      Description
-    type(Tdataset), intent(in)  :: ds         ! Data points and sums
-    real, intent(in)            :: slopem     ! Slope of the line
-    real, intent(in)            :: intrcpt    ! Line's y-intercept
-    real                        :: fx         ! f(x) at a given x
-    real                        :: finvy      ! finv(y) at a given y
-    real                        :: perpx      ! x-coord where a perpendicular
-                                              !   line through (x_i,y_i)
-                                              !   intersects
-    real                        :: perpy      ! y-coord of intersection
-    real :: vdist, hdist, pdist               ! Distances of a particular point
-    real, intent(out)           :: ssvd       ! Sum of squares of vert dist's
-    real, intent(out)           :: sshd       ! Sum of squares of horiz dist's
-    real, intent(out)           :: sspd       ! Sum of squares of perp dist's
-    integer                     :: indx       ! Loop counter
-    
-    ! Initialize sums to 0.0
-    ssvd = 0.0
-    sshd = 0.0
-    sspd = 0.0
-  
-    ! Add the squares of the distances
-    do indx = 1,ds%npts
-      ! Calculate f(x_i) = m x_i + b
-      fx = slopem * ds%datapt(1,indx) + intrcpt
-      
-      ! Calculate finv(y_i) = (y_i - b) / m
-      finvy = (ds%datapt(2,indx) - intrcpt) / slopem
-      
-      ! Vertical distance = |f(x_i) - y_i|
-      vdist = abs(fx - ds%datapt(2,indx))
-      
-      ! Horizontal distance = |finv(y_i) - x_i|
-      hdist = abs(finvy - ds%datapt(1,indx))
-      
-      ! Perpendicular distance is more complicated
-      
-      ! The perpendicular line through (x_i, y_i) will intersect
-      ! at x-coordinate (y_i + x_i/m - b)/(m + 1/m)
-      ! and y-coordinate f(perpx)
-      perpx = (ds%datapt(2,indx) + ds%datapt(1,indx)/slopem - intrcpt) &
-              / (slopem + 1.0/slopem)
-      perpy = slopem * perpx + intrcpt
-      
-      ! Perpendicular distance is now given by the distance formula
-      !    ________________________________
-      !   /              2                2
-      ! \/  (y_i - perpy)  + (x_i - perpx)
-      !
-      pdist = sqrt((ds%datapt(2,indx) - perpy)**2 + (ds%datapt(1,indx) - perpx)**2)
-      
-      ! Now add these distances squared to the sums
-      ssvd = ssvd + vdist**2
-      sshd = sshd + hdist**2
-      sspd = sspd + pdist**2
-    end do
-    
-    return
-    
-  end subroutine SquareDistances
-  
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  !
-  ! OpenOutput - Open an output file and return the unit number
-  !
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  integer function OpenOutput() result(outu)
-
-    ! Declare all variables
-    implicit none
-    ! Type                  Name(s)             Description
-    character (len=64) :: outfile           ! Output filename
-    integer            :: ieof              ! File status
-
-    ! Ask the user for the name of the output file
-    write (*, *) 'Enter the output filename or - for screen display: '
-    read (*, *) outfile
-    
-    if (outfile .eq. '-') then
-      outu = 6  ! Standard output
-    else
-    
-      ! Open the file
-      open (10, file = outfile, status = 'replace', iostat = ieof)
-      if (ieof .ne. 0) then
-        write (*, *) 'The specified file could not be opened.'
-        stop
-      end if
-      
-      outu = 10 ! File output
-    end if
-    
-    return
-    
-  end function OpenOutput
-  
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  !
-  ! LinearLeastSquares - Compute a linear least squares line y = ax + b
-  !                      using vertical or horizontal distances
-  !
-  ! For vertical distances, set xcol = 1 and ycol = 2
-  ! For horizontal distances, set xcol = 2 and ycol = 1
-  ! Other values of xcol and ycol are used by the power and exponential
-  !   least squares functions (see below)
-  ! Values of a and b will be stored in aval and bval
-  !
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  subroutine LinearLeastSquares(ds, xcol, ycol, aval, bval)
-  
-    ! Declare all variables
-    implicit none
-    ! Type                         Name(s)      Description
-    type(Tdataset), intent(in)  :: ds         ! Data points and sums
-    integer, intent(in)         :: xcol       ! Which column contains x-values
-                                              !   (independent data)?
-    integer, intent(in)         :: ycol       ! Which column contains y-values
-                                              !   (dependent data)?
-    integer                     :: xycol      ! Which xyval to use?
-    real, intent(out)           :: aval       ! Value of a
-    real, intent(out)           :: bval       ! Value of b
-    real                        :: dval       ! Value of delta (denominator)
-    
-    ! Determine which xyval to use (xy, x ln y, or ln x ln y)
-    if (xcol .eq. 1 .and. ycol .eq. 2 .or. xcol .eq. 2 .and. ycol .eq. 1) then
-      xycol = 1
-    else if (xcol .eq. 1 .and. ycol .eq. 4 .or. xcol .eq. 4 .and. ycol .eq. 1) then
-      xycol = 2
-    else if (xcol .eq. 3 .and. ycol .eq. 4 .or. xcol .eq. 4 .and. ycol .eq. 3) then
-      xycol = 3
-    else
-      write (*, *) 'ERROR: Invalid call to LinearLeastSquares'
-      write (*, *) 'Unable to continue'
-      stop
-    end if
-    
-    ! Compute the denominator:
-    !
-    !             n                n        2
-    !            ___    2      (  ___     )
-    ! delta = n  \    x    -  (   \    x   )
-    !            /__   i      (   /__   i  )
-    !                          (          )
-    !            i=1              i=1
-    
-    dval = ds%npts * ds%sqsum(xcol) - ds%valsum(xcol)**2
-    
-    ! Compute a:
-    !
-    !          n            n        n
-    !         ___          ___      ___
-    !      n  \    x y  -  \    x   \    y
-    !         /__   i i    /__   i  /__   i
-    !
-    !         i=1          i=1      i=1
-    ! a = ----------------------------------
-    !                   delta
-    
-    aval = ( ds%npts * ds%xysum(xycol) -         &
-             ds%valsum(xcol) * ds%valsum(ycol) ) &
-           / dval
-    
-    
-    ! Compute b:
-    !
-    !       n        n            n        n
-    !      ___      ___    2     ___      ___
-    !      \    y   \    x    -  \    x   \    x y
-    !      /__   i  /__   i      /__   i  /__   i i
-    !
-    !      i=1      i=1          i=1      i=1
-    ! b = ------------------------------------------
-    !                   delta
-    
-    bval = ( ds%valsum(ycol) * ds%sqsum(xcol) -   &
-             ds%valsum(xcol) * ds%xysum(xycol)  ) &
-           / dval
-           
-    ! If we are calculating using horizontal distances, we need to
-    ! solve x=ay+b for y (y = 1/a * x - b/a) and change a and b
-    ! accordingly
-    if (xcol .gt. ycol) then
-      aval = 1.0 / aval
-      bval = -bval * aval
-    end if
-    
-    return
-    
-  end subroutine LinearLeastSquares
-  
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  !
-  ! PerpLeastSquares - Compute a linear least squares line y = ax + b
-  !                    using perpendicular distances
-  !
-  ! To use a = -p + sqrt(...), set subtr to an even value
-  ! To use a = -p - sqrt(...), set subtr to an odd value
-  ! Values of a and b will be stored in aval and bval
-  !
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  subroutine PerpLeastSquares(ds, subtr, aval, bval)
-  
-    ! Declare all variables
-    implicit none
-    ! Type                         Name(s)      Description
-    type(Tdataset), intent(in)  :: ds         ! Data points and sums
-    integer, intent(in)         :: subtr      ! Determines which of two values
-                                              !   of a will be chosen
-    real, intent(out)           :: aval       ! Value of a
-    real, intent(out)           :: bval       ! Value of b
-    real                        :: pval       ! Value of p
-    
-    ! Compute p:
-    !
-    !         (   n           n       )    [  (  n      )  2   (  n      )  2 ]
-    !        (   ___    2    ___    2  )   [ (  ___      )    (  ___      )   ]
-    !      n (   \    x   -  \    y    ) - [ (  \    x   )  - (  \    y   )   ]
-    !        (   /__   k     /__   k   )   [ (  /__   k  )    (  /__   k  )   ]
-    !        (                         )   [  (         )      (         )    ]
-    !         (  k=1         k=1      )    [    k=1              k=1          ]  
-    ! p = ----------------------------------------------------------------------
-    !         (     n           n       n     )
-    !        (     ___         ___     ___     )
-    !      2 (  n  \   x y  -  \   x   \   y   )
-    !        (     /__  k k    /__  k  /__  k  )
-    !        (                                 )
-    !         (    k=1         k=1     k=1    )
-    
-    pval = (ds%npts*(ds%sqsum(1)-ds%sqsum(2)) - (ds%valsum(1)**2 - ds%valsum(2)**2)) &
-           / (2 * (ds%npts*ds%xysum(1) - ds%valsum(1)*ds%valsum(2)))
-    
-    !                        _______
-    !                       / 2
-    ! Compute a = -p +/-   / p  + 1
-    !                    \/
-    
-    aval = -pval + (-1)**subtr * sqrt(pval**2 + 1)
-
-    !               n           n
-    !              ___         ___
-    !              \    y  - a \    x
-    !              /__   k     /__   k
-    !
-    !              k=1         k=1
-    ! Compute b = ---------------------
-    !                       n
-    
-    bval = ( ds%valsum(2) - aval * ds%valsum(1) ) / ds%npts
-    
-    return
-    
-  end subroutine PerpLeastSquares
-  
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  !                                                                     ax
-  ! ExpLeastSquares - Compute an exponential least squares curve y = b e
-  !                   using vertical distances
-  !
-  ! Values of a and b will be stored in aval and bval
-  !
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  subroutine ExpLeastSquares(ds, aval, bval, suces)
-  
-    ! Declare all variables
-    implicit none
-    ! Type                         Name(s)      Description
-    type(Tdataset), intent(in)  :: ds         ! Data points and sums
-    real, intent(out)           :: aval       ! Value of a
-    real, intent(out)           :: bval       ! Value of b
-    logical, intent(out)        :: suces      ! Success?
-
-    ! Make sure all y-values are positive
-    if (ds%has_np(2) .eqv. .true.) then
-      suces = .false.
-      return
-    end if
-    
-    ! Exponential least squares is done by reducing the problem to a linear
-    ! one, which is more easily solved.
-    
-    ! We want    y  = b e^(ax)
-    ! ==>     ln(y) = ln(b e^(ax)
-    ! ==>     ln(y) = ln(b) + ax
-    ! ==>     ln(y) = ax + ln(b)
-    
-    ! Use linear least squares on ln(y) = ax + ln(b)
-    call LinearLeastSquares(ds, 1, 4, aval, bval)
-    ! The variable bval now contains ln(b); make it contain b instead
-    bval = exp(bval)
-    
-    ! Now     ln(y) = ax + ln(b)
-    ! So         y  = e^(ax + ln(b))
-    ! ==>        y  = e^(ax) e^(ln(b))
-    ! ==>        y  = e^(ax) b
-    ! ==>        y  = b e^(ax)
-    
-    suces = .true.
-    return
-  
-  end subroutine ExpLeastSquares
-  
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  !                                                           a
-  ! PowerLeastSquares - Compute an least squares curve y = b x
-  !                     using vertical distances
-  !
-  ! Values of a and b will be stored in aval and bval
-  !
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  subroutine PowerLeastSquares(ds, aval, bval, suces)
-  
-    ! Declare all variables
-    implicit none
-    ! Type                         Name(s)      Description
-    type(Tdataset), intent(in)  :: ds         ! Data points and sums
-    real, intent(out)           :: aval       ! Value of a
-    real, intent(out)           :: bval       ! Value of b
-    logical, intent(out)        :: suces      ! Success?
-
-    ! Make sure all values are positive
-    if ((ds%has_np(1) .eqv. .true.) .or. (ds%has_np(2) .eqv. .true.)) then
-      suces = .false.
-      return
-    end if
-    
-    ! Exponential least squares is done by reducing the problem to a linear
-    ! one, which is more easily solved.
-    
-    ! We want    y  = b x^a
-    ! ==>     ln(y) = ln(b x^a)
-    ! ==>     ln(y) = ln(b) + ln(x^a)
-    ! ==>     ln(y) = ln(b) + a ln(x)
-    ! ==>     ln(y) = a ln(x) + ln(b)
-    
-    ! Use linear least squares on ln(y) = a ln(x) + ln(b)
-    call LinearLeastSquares(ds, 3, 4, aval, bval)
-    ! The variable bval now contains ln(b); make it contain b instead
-    bval = exp(bval)
-    
-    ! Now     ln(y) = a ln(x) + ln(b)
-    !
-    !                  a ln(x) + ln(b)
-    ! ==>        y  = e
-    !
-    !                  a ln(x)  ln(b)
-    ! ==>        y  = e        e
-    !
-    !                   a ln(x)
-    ! ==>        y  = (e )      b
-    !
-    !                   ln(x) a
-    ! ==>        y  = (e     )  b
-    !
-    !                  a
-    ! ==>        y  = x  b
-    !
-    !                    a
-    ! ==>        y  = b x
-    
-    suces = .true.
-    return
-  
-  end subroutine PowerLeastSquares
-  
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  !
-  ! int2str - Convert an integer i to a string
-  !
-  ! The string will need to be trim()ed before displaying
-  !
-  ! Shouldn't something like this be built in?!
-  !
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  character(len=32) function int2str(i) result(s)
-  
-    ! Declare all variables
-    implicit none
-    
-    ! Type                 Name       Description
-    integer, intent(in) :: i        ! The number to convert
-    integer             :: ival     ! The number, with leading digits removed
-    integer             :: ndigits  ! The number of digits in the number
-    integer             :: indx     ! Loop counter
-    integer             :: is_neg   ! 0 if negative, 1 if positive
-
-    ! Start with a 0 string, overwriting the 0 if necessary
-    s = '0'
-    
-    ! Handle the cases where i is <= 0
-    if (i .eq. 0) then
-      return
-    else if (i .lt. 0) then
-      s(1:1) = '-'  ! Prefix output with a minus sign
-      is_neg = 1    ! There is one extra character at the start of the number
-      ival = -i     ! Now write out the absolute value of i
-    else
-      is_neg = 0    ! It's not negative
-      ival = i      ! We want to write out i
-    end if
-    
-    ! The number of digits needed to write out an integer i in base b is
-    ! |           |
-    ! |  log (i)  | + 1
-    ! |_    b    _|
-    !
-    ndigits = floor(log10(ival*1.0)) + 1
-    
-    ! Write out the digits in order, starting at the left
-    do indx = 1, ndigits
-      ! What is the first digit's ASCII code?  Append it to the string
-      s(indx+is_neg:indx+is_neg) = char(48 + ival/10**(ndigits-indx))
-      ! Now remove the first digit from ival
-      ival = ival - (ival/10**(ndigits-indx))*10**(ndigits-indx)
-    end do
-  
-    return
-    
-  end function int2str
-  
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  !
-  ! real2str - Convert a real number r to a string
-  !
-  ! The string will need to be trim()ed before displaying
-  !
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  character(len=128) function real2str(r) result(s)
-  
-    ! Declare all variables
-    implicit none
-    
-    ! Type                 Name       Description
-    real, intent(in)    :: r        ! The number to convert
-    real                :: rval     ! Value of |r|
-    integer             :: intpt    ! The integer part of the number
-    integer             :: ifracpt  ! The fractional part of the number
-                                    !   (rounded somewhat)
-    character(len=1)    :: is_neg   ! '-' if negative, ' ' otherwise
-    character(len=32)   :: sintpt   ! The integer part, as a string
-    character(len=32)   :: slead0   ! Leading 0s for fractional part
-    character(len=32)   :: sfracpt  ! The fractional part, as a string
-    integer             :: nfdigs=4 ! Number of fractional digits
-    
-    ! If the number's negative, remember this, but make it positive
-    if (r .lt. 0) then
-      is_neg = '-'
-      rval = -r
-    else
-      is_neg = ' '
-      rval = r
-    end if
-
-    ! Integer part = |_ r _|
-    intpt = floor(rval)
-    
-    ! To get the fractional part, subtract off the integer part, multiply
-    ! by 10**(# decimal places), and take the floor to drop off extra digits
-    ifracpt = floor((rval-intpt) * 10**nfdigs)
-    
-    ! Now convert the integer and fractional parts to strings
-    sintpt = int2str(intpt)
-    sfracpt = int2str(ifracpt)
-    slead0 = repeat('0', nfdigs-len_trim(sfracpt))
-    
-    ! Now just concatenate the number together
-    s = trim(is_neg) // &  ! Negative sign (if any)
-        trim(sintpt) // &  ! Integer part
-        '.' // &           ! Decimal point
-        trim(slead0) // &  ! Fractional part leading zeros
-        int2str(ifracpt)   ! Fractional part
-    
-    return
-    
-  end function real2str
-  
-end program BstFitProj

diff --git a/org.eclipse.photran-samples/src-modules-addl/.cvsignore b/org.eclipse.photran-samples/src-modules-addl/.cvsignore
deleted file mode 100644
index 43fca42..0000000
--- a/org.eclipse.photran-samples/src-modules-addl/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-*.exe
-a.out
-*.mod

diff --git a/org.eclipse.photran-samples/src-modules-addl/Makefile b/org.eclipse.photran-samples/src-modules-addl/Makefile
deleted file mode 100644
index c5bbd8d..0000000
--- a/org.eclipse.photran-samples/src-modules-addl/Makefile
+++ /dev/null

@@ -1,7 +0,0 @@
-.PHONY: all clean
-
-all:
-	@echo src-modules-addl programs will not be compiled.
-
-clean:
-	rm -f *.exe *.mod
\ No newline at end of file

diff --git a/org.eclipse.photran-samples/src-modules-addl/import-rename-bug-1.f90 b/org.eclipse.photran-samples/src-modules-addl/import-rename-bug-1.f90
deleted file mode 100644
index 63ded19..0000000
--- a/org.eclipse.photran-samples/src-modules-addl/import-rename-bug-1.f90
+++ /dev/null

@@ -1,53 +0,0 @@
-! This demonstrates an inconsistency in the handling of modules with renaming.
-! J. Overbey 8 Apr 2010
-
-module m1
-  implicit none
-  integer :: m
-  integer :: n
-end module
-
-module m2
-  implicit none
-  integer :: o
-  integer :: p
-end module
-
-module helper; implicit none; contains
-  subroutine init
-    use m1
-    use m2
-    m = 1
-    n = 2
-    o = 3
-    p = 4
-  end subroutine
-end module
-
-program test
-  use helper
-  use m1, n => m ! m is inaccessible
-                 ! Does the local n shadow the module entity n?
-  use m2, oo => p
-  implicit none
-  integer :: p
-  p = 5
-  call init
-  
-  ! There is ambiguity in the Fortran 95 standard as to how the following
-  ! statement should be handled.  According to Section 11.3.2:
-  ! "Two or more accessible entities, other than
-  ! generic interfaces, may have the same name only if
-  ! the name is not used to refer to an entity in the
-  ! scoping unit. ... the local name of any entity
-  ! given accessibility by a USE statement shall differ
-  ! from the local names of all other entities accessible
-  ! to the scoping unit through USE statements and
-  ! otherwise."
-  ! GNU Fortran 4.4.2:   Compilation fails: n is an ambiguous reference
-  ! IBM XL Fortran 12.1: Outputs 2 3 5
-  ! Intel Fortran 10.1:  Outputs 2 3 5
-  ! PGI Fortran 10.0:    Outputs 1 3 5
-  print *, n, o, p
-  
-end program
\ No newline at end of file

diff --git a/org.eclipse.photran-samples/src-modules-addl/import-rename-bug-2.f90 b/org.eclipse.photran-samples/src-modules-addl/import-rename-bug-2.f90
deleted file mode 100644
index ce7d554..0000000
--- a/org.eclipse.photran-samples/src-modules-addl/import-rename-bug-2.f90
+++ /dev/null

@@ -1,35 +0,0 @@
-! This demonstrates an inconsistency in the handling of modules with renaming.
-! J. Overbey 8 Apr 2010
-
-module m1; implicit none
-  integer :: m
-end module
-
-module m2; use m1; implicit none
-  integer :: n
-end module
-
-program test
-  ! There is ambiguity in the Fortran 95 standard as to how the following
-  ! statement should be handled.  According to Section 11.3.2:
-  ! "Two or more accessible entities, other than
-  ! generic interfaces, may have the same name only if
-  ! the name is not used to refer to an entity in the
-  ! scoping unit."
-  ! The question is what "refer to" means.  If you
-  ! interpret this to mean, "The name has no references,"
-  ! then compilation should succeed.  If you interpret it to mean,
-  ! "There are no other declarations/entities with that
-  ! name," then compilation should fail.
-  ! GNU Fortran 4.4.2:   Compilation succeeds.
-  ! IBM XL Fortran 12.1: Compilation fails: "Identifier "x" to be used as the
-  !                          the local name in a rename, has already been used
-  !                          to access another entity by use-association. This
-  !                          rename will not be done."
-  ! Intel Fortran 10.1:  Compilation fails: "There is more than one use-name
-  !                          for a local-name. [X]"
-  ! PGI Fortran 10.0:    Compilation succeeds.
-  use m2, x => n, x => m
-  implicit none
-  print *, "Hi"
-end program

diff --git a/org.eclipse.photran-samples/src-modules-addl/transitive-import.f90 b/org.eclipse.photran-samples/src-modules-addl/transitive-import.f90
deleted file mode 100644
index 5862fd6..0000000
--- a/org.eclipse.photran-samples/src-modules-addl/transitive-import.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-! If A imports B and B imports C, then A imports entities from C
-! (modulo renaming and ONLY lists).
-! J. Overbey (8 Apr 2010)
-
-module m1; implicit none
-  integer :: m
-end module
-
-module m2; use m1; implicit none
-  integer :: n
-end module
-
-program test
-  use m2
-  implicit none
-  print *, m, n
-end program
\ No newline at end of file

diff --git a/org.eclipse.photran-samples/src-modules/.cvsignore b/org.eclipse.photran-samples/src-modules/.cvsignore
deleted file mode 100644
index 2e87cbd..0000000
--- a/org.eclipse.photran-samples/src-modules/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-a.exe

diff --git a/org.eclipse.photran-samples/src-modules/module1.f90 b/org.eclipse.photran-samples/src-modules/module1.f90
deleted file mode 100644
index d7ade86..0000000
--- a/org.eclipse.photran-samples/src-modules/module1.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-module Module1
-contains
-    subroutine say_hi
-        print *, "Hi"
-    end subroutine
-
-    subroutine say_bye
-        print *, "Bye"
-    end subroutine
-
-    subroutine rename_this
-        print *, "Renamed in 1"
-    end subroutine
-end module

diff --git a/org.eclipse.photran-samples/src-modules/module2.f90 b/org.eclipse.photran-samples/src-modules/module2.f90
deleted file mode 100644
index b9e484f..0000000
--- a/org.eclipse.photran-samples/src-modules/module2.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-module Module2
-contains
-    subroutine say_konnichiwa
-        print *, "Kon'nichiwa"
-    end subroutine
-
-    subroutine say_sayonara
-        print *, "Sayonara"
-    end subroutine
-
-    subroutine rename_this
-        print *, "Renamed in 2"
-    end subroutine
-end module

diff --git a/org.eclipse.photran-samples/src-modules/zmain.f90 b/org.eclipse.photran-samples/src-modules/zmain.f90
deleted file mode 100644
index d4b8d98..0000000
--- a/org.eclipse.photran-samples/src-modules/zmain.f90
+++ /dev/null

@@ -1,26 +0,0 @@
-program MyProgram
-!implicit none
-
-use module1, renamed_in_1 => rename_this
-use module2, only: say_konnichiwa, renamed_in_2 => rename_this
-
-call start
-
-call say_hi
-call say_bye
-call say_konnichiwa
-!call say_sayonara
-call renamed_in_1
-call renamed_in_2
-
-stop
-
-contains
-
-subroutine start
-  implicit none
-  integer :: i
-    print *, i
-end subroutine
-
-end

diff --git a/org.eclipse.photran-samples/src-op-overload/.cvsignore b/org.eclipse.photran-samples/src-op-overload/.cvsignore
deleted file mode 100644
index 43fca42..0000000
--- a/org.eclipse.photran-samples/src-op-overload/.cvsignore
+++ /dev/null

@@ -1,3 +0,0 @@
-*.exe
-a.out
-*.mod

diff --git a/org.eclipse.photran-samples/src-op-overload/op.f90 b/org.eclipse.photran-samples/src-op-overload/op.f90
deleted file mode 100644
index 2b243dc..0000000
--- a/org.eclipse.photran-samples/src-op-overload/op.f90
+++ /dev/null

@@ -1,37 +0,0 @@
-! Demonstrates operator overloading
-! J. Overbey 1 Feb 2010
-module m
-    implicit none
-
-    type t
-      integer :: component
-    end type
-
-    ! Overload the less-than operator for derived type t
-    interface operator(.lt.)
-      module procedure lessthan
-    end interface
-contains
-    logical function lessthan(a, b)
-       type(t), intent(in) :: a
-       type(t), intent(in) :: b
-       lessthan = a%component < b%component
-    end function
-end module m
-
-program op
-    use m
-    implicit none
-
-    type(t) :: t1, t2
-    t1%component = 1
-    t2%component = 2
-
-    ! Invoke overloaded operator using .lt. syntax
-    if (t1 .lt. t2) then; print *, 'Yes'; else; print *, 'No'; end if
-    if (t2 .lt. t1) then; print *, 'Yes'; else; print *, 'No'; end if
-
-    ! Invoke overloaded operator using < syntax
-    if (t1 < t2) then; print *, 'Yes'; else; print *, 'No'; end if
-    if (t2 < t1) then; print *, 'Yes'; else; print *, 'No'; end if
-end program op

diff --git a/org.eclipse.photran-samples/src-scoping/.cvsignore b/org.eclipse.photran-samples/src-scoping/.cvsignore
deleted file mode 100644
index 2e87cbd..0000000
--- a/org.eclipse.photran-samples/src-scoping/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-a.exe

diff --git a/org.eclipse.photran-samples/src-scoping/scoping.f90 b/org.eclipse.photran-samples/src-scoping/scoping.f90
deleted file mode 100644
index 9cc9b36..0000000
--- a/org.eclipse.photran-samples/src-scoping/scoping.f90
+++ /dev/null

@@ -1,26 +0,0 @@
-program p
-    call ctn1
-    call ctn2
-    call ext1
-    call ext2
-contains
-  subroutine ctn1
-    call ctn2
-    call ext1
-    call ext2
-  end subroutine
-  
-  subroutine ctn2
-    call ctn1
-    call ext1
-    call ext2
-  end subroutine
-end program p
-
-subroutine ext1
-    call ext2
-end subroutine ext1
-
-subroutine ext2
-    call ext1
-end subroutine ext2

diff --git a/org.eclipse.photran-samples/src-types/.cvsignore b/org.eclipse.photran-samples/src-types/.cvsignore
deleted file mode 100644
index 2e87cbd..0000000
--- a/org.eclipse.photran-samples/src-types/.cvsignore
+++ /dev/null

@@ -1 +0,0 @@
-a.exe

diff --git a/org.eclipse.photran-samples/src-types/types.f90 b/org.eclipse.photran-samples/src-types/types.f90
deleted file mode 100644
index 2789c86..0000000
--- a/org.eclipse.photran-samples/src-types/types.f90
+++ /dev/null

@@ -1,135 +0,0 @@
-! Illustrates various data types in Fortran 90/95.
-! J. Overbey 5/18/10
-program types
-    implicit none
-
-    ! Declare two derived types (equivalent to C structs)
-    ! ===================================================
-
-    ! A simple derived type
-    type point
-        real :: x, y
-    end type
-
-    ! A derived type with nested derived types
-    type line
-        type(point) :: start, end
-    end type
-
-    ! Program entrypoint
-    ! ==================
-
-    call test_scalars
-    call test_scalars_with_kinds
-    call test_arrays_1dimension
-    call test_arrays_2dimensions
-    stop
-
-contains
-
-subroutine test_scalars
-    integer          :: integer_var
-    real             :: real_var
-    double precision :: double_var
-    complex          :: complex_var
-    logical          :: logical_var
-    character(len=5) :: character_var
-    type(point)      :: point_var
-    type(line)       :: line_var
-
-    integer_var = 1
-    real_var = 2.345
-    double_var = 6.789012345
-    complex_var = ( -1.234, 5.678 )
-    logical_var = .true.
-    character_var = "Hello"
-    point_var = point(12.34, 56.78)
-    line_var = line(point(1.2, 3.4), point(5.6, 7.8))
-
-    print *, integer_var
-    print *, real_var
-    print *, double_var
-    print *, complex_var
-    print *, logical_var
-    print *, character_var
-    print *, point_var
-    print *, line_var
-end subroutine
-
-subroutine test_scalars_with_kinds
-    integer(kind=2)  :: integer_2
-    integer(kind=4)  :: integer_4
-    integer(kind=8)  :: integer_8
-
-    real(kind=selected_real_kind(3))  :: real_3
-    real(kind=selected_real_kind(4))  :: real_4
-    real(kind=selected_real_kind(7))  :: real_7
-
-    integer_2 = -100
-    integer_4 = -1000
-    integer_8 = -1000000
-    print *, integer_2, integer_4, integer_8
-
-    real_3 = -100.001
-    real_4 = -1000.0001
-    real_7 = -1000000.0000001 ! gfortran rounds this off
-    print *, real_3, real_4, real_7
-end subroutine
-
-subroutine test_arrays_1dimension
-    implicit none
-
-    real             :: real_array(5)
-    type(point)      :: point_array(3)
-    type(line)       :: line_array(2)
-
-    real_array = (/ 1.2, 3.4, 5.6, 7.8, 9.0 /)
-    point_array = (/ point(12.34, 56.78), &
-                   point(-100, -1000),  &
-                   point(0, 999)        /)
-    line_array = (/ line(point(1.2, 3.4), point(5.6, 7.8)), &
-                  line(point(8.7, 6.5), point(4.3, 2.1))  /)
-
-    print *, real_array
-    print *, point_array
-    print *, line_array
-end subroutine
-
-subroutine test_arrays_2dimensions
-    implicit none
-
-    integer :: row, col
-
-    real             :: real_matrix(3, 5)
-    type(point)      :: point_matrix(3, 5)
-    
-    ! Fortran stores arrays in *column-major* order,
-    ! unlike C.  It also indexes from 1, unlike C.
-    ! So real_array(2,5) is the second row, fifth column.
-
-    ! real_matrix is this:
-    ! [  1.1  1.2  1.3  1.4  1.5  ]
-    ! [  2.1  2.2  2.3  2.4  2.5  ]
-    ! [  3.1  3.2  3.3  3.4  3.5  ]
-    do col = 1, 5
-        do row = 1, 3
-            real_matrix(row, col) = row + (col / 10.0)
-        end do
-    end do
-    print *, "real_matrix is:"
-    print *, real_matrix
-    
-    ! point_matrix is this:
-    ! [ (1,1) (1,2) (1,3) (1,4) (1,5) ]
-    ! [ (2,1) (2,2) (2,3) (2,4) (2,5) ]
-    ! [ (3,1) (3,2) (3,3) (3,4) (3,5) ]
-    do col = 1, 5
-        do row = 1, 3
-            point_matrix(row, col) = point(row, col)
-        end do
-    end do
-    print *, "point_matrix is:"
-    print *, point_matrix
-end subroutine
-
-end program types

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/.classpath b/org.eclipse.photran.core.vpg.preprocessor.c.tests/.classpath
deleted file mode 100755
index 64c5e31..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/.project b/org.eclipse.photran.core.vpg.preprocessor.c.tests/.project
deleted file mode 100755
index cdd54df..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.photran.core.vpg.preprocessor.c.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>net.sourceforge.metrics.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>net.sourceforge.metrics.nature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.photran.core.vpg.preprocessor.c.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100755
index 7135d96..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,330 +0,0 @@
-#Thu May 27 09:03:29 CDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=disabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=18
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=18
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=100
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=100
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.photran.core.vpg.preprocessor.c.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ec3e913..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,6 +0,0 @@
-#Tue Dec 01 10:22:15 CST 2009

-eclipse.preferences.version=1

-formatter_profile=_Photran

-formatter_settings_version=11

-org.eclipse.jdt.ui.javadoc=true

-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) ${year} University of Illinois at Urbana-Champaign and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *    UIUC - Initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * \r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/META-INF/MANIFEST.MF b/org.eclipse.photran.core.vpg.preprocessor.c.tests/META-INF/MANIFEST.MF
deleted file mode 100755
index 4bead14..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Photran C Preprocessor Support - Unit Tests
-Bundle-SymbolicName: org.eclipse.photran.core.vpg.preprocessor.c.tests
-Bundle-Version: 7.0.0.qualifier
-Bundle-Vendor: Eclipse.org
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.cdt.core,
- org.eclipse.core.runtime,
- org.eclipse.photran.core,
- org.eclipse.photran.core.vpg,
- org.eclipse.photran.core.vpg.preprocessor.c,
- org.eclipse.photran.core.vpg.tests,
- org.junit,
- org.eclipse.core.resources,
- org.eclipse.rephraserengine.testing.junit3

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/about.html b/org.eclipse.photran.core.vpg.preprocessor.c.tests/about.html
deleted file mode 100644
index 9c7ba0a..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/about.html
+++ /dev/null

@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>About</title></head>
-
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/build.properties b/org.eclipse.photran.core.vpg.preprocessor.c.tests/build.properties
deleted file mode 100755
index 34d2e4d..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/extractvariable/ExtractVariable.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/extractvariable/ExtractVariable.f90
deleted file mode 100755
index 4e2eb2d..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/extractvariable/ExtractVariable.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-program TestExtractVariable

-

-contains

-

-subroutine Sub()

-  integer :: x

-  x = 1

-  if(x==1) then

-  	x=2

-  end if	

-  

-end subroutine Sub

-

-end program TestExtractVariable


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/extractvariable/ExtractVariableAfter.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/extractvariable/ExtractVariableAfter.f90
deleted file mode 100755
index 29fa234..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/extractvariable/ExtractVariableAfter.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-program TestExtractVariable

-

-contains

-

-subroutine Sub()

-  integer :: x

-  logical :: y

-  x = 1

-  y = (x == 1)

-  if(y) then

-  	x=2

-  end if	

-  

-end subroutine Sub

-

-end program TestExtractVariable


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/MainProgramRefactoringAfter.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/MainProgramRefactoringAfter.f90
deleted file mode 100755
index 4921600..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/MainProgramRefactoringAfter.f90
+++ /dev/null

@@ -1,34 +0,0 @@
-program Hello

-  implicit none

-  integer :: i

-

-  i = 3

-  call Sub(i + 1)

-

-  print *, "The integer is ", i

-

-contains

-

-subroutine Sub(i)

-  integer :: i

-  integer :: x

-

-  x = i

-  print *, x

-

-end subroutine Sub

-

-

-subroutine SomeSub(y,z)

-  real :: y

-  real :: z

-  real :: x

-

-  x = y + z

-  y = 22

-  z = y + z

-  print *, x

-

-end subroutine SomeSub

-

-end program


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/MainProgramRefactoringBefore.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/MainProgramRefactoringBefore.f90
deleted file mode 100755
index 9b0fd49..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/MainProgramRefactoringBefore.f90
+++ /dev/null

@@ -1,30 +0,0 @@
-program Hello

-

-  i = 3

-  call Sub(i + 1)

-

-  print *, "The integer is ", i

-  

-contains

-

-subroutine Sub(i)

-  integer :: x

-

-  x = i

-  print *, x

-  

-end subroutine Sub

-

-

-subroutine SomeSub(y,z)

-  real :: y

-  real :: z

-

-  x = y + z

-  y = 22

-  z = y + z

-  print *, x

-  

-end subroutine SomeSub

-

-end program


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/Subroutine2RefactoringsAfter.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/Subroutine2RefactoringsAfter.f90
deleted file mode 100755
index b0ffe2d..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/Subroutine2RefactoringsAfter.f90
+++ /dev/null

@@ -1,34 +0,0 @@
-program Hello

-  integer :: i = 3

-

-  call Sub(i + 1)

-

-  print *, "The integer is ", i

-

-contains

-

-subroutine Sub(i)

-  implicit none

-  integer :: i

-  real :: x

-

-  x = i

-  print *, x

-

-end subroutine Sub

-

-

-subroutine SomeSub(y,z)

-  implicit none

-  real :: y

-  real :: z

-  real :: x

-

-  x = y + z

-  y = 22

-  z = y + z

-  print *, x

-

-end subroutine SomeSub

-

-end program


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/Subroutine2RefactoringsBefore.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/Subroutine2RefactoringsBefore.f90
deleted file mode 100755
index c9a9a2f..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/Subroutine2RefactoringsBefore.f90
+++ /dev/null

@@ -1,27 +0,0 @@
-program Hello

-  integer :: i = 3

-

-  call Sub(i + 1)

-

-  print *, "The integer is ", i

-  

-contains

-

-subroutine Sub(i)

-  

-  x = i

-  print *, x

-  

-end subroutine Sub

-

-

-subroutine SomeSub(y,z)

-  

-  x = y + z

-  y = 22

-  z = y + z

-  print *, x

-  

-end subroutine SomeSub

-

-end program


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/SubroutineRefactoringAfter.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/SubroutineRefactoringAfter.f90
deleted file mode 100755
index a06c261..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/SubroutineRefactoringAfter.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-program Hello

-  integer :: i = 3

-

-  call Sub(i + 1)

-

-  print *, "The integer is ", i

-

-contains

-

-subroutine Sub(i)

-  implicit none

-  integer :: i

-  real :: x

-

-  x = i

-  print *, x

-

-end subroutine Sub

-

-end program


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/SubroutineRefactoringBefore.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/SubroutineRefactoringBefore.f90
deleted file mode 100755
index bd9d871..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/SubroutineRefactoringBefore.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-program Hello

-  integer :: i = 3

-

-  call Sub(i + 1)

-

-  print *, "The integer is ", i

-  

-contains

-

-subroutine Sub(i)

-  

-  x = i

-  print *, x

-  

-end subroutine Sub

-

-end program


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/SubroutineThatHasAnImplicitStmt.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/SubroutineThatHasAnImplicitStmt.f90
deleted file mode 100755
index 92c1e0b..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/SubroutineThatHasAnImplicitStmt.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-program Hello

-  integer :: i = 3

-

-  call Sub(i + 1)

-

-  print *, "The integer is ", i

-

-contains

-

-subroutine Sub(i)

-  implicit none

-  integer :: i

-  real :: x

-

-  x = i

-  print *, x

-  

-end subroutine Sub

-

-end program


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/SubroutineWithDecalaredVarsRefactoringBefore.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/SubroutineWithDecalaredVarsRefactoringBefore.f90
deleted file mode 100755
index 9b9f239..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/SubroutineWithDecalaredVarsRefactoringBefore.f90
+++ /dev/null

@@ -1,19 +0,0 @@
-program Hello

-  integer :: i = 3

-

-  call Sub(i + 1)

-

-  print *, "The integer is ", i

-

-contains

-

-subroutine Sub(i)

-  integer :: i

-  real :: x

-

-  x = i

-  print *, x

-  

-end subroutine Sub

-

-end program


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/SubroutineWithDeclaredVarsRefactoringAfter.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/SubroutineWithDeclaredVarsRefactoringAfter.f90
deleted file mode 100755
index a06c261..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/introduceimplicitnone/SubroutineWithDeclaredVarsRefactoringAfter.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-program Hello

-  integer :: i = 3

-

-  call Sub(i + 1)

-

-  print *, "The integer is ", i

-

-contains

-

-subroutine Sub(i)

-  implicit none

-  integer :: i

-  real :: x

-

-  x = i

-  print *, x

-

-end subroutine Sub

-

-end program


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test1aRefactored.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test1aRefactored.f90
deleted file mode 100755
index 5738336..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test1aRefactored.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-program Hello

-  integer :: Whatever = 3

-

-  Whatever = Whatever + 1

-  print *, "The integer is ", Whatever

-  stop

-

-end program Hello


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test1abOriginal.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test1abOriginal.f90
deleted file mode 100755
index 963c879..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test1abOriginal.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-program Hello

-  integer :: i = 3

-  

-  i = i + 1

-  print *, "The integer is ", i

-  stop

-

-end program Hello


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test1bRefactored.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test1bRefactored.f90
deleted file mode 100755
index fe23bd6..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test1bRefactored.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-program Whatever

-  integer :: i = 3

-

-  i = i + 1

-  print *, "The integer is ", i

-  stop

-

-end program Whatever


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test2Original.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test2Original.f90
deleted file mode 100755
index fd97eac..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test2Original.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-program Hello

-  integer :: i = 3

-  integer :: j = 4

-  

-  i = i + 1

-  print *, "The integer is ", i

-  print *, "and the other integer is ", j

-  stop

-

-end program


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test3Original.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test3Original.f90
deleted file mode 100755
index b1cc8f1..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test3Original.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-program Hello

-  integer :: i = 3

-

-  call Sub(i + 1)

-

-  print *, "The integer is ", i

-  

-contains

-

-subroutine Sub(x)

-  integer, intent(in) :: x

-

-  print *, "In the subroutine, the integer is ", x

-end subroutine Sub

-

-end program


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test4Original.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test4Original.f90
deleted file mode 100755
index 1955606..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test4Original.f90
+++ /dev/null

@@ -1,23 +0,0 @@
-! This is a sample program

-

-program Hello

-  integer :: i = 3 !!! a variable !!!

-

-  call Sub(Fn(i) + 1)

-

-  print *, "The integer is ", i

-

-contains ! a comment

-

-subroutine Sub(x) ! start

-  integer, intent(in) :: x

-

-  print *, "In the subroutine, the integer is ", x

-end subroutine Sub   ! end

-

-end program

-

-integer function Fn(n) result(y)

-  print *, "You sent", n, "to the function"

-  y = n

-end function


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test4Refactored.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test4Refactored.f90
deleted file mode 100755
index 52b7362..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/basic_test_files/rename/Test4Refactored.f90
+++ /dev/null

@@ -1,23 +0,0 @@
-! This is a sample program

-

-program Hello

-  integer :: i = 3 !!! a variable !!!

-

-  call buS(nF(i) + 1)

-

-  print *, "The integer is ", i

-

-contains ! a comment

-

-subroutine buS(x) ! start

-  integer, intent(in) :: x

-

-  print *, "In the subroutine, the integer is ", x

-end subroutine buS   ! end

-

-end program

-

-integer function nF(n) result(y)

-  print *, "You sent", n, "to the function"

-  y = n

-end function


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro1.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro1.f90
deleted file mode 100644
index 4b27ca4..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro1.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-! Here's a comment at the top of the file
-#define TYPE integer
-#define VALUE 5
-program hello_world
-  implicit none
-  TYPE :: hello = VALUE
-  print *, hello
-end program

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro2.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro2.f90
deleted file mode 100644
index 0c9db19..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro2.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-! Here's a comment at the top of the file
-#define TYPE integer
-#define VALUE 5
-program hello_world
-  implicit none
-  TYPE :: hello = VALUE
-  print *, hello
-  
-! TYPE
-end program
-! TYPE

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro3.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro3.f90
deleted file mode 100644
index ceeb588..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro3.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-! Here's a comment at the top of the file
-#define TYPE_AND_VAR integer :: hello
-#define VALUE 5
-program hello_world
-  implicit none
-  TYPE_AND_VAR = VALUE
-  print *, hello
-  
-end program

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro4.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro4.f90
deleted file mode 100644
index 5daa625..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro4.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-! This program will test some complicated token overlap situation
-#define ECHO(x) x
-
-program hello_world
-  implicit none
-  integer :: hello = 5
-  if(3 ECHO(.lt). 4) print *, hello
-  if(3 .ECHO(lt. 4 .)ECHO(and)ECHO(. 4 .lt). 5) print *, hello
-  if(3 ECHO(<)ECHO(4)) print *ECHO(),ECHO() ECHO()hello
-  print *, ECHO(hello ! in macro)
-  print *, ECHO(hello ! in macro) out of macro
-  
-end program

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro5.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro5.f90
deleted file mode 100644
index 01bf0bc..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro5.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-! this just tests to make sure the code works if there are no macros, etc.
-
-program hello_world
-  implicit none
-  integer :: hello = 5
-  print *, hello
-end program

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro6.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro6.f90
deleted file mode 100644
index 0a5ca51..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/fortran_macro_test_files/macro6.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-#define int integer ::
-
-program cpp
-    implicit none
-    int i = 3
-end program cpp

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/basic_function_test.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/basic_function_test.f90
deleted file mode 100755
index 23cb097..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/basic_function_test.f90
+++ /dev/null

@@ -1,4 +0,0 @@
-/*1*/ # /*2*/ define /*3*/ f( /*4*/ x /*5*/, /*6*/ y /*7*/) /*8*/ x /*9*/ * /*10*/ y /*11*/ 

-

-/*12*/ f /*13*/ ( /*14*/ 5 /*15*/ , /*16*/ A /*17*/ + /*18*/ B /*19*/) /*20*/;

-


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/constant_test.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/constant_test.f90
deleted file mode 100755
index 5e38ba6..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/constant_test.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-#define  /*comment1*/ PI /*comment2*/  3.14159  /*comment3*/

-

-/*comment4*/ PI /*comment5*/

-

-/*comment6*/# /*comment7*/ define STRING some text

-

-/*comment8*/ PI /*comment9*/ STRING /*comment10*/

-

-

-


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/empty_macro_test.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/empty_macro_test.f90
deleted file mode 100755
index 310fcc4..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/empty_macro_test.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-There may be a problem reconstructing source code if a macro does not

-produce any tokens, because the macro invocation cannot be attached to

-the macro expansion.

-

-

-#define BLANK

-#define ECHO(x) x

-

-/*1*/BLANK  //2

-

-/*3*/ECHO()  //4

-


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/indirect_macro_test.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/indirect_macro_test.f90
deleted file mode 100755
index b347311..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/indirect_macro_test.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-#define SQUARE(x) x*x

-#define MAKE_SQUARE SQUARE

-#define SQUARE_OPEN SQUARE(

-

-MAKE_SQUARE(5)

-SQUARE_OPEN A)

-


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/newline_bug_test.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/newline_bug_test.f90
deleted file mode 100755
index cefa719..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/newline_bug_test.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-A newline token may not be returned if a macro expansion attempt fails.

-

-#define SQUARE(x) x*x

-

-SQUARE /*1*/

- /*2*/

- /*3*/ nothing

-


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/trigraph_splice_macro_test.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/trigraph_splice_macro_test.f90
deleted file mode 100755
index afd1bf6..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/macro_test_files/trigraph_splice_macro_test.f90
+++ /dev/null

@@ -1,23 +0,0 @@
-#define \u0025(x) x*x

-#define ??/u0027(x) x+x

-

-/*1*/ \u0025(10);

-/*2*/ ??/u0025(20);

-/*3*/ \u0027(30);

-/*4*/ ??/u0027(40);

-/*5*/ ??/u002\

-5(50);

-

-\u0025(/*6*/??=/*7*/)

-

-#define TRIGRAPH /*8*/ ??( /*9*/

-

-/*10*/ TRIGRAPH //11

-

-#define ALPHA  /*12*/ a \

-  b  \

-   \

-   c //13

-

-/*14*/ ALPHA //15

-


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/basic_included.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/basic_included.f90
deleted file mode 100755
index 337ffe4..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/basic_included.f90
+++ /dev/null

@@ -1,2 +0,0 @@
-This is an included file.

-


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/basic_includer.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/basic_includer.f90
deleted file mode 100755
index 76b5509..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/basic_includer.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-PRE INCLUDED FILE

-

-#include "basic_included.f90"

-

-POST INCLUDED FILE

-


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/commented_included.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/commented_included.f90
deleted file mode 100755
index ebf9edc..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/commented_included.f90
+++ /dev/null

@@ -1 +0,0 @@
-/*commentA*/ This is an included file. /*commentB*/
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/commented_includer.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/commented_includer.f90
deleted file mode 100755
index 400e2b2..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/commented_includer.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-PRE INCLUDED FILE

-

-/*comment1*/ #include "commented_included.f90" /*comment2 */

-/*comment3*/

-

-POST INCLUDED FILE

-

-WARNING: There may still be an error even if source reproduction succeeds.

-The included file ends with a comment instead of a newline, so make sure

-the comment is remembered.

-


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/deep_includer.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/deep_includer.f90
deleted file mode 100755
index 4ff481d..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/deep_includer.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-PRE OUTER INCLUDED FILE

-

-#include "basic_includer.f90"

-

-POST OUTER INCLUDED FILE

-


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/directive_includer.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/directive_includer.f90
deleted file mode 100644
index 905b2ce..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/directive_includer.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-PRE INCLUDED FILE
-
-#include "if_test.f90"
-
-POST INCLUDED FILE
-

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/empty_file.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/empty_file.f90
deleted file mode 100755
index e69de29..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/empty_file.f90
+++ /dev/null


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/empty_includer.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/empty_includer.f90
deleted file mode 100755
index 4b19146..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/empty_includer.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-PRE INCLUDED FILE

-

-#include "empty_file.f90"

-

-POST INCLUDED FILE

-


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/failing_includer.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/failing_includer.f90
deleted file mode 100755
index b6f00b3..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/failing_includer.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-PRE INCLUDED FILE

-

-#include "non_existant_file.f90"

-

-POST INCLUDED FILE

-


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/if_test.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/if_test.f90
deleted file mode 100755
index dcb4ac4..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/other_directive_test_files/if_test.f90
+++ /dev/null

@@ -1,31 +0,0 @@
-start

-

-#define DEFINED_VAR /*1*/

-

-#ifdef UNDEFINED_VAR/*2*/

-undefined-var is defined

-

-#elif defined(ANOTHER_UNDEFINED_VAR) /*3*/

-another-undefined-var is defined

-

-#elif defined(DEFINED_VAR) /*4*/

-defined-var is defined

-

-#else/*5*/

-none of the tested vars were defined

-

-#endif/*6*/

-

-#if defined(UNDEFINED_VAR)/*7*/

-undefined-var is defined

-#include "basic_included.f90"

-

-#endif/*8*/

-

-#if defined(DEFINED_VAR)/*17*/

-defined-var is defined

-#include "basic_included.f90"

-

-#endif/*9*/

-

-end


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/at_sign_test.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/at_sign_test.f90
deleted file mode 100755
index b07cd0e..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/at_sign_test.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-@ @@ @ @ @  @ @ @@  @

-

-At signs are considered unknown tokens by the Lexer. The Lexer will

-return unknown tokens like this with the proper image. However,

-the CPreprocessor is designed (or was designed) to not return tokens

-with an unknown type that it receives from the Lexer. If this is not

-handled, at signs will be lost.

-

-

-@@ @ @  @ @ @  @ @ @ @@  @

-


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/backslash_test.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/backslash_test.f90
deleted file mode 100755
index f434f07..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/backslash_test.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-If a backslash isn't the last character on a line (making a line

-splice), it may not be remembered. In this situation, it would be

-in a similar situation as the at sign: considered an unknown character.

-

-text \ text

-

-

-

-


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/comment_test.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/comment_test.f90
deleted file mode 100755
index 3c0a8a0..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/comment_test.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-//comment1

-

-text1 //comment2

-

-text2/*comment3*/ /*comment 4*/   text3

-

-//comment5

-/*comment6

-*/text

-

-


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/end_of_file_directive_test.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/end_of_file_directive_test.f90
deleted file mode 100755
index e5514a6..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/end_of_file_directive_test.f90
+++ /dev/null

@@ -1,5 +0,0 @@
-There may be a problem when the file ends with a directive instead

-of a newline, since there is no token to attach the white space of

-the directive to the beginning of.

-

-#directive
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/end_of_file_test.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/end_of_file_test.f90
deleted file mode 100755
index 89cadb4..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/end_of_file_test.f90
+++ /dev/null

@@ -1,5 +0,0 @@
-There may be a problem when the file ends with "whitespace" instead

-of a newline, since there is no token to attach the white space to

-the beginning of. For example, this file ends with a few spaces.

-

-   
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/line_splice_test.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/line_splice_test.f90
deleted file mode 100755
index 428e37c..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/line_splice_test.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-Here is a line splice \

-This is the next line.

-

-Here is another line splice \

-Here is \

-    \

-another line splice\

-


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/pound_test.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/pound_test.f90
deleted file mode 100755
index 93da356..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/pound_test.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-  #  #  ## # textA # #  # # 

-textB

-#

-textC

-##

-

-If a pound token starts out a line, the line may be lost

-in some cases...

-

-

-#textD

-textE ### #

-# textF

-

-#  5

-


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/token_test.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/token_test.f90
deleted file mode 100755
index 761f776..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/token_test.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-	 	 	 	 	!#$%^&*(*(()

-

-{} [] abcdef ghijk

-lmnopqrs  tuvwxyz

-

-<< >> <<<<< >>>> <<< >>>

-

-??   ????  ????????

-...

-%:%:

-;;;

-"this is quoted text   \n  \t    \r\n"

-'a' 'abdefg'

-

-


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/trigraph_test.f90 b/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/trigraph_test.f90
deleted file mode 100755
index 88274a8..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/token_test_files/trigraph_test.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-start

-

-text ??=

-??\

-??(

-??)

-??!

-??<

-??>

-??-

-??/

-

-???

-??abcdefg

-?????????

-

-??-??!??<

-

-

-end


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/AbstractCppTestCase.java b/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/AbstractCppTestCase.java
deleted file mode 100755
index 1a2a576..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/AbstractCppTestCase.java
+++ /dev/null

@@ -1,82 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.core.tests.preprocessor.c;

-

-import java.io.File;

-import java.io.IOException;

-

-import junit.framework.ComparisonFailure;

-import junit.framework.TestCase;

-

-import org.eclipse.photran.internal.core.preprocessor.c.CppHelper;

-import org.eclipse.photran.internal.core.preprocessor.c.IToken;

-import org.eclipse.photran.internal.core.util.SemanticError;

-

-/**

- * A test case for parsing a single file with the CPreprocessor. Based

- * on AbstractParserTestCase by joverbey.

- * @author Matthew Michelotti

- */

-public abstract class AbstractCppTestCase extends TestCase

-{

-    protected File file = null;

-    protected boolean isFixedForm = false;

-    protected String fileDescription = null;

-

-    /**

-     * Constructor

-     * 

-     * @param filename the file to parse

-     * @param isFixedForm true iff the file is in fixed format

-     */

-    public AbstractCppTestCase(File file, boolean isFixedForm, String testCaseDescription)

-    {

-        super("test"); // name of method to run

-        this.file = file;

-        this.isFixedForm = isFixedForm;

-        this.fileDescription = testCaseDescription;

-    }

-    

-    /**

-     * Method called by JUnit: Parses the given file.

-     * 

-     * @throws Exception

-     */

-    public final void test() throws Exception

-    {

-        if (file == null) return; // for when JUnit invokes the no-arguments constructor and reflectively invokes this method

-        

-        try

-        {

-            //SourceForm sourceForm = (isFixedForm ? SourceForm.FIXED_FORM : SourceForm.UNPREPROCESSED_FREE_FORM);

-            

-            CppHelper cpp = new CppHelper(file);

-            handleTokens(cpp.getRemainingTokens());

-        }

-        catch (ComparisonFailure f)

-        {

-            throw f;

-        }

-        catch (Throwable t)

-        {

-            throw new Exception(fileDescription, t);

-        }

-    }

-

-    /**

-     * Subclasses can override this method to perform the appropriate test on tokens

-     * 

-     * @param startToken - The first token in a linked-list of tokens

-     *        obtained from the CPP. Get other tokens with IToken.getNext().

-     * @throws IOException 

-     */

-    protected abstract void handleTokens(IToken startToken) throws IOException, SemanticError;

-}


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/AbstractCppTestSuite.java b/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/AbstractCppTestSuite.java
deleted file mode 100755
index b79645e..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/AbstractCppTestSuite.java
+++ /dev/null

@@ -1,136 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.core.tests.preprocessor.c;

-

-import java.io.File;

-import java.io.FileFilter;

-import java.io.FileNotFoundException;

-import java.io.FilenameFilter;

-import java.io.IOException;

-

-import junit.framework.TestSuite;

-

-/**

- * Test suite for the C preprocessor, based on

- * AbstractParserTestSuite by joverbey.

- * 

- * @author Matthew Michelotti

- */

-public abstract class AbstractCppTestSuite extends TestSuite

-{

-    public static final String TEST_ROOT = "../org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/";

-    

-    protected String directory;

-    protected boolean isFixedForm;

-    protected boolean print;

-

-    public AbstractCppTestSuite(String directorySuffix, boolean isFixedForm, boolean mustExist, boolean print) throws FileNotFoundException, IOException

-    {

-        this.directory = getFullPath(directorySuffix);

-        this.isFixedForm = isFixedForm;

-        this.print = print;

-

-        setName(getDescription(directorySuffix, isFixedForm, mustExist));

-

-        File dir = new File(directory);

-        if (dir.exists()) processDirectory(dir);

-    }

-    

-    protected String getDescription(String directorySuffix, boolean isFixedForm, boolean mustExist)

-    {

-        String dir = getFullPath(directorySuffix);

-        

-        StringBuffer sb = new StringBuffer(256);

-        sb.append(describeTestAction());

-        sb.append(" ");

-        sb.append(directorySuffix);

-        sb.append(isFixedForm ? " (fixed format)" : " (free format)");

-        String message = sb.toString();

-        

-        if (!new File(dir).exists())

-        {

-            if (mustExist)

-                throw new Error("Unable to find directory " + dir + " (working directory is " + getWorkingDirectory() + ")");

-            else

-                message = "NOTE: Confidential parser tests are not installed on this system: " + dir + " does not exist";

-        }

-        

-        return message;

-    }

-

-    private String getWorkingDirectory()

-    {

-        try

-        {

-            return new File(".").getCanonicalPath();

-        }

-        catch (IOException e)

-        {

-            return "???";

-        }

-    }

-

-    protected abstract String describeTestAction();

-

-    private static String getFullPath(String directorySuffix)

-    {

-        return TEST_ROOT + directorySuffix + (directorySuffix.endsWith("/") ? "" : "/");

-    }

-    

-    private void processDirectory(File dir)

-    {

-        if (isFixedForm)

-            for (File file : dir.listFiles(FIXED_FORM_FILENAME_FILTER))

-                addTest(createTestFor(file, isFixedForm, describe(file)));

-        else

-            for (File file : dir.listFiles(FREE_FORM_FILENAME_FILTER))

-                addTest(createTestFor(file, isFixedForm, describe(file)));

-        

-        for (File subdir : dir.listFiles(DIRECTORY_FILTER))

-            processDirectory(subdir);

-    }

-

-    protected abstract AbstractCppTestCase createTestFor(File file, boolean isFixedForm, String fileDescription);

-    

-    private String describe(File file)

-    {

-        return file.getAbsolutePath().substring(directory.length());

-    }

-

-    private static FilenameFilter FREE_FORM_FILENAME_FILTER = new FilenameFilter()

-    {

-        public boolean accept(File dir, String name)

-        {

-            return (name.endsWith(".f90")

-                || name.endsWith(".f03")

-                || name.endsWith(".F90")

-                || name.endsWith(".F03")

-                || name.endsWith(".FRE")) && !name.startsWith("XXX");

-        }

-    };

-

-    private static FilenameFilter FIXED_FORM_FILENAME_FILTER = new FilenameFilter()

-    {

-        public boolean accept(File dir, String name)

-        {

-            return (name.endsWith(".f")

-                || name.endsWith(".FIX")) && !name.startsWith("XXX");

-        }

-    };

-

-    private static FileFilter DIRECTORY_FILTER = new FileFilter()

-    {

-        public boolean accept(File f)

-        {

-            return f.isDirectory() && !f.getName().startsWith("XXX");

-        }

-    };

-}


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/CppIntegratedSourceReproductionTestCase.java b/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/CppIntegratedSourceReproductionTestCase.java
deleted file mode 100755
index c2ae0ef..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/CppIntegratedSourceReproductionTestCase.java
+++ /dev/null

@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.core.tests.preprocessor.c;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-
-import org.eclipse.photran.internal.core.lexer.sourceform.CPreprocessedFreeSourceForm;
-import org.eclipse.photran.internal.core.parser.ASTExecutableProgramNode;
-import org.eclipse.photran.internal.core.refactoring.infrastructure.SourcePrinter;
-import org.eclipse.photran.internal.core.sourceform.ISourceForm;
-import org.eclipse.photran.internal.tests.PhotranASTTestCase;
-
-public class CppIntegratedSourceReproductionTestCase extends PhotranASTTestCase
-{
-    public CppIntegratedSourceReproductionTestCase(File file, boolean isFixedForm, String testCaseDescription)
-    {
-        super(file, isFixedForm, testCaseDescription);
-    }
-
-    @Override protected ISourceForm createSourceForm()
-    {
-        return new CPreprocessedFreeSourceForm();
-    }
-
-    @Override
-    protected void handleAST(ASTExecutableProgramNode ast) throws IOException
-    {
-        String originalSourceCode = getSourceCodeFromFile(file);
-        transform(ast);
-        String reproducedSourceCode = getSourceCodeFromAST(ast);
-        assertEquals(originalSourceCode.replaceAll("\\r", "").trim(), reproducedSourceCode.replaceAll("\\r", "").trim());
-    }
-
-    protected void transform(ASTExecutableProgramNode ast)
-    {
-        // Subclass and override to transform AST first
-    }
-
-    private String getSourceCodeFromFile(File file) throws IOException
-    {
-        StringBuffer sb = new StringBuffer(4096);
-        BufferedReader in = new BufferedReader(new FileReader(file));
-        for (int ch = in.read(); ch >= 0; ch = in.read())
-            sb.append((char)ch);
-        in.close();
-        return sb.toString();
-    }
-    
-    private String getSourceCodeFromAST(ASTExecutableProgramNode ast)
-    {
-        return SourcePrinter.getSourceCodeFromAST(ast);
-    }
-
-    public CppIntegratedSourceReproductionTestCase() { super(null, false, ""); } // to keep JUnit quiet
-}

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/CppIntegratedSourceReproductionTestSuite.java b/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/CppIntegratedSourceReproductionTestSuite.java
deleted file mode 100755
index 29927ee..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/CppIntegratedSourceReproductionTestSuite.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.core.tests.preprocessor.c;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import org.eclipse.photran.internal.tests.PhotranASTTestCase;
-import org.eclipse.photran.internal.tests.PhotranTestSuiteFromFiles;
-
-public abstract class CppIntegratedSourceReproductionTestSuite extends PhotranTestSuiteFromFiles
-{
-    public CppIntegratedSourceReproductionTestSuite(String directorySuffix, boolean isFixedForm, boolean mustExist) throws FileNotFoundException, IOException
-    {
-    	// Super constructor will append directorySuffix to
-    	// ../org.eclipse.photran.core.vpg.tests/parser-test-code/
-        super("Reproduce preprocessed source code for",
-              "../../org.eclipse.photran.core.vpg.preprocessor.c.tests/cpp-test-code/" + directorySuffix,
-              isFixedForm,
-              mustExist);
-    }
-
-    @Override
-    protected PhotranASTTestCase createTestFor(File file, boolean isFixedForm, String fileDescription)
-    {
-        return new CppIntegratedSourceReproductionTestCase(file, isFixedForm, fileDescription);
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/CppIsolatedSourceReproductionTestCase.java b/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/CppIsolatedSourceReproductionTestCase.java
deleted file mode 100755
index 24d18a3..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/CppIsolatedSourceReproductionTestCase.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.core.tests.preprocessor.c;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-
-import org.eclipse.photran.internal.core.preprocessor.c.CppHelper;
-import org.eclipse.photran.internal.core.preprocessor.c.IToken;
-import org.eclipse.photran.internal.core.util.SemanticError;
-
-/**
- * A test case for making sure that code processed by the CPreprocessor
- * can be restored to the original source code. Based on the
- * SourceReproductionTestCase class.
- * @author Matthew Michelotti
- */
-public class CppIsolatedSourceReproductionTestCase extends AbstractCppTestCase
-{
-    //private String filename;
-    //private boolean print;
-    
-    public CppIsolatedSourceReproductionTestCase(File file, boolean isFixedForm, String testCaseDescription, boolean print)
-    {
-        super(file, isFixedForm, testCaseDescription);
-        //filename = file.getName();
-        //this.print = print;
-    }
-
-    @Override
-    protected void handleTokens(IToken startToken) throws IOException, SemanticError
-    {
-        String originalSourceCode = getSourceCodeFromFile(file);
-        String reproducedSourceCode = getSourceCodeFromTokens(startToken);
-        
-        assertEquals(originalSourceCode, reproducedSourceCode);
-        
-        /*int line = 1;
-        int col = 1;
-        for(int i = 0; i < originalSourceCode.length(); i++) {
-            char origChar = originalSourceCode.charAt(i);
-            
-            if(reproducedSourceCode.length() <= i) {
-                fail("Reproduced code ended prematurely at line "
-                    + line + ", col " + col + " of " + filename);
-            }
-            
-            if(origChar != reproducedSourceCode.charAt(i)) {
-                fail("Incorrect source reproduction at line "
-                    + line + ", col" + col + " of " + filename);
-            }
-            
-            if(origChar == '\n') {
-                line++;
-                col = 1;
-            }
-            else col++;
-        }*/
-    }
-    
-    private static String getSourceCodeFromFile(File file) throws IOException
-    {
-        StringBuffer sb = new StringBuffer(4096);
-        BufferedReader in = new BufferedReader(new FileReader(file));
-        for (int ch = in.read(); ch >= 0; ch = in.read())
-            sb.append((char)ch);
-        in.close();
-        return sb.toString();
-    }
-    
-    private String getSourceCodeFromTokens(IToken startToken) {
-    	/*
-        if(print) {
-            System.out.println();
-            System.out.println("----------------------------------------------------");
-            System.out.println("file: " + filename);
-            System.out.println("----------------------------------------------------");
-            for(IToken t = startToken; t != null; t = t.getNext()) {
-                System.out.println(CppHelper.getTokenDetails(t, "~", "|", false));
-            }
-        }
-        */
-        
-        return CppHelper.reproduceSourceCode(startToken);
-    }
-    
-    public CppIsolatedSourceReproductionTestCase() { super(null, false, ""); } // to keep JUnit quiet
-
-}

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/CppIsolatedSourceReproductionTestSuite.java b/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/CppIsolatedSourceReproductionTestSuite.java
deleted file mode 100755
index 203b9f1..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/CppIsolatedSourceReproductionTestSuite.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.core.tests.preprocessor.c;

-

-import java.io.File;

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-/**

- * Test suite for CppSourceReproductionTestCase's. Based on the

- * code from SourceReproductionTestSuite.

- * @author Matthew Michelotti

- */

-public abstract class CppIsolatedSourceReproductionTestSuite extends AbstractCppTestSuite

-{

-    public CppIsolatedSourceReproductionTestSuite(String directorySuffix, boolean isFixedForm, boolean mustExist, boolean print) throws FileNotFoundException, IOException

-    {

-        super(directorySuffix, isFixedForm, mustExist, print);

-    }

-

-    public CppIsolatedSourceReproductionTestSuite(String directorySuffix, boolean isFixedForm, boolean mustExist) throws FileNotFoundException, IOException

-    {

-        this(directorySuffix, isFixedForm, mustExist, true);

-    }

-

-    @Override

-    protected String describeTestAction()

-    {

-        return "Reproduce unpreprocessed source code for";

-    }

-

-    @Override

-    protected AbstractCppTestCase createTestFor(File file, boolean isFixedForm, String fileDescription)

-    {

-        return new CppIsolatedSourceReproductionTestCase(file, isFixedForm, fileDescription, print);

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintArjanVanDijkAtmos.java b/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintArjanVanDijkAtmos.java
deleted file mode 100755
index af9fdfb..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintArjanVanDijkAtmos.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.core.tests.preprocessor.c.source_reproduction;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-import org.eclipse.photran.internal.core.tests.preprocessor.c.CppIsolatedSourceReproductionTestSuite;

-

-public class PrintArjanVanDijkAtmos

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new CppIsolatedSourceReproductionTestSuite("../../org.eclipse.photran-projects.confidential.arjan-van-dijk-atmos", false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintAsteroids.java b/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintAsteroids.java
deleted file mode 100755
index 1962988..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintAsteroids.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.core.tests.preprocessor.c.source_reproduction;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-import org.eclipse.photran.internal.core.tests.preprocessor.c.CppIsolatedSourceReproductionTestSuite;

-

-public class PrintAsteroids

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new CppIsolatedSourceReproductionTestSuite("../../org.eclipse.photran-projects.confidential.asteroids", false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintBasicTestFiles.java b/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintBasicTestFiles.java
deleted file mode 100755
index 5bcd769..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintBasicTestFiles.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.core.tests.preprocessor.c.source_reproduction;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-import junit.framework.TestSuite;

-

-import org.eclipse.photran.internal.core.tests.preprocessor.c.CppIntegratedSourceReproductionTestSuite;

-import org.eclipse.photran.internal.core.tests.preprocessor.c.CppIsolatedSourceReproductionTestSuite;

-

-public class PrintBasicTestFiles

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-    	TestSuite suite = new TestSuite();

-    	suite.addTest(new CppIsolatedSourceReproductionTestSuite("basic_test_files", false, true, true) {});

-    	suite.addTest(new CppIntegratedSourceReproductionTestSuite("basic_test_files", false, true) {});

-    	return suite;

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintFMLIB.java b/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintFMLIB.java
deleted file mode 100755
index dc7a842..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintFMLIB.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.core.tests.preprocessor.c.source_reproduction;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-import org.eclipse.photran.internal.core.tests.preprocessor.c.CppIsolatedSourceReproductionTestSuite;

-

-public class PrintFMLIB

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new CppIsolatedSourceReproductionTestSuite("../../org.eclipse.photran-projects.confidential.fmlib", false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintMacroTestFiles.java b/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintMacroTestFiles.java
deleted file mode 100755
index e024500..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintMacroTestFiles.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.core.tests.preprocessor.c.source_reproduction;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-import junit.framework.TestSuite;

-

-import org.eclipse.photran.internal.core.tests.preprocessor.c.CppIntegratedSourceReproductionTestSuite;

-import org.eclipse.photran.internal.core.tests.preprocessor.c.CppIsolatedSourceReproductionTestSuite;

-

-public class PrintMacroTestFiles

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-    	TestSuite suite = new TestSuite();

-    	suite.addTest(new CppIsolatedSourceReproductionTestSuite("macro_test_files", false, true, true) {});

-    	suite.addTest(new CppIsolatedSourceReproductionTestSuite("fortran_macro_test_files", false, true, true) {});

-    	suite.addTest(new CppIntegratedSourceReproductionTestSuite("fortran_macro_test_files", false, true) {});

-    	return suite;

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintOtherDirectiveTestFiles.java b/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintOtherDirectiveTestFiles.java
deleted file mode 100755
index 2e49a74..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintOtherDirectiveTestFiles.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.core.tests.preprocessor.c.source_reproduction;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import org.eclipse.photran.internal.core.tests.preprocessor.c.CppIsolatedSourceReproductionTestSuite;

-

-import junit.framework.Test;

-

-public class PrintOtherDirectiveTestFiles

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new CppIsolatedSourceReproductionTestSuite("other_directive_test_files", false, true, true) {};

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintPOP.java b/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintPOP.java
deleted file mode 100755
index 41de361..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintPOP.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.core.tests.preprocessor.c.source_reproduction;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-import org.eclipse.photran.internal.core.tests.preprocessor.c.CppIsolatedSourceReproductionTestSuite;

-

-public class PrintPOP

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new CppIsolatedSourceReproductionTestSuite("../../org.eclipse.photran-projects.confidential.pop", false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintProjectString.java b/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintProjectString.java
deleted file mode 100755
index edd2da9..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintProjectString.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.core.tests.preprocessor.c.source_reproduction;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-import org.eclipse.photran.internal.core.tests.preprocessor.c.CppIsolatedSourceReproductionTestSuite;

-

-public class PrintProjectString

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new CppIsolatedSourceReproductionTestSuite("../../org.eclipse.photran-projects.string", false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintTokenTestFiles.java b/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintTokenTestFiles.java
deleted file mode 100755
index 0d7e4f2..0000000
--- a/org.eclipse.photran.core.vpg.preprocessor.c.tests/src/org/eclipse/photran/internal/core/tests/preprocessor/c/source_reproduction/PrintTokenTestFiles.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.core.tests.preprocessor.c.source_reproduction;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import org.eclipse.photran.internal.core.tests.preprocessor.c.CppIsolatedSourceReproductionTestSuite;

-

-import junit.framework.Test;

-

-public class PrintTokenTestFiles

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new CppIsolatedSourceReproductionTestSuite("token_test_files", false, true, true) {};

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests.failing/.classpath b/org.eclipse.photran.core.vpg.tests.failing/.classpath
deleted file mode 100644
index 472ee29..0000000
--- a/org.eclipse.photran.core.vpg.tests.failing/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.photran.core.vpg.tests.failing/.project b/org.eclipse.photran.core.vpg.tests.failing/.project
deleted file mode 100644
index 82783c8..0000000
--- a/org.eclipse.photran.core.vpg.tests.failing/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.photran.core.vpg.tests.failing</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>net.sourceforge.metrics.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>net.sourceforge.metrics.nature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.photran.core.vpg.tests.failing/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.photran.core.vpg.tests.failing/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 5d0da91..0000000
--- a/org.eclipse.photran.core.vpg.tests.failing/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,335 +0,0 @@
-#Thu May 27 09:03:09 CDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=disabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=18
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=18
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=100
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=100
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

diff --git a/org.eclipse.photran.core.vpg.tests.failing/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.photran.core.vpg.tests.failing/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 25d194d..0000000
--- a/org.eclipse.photran.core.vpg.tests.failing/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,6 +0,0 @@
-#Thu Oct 08 11:30:47 CDT 2009
-eclipse.preferences.version=1
-formatter_profile=_Photran
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) ${year} University of Illinois at Urbana-Champaign and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *    UIUC - Initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * \r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

diff --git a/org.eclipse.photran.core.vpg.tests.failing/META-INF/MANIFEST.MF b/org.eclipse.photran.core.vpg.tests.failing/META-INF/MANIFEST.MF
deleted file mode 100644
index 13e5d1a..0000000
--- a/org.eclipse.photran.core.vpg.tests.failing/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Photran VPG Failing Unit Tests
-Bundle-SymbolicName: org.eclipse.photran.core.vpg.tests.failing;singleton:=true
-Bundle-Version: 7.0.0.qualifier
-Bundle-Vendor: Eclipse.org
-Require-Bundle: org.eclipse.photran.core.vpg.tests,
- org.eclipse.photran.ui.vpg,
- org.junit,
- org.eclipse.photran.core,
- org.eclipse.photran.core.vpg,
- org.eclipse.cdt.core,
- org.eclipse.cdt.core.tests,
- org.eclipse.jface,
- org.eclipse.search,
- org.eclipse.rephraserengine.testing.junit3,
- org.eclipse.core.resources,
- org.eclipse.jface.text,
- org.eclipse.rephraserengine.core.vpg,
- org.eclipse.rephraserengine.core,
- org.eclipse.rephraserengine.core.refactoring,
- org.eclipse.core.runtime
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Activator: org.eclipse.photran.internal.tests.failing.Activator
-Bundle-ActivationPolicy: lazy

diff --git a/org.eclipse.photran.core.vpg.tests.failing/build.properties b/org.eclipse.photran.core.vpg.tests.failing/build.properties
deleted file mode 100644
index 4f89978..0000000
--- a/org.eclipse.photran.core.vpg.tests.failing/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               refactoring-test-code/
-src.includes = refactoring-test-code/

diff --git a/org.eclipse.photran.core.vpg.tests.failing/refactoring-test-code/intro-implicit-none/test-subroutine-1/hello.f90 b/org.eclipse.photran.core.vpg.tests.failing/refactoring-test-code/intro-implicit-none/test-subroutine-1/hello.f90
deleted file mode 100644
index 851068e..0000000
--- a/org.eclipse.photran.core.vpg.tests.failing/refactoring-test-code/intro-implicit-none/test-subroutine-1/hello.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-program Hello !<<<<<1,1,pass
-  integer :: i = 3 !!! a variable !!!
-
-  call Sub(Fn(i) + 1)
-
-  print *, "The integer is ", i
-
-contains ! a comment
-
-subroutine Sub(x) ! start
-
-  print *, "In the subroutine, the integer is ", x
-end subroutine Sub   ! end
-
-end program
-
-integer function Fn(n) result(y)
-  print *, "You sent", n, "to the function"
-  y = n
-end function

diff --git a/org.eclipse.photran.core.vpg.tests.failing/refactoring-test-code/intro-implicit-none/test-subroutine-1/hello.f90.result b/org.eclipse.photran.core.vpg.tests.failing/refactoring-test-code/intro-implicit-none/test-subroutine-1/hello.f90.result
deleted file mode 100644
index c1e95d8..0000000
--- a/org.eclipse.photran.core.vpg.tests.failing/refactoring-test-code/intro-implicit-none/test-subroutine-1/hello.f90.result
+++ /dev/null

@@ -1,23 +0,0 @@
-program Hello !<<<<<1,1,pass
-  implicit none
-  integer :: i = 3 !!! a variable !!!
-
-  call Sub(Fn(i) + 1)
-
-  print *, "The integer is ", i
-
-contains ! a comment
-
-subroutine Sub(x) ! start
-  implicit none
-  real :: x
-
-  print *, "In the subroutine, the integer is ", x
-end subroutine Sub   ! end
-
-end program
-
-integer function Fn(n) result(y)
-  print *, "You sent", n, "to the function"
-  y = n
-end function

diff --git a/org.eclipse.photran.core.vpg.tests.failing/refactoring-test-code/intro-implicit-none/test-subroutine-2/hello2.f90 b/org.eclipse.photran.core.vpg.tests.failing/refactoring-test-code/intro-implicit-none/test-subroutine-2/hello2.f90
deleted file mode 100644
index 5b7d90a..0000000
--- a/org.eclipse.photran.core.vpg.tests.failing/refactoring-test-code/intro-implicit-none/test-subroutine-2/hello2.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-program Hello !<<<<<1,1,pass
-  integer :: i = 3 !!! a variable !!!
-
-  call Sub(Fn(i) + 1)
-
-  print *, "The integer is ", i
-
-contains ! a comment
-
-subroutine Sub(x) ! start
-
-  print *, "In the subroutine, the integer is ", x
-end subroutine Sub   ! end
-
-integer function Fn(n) result(y)
-  print *, "You sent", n, "to the function"
-  y = n
-end function
-
-end program

diff --git a/org.eclipse.photran.core.vpg.tests.failing/refactoring-test-code/intro-implicit-none/test-subroutine-2/hello2.f90.result b/org.eclipse.photran.core.vpg.tests.failing/refactoring-test-code/intro-implicit-none/test-subroutine-2/hello2.f90.result
deleted file mode 100644
index 9a4121d..0000000
--- a/org.eclipse.photran.core.vpg.tests.failing/refactoring-test-code/intro-implicit-none/test-subroutine-2/hello2.f90.result
+++ /dev/null

@@ -1,26 +0,0 @@
-program Hello !<<<<<1,1,pass
-  implicit none
-  integer :: i = 3 !!! a variable !!!
-
-  call Sub(Fn(i) + 1)
-
-  print *, "The integer is ", i
-
-contains ! a comment
-
-subroutine Sub(x) ! start
-  implicit none
-  real :: x
-
-  print *, "In the subroutine, the integer is ", x
-end subroutine Sub   ! end
-
-integer function Fn(n) result(y)
-  implicit none
-  integer :: n
-  integer :: y
-  print *, "You sent", n, "to the function"
-  y = n
-end function
-
-end program

diff --git a/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/failing/Activator.java b/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/failing/Activator.java
deleted file mode 100644
index c0dcbfd..0000000
--- a/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/failing/Activator.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.failing;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle.
- * 
- * @author (generated)
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.photran.core.vpg.tests.failing";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	@Override public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}

diff --git a/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/parser/failing/00-README.txt b/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/parser/failing/00-README.txt
deleted file mode 100644
index f031a7e..0000000
--- a/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/parser/failing/00-README.txt
+++ /dev/null

@@ -1,3 +0,0 @@
-The classes in this package are identical to those in the same package in the
-org.eclipse.photran.core.vpg.tests plug-in, EXCEPT that they create an instance
-of FailingParserTestSuite
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/parser/failing/ParseBrainerdTestSuiteFixed.java b/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/parser/failing/ParseBrainerdTestSuiteFixed.java
deleted file mode 100644
index 7ae2490..0000000
--- a/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/parser/failing/ParseBrainerdTestSuiteFixed.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser.failing;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-import org.eclipse.photran.internal.tests.parser.MultiTestSuite.FailingParserTestSuite;

-

-public class ParseBrainerdTestSuiteFixed

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new FailingParserTestSuite("../../org.eclipse.photran-projects.confidential.walt-brainerd-test-suite",

-            true, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/parser/failing/ParseBrainerdTestSuiteFree.java b/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/parser/failing/ParseBrainerdTestSuiteFree.java
deleted file mode 100644
index 17697cd..0000000
--- a/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/parser/failing/ParseBrainerdTestSuiteFree.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser.failing;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-import org.eclipse.photran.internal.tests.parser.MultiTestSuite.FailingParserTestSuite;

-

-public class ParseBrainerdTestSuiteFree

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new FailingParserTestSuite("../../org.eclipse.photran-projects.confidential.walt-brainerd-test-suite",

-            false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/parser/failing/ParseFilesFromTheWWW.java b/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/parser/failing/ParseFilesFromTheWWW.java
deleted file mode 100644
index 7b719a6..0000000
--- a/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/parser/failing/ParseFilesFromTheWWW.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser.failing;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-import org.eclipse.photran.internal.tests.parser.MultiTestSuite.FailingParserTestSuite;

-

-public class ParseFilesFromTheWWW

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new FailingParserTestSuite("../../org.eclipse.photran-projects.confidential.from-the-www", false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/failing/TestReindent.java b/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/failing/TestReindent.java
deleted file mode 100644
index e36728a..0000000
--- a/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/failing/TestReindent.java
+++ /dev/null

@@ -1,39 +0,0 @@
-package org.eclipse.photran.internal.tests.refactoring.infrastructure.failing;
-
-import org.eclipse.photran.internal.tests.refactoring.infrastructure.AbstractSourceEditorTestCase;
-
-public class TestReindent extends AbstractSourceEditorTestCase
-{
-    public void test() {}
-    
-//    public void testPasteQOutsideAndReindent() throws Exception
-//    {
-//        ASTExecutableProgramNode ast = load("hello-1-initial.f90");
-//        
-//        ASTSubroutineSubprogramNode q = ast.getASTProgramUnit(1).getASTMainProgram().getASTMainRange().getASTBodyPlusInternals().getASTInternalSubprogram(2).getASTSubroutineSubprogram();
-//        SourceEditor.cut(q);
-//        SourceEditor.pasteAsFirstChild(q, ast.getASTProgramUnit(0), ast, true);
-//        assertEquals(load("hello-7-q-pasted-formatted.f90"), ast);
-//    }
-//
-//    public void testPasteQAtBottomAndReindent() throws Exception
-//    {
-//        ASTExecutableProgramNode ast = load("hello-1-initial.f90");
-//        
-//        ASTSubroutineSubprogramNode q = ast.getASTProgramUnit(1).getASTMainProgram().getASTMainRange().getASTBodyPlusInternals().getASTInternalSubprogram(2).getASTSubroutineSubprogram();
-//        SourceEditor.cut(q);
-//        SourceEditor.pasteAsLastChild(q, ast.getASTProgramUnit(0), ast, true);
-//        assertEquals(load("hello-8-q-pasted-at-bottom-formatted.f90"), ast);
-//    }
-//
-//    public void testPasteTAboveQAndReindent() throws Exception
-//    {
-//        ASTExecutableProgramNode ast = load("hello-1-initial.f90");
-//        
-//        ASTSubroutineSubprogramNode t = ast.getASTProgramUnit(0).getASTSubroutineSubprogram();
-//        ParseTreeNode internalSubprogram2 = ast.getASTProgramUnit(1).getASTMainProgram().getASTMainRange().getASTBodyPlusInternals().getASTInternalSubprogram(2);
-//        SourceEditor.cut(t);
-//        SourceEditor.pasteAsFirstChild(t, internalSubprogram2, ast, true);
-//        assertEquals(load("hello-9-t-above-q.f90"), ast);
-//    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/refactoring/introimplicitnone/failing/IntroImplicitTestSuite.java b/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/refactoring/introimplicitnone/failing/IntroImplicitTestSuite.java
deleted file mode 100644
index a8fe8e6..0000000
--- a/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/refactoring/introimplicitnone/failing/IntroImplicitTestSuite.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-

-package org.eclipse.photran.internal.tests.refactoring.introimplicitnone.failing;

-

-import junit.framework.Test;

-

-import org.eclipse.photran.internal.core.refactoring.IntroImplicitNoneRefactoring;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-import org.eclipse.photran.internal.tests.failing.Activator;

-

-/**

- * Unit tests for the Introduce Implicit None refactoring.

- *

- * @author Jeff Overbey

- * @author Esfar Huq 

- * @author Rui Wang - Modified to allow for marker based testing, documentation

- */

-

-public class IntroImplicitTestSuite

-     extends PhotranRefactoringTestSuiteFromMarkers<IntroImplicitNoneRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/intro-implicit-none";

-

-    public static Test suite() throws Exception

-    {

-        return new IntroImplicitTestSuite();

-    }

-

-    public IntroImplicitTestSuite() throws Exception

-    {

-        super(Activator.getDefault(),

-              "Running Intro implicit refactoring in",

-              DIR,

-              IntroImplicitNoneRefactoring.class);

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/search/failing/VPGSearchTestSuite.java b/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/search/failing/VPGSearchTestSuite.java
deleted file mode 100644
index beea658..0000000
--- a/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/search/failing/VPGSearchTestSuite.java
+++ /dev/null

@@ -1,44 +0,0 @@
-package org.eclipse.photran.internal.tests.search.failing;
-
-import java.util.ArrayList;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.photran.internal.tests.search.VPGSearchTestCase;
-import org.eclipse.photran.internal.ui.search.FortranSearchQuery;
-import org.eclipse.search.ui.text.Match;
-
-/**
- * The suite of tests for testing search functionality
- * 
- * @author Jeff Dammeyer, Andrew Deason, Joe Digiovanna, Nick Sexmith
- */
-public class VPGSearchTestSuite extends TestSuite
-{   
-    /**
-     * Adds all the tests to the suite for searching tests
-     */
-    public static Test suite() throws Exception
-    {
-        TestSuite suite = new TestSuite();
-        ArrayList<Match> matches = new ArrayList<Match>();
-        
-        //test 4
-        //Tests FIND_REFERENCES
-        matches = new ArrayList<Match>();
-        matches.add(new Match("foo.f90",30,1));
-        matches.add(new Match("implicitTest.f90",22,1));
-        suite.addTest(getSuiteFor("testFour", new VPGSearchTestCase("a",
-            FortranSearchQuery.FIND_REFERENCES | FortranSearchQuery.FIND_ALL_TYPES, matches, false)));
-               
-        return suite;
-    }
-    
-    private static TestSuite getSuiteFor(String baseFilename, VPGSearchTestCase testCase)
-    {
-        TestSuite subSuite = new TestSuite(baseFilename);
-        subSuite.addTest(testCase);
-        return subSuite;
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/vpg/failing/VariableAccessTestSuite.java b/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/vpg/failing/VariableAccessTestSuite.java
deleted file mode 100644
index a744d8f..0000000
--- a/org.eclipse.photran.core.vpg.tests.failing/src/org/eclipse/photran/internal/tests/vpg/failing/VariableAccessTestSuite.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.vpg.failing;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.photran.core.IFortranAST;
-import org.eclipse.photran.internal.core.analysis.loops.ASTVisitorWithLoops;
-import org.eclipse.photran.internal.core.lexer.Token;
-import org.eclipse.photran.internal.core.vpg.PhotranVPG;
-import org.eclipse.photran.internal.tests.failing.Activator;
-import org.eclipse.photran.internal.tests.PhotranWorkspaceTestCase;
-import org.eclipse.rephraserengine.testing.junit3.GeneralTestSuiteFromMarkers;
-
-/**
- * Test Suite for variable access marking (performed by the <code>ReferenceCollector</code>).
- * 
- * @author Matthew Fotzler
- */
-public class VariableAccessTestSuite extends GeneralTestSuiteFromMarkers
-{
-    private static final String DIR = "var-access-test-code";
-    
-    public static Test suite() throws Exception
-    {
-        return new VariableAccessTestSuite();
-    }
-    
-    public VariableAccessTestSuite() throws Exception
-    {
-        super("Constructing variable access marking for",
-            PhotranWorkspaceTestCase.MARKER,
-            new File(DIR),
-            PhotranWorkspaceTestCase.FORTRAN_FILE_FILTER);
-    }
-    
-    @Override
-    protected Test createTestFor(File fileContainingMarker, int markerOffset, String markerText)
-        throws Exception
-    {
-        return new ReferenceCollectorTestCase(fileContainingMarker, markerText) {};
-    }
-    
-    public static abstract class ReferenceCollectorTestCase extends PhotranWorkspaceTestCase
-    {
-        private File javaFile;
-        private IFile file;
-        private String[] markerText;
-        
-        public ReferenceCollectorTestCase(File file, String markerText) throws Exception
-        {
-            super("test");
-            this.javaFile = file;
-            this.markerText = parseMarker(markerText);
-        }
-        
-        @Override public void setUp() throws Exception
-        {
-            super.setUp();
-            
-            this.file = importFile(Activator.getDefault(), javaFileDirectory(), javaFile.getName());
-            project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-        }
-        
-        protected String javaFileDirectory()
-        {
-            return DIR+File.separator+javaFile.getParentFile().getName();
-        }
-        
-        public void test() throws Exception
-        {
-            PhotranVPG vpg = PhotranVPG.getInstance();
-            vpg.ensureVPGIsUpToDate(new NullProgressMonitor());
-            
-            IFortranAST ast = PhotranVPG.getInstance().acquireTransientAST(file);
-            assertNotNull(ast);
-            
-            String lineNumber = markerText[0];
-            String column = markerText[1];
-            Token token = findTokenByLineCol(ast, Integer.parseInt(lineNumber), Integer.parseInt(column));
-            assertNotNull(token);
-
-            String line = getLine(ast, Integer.parseInt(lineNumber));
-            String actual = line + token.getText() + " - " + token.getVariableAccessType().toString();
-            String expected = line + token.getText() + " - " + markerText[2];
-            if (!expected.equals(actual))
-                System.err.println(file.getFullPath());
-            assertEquals(expected, actual);
-        }
-
-        private String getLine(IFortranAST ast, int lineNumber)
-        {
-            final ArrayList<Token> lineTokens = new ArrayList<Token>();
-            final int lineNum = lineNumber;
-            String line = "";
-            
-            ast.accept(new ASTVisitorWithLoops(){
-                @Override public void visitToken(Token token)
-                {
-                    if(token.getLine() == lineNum)
-                        lineTokens.add(token);
-                }
-            });
-            
-            for(Token token : lineTokens)
-            {
-                line += token.getWhiteBefore() + token.getText() + token.getWhiteAfter();
-            }
-            
-            line += "\n";
-            
-            return line;
-        }
-        
-        private Token findTokenByLineCol(IFortranAST ast, int line, int col)
-        {
-            for (Token token : ast)
-                if (token.getLine() == line && token.getCol() == col)
-                    return token;
-
-            return null;
-        }
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests.failing/var-access-test-code/test-io/test-io.f90 b/org.eclipse.photran.core.vpg.tests.failing/var-access-test-code/test-io/test-io.f90
deleted file mode 100644
index d069a43..0000000
--- a/org.eclipse.photran.core.vpg.tests.failing/var-access-test-code/test-io/test-io.f90
+++ /dev/null

@@ -1,52 +0,0 @@
-program testio
-    integer :: assignme, assignme2, assignme3
-    integer :: w,x
-    real :: y = 23.4
-    real :: z = 25.5
-    character(len=5) :: format = "(I5)"
-    character(len=50) :: testline
-
-    assign 100 to assignme2
-    assign 200 to assignme3
-
-    read (5, format, iostat=w, err=100, end=100) x
-    !<<<<< 12,14,READ
-    !<<<<< 12,29,RW
-    !<<<<< 12,50,WRITE
-
-    assign 20 to assignme
-    !<<<<< 17,18,WRITE
-
-    print assignme, x,y,z
-    !<<<<< 20,11,READ
-    !<<<<< 20,21,READ
-    !<<<<< 20,23,READ
-    !<<<<< 20,25,READ
-    
-20  format(i10,f10.2,f10.3)
-    !<<<<< 26,12,NONE
-    !<<<<< 26,16,NONE
-    !<<<<< 26,22,NONE
-    
-    write (6, format, iostat=w, err=100) x
-    !<<<<< 31,15,READ
-    !<<<<< 31,30,RW
-    !<<<<< 31,42,READ
-    
-    write (6, "(I5)", iostat=w, err=100) 2
-    !<<<<< 36,15,NONE
-    !<<<<< 36,30,RW
-    !<<<<< 36,42,NONE
-    
-    write (testline, assignme, iostat=w, err=100) x,y,z
-    !<<<<< 41,12,WRITE
-    !<<<<< 41,22,READ
-    !<<<<< 41,39,RW
-    !<<<<< 41,51,READ
-    !<<<<< 41,53,READ
-    !<<<<< 41,55,READ
-
-100 print *, "1"
-200 print *, "2"
-
-end program testio

diff --git a/org.eclipse.photran.core.vpg.tests/.classpath b/org.eclipse.photran.core.vpg.tests/.classpath
deleted file mode 100644
index 472ee29..0000000
--- a/org.eclipse.photran.core.vpg.tests/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.photran.core.vpg.tests/.project b/org.eclipse.photran.core.vpg.tests/.project
deleted file mode 100644
index 67cbcd3..0000000
--- a/org.eclipse.photran.core.vpg.tests/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.photran.core.vpg.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>net.sourceforge.metrics.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>net.sourceforge.metrics.nature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.photran.core.vpg.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.photran.core.vpg.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 84d028b..0000000
--- a/org.eclipse.photran.core.vpg.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,335 +0,0 @@
-#Thu May 27 09:03:20 CDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=disabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=18
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=18
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=100
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=100
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

diff --git a/org.eclipse.photran.core.vpg.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.photran.core.vpg.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index b439e4e..0000000
--- a/org.eclipse.photran.core.vpg.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,6 +0,0 @@
-#Thu Oct 08 11:30:38 CDT 2009
-eclipse.preferences.version=1
-formatter_profile=_Photran
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) ${year} University of Illinois at Urbana-Champaign and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *    UIUC - Initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * \r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

diff --git a/org.eclipse.photran.core.vpg.tests/META-INF/MANIFEST.MF b/org.eclipse.photran.core.vpg.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index b4fce7c..0000000
--- a/org.eclipse.photran.core.vpg.tests/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,37 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Photran Virtual Program Graph Tests Plug-in
-Bundle-SymbolicName: org.eclipse.photran.core.vpg.tests
-Bundle-Version: 7.0.0.qualifier
-Bundle-Vendor: Eclipse.org
-Require-Bundle: org.eclipse.photran.core.vpg,
- org.eclipse.photran.ui.vpg,
- org.eclipse.cdt.core.tests,
- org.eclipse.core.resources,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.core.runtime,
- org.eclipse.jface.text,
- org.junit,
- org.eclipse.cdt.core,
- org.eclipse.jface,
- org.eclipse.search,
- org.eclipse.rephraserengine.core.vpg,
- org.eclipse.rephraserengine.core,
- org.eclipse.rephraserengine.core.refactoring,
- org.eclipse.rephraserengine.testing.junit3,
- org.eclipse.rephraserengine.ui,
- org.eclipse.photran.core
-Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.photran.internal.tests.Activator
-Export-Package: org.eclipse.photran.internal.tests,
- org.eclipse.photran.internal.tests.analysis.dependence,
- org.eclipse.photran.internal.tests.analysis.types,
- org.eclipse.photran.internal.tests.parser,
- org.eclipse.photran.internal.tests.patternmatching,
- org.eclipse.photran.internal.tests.refactoring,
- org.eclipse.photran.internal.tests.refactoring.extractprocedure,
- org.eclipse.photran.internal.tests.refactoring.infrastructure,
- org.eclipse.photran.internal.tests.refactoring.rename,
- org.eclipse.photran.internal.tests.search,
- org.eclipse.photran.internal.tests.vpg
-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/org.eclipse.photran.core.vpg.tests/Makefile b/org.eclipse.photran.core.vpg.tests/Makefile
deleted file mode 100644
index 6d0965f..0000000
--- a/org.eclipse.photran.core.vpg.tests/Makefile
+++ /dev/null

@@ -1,5 +0,0 @@
-all:
-	$(MAKE) -C rename-test-code
-
-clean:
-	$(MAKE) clean -C rename-test-code

diff --git a/org.eclipse.photran.core.vpg.tests/NOTE b/org.eclipse.photran.core.vpg.tests/NOTE
deleted file mode 100644
index 95ff0f7..0000000
--- a/org.eclipse.photran.core.vpg.tests/NOTE
+++ /dev/null

@@ -1,9 +0,0 @@
-Due to licensing restrictions, some of the Fortran code used for testing
-the parser cannot be made publicly available.  The corresponding JUnit
-tests will display an informational message if these directories do not
-exist, but no tests should fail.  (See ParseIBEAMCppMod.java for one
-example of such a test.)
-
-See the Photran Developer's Guide for more information.
-
---Jeff Overbey (23 Sept 06, updated 16 May 10)

diff --git a/org.eclipse.photran.core.vpg.tests/build.properties b/org.eclipse.photran.core.vpg.tests/build.properties
deleted file mode 100644
index c087562..0000000
--- a/org.eclipse.photran.core.vpg.tests/build.properties
+++ /dev/null

@@ -1,15 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               parser-test-code/,\
-               refactoring-test-code/,\
-               search-test-code/,\
-               vpg-test-code/,\
-               control-flow-test-code/
-src.includes = Makefile,\
-               NOTE,\
-               refactoring-test-code/,\
-               parser-test-code/,\
-               search-test-code/,\
-               vpg-test-code/

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-allstop/test-allstop.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-allstop/test-allstop.f90
deleted file mode 100644
index 4cd8a2e..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-allstop/test-allstop.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-program testallstop
-
-	print *, "1"
-	
-	all stop
-	
-	print *, "2"
-
-end program testallstop !<<<<< 9
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-allstop/test-allstop.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-allstop/test-allstop.f90.result
deleted file mode 100644
index 1e75b87..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-allstop/test-allstop.f90.result
+++ /dev/null

@@ -1,5 +0,0 @@
-node1: null
-    => node3
-node3: print *, "1"
-    => node4
-node4: all stop
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-arithmetic-if/test-arithmetic-if.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-arithmetic-if/test-arithmetic-if.f90
deleted file mode 100644
index b3d8aab..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-arithmetic-if/test-arithmetic-if.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-program test19
-	integer x = 3
-
-	if (x) 10,20,30
-
-10	print *, "1"
-	return
-
-20	print *, "2"
-
-30	print *, "3"
-
-	print *, "4"
-
-end program test19 !<<<<< 15
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-arithmetic-if/test-arithmetic-if.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-arithmetic-if/test-arithmetic-if.f90.result
deleted file mode 100644
index 7a6b7ba..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-arithmetic-if/test-arithmetic-if.f90.result
+++ /dev/null

@@ -1,16 +0,0 @@
-node1: null
-    => node3
-node3: if (x) 10,20,30
-    => node4
-    => node5
-    => node6
-node4: 10	print *, "1"
-    => node7
-node7: return
-node5: 20	print *, "2"
-    => node6
-node6: 30	print *, "3"
-    => node8
-node8: print *, "4"
-    => node2
-node2: null
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-assigned-goto/test-assigned-goto.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-assigned-goto/test-assigned-goto.f90
deleted file mode 100644
index 3a45586..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-assigned-goto/test-assigned-goto.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-program testassignedgoto
-	integer :: return_label
-
-	assign 200 to return_label
-
-	goto return_label
-
-	print *, "I will never be printed..."
-
-200 print *, "but I will!"
-
-end program testassignedgoto !<<<<< 12
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-assigned-goto/test-assigned-goto.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-assigned-goto/test-assigned-goto.f90.result
deleted file mode 100644
index ff756f1..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-assigned-goto/test-assigned-goto.f90.result
+++ /dev/null

@@ -1,9 +0,0 @@
-node1: null
-    => node3
-node3: assign 200 to return_label
-    => node4
-node4: goto return_label
-    => node5
-node5: 200 print *, "but I will!"
-    => node2
-node2: null
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-associate/test-associate.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-associate/test-associate.f90
deleted file mode 100644
index b8f377b..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-associate/test-associate.f90
+++ /dev/null

@@ -1,25 +0,0 @@
-program testassociate
-	type :: weights
-		integer :: onEarth
-	end type
-
-	type :: person
-		integer :: age
-		type(weights) :: weight
-	end type
-
-	type(person) :: me
-
-	me%age = 23
-
-	me%weight%onEarth = 150
-
-	associate (myWeight => me%weight)
-
-		print *, myWeight%onEarth
-
-	end associate
-
-	print *, "I am a heavy boy!"
-
-end program testassociate !<<<<< 25
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-associate/test-associate.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-associate/test-associate.f90.result
deleted file mode 100644
index 65e3600..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-associate/test-associate.f90.result
+++ /dev/null

@@ -1,17 +0,0 @@
-node1: null
-    => node3
-node3: me%age = 23
-    => node4
-node4: me%weight%onEarth = 150
-    => node5
-node5: associate (myWeight => me%weight)
-     
-     		print *, myWeight%onEarth
-     
-     	end associate
-    => node6
-node6: print *, myWeight%onEarth
-    => node7
-node7: print *, "I am a heavy boy!"
-    => node2
-node2: null
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-block/test-block.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-block/test-block.f90
deleted file mode 100644
index ee8017a..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-block/test-block.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-program testblock
-	integer :: x=4
-
-	block
-		integer :: x=2
-
-		print *, x
-	end block
-
-	print *, x
-end program testblock !<<<<< 11
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-block/test-block.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-block/test-block.f90.result
deleted file mode 100644
index 73922a7..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-block/test-block.f90.result
+++ /dev/null

@@ -1,13 +0,0 @@
-node1: null
-    => node3
-node3: block
-     		integer :: x=2
-     
-     		print *, x
-     	end block
-    => node4
-node4: print *, x
-    => node5
-node5: print *, x
-    => node2
-node2: null
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-computed-goto/test-computed-goto.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-computed-goto/test-computed-goto.f90
deleted file mode 100644
index 75e7817..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-computed-goto/test-computed-goto.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-program test20
-	integer :: x = 2
-
-	go to (10,20) x
-
-	print *, "0"
-
-10	print *, "1"
-
-	return
-
-20	print *, "2"
-
-end program test20 !<<<<< 14
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-computed-goto/test-computed-goto.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-computed-goto/test-computed-goto.f90.result
deleted file mode 100644
index e61b965..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-computed-goto/test-computed-goto.f90.result
+++ /dev/null

@@ -1,14 +0,0 @@
-node1: null
-    => node3
-node3: go to (10,20) x
-    => node4
-    => node5
-    => node6
-node4: print *, "0"
-    => node5
-node5: 10	print *, "1"
-    => node7
-node7: return
-node6: 20	print *, "2"
-    => node2
-node2: null
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-critical/test-critical.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-critical/test-critical.f90
deleted file mode 100644
index 3ded7c1..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-critical/test-critical.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-program test23
-
-	critical
-		print *, "Hello"
-	end critical
-
-end program test23 !<<<<< 7
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-critical/test-critical.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-critical/test-critical.f90.result
deleted file mode 100644
index f2459e3..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-critical/test-critical.f90.result
+++ /dev/null

@@ -1,9 +0,0 @@
-node1: null
-    => node3
-node3: critical
-     		print *, "Hello"
-     	end critical
-    => node4
-node4: print *, "Hello"
-    => node2
-node2: null
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-cycle/test-cycle.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-cycle/test-cycle.f90
deleted file mode 100644
index c879e1e..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-cycle/test-cycle.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-program testcycle
-	integer :: i
-
-	do i=1,5
-		print *, "1"
-		cycle
-		print *, "2"
-	end do
-	
-	print *, "3"
-
-end program testcycle !<<<<< 12
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-cycle/test-cycle.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-cycle/test-cycle.f90.result
deleted file mode 100644
index f0d4621..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-cycle/test-cycle.f90.result
+++ /dev/null

@@ -1,16 +0,0 @@
-node1: null
-    => node3
-node3: do i=1,5
-     		print *, "1"
-     		cycle
-     		print *, "2"
-     	end do
-    => node4
-    => node5
-node4: print *, "1"
-    => node6
-node6: cycle
-    => node3
-node5: print *, "3"
-    => node2
-node2: null
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-do-loop/test-do-loop.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-do-loop/test-do-loop.f90
deleted file mode 100644
index 58762e0..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-do-loop/test-do-loop.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-program test8
-	integer :: i
-
-	do i=1,5
-		print *, "Hello"
-	end do
-end program test8 !<<<<< 7
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-do-loop/test-do-loop.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-do-loop/test-do-loop.f90.result
deleted file mode 100644
index 9a299d4..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-do-loop/test-do-loop.f90.result
+++ /dev/null

@@ -1,10 +0,0 @@
-node1: null
-    => node3
-node3: do i=1,5
-     		print *, "Hello"
-     	end do
-    => node4
-    => node2
-node4: print *, "Hello"
-    => node3
-node2: null
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-do-while/test-do-while.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-do-while/test-do-while.f90
deleted file mode 100644
index c9eaf42..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-do-while/test-do-while.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-program test8
-	integer :: i
-
-	do while (i < 5)
-		print *, "Hello"
-		i = i + 1
-	end do
-end program test8 !<<<<< 8
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-do-while/test-do-while.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-do-while/test-do-while.f90.result
deleted file mode 100644
index 9cda577..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-do-while/test-do-while.f90.result
+++ /dev/null

@@ -1,13 +0,0 @@
-node1: null
-    => node3
-node3: do while (i < 5)
-     		print *, "Hello"
-     		i = i + 1
-     	end do
-    => node4
-    => node2
-node4: print *, "Hello"
-    => node5
-node5: i = i + 1
-    => node3
-node2: null
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-forall/test-forall.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-forall/test-forall.f90
deleted file mode 100644
index 1192ba7..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-forall/test-forall.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-program testforall
-	integer, dimension(10) :: array
-
-	forall (I = 1:5)
-		array(I) = 2
-		array(I) = array(I) * 2
-	end forall
-	
-end program testforall !<<<<< 9
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-forall/test-forall.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-forall/test-forall.f90.result
deleted file mode 100644
index 71e6279..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-forall/test-forall.f90.result
+++ /dev/null

@@ -1,10 +0,0 @@
-node1: null
-    => node3
-node3: forall (I = 1:5)
-    => node4
-    => node2
-node4: array(I) = 2
-    => node5
-node5: array(I) = array(I) * 2
-    => node3
-node2: null
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-function/test-function.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-function/test-function.f90
deleted file mode 100644
index 8851180..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-function/test-function.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-function testfunction(A)
-
-	integer, intent(in) :: A
-
-	testfunction = 4;
-
-end !<<<<< 7
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-function/test-function.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-function/test-function.f90.result
deleted file mode 100644
index f4c6345..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-function/test-function.f90.result
+++ /dev/null

@@ -1,5 +0,0 @@
-node1: function testfunction(A)
-    => node3
-node3: testfunction = 4;
-    => node2
-node2: null
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-goto/test-goto.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-goto/test-goto.f90
deleted file mode 100644
index 5014a60..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-goto/test-goto.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-program testgoto
-
-	print *, "1"
-	
-	go to 20
-	
-	print *, "2"
-	
-20	print *, "3"
-
-end program testgoto !<<<<< 11
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-goto/test-goto.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-goto/test-goto.f90.result
deleted file mode 100644
index 388ca7b..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-goto/test-goto.f90.result
+++ /dev/null

@@ -1,9 +0,0 @@
-node1: null
-    => node3
-node3: print *, "1"
-    => node4
-node4: go to 20
-    => node5
-node5: 20	print *, "3"
-    => node2
-node2: null
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-if-single/test-if-single1.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-if-single/test-if-single1.f90
deleted file mode 100644
index 9f8410f..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-if-single/test-if-single1.f90
+++ /dev/null

@@ -1,4 +0,0 @@
-program test
-if (.true.) a = 1
-a = 2
-end program !<<<<<4
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-if-single/test-if-single1.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-if-single/test-if-single1.f90.result
deleted file mode 100644
index fa799db..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-if-single/test-if-single1.f90.result
+++ /dev/null

@@ -1,10 +0,0 @@
-node1: null
-    => node3
-node3: if (.true.) a = 1
-    => node4
-    => node5
-node4: a = 1
-    => node5
-node5: a = 2
-    => node2
-node2: null
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-ifconstruct/test-ifconstruct.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-ifconstruct/test-ifconstruct.f90
deleted file mode 100644
index d819030..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-ifconstruct/test-ifconstruct.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-program testifconstruct
-	integer :: x = 2
-	
-	if (x > 2) then
-		print *, "x is greater than 2!"
-	else if (x < -2) then
-		print *, "x is less than -2!"
-		print *, "..."
-	else
-		print *, "I have no clue what x is!"
-	end if
-	
-	print *, "This print statement is after the if construct!"	
-
-end program testifconstruct !<<<<< 15
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-ifconstruct/test-ifconstruct.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-ifconstruct/test-ifconstruct.f90.result
deleted file mode 100644
index 25d09e2..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-ifconstruct/test-ifconstruct.f90.result
+++ /dev/null

@@ -1,21 +0,0 @@
- node1: null
-    => node3
- node3: if (x > 2) then
-    => node4
-    => node5
- node4: print *, "x is greater than 2!"
-    => node6
- node6: print *, "This print statement is after the if construct!"
-    => node2
- node2: null
- node5: else if (x < -2) then
-    => node7
-    => node8
- node7: print *, "x is less than -2!"
-    => node9
- node9: print *, "..."
-    => node6
- node8: else
-    => node10
-node10: print *, "I have no clue what x is!"
-    => node6
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-io/test-io.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-io/test-io.f90
deleted file mode 100644
index a18d862..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-io/test-io.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-program testio
-	integer :: x
-
-	print *, "hello world!"
-	
-	read *, x
-	
-	write (*,*) "test"
-
-end program testio !<<<<< 10
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-io/test-io.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-io/test-io.f90.result
deleted file mode 100644
index 5d9bd1f..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-io/test-io.f90.result
+++ /dev/null

@@ -1,9 +0,0 @@
-node1: null
-    => node3
-node3: print *, "hello world!"
-    => node4
-node4: read *, x
-    => node5
-node5: write (*,*) "test"
-    => node2
-node2: null
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-loopswithexit/test-loopwithexit.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-loopswithexit/test-loopwithexit.f90
deleted file mode 100644
index ff9ff52..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-loopswithexit/test-loopwithexit.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-program testloops
-	integer :: i,j
-	
-	firstdo: do i=1,5
-		innerdo: do j=1,5
-			print *, "1"
-			exit firstdo
-			print *, "2"
-		end do
-		print *, "3"
-	end do
-
-end program testloops !<<<<< 13
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-loopswithexit/test-loopwithexit.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-loopswithexit/test-loopwithexit.f90.result
deleted file mode 100644
index 29b32ad..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-loopswithexit/test-loopwithexit.f90.result
+++ /dev/null

@@ -1,26 +0,0 @@
-node1: null
-    => node3
-node3: firstdo: do i=1,5
-     		innerdo: do j=1,5
-     			print *, "1"
-     			exit firstdo
-     			print *, "2"
-     		end do
-     		print *, "3"
-     	end do
-    => node4
-    => node2
-node4: innerdo: do j=1,5
-     			print *, "1"
-     			exit firstdo
-     			print *, "2"
-     		end do
-    => node5
-    => node6
-node5: print *, "1"
-    => node7
-node7: exit firstdo
-    => node2
-node2: null
-node6: print *, "3"
-    => node3
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-module/test-module.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-module/test-module.f90
deleted file mode 100644
index f549e15..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-module/test-module.f90
+++ /dev/null

@@ -1,5 +0,0 @@
-module testmodule
-
-	integer :: xfromtestmodule
-
-10 end !<<<<< 5
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-module/test-module.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-module/test-module.f90.result
deleted file mode 100644
index 513af9f..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-module/test-module.f90.result
+++ /dev/null

@@ -1,3 +0,0 @@
-node1: null
-    => node2
-node2: null
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-return/test-return.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-return/test-return.f90
deleted file mode 100644
index c8a8ea6..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-return/test-return.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-program testreturn
-
-	print *, "1"
-	
-	return
-	
-	print *, "2"
-
-end program testreturn !<<<<< 9
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-return/test-return.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-return/test-return.f90.result
deleted file mode 100644
index 3586bad..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-return/test-return.f90.result
+++ /dev/null

@@ -1,5 +0,0 @@
-node1: null
-    => node3
-node3: print *, "1"
-    => node4
-node4: return
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-select-type/test-select-type.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-select-type/test-select-type.f90
deleted file mode 100644
index 9fe50d4..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-select-type/test-select-type.f90
+++ /dev/null

@@ -1,30 +0,0 @@
-program testselecttype
-    type person
-	integer :: age
-    end type
-    type, extends(person) :: friend
-	integer :: duration_of_friendship
-    end type
-
-    class(person),pointer :: p
-	integer :: i
-    type(friend), target :: my_buddy
-
-    p => my_buddy
-
-    select type (p)
-		type is (person)
-		    print *, "1"
-		    print *, "2"
-		type is (friend)
-		    print *, "3"
-		    do i=1,5
-		    	print *, "4"
-		    	cycle
-		    	print *, "5"
-		    end do
-    end select
-
-    print *, "6"
-
-end program testselecttype !<<<<< 30
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-select-type/test-select-type.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-select-type/test-select-type.f90.result
deleted file mode 100644
index 507b917..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-select-type/test-select-type.f90.result
+++ /dev/null

@@ -1,38 +0,0 @@
- node1: null
-    => node3
- node3: p => my_buddy
-    => node4
- node4: select type (p)
-      		type is (person)
-      		    print *, "1"
-      		    print *, "2"
-      		type is (friend)
-      		    print *, "3"
-      		    do i=1,5
-      		    	print *, "4"
-      		    	cycle
-      		    	print *, "5"
-      		    end do
-          end select
-    => node5
-    => node6
- node5: print *, "1"
-    => node7
- node7: print *, "2"
-    => node9
- node9: print *, "6"
-    => node2
- node2: null
- node6: print *, "3"
-    => node8
- node8: do i=1,5
-      		    	print *, "4"
-      		    	cycle
-      		    	print *, "5"
-      		    end do
-    => node10
-    => node9
-node10: print *, "4"
-    => node11
-node11: cycle
-    => node8
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-stmt-function/test-stmt-function.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-stmt-function/test-stmt-function.f90
deleted file mode 100644
index a43f0e5..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-stmt-function/test-stmt-function.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-program test18
-	implicit none
-	real :: teststmtfun
-	real :: z
-	real :: x = 2.
-
-	teststmtfun(z) = z * 2. + 1.
-
-	print *, teststmtfun(x)
-
-end program test18 !<<<<< 11
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-stmt-function/test-stmt-function.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-stmt-function/test-stmt-function.f90.result
deleted file mode 100644
index a303804..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-stmt-function/test-stmt-function.f90.result
+++ /dev/null

@@ -1,7 +0,0 @@
-node1: null
-    => node3
-node3: teststmtfun(z) = z * 2. + 1.
-    => node4
-node4: print *, teststmtfun(x)
-    => node2
-node2: null
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-stop/test-stop.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-stop/test-stop.f90
deleted file mode 100644
index 667c51e..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-stop/test-stop.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-program teststop
-
-	print *, "1"
-	
-	stop
-	
-	print *, "2"
-
-end program teststop !<<<<< 9
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-stop/test-stop.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-stop/test-stop.f90.result
deleted file mode 100644
index 4d626e4..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-stop/test-stop.f90.result
+++ /dev/null

@@ -1,5 +0,0 @@
-node1: null
-    => node3
-node3: print *, "1"
-    => node4
-node4: stop
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-subroutine/test-subroutine.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-subroutine/test-subroutine.f90
deleted file mode 100644
index dea6bbf..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-subroutine/test-subroutine.f90
+++ /dev/null

@@ -1,3 +0,0 @@
-subroutine testsub
-	print *, "Inside the subroutine!"
-end subroutine testsub !<<<<< 3
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-subroutine/test-subroutine.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-subroutine/test-subroutine.f90.result
deleted file mode 100644
index df837d1..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-subroutine/test-subroutine.f90.result
+++ /dev/null

@@ -1,5 +0,0 @@
-node1: subroutine testsub
-    => node3
-node3: print *, "Inside the subroutine!"
-    => node2
-node2: null
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-where-construct/test-where-construct.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-where-construct/test-where-construct.f90
deleted file mode 100644
index c32f7e9..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-where-construct/test-where-construct.f90
+++ /dev/null

@@ -1,19 +0,0 @@
-program testwhereconstruct
-	integer, dimension(10) :: array
-	
-	do i=1,10
-		array(i) = i
-	end do
-	
-	where (array > 5)
-		array = 2
-		array = 3
-	elsewhere (array < 2)
-		array = 10
-	elsewhere (array < 5)
-		array = 400
-	elsewhere
-		array = 1
-	end where
-
-end program testwhereconstruct !<<<<< 19
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-where-construct/test-where-construct.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-where-construct/test-where-construct.f90.result
deleted file mode 100644
index 550a86e..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-where-construct/test-where-construct.f90.result
+++ /dev/null

@@ -1,67 +0,0 @@
- node1: null
-    => node3
- node3: do i=1,10
-      		array(i) = i
-      	end do
-    => node4
-    => node5
- node4: array(i) = i
-    => node3
- node5: where (array > 5)
-      		array = 2
-      		array = 3
-      	elsewhere (array < 2)
-      		array = 10
-      	elsewhere (array < 5)
-      		array = 400
-      	elsewhere
-      		array = 1
-      	end where
-    => node6
-    => node7
- node6: array = 2
-    => node8
- node8: array = 3
-    => node2
- node2: null
- node7: where (array > 5)
-      		array = 2
-      		array = 3
-      	elsewhere (array < 2)
-      		array = 10
-      	elsewhere (array < 5)
-      		array = 400
-      	elsewhere
-      		array = 1
-      	end where
-    => node9
-    => node10
- node9: array = 10
-    => node2
-node10: where (array > 5)
-      		array = 2
-      		array = 3
-      	elsewhere (array < 2)
-      		array = 10
-      	elsewhere (array < 5)
-      		array = 400
-      	elsewhere
-      		array = 1
-      	end where
-    => node11
-    => node12
-node11: array = 400
-    => node2
-node12: where (array > 5)
-      		array = 2
-      		array = 3
-      	elsewhere (array < 2)
-      		array = 10
-      	elsewhere (array < 5)
-      		array = 400
-      	elsewhere
-      		array = 1
-      	end where
-    => node13
-node13: array = 1
-    => node2
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-where-stmt/test-where-stmt.f90 b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-where-stmt/test-where-stmt.f90
deleted file mode 100644
index aab917a..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-where-stmt/test-where-stmt.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-program testwherestmt
-
-	integer, dimension(10) :: array
-
-	do i=1,10
-		array(i) = i
-	end do
-
-	where (array < 5) array = 1
-	
-	print *, "2"
-
-end program testwherestmt !<<<<< 13
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-where-stmt/test-where-stmt.f90.result b/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-where-stmt/test-where-stmt.f90.result
deleted file mode 100644
index 44a2627..0000000
--- a/org.eclipse.photran.core.vpg.tests/control-flow-test-code/test-where-stmt/test-where-stmt.f90.result
+++ /dev/null

@@ -1,16 +0,0 @@
-node1: null
-    => node3
-node3: do i=1,10
-     		array(i) = i
-     	end do
-    => node4
-    => node5
-node4: array(i) = i
-    => node3
-node5: where (array < 5) array = 1
-    => node6
-node6: array = 1
-    => node7
-node7: print *, "2"
-    => node2
-node2: null
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/.cvsignore b/org.eclipse.photran.core.vpg.tests/parser-test-code/.cvsignore
deleted file mode 100644
index e69de29..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/.cvsignore
+++ /dev/null


diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/fortran2003_tests/fortran2003-syntax.f03 b/org.eclipse.photran.core.vpg.tests/parser-test-code/fortran2003_tests/fortran2003-syntax.f03
deleted file mode 100644
index 405f051..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/fortran2003_tests/fortran2003-syntax.f03
+++ /dev/null

@@ -1,80 +0,0 @@
-! This is syntactically correct but semantically incorrect and meaningless
-program Fortran2003
-    import x, y
-    import :: z
-
-    type, bind(c) :: class
-        private
-        procedure(), public :: proc_component
-    contains
-        procedure                     type_bound_proc1
-        procedure, non_overridable :: type_bound_proc3
-        procedure                     type_bound_proc4 => proc
-        procedure, non_overridable :: type_bound_proc6 => proc
-    end type
-
-    enum, bind(c)
-        enumerator    apple = 3, orange, pear
-        enumerator :: grapefruit
-    end enum
-
-    type(class), asynchronous, bind(c, name='x'), protected, value, volatile, pointer :: t1
-    class(class) :: t2
-    class(*)     :: t3
-
-    common /c1/ t1, t2
-
-    asynchronous      x1, x2
-    asynchronous   :: x3
-    bind(c)           x4
-    bind(c,name=x) :: x5, /c1/
-    protected         x6
-    protected      :: x7, x8
-
-    abstract interface
-        subroutine s
-        end subroutine s
-    end interface
-
-    procedure() p1
-    procedure(integer) p2
-    procedure(), pointer :: p3
-    procedure(integer), save, optional :: p4, p5 => null(), p6
-
-    ! EXECUTION PART
-
-    associate (this => 3 + 4, that => 5)
-        print *, this
-        print *, that
-    end associate
-
-    select type (renamed => t3)
-        type is (class)
-            print *, "1"
-        class is (class)
-            print *, '2'
-        class default
-            print *, '3'
-            if (3 .eq. 4) then
-                print *, '?!'
-            end if
-            do i = 6,8
-                print *, ":-)"
-            end do
-            do 51 i = 6,8
-51              print *, ":-)"
-    end select
-
-!    if (t1%type_bound_proc1() .eq. 3) print *, "!"
-
-    call t2%type_bound_proc4
-
-    open (3,action=something,asynchronous='?',decimal='?',encoding='?',iomsg=v,round='?',sign='?')
-    decimal=3
-    wait (3,id=n,iostat=m)
-    close (unit=3,iomsg=v)
-
-    use, intrinsic :: some_module
-    use :: some_other_module, operator(.x.) => operator(.y.)
-    use :: some_third_module, only: operator(.x.) => operator(.y.)
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/extractvariable/ExtractVariable.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/extractvariable/ExtractVariable.f90
deleted file mode 100644
index c8798f9..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/extractvariable/ExtractVariable.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-program TestExtractVariable
-
-contains
-
-subroutine Sub()
-  integer :: x
-  x = 1
-  if(x==1) then
-  	x=2
-  end if	
-  
-end subroutine Sub
-
-end program TestExtractVariable

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/extractvariable/ExtractVariableAfter.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/extractvariable/ExtractVariableAfter.f90
deleted file mode 100644
index 014e055..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/extractvariable/ExtractVariableAfter.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-program TestExtractVariable
-
-contains
-
-subroutine Sub()
-  integer :: x
-  logical :: y
-  x = 1
-  y = (x == 1)
-  if(y) then
-  	x=2
-  end if	
-  
-end subroutine Sub
-
-end program TestExtractVariable

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/MainProgramRefactoringAfter.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/MainProgramRefactoringAfter.f90
deleted file mode 100644
index 7f06a62..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/MainProgramRefactoringAfter.f90
+++ /dev/null

@@ -1,34 +0,0 @@
-program Hello
-  implicit none
-  integer :: i
-
-  i = 3
-  call Sub(i + 1)
-
-  print *, "The integer is ", i
-
-contains
-
-subroutine Sub(i)
-  integer :: i
-  integer :: x
-
-  x = i
-  print *, x
-
-end subroutine Sub
-
-
-subroutine SomeSub(y,z)
-  real :: y
-  real :: z
-  real :: x
-
-  x = y + z
-  y = 22
-  z = y + z
-  print *, x
-
-end subroutine SomeSub
-
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/MainProgramRefactoringBefore.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/MainProgramRefactoringBefore.f90
deleted file mode 100644
index 11faff4..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/MainProgramRefactoringBefore.f90
+++ /dev/null

@@ -1,30 +0,0 @@
-program Hello
-
-  i = 3
-  call Sub(i + 1)
-
-  print *, "The integer is ", i
-  
-contains
-
-subroutine Sub(i)
-  integer :: x
-
-  x = i
-  print *, x
-  
-end subroutine Sub
-
-
-subroutine SomeSub(y,z)
-  real :: y
-  real :: z
-
-  x = y + z
-  y = 22
-  z = y + z
-  print *, x
-  
-end subroutine SomeSub
-
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/Subroutine2RefactoringsAfter.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/Subroutine2RefactoringsAfter.f90
deleted file mode 100644
index ada2665..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/Subroutine2RefactoringsAfter.f90
+++ /dev/null

@@ -1,34 +0,0 @@
-program Hello
-  integer :: i = 3
-
-  call Sub(i + 1)
-
-  print *, "The integer is ", i
-
-contains
-
-subroutine Sub(i)
-  implicit none
-  integer :: i
-  real :: x
-
-  x = i
-  print *, x
-
-end subroutine Sub
-
-
-subroutine SomeSub(y,z)
-  implicit none
-  real :: y
-  real :: z
-  real :: x
-
-  x = y + z
-  y = 22
-  z = y + z
-  print *, x
-
-end subroutine SomeSub
-
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/Subroutine2RefactoringsBefore.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/Subroutine2RefactoringsBefore.f90
deleted file mode 100644
index 41e5075..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/Subroutine2RefactoringsBefore.f90
+++ /dev/null

@@ -1,27 +0,0 @@
-program Hello
-  integer :: i = 3
-
-  call Sub(i + 1)
-
-  print *, "The integer is ", i
-  
-contains
-
-subroutine Sub(i)
-  
-  x = i
-  print *, x
-  
-end subroutine Sub
-
-
-subroutine SomeSub(y,z)
-  
-  x = y + z
-  y = 22
-  z = y + z
-  print *, x
-  
-end subroutine SomeSub
-
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/SubroutineRefactoringAfter.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/SubroutineRefactoringAfter.f90
deleted file mode 100644
index 5c1e049..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/SubroutineRefactoringAfter.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-program Hello
-  integer :: i = 3
-
-  call Sub(i + 1)
-
-  print *, "The integer is ", i
-
-contains
-
-subroutine Sub(i)
-  implicit none
-  integer :: i
-  real :: x
-
-  x = i
-  print *, x
-
-end subroutine Sub
-
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/SubroutineRefactoringBefore.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/SubroutineRefactoringBefore.f90
deleted file mode 100644
index 969f1ab..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/SubroutineRefactoringBefore.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-program Hello
-  integer :: i = 3
-
-  call Sub(i + 1)
-
-  print *, "The integer is ", i
-  
-contains
-
-subroutine Sub(i)
-  
-  x = i
-  print *, x
-  
-end subroutine Sub
-
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/SubroutineThatHasAnImplicitStmt.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/SubroutineThatHasAnImplicitStmt.f90
deleted file mode 100644
index a053466..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/SubroutineThatHasAnImplicitStmt.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-program Hello
-  integer :: i = 3
-
-  call Sub(i + 1)
-
-  print *, "The integer is ", i
-
-contains
-
-subroutine Sub(i)
-  implicit none
-  integer :: i
-  real :: x
-
-  x = i
-  print *, x
-  
-end subroutine Sub
-
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/SubroutineWithDecalaredVarsRefactoringBefore.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/SubroutineWithDecalaredVarsRefactoringBefore.f90
deleted file mode 100644
index cf99a33..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/SubroutineWithDecalaredVarsRefactoringBefore.f90
+++ /dev/null

@@ -1,19 +0,0 @@
-program Hello
-  integer :: i = 3
-
-  call Sub(i + 1)
-
-  print *, "The integer is ", i
-
-contains
-
-subroutine Sub(i)
-  integer :: i
-  real :: x
-
-  x = i
-  print *, x
-  
-end subroutine Sub
-
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/SubroutineWithDeclaredVarsRefactoringAfter.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/SubroutineWithDeclaredVarsRefactoringAfter.f90
deleted file mode 100644
index 5c1e049..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/introduceimplicitnone/SubroutineWithDeclaredVarsRefactoringAfter.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-program Hello
-  integer :: i = 3
-
-  call Sub(i + 1)
-
-  print *, "The integer is ", i
-
-contains
-
-subroutine Sub(i)
-  implicit none
-  integer :: i
-  real :: x
-
-  x = i
-  print *, x
-
-end subroutine Sub
-
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test1aRefactored.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test1aRefactored.f90
deleted file mode 100644
index 47cefca..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test1aRefactored.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-program Hello
-  integer :: Whatever = 3
-
-  Whatever = Whatever + 1
-  print *, "The integer is ", Whatever
-  stop
-
-end program Hello

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test1abOriginal.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test1abOriginal.f90
deleted file mode 100644
index ea5bbad..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test1abOriginal.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-program Hello
-  integer :: i = 3
-  
-  i = i + 1
-  print *, "The integer is ", i
-  stop
-
-end program Hello

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test1bRefactored.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test1bRefactored.f90
deleted file mode 100644
index 89cbb8f..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test1bRefactored.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-program Whatever
-  integer :: i = 3
-
-  i = i + 1
-  print *, "The integer is ", i
-  stop
-
-end program Whatever

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test2Original.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test2Original.f90
deleted file mode 100644
index c58a7cd..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test2Original.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-program Hello
-  integer :: i = 3
-  integer :: j = 4
-  
-  i = i + 1
-  print *, "The integer is ", i
-  print *, "and the other integer is ", j
-  stop
-
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test3Original.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test3Original.f90
deleted file mode 100644
index 091fbdc..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test3Original.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-program Hello
-  integer :: i = 3
-
-  call Sub(i + 1)
-
-  print *, "The integer is ", i
-  
-contains
-
-subroutine Sub(x)
-  integer, intent(in) :: x
-
-  print *, "In the subroutine, the integer is ", x
-end subroutine Sub
-
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test4Original.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test4Original.f90
deleted file mode 100644
index 5712ebd..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test4Original.f90
+++ /dev/null

@@ -1,23 +0,0 @@
-! This is a sample program
-
-program Hello
-  integer :: i = 3 !!! a variable !!!
-
-  call Sub(Fn(i) + 1)
-
-  print *, "The integer is ", i
-
-contains ! a comment
-
-subroutine Sub(x) ! start
-  integer, intent(in) :: x
-
-  print *, "In the subroutine, the integer is ", x
-end subroutine Sub   ! end
-
-end program
-
-integer function Fn(n) result(y)
-  print *, "You sent", n, "to the function"
-  y = n
-end function

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test4Refactored.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test4Refactored.f90
deleted file mode 100644
index 3f1cd57..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/refactoring_test_files/rename/Test4Refactored.f90
+++ /dev/null

@@ -1,23 +0,0 @@
-! This is a sample program
-
-program Hello
-  integer :: i = 3 !!! a variable !!!
-
-  call buS(nF(i) + 1)
-
-  print *, "The integer is ", i
-
-contains ! a comment
-
-subroutine buS(x) ! start
-  integer, intent(in) :: x
-
-  print *, "In the subroutine, the integer is ", x
-end subroutine buS   ! end
-
-end program
-
-integer function nF(n) result(y)
-  print *, "You sent", n, "to the function"
-  y = n
-end function

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/AssignResult.F90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/AssignResult.F90
deleted file mode 100644
index 1c35155..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/AssignResult.F90
+++ /dev/null

@@ -1,3 +0,0 @@
-program p
-result(1:7) = (/ 1.3, vector_x, 2.35, vector_y /)
-end program p

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/BlockData.F90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/BlockData.F90
deleted file mode 100644
index 0b6e27e..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/BlockData.F90
+++ /dev/null

@@ -1,7 +0,0 @@
-PROGRAM P
-
-END PROGRAM P
-
-BLOCK DATA INIT_BLOCK_A
-
-END BLOCK DATA

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/ConstSubstring.F90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/ConstSubstring.F90
deleted file mode 100644
index 154591c..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/ConstSubstring.F90
+++ /dev/null

@@ -1,4 +0,0 @@
-Program p
-TEMP = "ELMWOOD HIGH" (N:N+3)   ! Parent is a constant.
-lll = 'ABCDF' (i:i)
-End program p

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/DblPrecDim.F90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/DblPrecDim.F90
deleted file mode 100644
index 8b29635..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/DblPrecDim.F90
+++ /dev/null

@@ -1,4 +0,0 @@
-program p
-  ! DIMENSION is a keyword
-  DOUBLE PRECISION , DIMENSION ( 100 ) :: A , B 
-end program p

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/FormatTest.F90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/FormatTest.F90
deleted file mode 100644
index 1e3ce78..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/FormatTest.F90
+++ /dev/null

@@ -1,4 +0,0 @@
-program p
-  ! Should match / ) as two tokens, not one
-  100 FORMAT (2(3EN15.4,3X)/)
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/Function.F90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/Function.F90
deleted file mode 100644
index fddbbb3..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/Function.F90
+++ /dev/null

@@ -1,11 +0,0 @@
-program p
-
-contains
-
-integer function f(x)
-end function
-
-double precision function f(x)
-end function
-
-end program p

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/ImplicitTest.F90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/ImplicitTest.F90
deleted file mode 100644
index 56e226e..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/ImplicitTest.F90
+++ /dev/null

@@ -1,12 +0,0 @@
-program lineContTest
-	! See Fortran 95 Handbook p.112
-	implicit integer (a)
-	implicit integer (b-c)
-	implicit complex (d-e, f)
-	implicit integer (g-i, k), complex(l-n)
-	implicit type (mytype) (p), complex (q)
-	implicit logical (kind = bit) (r)
-	IMPLICIT INTEGER (S-V) ! Comment here
-	IMPLICIT CHARACTER(LEN=5)(W-X)
-	IMPLICIT CHARACTER(LEN=5, KIND=7)(Y), COMPLEX(Z) ! Yeah!
-end program lineContTest

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/IntentTest.F90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/IntentTest.F90
deleted file mode 100644
index 8351310..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/IntentTest.F90
+++ /dev/null

@@ -1,4 +0,0 @@
-integer function f(x, y) result(r)
-  intent ( in ) x , y
-  return 0
-end function

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/LineContinuationTest.F90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/LineContinuationTest.F90
deleted file mode 100644
index 2fa3bd6..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/LineContinuationTest.F90
+++ /dev/null

@@ -1,12 +0,0 @@
-program lineContTest

-	

-	REAL::S

-	REAL::R

-    R = 1.01 

-    S = R + & 		! a comment

-    				! another comment

-    & R*2 	&		! a comment

-    				! another comment

-    + R				! comment

-    

-end program lineContTest


diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/OperatorStarTest.F90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/OperatorStarTest.F90
deleted file mode 100644
index fad4a47..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/OperatorStarTest.F90
+++ /dev/null

@@ -1,5 +0,0 @@
-module ops

-interface operator (*)

-	module procedure rat_mult

-end interface

-end module


diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/ParenSlash.F90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/ParenSlash.F90
deleted file mode 100644
index 3fe1c7c..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/ParenSlash.F90
+++ /dev/null

@@ -1,7 +0,0 @@
-MODULE X
-   ! (/) should be three tokens, not (/ followed by )
-   INTERFACE OPERATOR (/)
-      MODULE PROCEDURE BIG_DIV_INT, &
-                       BIG_DIV_BIG
-   END INTERFACE
-END MODULE X

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug118954-todo.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug118954-todo.f90
deleted file mode 100644
index e02a9e6..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug118954-todo.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-500 FORMAT (1H0, 2F10.3, E15.1, TR1, A10, 7HIN BOOK)
-1001 FORMAT (2(5E10.2, I10/), (1X, SP, I7, ss, ES10.2))
-130 FORMAT (9HMORE SNOW)
-140 FORMAT (a, 9X, 3A5, 7/ a, 10X, 3L4)
-! 17   format (7Ha"cde'g, 4 I8, '***')   ! This still doesn't work (Holleriths in free form)
-
-string = ASCII_"Hello"
-
-end

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug118955.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug118955.f90
deleted file mode 100644
index 9b5ce8e..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug118955.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-IDENT = RESHAPE ( (/ (1, (0, II=1,N), JJ=1,N-1), 1 /), (/ N,N /) )
-
-
-   a = reshape( (/ (1.0, (real(k), i=1,N), j=1,N), 1.0 /), &
-      (/ N, N /) )
-
-STOKES=DEN&
-      &SITY-11.11
-
-end

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug118965.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug118965.f90
deleted file mode 100644
index 475cfa4..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug118965.f90
+++ /dev/null

@@ -1,174 +0,0 @@
-module CmatProduct_m
-
-use MatranUtil_m
-use Cmat_m
-
-implicit none
-
-
-
-  real(wp), parameter :: ZERO = 0, ONE = 1
-
-  interface Times
-     module procedure CmTimesComplexScalarRm, CmTimesComplexScalarCm, &
-     CmTimesRealScalarCm, CmTimesRealScalarRm
-  end interface Times
-
-!    interface operator(*)
-!       module procedure RmTimesScalarRm_o, RmTimesRmScalar_o, &
-!                        RmTimesRmRm_o
-!    end interface
-!
-!    interface TimesXhy
-!       module procedure RmTimesXhy
-!    end interface TimesXhy
-!
-!    interface operator(.xhy.)
-!       module procedure RmTimes_xhy
-!    end interface
-!
-!    interface TimesXyh
-!       module procedure RmTimesXyh
-!    end interface TimesXyh
-!   !    interface operator(.xyh.)
-!       module procedure RmTimes_xyh
-!    end interface
-!
-!    interface TimesXhx
-!       module procedure RmTimesXhx
-!    end interface
-!
-!    interface operator(.xhx.)
-!       module procedure RmTimes_xhx
-!    end interface
-!
-!    interface TimesXxh
-!       module procedure RmTimesXxh
-!    end interface
-!
-!    interface operator(.xxh.)
-!       module procedure RmTimes_xxh
-!    end interface
-
-contains
-
-  subroutine CmTimesComplexScalarRm(C, s, A)
-     type(Cmat), intent(inout) :: C
-     complex(wp), intent(in) :: s
-     type(Rmat), intent(in) :: A
-
-     integer :: m, n, i, j
-
-     m = A%nrow
-     n = A%ncol
-
-     call GuardTemp(A)
-     call ReshapeAry(C, m, n)
-
-     if (m==0 .or. n==0) then
-        C%tag = 'yy'
-     !else                C%tag = 'xx'
-     else
-                     C%tag = 'xx'
-        forall (i=1:m,j=1:n)
-            C%a(i,j) = s*cmplx(A%a(i,j),0)
-        end forall
-
-     end if
-
-     call CleanTemp(A)
-
-  end subroutine CmTimesComplexScalarRm
-
-  subroutine CmTimesRealScalarCm(C, s, A)
-     type(Cmat), intent(out) :: C
-     real(wp), intent(in) :: s
-     type(Cmat), intent(in) :: A
-
-     integer m, n
-
-     m = A%nrow
-     n = A%ncol
-
-     call GuardTemp(A)
-     call ReshapeAry(C, m, n)
-
-     if (m==0 .or. n==0) then
-        C%tag = 'GE'
-
-     else
-
-        if (s>=0 .OR. A%tag/='HP') then
-           C%tag = A%tag
-        else
-           C%tag = 'HE'
-        end if
-        C%a(1:m,1:n) = s*A%a(1:m,1:n)
-
-     end if
-
-     call CleanTemp(A)
-
-  end subroutine CmTimesRealScalarCm
-
-  subroutine CmTimesRealScalarRm(C, s, A)
-     type(Cmat), intent(out) :: C
-     real(wp), intent(in) :: s
-     type(Rmat), intent(in) :: A
-
-     integer m, n
-
-     m = A%nrow
-     n = A%ncol
-
-     call GuardTemp(A)
-     call ReshapeAry(C, m, n)
-
-     if (m==0 .or. n==0) then
-        C%tag = 'GE'
-
-     else
-
-        if (s>=0 .OR. A%tag/='HP') then
-           C%tag = A%tag
-        else
-           C%tag = 'HE'
-        end if
-        C%a(1:m,1:n) = s*A%a(1:m,1:n)
-
-     end if
-
-     call CleanTemp(A)
-
-  end subroutine CmTimesRealScalarRm
-
-  subroutine CmTimesComplexScalarCm(C, s, A)
-     type(Cmat), intent(out) :: C
-     complex(wp), intent(in) :: s
-     type(Cmat), intent(in) :: A
-
-     integer m, n
-
-     m = A%nrow
-     n = A%ncol
-
-     call GuardTemp(A)
-     call ReshapeAry(C, m, n)
-
-     if (m==0 .or. n==0) then
-        C%tag = 'GE'
-
-     else
-
-        C%tag = 'HE'
-        C%a(1:m,1:n) = s*A%a(1:m,1:n)
-
-     end if
-
-     call CleanTemp(A)
-
-  end subroutine CmTimesComplexScalarCm
-
-
-
-end module CmatProduct_m

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug126383.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug126383.f90
deleted file mode 100644
index a7c6b83..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug126383.f90
+++ /dev/null

@@ -1,25 +0,0 @@
-PROGRAM TstFmts
-
-!   This program contains snippets of code that may cause the photran
-!   outline parser grief.  The program provides no useful function.
-
-    IMPLICIT NONE
-
-          WRITE (6, 148)
-          WRITE (6, 149)
-          WRITE (6, 150)
-
-148       FORMAT (/ ' *TestForBackup*  Backup due to too large a fractional ', 'change in core power.' / )
-149       FORMAT ( / ' *TestForBackup*  Backup due to too large a fractional ', 'change in core power.' /)
-150       FORMAT ( / ' *TestForBackup*  Backup due to too large a fractional change in core power.', // )
-
-         ictl(1:6) = ( / ictl1, ictl2, 1, 0, 0, 0 / )
-         ictl(1:6) = (/ ictl1, ictl2, 1, 0, 0, 0 /)
-
-
-data radii/(12*(fcasts+1))*0/
-
-       data radii / (12*(fcasts+1))*0 /
-
-
-END PROGRAM

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug126546.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug126546.f90
deleted file mode 100644
index 51da770..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug126546.f90
+++ /dev/null

@@ -1,3 +0,0 @@
-density(atoms%orbs) = 1.0d0
-density(atoms%orbs(i,n)) = 1.0d0
-end
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug126547.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug126547.f90
deleted file mode 100644
index 29dfdd6..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug126547.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-module blabla
-implicit none
-
-type,public :: atomic_type
-    integer ::n
-    integer, allocatable :: orbs(:,:)
-end type atomic_type
-
-end module blabla
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug126548.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug126548.f90
deleted file mode 100644
index ac34d1a..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug126548.f90
+++ /dev/null

@@ -1,24 +0,0 @@
-module blabla
-implicit none
-
-integer :: includx
-integer :: includex
-real :: m
-
-end module blabla
-
-module blabla
-implicit none
-
-integer :: includx
-integer :: includex
-
-contains
-
-subroutine blablas
-
-    print *, includex
-    write(*,*)"hello"
-end subroutine blablas
-
-end module blabla
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug138221.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug138221.f90
deleted file mode 100644
index 4ffa5ef..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug138221.f90
+++ /dev/null

@@ -1,5 +0,0 @@
-    type VarcharType
-        private
-        character,  dimension(:), allocatable :: chars
-    end type
-    end
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug167734.f b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug167734.f
deleted file mode 100644
index d9ca601..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug167734.f
+++ /dev/null

@@ -1,3 +0,0 @@
-      program Hello
- 10    format(F5.4,3E2.1)
-      end

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug193031.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug193031.f90
deleted file mode 100644
index 1c2d909..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug193031.f90
+++ /dev/null

@@ -1,32 +0,0 @@
-! This did not parse correctly if its filename extension was .F (it was interpreted as fixed rather than free format),
-! even if .F files were associated with the free-format Fortran content type 
-
-!WRF:DRIVER_LAYER:MAIN
-!
-
-PROGRAM wrf
-
-   USE module_wrf_top
-
-!<DESCRIPTION>
-! Main program of WRF model.  Responsible for starting up the model, reading in (and
-! broadcasting for distributed memory) configuration data, defining and initializing
-! the top-level domain, either from initial or restart data, setting up time-keeping, and
-! then calling the <a href=integrate.html>integrate</a> routine to advance the domain
-! to the ending time of the simulation. After the integration is completed, the model
-! is properly shut down.
-!
-!</DESCRIPTION>
-
-   IMPLICIT NONE
-
-   ! Initialize WRF model.  
-   CALL wrf_init
-
-   ! WRF model time-stepping.  Calls integrate().  
-   CALL wrf_run
-
-   ! WRF model clean-up.  This calls MPI_FINALIZE() for DM parallel runs.  
-   CALL wrf_finalize
-
-END PROGRAM wrf
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug193196.f b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug193196.f
deleted file mode 100644
index 322af35..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug193196.f
+++ /dev/null

@@ -1,3 +0,0 @@
-      FORMAT(1X,I10,1X,I10,1X,E15.7,I10,1X,I10,1X,I3/)
- 9973 FORMAT(/,1X,'!!!!!! EXECUTION WILL NOW BE TERMINATED !!!!!!',//)
-      END

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug195801.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug195801.f90
deleted file mode 100644
index 2c8e869..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug195801.f90
+++ /dev/null

@@ -1,36 +0,0 @@
-PROGRAM TEST_DERIVED_TYPE
-
-	IMPLICIT NONE
-	
-	TYPE :: TestType
-		INTEGER :: a, b
-	END TYPE
-	
-	
-	TYPE(TestType) :: TestVar
-	
-	
-	TestVar%a = 10
-	TestVar%b = 20
-
-	CALL DISPLAYTEST(TestVar)
-
-	
-CONTAINS
-
-
-
-	SUBROUTINE DISPLAYTEST(Var)
-	
-		IMPLICIT NONE
-		
-		TYPE(TestType), INTENT(IN) :: Var
-		
-		PRINT *, Var%a
-		PRINT *, Var%b
-		
-	END SUBROUTINE
-
-
-
-END PROGRAM
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug212606-todo.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug212606-todo.f90
deleted file mode 100644
index 1623eba..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug212606-todo.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-USE SIZES; USE GLOBAL, ONLY: C3D, COMM; USE GLOBAL_IO
-
-
-type (OutputDataDescript_t) :: descript
-CHARACTER(LEN=4) :: type1
-CHARACTER(LEN=4) :: type2
-integer :: ns,type
-
-type1     = type2
-!type = 2   ! This line still has problems
-
-     READ(IHOT,REC=IHOTSTP) IMHS         ; IHOTSTP = IHOTSTP + 1
-     READ(IHOT,REC=IHOTSTP) TIME         ; IHOTSTP = IHOTSTP + 1
-     READ(IHOT,REC=IHOTSTP) ITHS         ; IHOTSTP = IHOTSTP + 1
-     READ(IHOT,REC=IHOTSTP) NP_G_IN      ; IHOTSTP = IHOTSTP + 1
-     READ(IHOT,REC=IHOTSTP) NE_G_IN      ; IHOTSTP = IHOTSTP + 1
-     READ(IHOT,REC=IHOTSTP) NP_A_IN      ; IHOTSTP = IHOTSTP + 1
-     READ(IHOT,REC=IHOTSTP) NE_A_IN      ; IHOTSTP = IHOTSTP + 1
-
-end

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug212606.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug212606.f90
deleted file mode 100644
index 1822e04..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug212606.f90
+++ /dev/null

@@ -1,23 +0,0 @@
-subroutine s
-end subroutine  
-                
-
-program bug212606
-    implicit none
-
-    type OutputDataDescript_t
-        integer n
-    end type
-
-    type (OutputDataDescript_t) :: descript
-
-    CHARACTER(LEN=4) :: type1
-    CHARACTER(LEN=4) :: type2
-
-    integer :: ns,type
-
-    type1 = type2
-
-    type = 2
-
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug276186.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug276186.f90
deleted file mode 100644
index 8620ba3..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug276186.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-type t1(l)
-    integer, len :: l
-end type
-
-type t2(len)
-    integer, len :: len
-end type
-
-!            v-- F03 parser reports unexpected len
-integer ifdr,len_n,len_c,filtyp,fdrnam
-
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug294055.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug294055.f90
deleted file mode 100644
index afccca3..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug294055.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-      program test
-      implicit none
-      logical a /.true./
-
-      print *,'A = ', a
-
-      end program test

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug298895.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug298895.f90
deleted file mode 100644
index c4b07cc..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug298895.f90
+++ /dev/null

@@ -1,5 +0,0 @@
-iunit=20
-convert=17.0
-open(iunit, file=filename, form=form, status=status, convert='BIG_ENDIAN', recl=65534, err=100)
-print *, convert
-end program test

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug300931.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug300931.f90
deleted file mode 100644
index b0478cd..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug300931.f90
+++ /dev/null

@@ -1,3 +0,0 @@
-CHARACTER(LEN=B,KIND=A) :: NAME2
-CHARACTER(KIND=A,LEN=B) :: NAME1
-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug304269.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug304269.f90
deleted file mode 100644
index 572fa5a..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug304269.f90
+++ /dev/null

@@ -1,3 +0,0 @@
-! ERRMSG= is an Intel extension
-ALLOCATE(BOX(NUM_THREADS),BOX_CTF(NUM_THREADS),STAT=IERR,ERRMSG=ERRMSG)
-END PROGRAM

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug305134.f b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug305134.f
deleted file mode 100644
index c14720d..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug305134.f
+++ /dev/null

@@ -1,2 +0,0 @@
-      RECURSIVE SUBROUTINE Read_BFTransfo()
-      END SUBROUTINE

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug305134_sub_module_TnumERROR.f b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug305134_sub_module_TnumERROR.f
deleted file mode 100644
index 51f3474..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug305134_sub_module_TnumERROR.f
+++ /dev/null

@@ -1,302 +0,0 @@
-      MODULE mod_Tnum
-      USE mod_system
-      USE mod_dnSVM
-      IMPLICIT NONE
-        TYPE Type_BFTransfo
-          !----------------------------------------------------------------
-          logical                     :: init0,notinit0
-          logical                     :: allo ! If allocated => T
-
-          integer :: nb_vect,nb_BF
-          integer :: nb_var,nb_var_Rot
-          integer :: num_Frame
-          character (len=Name_len) :: name_Frame
-
-          logical :: Frame
-
-          integer, pointer                  :: type_Q(:)
-          character (len=Name_len), pointer :: name_Q(:)
-
-
-
-          TYPE (Type_BFTransfo), pointer :: tab_BFTransfo(:) ! dim: nb_vect or nb_BF
-
-        END TYPE Type_BFTransfo
-      CONTAINS
-c=======================================================================
-c
-c     Read BF transfo: BF and vectors
-c
-c=======================================================================
-      SUBROUTINE init0_BFTransfo(BFTransfo)
-        TYPE (Type_BFTransfo),intent(out) :: BFTransfo
-
-        BFTransfo%init0     = .TRUE.
-        BFTransfo%notinit0  = .FALSE.
-
-        BFTransfo%allo      = .FALSE.
-
-        BFTransfo%nb_vect    = 0
-        BFTransfo%nb_BF      = 0
-        BFTransfo%nb_var     = 0
-        BFTransfo%nb_var_Rot = 0
-        BFTransfo%num_Frame  = 0
-        BFTransfo%name_Frame = "F0"
-
-        BFTransfo%Frame      = .FALSE.
-
-        nullify(BFTransfo%type_Q)
-        nullify(BFTransfo%name_Q)
-        nullify(BFTransfo%tab_BFTransfo)
-
-      END SUBROUTINE init0_BFTransfo
-      SUBROUTINE check_init0_BFTransfo(A,name_A,name_sub)
-      TYPE (Type_BFTransfo), intent(in) :: A
-      character (len=*), intent(in) :: name_A
-      character (len=*), intent(in) :: name_sub
-
-      IF ( (A%init0 .EQV. A%notinit0) .OR.
-     *       (A%notinit0 .AND. .NOT. A%init0) ) THEN
-        write(6,*) ' ERROR in ',name_sub
-        write(6,*) name_A,
-     *  ' has NOT been initiated with "init0_BFTransfo"'
-        write(6,*) ' CHECK the source!!!!!'
-        write(6,*) '.%init0, %notinit0',A%init0,A%notinit0
-        STOP
-      END IF
-      END SUBROUTINE check_init0_BFTransfo
-      RECURSIVE SUBROUTINE dealloc_BFTransfo(BFTransfo)
-      TYPE (Type_BFTransfo),intent(inout) :: BFTransfo
-
-      integer :: iv
-      character (len=*), parameter :: name_sub='dealloc_BFTransfo'
-
-      IF (.NOT. BFTransfo%Frame) RETURN
-      write(6,*) 'BEGINNING ',name_sub
-
-      CALL check_init0_BFTransfo(BFTransfo,'BFTransfo',name_sub)
-
-      deallocate(BFTransfo%type_Q)
-      deallocate(BFTransfo%name_Q)
-
-      DO iv=1,BFTransfo%nb_vect
-        CALL dealloc_BFTransfo(BFTransfo%tab_BFTransfo(iv))
-      END DO
-
-      deallocate(BFTransfo%tab_BFTransfo)
-
-      BFTransfo%allo = .FALSE.
-      CALL init0_BFTransfo(BFTransfo)
-
-      write(6,*) 'END ',name_sub
-
-      END SUBROUTINE dealloc_BFTransfo
-!      SUBROUTINE Read_BFTransfo(BFTransfo,Qtransfo,i_Q,
-!     *                          in_unitp,out_unitp)
-      RECURSIVE SUBROUTINE Read_BFTransfo(BFTransfo,Qtransfo,i_Q,
-     *                                    in_unitp,out_unitp)
-      TYPE (Type_BFTransfo),intent(inout) :: BFTransfo
-      TYPE (Type_Qtransfo), intent(inout) :: Qtransfo
-      integer, intent(inout) :: i_Q
-      integer :: in_unitp,out_unitp
-
-
-      integer :: nb_vect,nb_var,iq,iv
-      logical :: Frame,cos_th,cart
-      character (len=Name_len) :: name_d,name_th,name_dih,
-     *                            name_x,name_y,name_z
-      character (len=Name_len) :: name_F,name_v
-
-      NAMELIST /BF/ nb_vect
-      NAMELIST /vector/ Frame,cos_th,name_d,name_th,name_dih,
-     *                          cart,name_x,name_y,name_z
-
-      character (len=*), parameter :: name_sub='Read_BFTransfo'
-
-
-      IF (.NOT. BFTransfo%Frame) RETURN
-c     write(6,*) 'BEGINNING ',name_sub
-
-      CALL check_init0_BFTransfo(BFTransfo,'BFTransfo',name_sub)
-
-      nb_vect = 0
-
-      read(in_unitp,BF)
-c     write(out_unitp,BF)
-
-      IF (nb_vect < 1) THEN
-        write(out_unitp,*) ' ERROR in ',name_sub
-        write(out_unitp,*) ' the number of vector is < 1',nb_vect
-        STOP
-      END IF
-      BFTransfo%nb_vect = nb_vect
-      nb_var = max(1,3*nb_vect-3)
-      IF (BFTransfo%num_Frame > 0) THEN
-        nb_var = nb_var + 2
-        IF (nb_vect > 1) nb_var = nb_var + 1
-      END IF
-      BFTransfo%nb_var = nb_var
-
-      allocate(BFTransfo%type_Q(nb_var))
-      allocate(BFTransfo%name_Q(nb_var))
-
-      allocate(BFTransfo%tab_BFTransfo(nb_vect))
-      BFTransfo%allo = .TRUE.
-
-      write(name_F,*) BFTransfo%num_Frame
-      name_F = "F" // trim(adjustl(name_F))
-      IF (BFTransfo%num_Frame > 0) name_F =
-     *     trim(adjustl(name_F)) // trim(adjustl(BFTransfo%name_Frame))
-
-      BFTransfo%name_Frame = name_F
-
-c     write(6,*) 'num_Frame,name_Frame',
-c    *         BFTransfo%num_Frame,BFTransfo%name_Frame
-
-      iq = 0
-      DO iv=1,nb_vect
-        Frame    = .FALSE.
-        cos_th   = .TRUE.
-        cart     = .FALSE.
-        write(name_v,*) iv
-        name_v = trim(adjustl(name_v)) // "_" // trim(adjustl(name_F))
-        name_x   = "x" // trim(adjustl(name_v))
-        name_y   = "y" // trim(adjustl(name_v))
-        name_z   = "z" // trim(adjustl(name_v))
-        name_d   = "d" // trim(adjustl(name_v))
-        name_th  ="th" // trim(adjustl(name_v))
-        name_dih="dih" // trim(adjustl(name_v))
-        read(in_unitp,vector)
-c       write(out_unitp,vector)
-
-        CALL init0_BFTransfo(BFTransfo%tab_BFTransfo(iv))
-        BFTransfo%tab_BFTransfo(iv)%num_Frame = iv
-        BFTransfo%tab_BFTransfo(iv)%Frame = Frame
-        BFTransfo%tab_BFTransfo(iv)%name_Frame = name_F
-        IF (cart .AND. iv < 3) THEN
-          write(out_unitp,*) ' ERROR in ',name_sub
-          write(out_unitp,*) ' vector in cartesian and iv < 3',
-     *       ' is not possible'
-          write(out_unitp,*) 'cart,iv',cart,iv
-          STOP
-        END IF
-        IF (cart) THEN
-           iq = iq + 1
-           BFTransfo%type_Q(iq) = 1 ! cart :x
-           BFTransfo%name_Q(iq) = name_x
-           i_Q = i_Q + 1
-           Qtransfo%type_Q(i_Q) = BFTransfo%type_Q(iq)
-           Qtransfo%name_Q(i_Q) = BFTransfo%name_Q(iq)
-           iq = iq + 1
-           BFTransfo%type_Q(iq) = 1 ! cart :y
-           BFTransfo%name_Q(iq) = name_y
-           i_Q = i_Q + 1
-           Qtransfo%type_Q(i_Q) = BFTransfo%type_Q(iq)
-           Qtransfo%name_Q(i_Q) = BFTransfo%name_Q(iq)
-           iq = iq + 1
-           BFTransfo%type_Q(iq) = 1 ! cart :z
-           BFTransfo%name_Q(iq) = name_z
-           i_Q = i_Q + 1
-           Qtransfo%type_Q(i_Q) = BFTransfo%type_Q(iq)
-           Qtransfo%name_Q(i_Q) = BFTransfo%name_Q(iq)
-        ELSE
-           iq = iq + 1
-           BFTransfo%type_Q(iq) = 2 ! distance
-           BFTransfo%name_Q(iq) = name_d
-           i_Q = i_Q + 1
-           Qtransfo%type_Q(i_Q) = BFTransfo%type_Q(iq)
-           Qtransfo%name_Q(i_Q) = BFTransfo%name_Q(iq)
-           IF (iv > 1) THEN
-             iq = iq + 1
-             BFTransfo%type_Q(iq) = 3 ! th
-             IF (cos_th) BFTransfo%type_Q(iq) = -3 ! cos(th)
-             BFTransfo%name_Q(iq) = name_th
-             i_Q = i_Q + 1
-             Qtransfo%type_Q(i_Q) = BFTransfo%type_Q(iq)
-             Qtransfo%name_Q(i_Q) = BFTransfo%name_Q(iq)
-           END IF
-           IF (iv > 2) THEN
-             iq = iq + 1
-             BFTransfo%type_Q(iq) = 4 ! dih
-             BFTransfo%name_Q(iq) = name_dih
-             i_Q = i_Q + 1
-             Qtransfo%type_Q(i_Q) = BFTransfo%type_Q(iq)
-             Qtransfo%name_Q(i_Q) = BFTransfo%name_Q(iq)
-           END IF
-        END IF
-
-
-        CALL Read_BFTransfo(BFTransfo%tab_BFTransfo(iv),Qtransfo,i_Q,
-     *                      in_unitp,out_unitp)
-      END DO
-
-      IF (BFTransfo%num_Frame > 0) THEN
-        iq = iq + 1
-        BFTransfo%type_Q(iq) = 4
-        BFTransfo%name_Q(iq) = "alpha_" // trim(adjustl(name_F))
-        i_Q = i_Q + 1
-        Qtransfo%type_Q(i_Q) = BFTransfo%type_Q(iq)
-        Qtransfo%name_Q(i_Q) = BFTransfo%name_Q(iq)
-        iq = iq + 1
-        BFTransfo%type_Q(iq) = 3
-        IF (cos_th) BFTransfo%type_Q(iq) = -3
-        BFTransfo%name_Q(iq) = "beta_" // trim(adjustl(name_F))
-        i_Q = i_Q + 1
-        Qtransfo%type_Q(i_Q) = BFTransfo%type_Q(iq)
-        Qtransfo%name_Q(i_Q) = BFTransfo%name_Q(iq)
-        IF (nb_vect > 1) THEN
-          iq = iq + 1
-          BFTransfo%type_Q(iq) = 4
-          BFTransfo%name_Q(iq) = "gamma_" // trim(adjustl(name_F))
-          i_Q = i_Q + 1
-          Qtransfo%type_Q(i_Q) = BFTransfo%type_Q(iq)
-          Qtransfo%name_Q(i_Q) = BFTransfo%name_Q(iq)
-        END IF
-      END IF
-
-
-c     write(out_unitp,*) 'END ',name_sub
-
-      END SUBROUTINE Read_BFTransfo
-      !SUBROUTINE Write_BFTransfo(BFTransfo,out_unitp)
-      RECURSIVE SUBROUTINE Write_BFTransfo(BFTransfo,out_unitp)
-
-      TYPE (Type_BFTransfo),intent(out) :: BFTransfo
-
-      integer :: out_unitp
-
-      integer :: iv,iq
-      character (len=*), parameter :: name_sub='Write_BFTransfo'
-
-      IF (.NOT. BFTransfo%Frame) RETURN
-      write(out_unitp,*) 'BEGINNING ',name_sub
-
-      CALL check_init0_BFTransfo(BFTransfo,'BFTransfo',name_sub)
-
-      write(out_unitp,*) 'allo',BFTransfo%allo
-      write(out_unitp,*) 'num_Frame',BFTransfo%num_Frame
-      write(out_unitp,*) 'name_Frame: ',BFTransfo%name_Frame
-
-      write(out_unitp,*) 'nb_vect,nb_BF',
-     *                   BFTransfo%nb_vect,BFTransfo%nb_BF
-
-      write(out_unitp,*) 'nb_var,nb_var_Rot',
-     *                   BFTransfo%nb_var,BFTransfo%nb_var_Rot
-
-      write(out_unitp,*) 'BF',BFTransfo%Frame
-
-
-      write(out_unitp,*) 'type_Q',BFTransfo%type_Q(:)
-      write(out_unitp,*) 'name_Q: ',
-     *        (trim(BFTransfo%name_Q(iq))," ",iq=1,BFTransfo%nb_var)
-
-      IF (BFTransfo%Frame) THEN
-        DO iv=1,BFTransfo%nb_vect
-          CALL Write_BFTransfo(BFTransfo%tab_BFTransfo(iv),out_unitp)
-        END DO
-      END IF
-
-      write(6,*) 'END ',name_sub
-
-      END SUBROUTINE Write_BFTransfo
-      END MODULE mod_Tnum

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug305134_sub_module_TnumOK.f b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug305134_sub_module_TnumOK.f
deleted file mode 100644
index abe498a..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug305134_sub_module_TnumOK.f
+++ /dev/null

@@ -1,302 +0,0 @@
-      MODULE mod_Tnum
-      USE mod_system
-      USE mod_dnSVM
-      IMPLICIT NONE
-        TYPE Type_BFTransfo
-          !----------------------------------------------------------------
-          logical                     :: init0,notinit0
-          logical                     :: allo ! If allocated => T
-
-          integer :: nb_vect,nb_BF
-          integer :: nb_var,nb_var_Rot
-          integer :: num_Frame
-          character (len=Name_len) :: name_Frame
-
-          logical :: Frame
-
-          integer, pointer                  :: type_Q(:)
-          character (len=Name_len), pointer :: name_Q(:)
-
-
-
-          TYPE (Type_BFTransfo), pointer :: tab_BFTransfo(:) ! dim: nb_vect or nb_BF
-
-        END TYPE Type_BFTransfo
-      CONTAINS
-c=======================================================================
-c
-c     Read BF transfo: BF and vectors
-c
-c=======================================================================
-      SUBROUTINE init0_BFTransfo(BFTransfo)
-        TYPE (Type_BFTransfo),intent(out) :: BFTransfo
-
-        BFTransfo%init0     = .TRUE.
-        BFTransfo%notinit0  = .FALSE.
-
-        BFTransfo%allo      = .FALSE.
-
-        BFTransfo%nb_vect    = 0
-        BFTransfo%nb_BF      = 0
-        BFTransfo%nb_var     = 0
-        BFTransfo%nb_var_Rot = 0
-        BFTransfo%num_Frame  = 0
-        BFTransfo%name_Frame = "F0"
-
-        BFTransfo%Frame      = .FALSE.
-
-        nullify(BFTransfo%type_Q)
-        nullify(BFTransfo%name_Q)
-        nullify(BFTransfo%tab_BFTransfo)
-
-      END SUBROUTINE init0_BFTransfo
-      SUBROUTINE check_init0_BFTransfo(A,name_A,name_sub)
-      TYPE (Type_BFTransfo), intent(in) :: A
-      character (len=*), intent(in) :: name_A
-      character (len=*), intent(in) :: name_sub
-
-      IF ( (A%init0 .EQV. A%notinit0) .OR.
-     *       (A%notinit0 .AND. .NOT. A%init0) ) THEN
-        write(6,*) ' ERROR in ',name_sub
-        write(6,*) name_A,
-     *  ' has NOT been initiated with "init0_BFTransfo"'
-        write(6,*) ' CHECK the source!!!!!'
-        write(6,*) '.%init0, %notinit0',A%init0,A%notinit0
-        STOP
-      END IF
-      END SUBROUTINE check_init0_BFTransfo
-      RECURSIVE SUBROUTINE dealloc_BFTransfo(BFTransfo)
-      TYPE (Type_BFTransfo),intent(inout) :: BFTransfo
-
-      integer :: iv
-      character (len=*), parameter :: name_sub='dealloc_BFTransfo'
-
-      IF (.NOT. BFTransfo%Frame) RETURN
-      write(6,*) 'BEGINNING ',name_sub
-
-      CALL check_init0_BFTransfo(BFTransfo,'BFTransfo',name_sub)
-
-      deallocate(BFTransfo%type_Q)
-      deallocate(BFTransfo%name_Q)
-
-      DO iv=1,BFTransfo%nb_vect
-        CALL dealloc_BFTransfo(BFTransfo%tab_BFTransfo(iv))
-      END DO
-
-      deallocate(BFTransfo%tab_BFTransfo)
-
-      BFTransfo%allo = .FALSE.
-      CALL init0_BFTransfo(BFTransfo)
-
-      write(6,*) 'END ',name_sub
-
-      END SUBROUTINE dealloc_BFTransfo
-      SUBROUTINE Read_BFTransfo(BFTransfo,Qtransfo,i_Q,
-     *                          in_unitp,out_unitp)
-!     RECURSIVE SUBROUTINE Read_BFTransfo(BFTransfo,Qtransfo,i_Q,
-!    *                                    in_unitp,out_unitp)
-      TYPE (Type_BFTransfo),intent(inout) :: BFTransfo
-      TYPE (Type_Qtransfo), intent(inout) :: Qtransfo
-      integer, intent(inout) :: i_Q
-      integer :: in_unitp,out_unitp
-
-
-      integer :: nb_vect,nb_var,iq,iv
-      logical :: Frame,cos_th,cart
-      character (len=Name_len) :: name_d,name_th,name_dih,
-     *                            name_x,name_y,name_z
-      character (len=Name_len) :: name_F,name_v
-
-      NAMELIST /BF/ nb_vect
-      NAMELIST /vector/ Frame,cos_th,name_d,name_th,name_dih,
-     *                          cart,name_x,name_y,name_z
-
-      character (len=*), parameter :: name_sub='Read_BFTransfo'
-
-
-      IF (.NOT. BFTransfo%Frame) RETURN
-c     write(6,*) 'BEGINNING ',name_sub
-
-      CALL check_init0_BFTransfo(BFTransfo,'BFTransfo',name_sub)
-
-      nb_vect = 0
-
-      read(in_unitp,BF)
-c     write(out_unitp,BF)
-
-      IF (nb_vect < 1) THEN
-        write(out_unitp,*) ' ERROR in ',name_sub
-        write(out_unitp,*) ' the number of vector is < 1',nb_vect
-        STOP
-      END IF
-      BFTransfo%nb_vect = nb_vect
-      nb_var = max(1,3*nb_vect-3)
-      IF (BFTransfo%num_Frame > 0) THEN
-        nb_var = nb_var + 2
-        IF (nb_vect > 1) nb_var = nb_var + 1
-      END IF
-      BFTransfo%nb_var = nb_var
-
-      allocate(BFTransfo%type_Q(nb_var))
-      allocate(BFTransfo%name_Q(nb_var))
-
-      allocate(BFTransfo%tab_BFTransfo(nb_vect))
-      BFTransfo%allo = .TRUE.
-
-      write(name_F,*) BFTransfo%num_Frame
-      name_F = "F" // trim(adjustl(name_F))
-      IF (BFTransfo%num_Frame > 0) name_F =
-     *     trim(adjustl(name_F)) // trim(adjustl(BFTransfo%name_Frame))
-
-      BFTransfo%name_Frame = name_F
-
-c     write(6,*) 'num_Frame,name_Frame',
-c    *         BFTransfo%num_Frame,BFTransfo%name_Frame
-
-      iq = 0
-      DO iv=1,nb_vect
-        Frame    = .FALSE.
-        cos_th   = .TRUE.
-        cart     = .FALSE.
-        write(name_v,*) iv
-        name_v = trim(adjustl(name_v)) // "_" // trim(adjustl(name_F))
-        name_x   = "x" // trim(adjustl(name_v))
-        name_y   = "y" // trim(adjustl(name_v))
-        name_z   = "z" // trim(adjustl(name_v))
-        name_d   = "d" // trim(adjustl(name_v))
-        name_th  ="th" // trim(adjustl(name_v))
-        name_dih="dih" // trim(adjustl(name_v))
-        read(in_unitp,vector)
-c       write(out_unitp,vector)
-
-        CALL init0_BFTransfo(BFTransfo%tab_BFTransfo(iv))
-        BFTransfo%tab_BFTransfo(iv)%num_Frame = iv
-        BFTransfo%tab_BFTransfo(iv)%Frame = Frame
-        BFTransfo%tab_BFTransfo(iv)%name_Frame = name_F
-        IF (cart .AND. iv < 3) THEN
-          write(out_unitp,*) ' ERROR in ',name_sub
-          write(out_unitp,*) ' vector in cartesian and iv < 3',
-     *       ' is not possible'
-          write(out_unitp,*) 'cart,iv',cart,iv
-          STOP
-        END IF
-        IF (cart) THEN
-           iq = iq + 1
-           BFTransfo%type_Q(iq) = 1 ! cart :x
-           BFTransfo%name_Q(iq) = name_x
-           i_Q = i_Q + 1
-           Qtransfo%type_Q(i_Q) = BFTransfo%type_Q(iq)
-           Qtransfo%name_Q(i_Q) = BFTransfo%name_Q(iq)
-           iq = iq + 1
-           BFTransfo%type_Q(iq) = 1 ! cart :y
-           BFTransfo%name_Q(iq) = name_y
-           i_Q = i_Q + 1
-           Qtransfo%type_Q(i_Q) = BFTransfo%type_Q(iq)
-           Qtransfo%name_Q(i_Q) = BFTransfo%name_Q(iq)
-           iq = iq + 1
-           BFTransfo%type_Q(iq) = 1 ! cart :z
-           BFTransfo%name_Q(iq) = name_z
-           i_Q = i_Q + 1
-           Qtransfo%type_Q(i_Q) = BFTransfo%type_Q(iq)
-           Qtransfo%name_Q(i_Q) = BFTransfo%name_Q(iq)
-        ELSE
-           iq = iq + 1
-           BFTransfo%type_Q(iq) = 2 ! distance
-           BFTransfo%name_Q(iq) = name_d
-           i_Q = i_Q + 1
-           Qtransfo%type_Q(i_Q) = BFTransfo%type_Q(iq)
-           Qtransfo%name_Q(i_Q) = BFTransfo%name_Q(iq)
-           IF (iv > 1) THEN
-             iq = iq + 1
-             BFTransfo%type_Q(iq) = 3 ! th
-             IF (cos_th) BFTransfo%type_Q(iq) = -3 ! cos(th)
-             BFTransfo%name_Q(iq) = name_th
-             i_Q = i_Q + 1
-             Qtransfo%type_Q(i_Q) = BFTransfo%type_Q(iq)
-             Qtransfo%name_Q(i_Q) = BFTransfo%name_Q(iq)
-           END IF
-           IF (iv > 2) THEN
-             iq = iq + 1
-             BFTransfo%type_Q(iq) = 4 ! dih
-             BFTransfo%name_Q(iq) = name_dih
-             i_Q = i_Q + 1
-             Qtransfo%type_Q(i_Q) = BFTransfo%type_Q(iq)
-             Qtransfo%name_Q(i_Q) = BFTransfo%name_Q(iq)
-           END IF
-        END IF
-
-
-        CALL Read_BFTransfo(BFTransfo%tab_BFTransfo(iv),Qtransfo,i_Q,
-     *                      in_unitp,out_unitp)
-      END DO
-
-      IF (BFTransfo%num_Frame > 0) THEN
-        iq = iq + 1
-        BFTransfo%type_Q(iq) = 4
-        BFTransfo%name_Q(iq) = "alpha_" // trim(adjustl(name_F))
-        i_Q = i_Q + 1
-        Qtransfo%type_Q(i_Q) = BFTransfo%type_Q(iq)
-        Qtransfo%name_Q(i_Q) = BFTransfo%name_Q(iq)
-        iq = iq + 1
-        BFTransfo%type_Q(iq) = 3
-        IF (cos_th) BFTransfo%type_Q(iq) = -3
-        BFTransfo%name_Q(iq) = "beta_" // trim(adjustl(name_F))
-        i_Q = i_Q + 1
-        Qtransfo%type_Q(i_Q) = BFTransfo%type_Q(iq)
-        Qtransfo%name_Q(i_Q) = BFTransfo%name_Q(iq)
-        IF (nb_vect > 1) THEN
-          iq = iq + 1
-          BFTransfo%type_Q(iq) = 4
-          BFTransfo%name_Q(iq) = "gamma_" // trim(adjustl(name_F))
-          i_Q = i_Q + 1
-          Qtransfo%type_Q(i_Q) = BFTransfo%type_Q(iq)
-          Qtransfo%name_Q(i_Q) = BFTransfo%name_Q(iq)
-        END IF
-      END IF
-
-
-c     write(out_unitp,*) 'END ',name_sub
-
-      END SUBROUTINE Read_BFTransfo
-       SUBROUTINE Write_BFTransfo(BFTransfo,out_unitp)
-      !RECURSIVE SUBROUTINE Write_BFTransfo(BFTransfo,out_unitp)
-
-      TYPE (Type_BFTransfo),intent(out) :: BFTransfo
-
-      integer :: out_unitp
-
-      integer :: iv,iq
-      character (len=*), parameter :: name_sub='Write_BFTransfo'
-
-      IF (.NOT. BFTransfo%Frame) RETURN
-      write(out_unitp,*) 'BEGINNING ',name_sub
-
-      CALL check_init0_BFTransfo(BFTransfo,'BFTransfo',name_sub)
-
-      write(out_unitp,*) 'allo',BFTransfo%allo
-      write(out_unitp,*) 'num_Frame',BFTransfo%num_Frame
-      write(out_unitp,*) 'name_Frame: ',BFTransfo%name_Frame
-
-      write(out_unitp,*) 'nb_vect,nb_BF',
-     *                   BFTransfo%nb_vect,BFTransfo%nb_BF
-
-      write(out_unitp,*) 'nb_var,nb_var_Rot',
-     *                   BFTransfo%nb_var,BFTransfo%nb_var_Rot
-
-      write(out_unitp,*) 'BF',BFTransfo%Frame
-
-
-      write(out_unitp,*) 'type_Q',BFTransfo%type_Q(:)
-      write(out_unitp,*) 'name_Q: ',
-     *        (trim(BFTransfo%name_Q(iq))," ",iq=1,BFTransfo%nb_var)
-
-      IF (BFTransfo%Frame) THEN
-        DO iv=1,BFTransfo%nb_vect
-          CALL Write_BFTransfo(BFTransfo%tab_BFTransfo(iv),out_unitp)
-        END DO
-      END IF
-
-      write(6,*) 'END ',name_sub
-
-      END SUBROUTINE Write_BFTransfo
-      END MODULE mod_Tnum

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug308196.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug308196.f90
deleted file mode 100644
index 987254b..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug308196.f90
+++ /dev/null

@@ -1,2 +0,0 @@
-FORALL (I=1:NAT) DIPOLES(3*I-2:3*I,:) = ALPHA(:,:,I)
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug308197.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug308197.f90
deleted file mode 100644
index badd2cc..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug308197.f90
+++ /dev/null

@@ -1,287 +0,0 @@
-      SUBROUTINE Get_Geom( IDEBUG, ROOTNAME, NC, COORD,                  &
-     &                     NEIGHB1, NBBOUND,                             &
-     &                     NHEXA, NPENTA, NHEPTA,                        &
-     &                     IHEXA ,IPENTA, IHEPTA,                        &
-     &                     NEIGHB2_OUT, NPOINT_OUT )
-!--------------------------------------------------------------------
-!  Function : this program builds several connectivity arrays :
-! NEIGHB1(J,I) indices of Jth nearest neighbours of atom I
-! NBBOUND(I) : Number of nearest neighbors of atom I
-! optionally
-! NEIGHB2_OUT(1..6,I) : indices of the secound nearest neighbours
-! NPOINT_OUT(1..6,I : indices of the atoms between atoms I and NEIGHB2(J,I)
-! and optionally writes several files to be used
-! by an external program to display fullerene or nanotube molecules
-!      - geom.xxx contains the indices of the nearest neighbours and
-!                 the coordinates of the atoms of the fullerene
-!      - hexagons.xxx contains the labels of the carbon atoms constituting
-!                 the hexagons (1 line per hexagon)
-!      - pentagons.xxx contains the labels of the carbon atoms constituting
-!                 the pentagons (1 line per pentagon)
-!      - heptagons.xxx contains the labels of the carbon atoms constituting
-!                 the heptagons (1 line per heptagon)
-!
-! The problem here is that the tube is not necessarily closed !
-! -> some carbon atoms only have 2 neighbours
-!
-! The files are needed by a Mathematica script
-! such as showtub.m to display the molecules.
-!
-!  Date     : 06-06-1997
-!  Author   : Michel Devel
-!  Status   : Ready to run
-!
-!  Changes  : 23-11-98 : (MD) add automatic naming of all the files
-!             25-02-04 : (MD) adapt geom90 as a subroutine
-!--------------------------------------------------------------------
-      use kinds
-
-      IMPLICIT NONE
-
-      Integer, intent(in) :: IDEBUG
-      Character(LEN=*), intent(in) :: ROOTNAME
-      Integer, intent(in) :: NC
-      Real(kind=r_), intent(in) :: COORD(3,NC)
-
-      Integer, intent(out) :: NEIGHB1(3,NC), NBBOUND(NC)
-! NEIGHB1(1..3,I) : indices of the nearest neigbours of atom nb I
-      Integer, intent(out) :: NHEXA, NPENTA, NHEPTA
-      Integer, intent(out) :: IHEPTA(7,NC),IHEXA(6,NC),IPENTA(5,NC)
-
-      Integer, intent(out), optional :: NEIGHB2_OUT(6,NC)
-! NEIGHB2_OUT(1..6,I) : indices of the secound nearest neighbours
-      Integer, intent(out), optional :: NPOINT_OUT(6,NC)
-! NPOINT_OUT(1..6,I : indices of the atoms between atoms I and NEIGHB2(J,I)
-
-      Real(kind=r_),parameter :: DISTMIN=1._r_, DISTMAX=2._r_
-
-      INTEGER :: I, J, K, L, M, N, I1, I2, I3
-      INTEGER :: IND, IND1, IND2, NIND1, NIND2, NPO1, NPO2, NVOIS
-      Integer :: NEIGHB2(6,NC), NPOINT(6,NC)
-
-
-      Real(kind=r_) :: DISTIJ, D12, D13, D23
-
-      Real*8,external :: Norm
-!
-!------------------------------------------------------------------
-! Find indices of the 3 nearest neighbours for each carbon atom
-      NBBOUND = 0
-      NEIGHB1 = 0
-
-      DO I=1,NC
-         DO J=I+1,NC
-            DISTIJ = NORM( COORD(:,I)-COORD(:,J) )
-!           PRINT *,I,J,SQRT(DISTIJ2)
-            IF (DISTIJ.GT.DISTMIN.AND.DISTIJ.LT.DISTMAX) THEN
-               IF (NBBOUND(I).GE.3.OR.NBBOUND(J).GE.3) THEN
-                  PRINT *, "ERROR in FINDBOUND : more than 3 bounds"
-                  PRINT *,"I,NBBOUND(I),J,NBBOUND(J)"
-                  PRINT *,I,NBBOUND(I),J,NBBOUND(J)
-                  STOP
-               ENDIF
-               NBBOUND(I)=NBBOUND(I)+1
-               NBBOUND(J)=NBBOUND(J)+1
-               NEIGHB1(NBBOUND(I),I)=J
-               NEIGHB1(NBBOUND(J),J)=I
-!              PRINT *,I,J,DISTIJ
-            ENDIF
-         END DO
-      END DO
-
-      IF ( IDEBUG < 1 .AND. .NOT. PRESENT(NEIGHB2_OUT) ) GO TO 9999
-
-      IF (IDEBUG.GE.3) THEN
-         DO I=1,NC
-          I1=NEIGHB1(1,I)
-          I2=NEIGHB1(2,I)
-          I3=NEIGHB1(3,I)
-          PRINT *,I,I1,I2,I3
-          D12=NORM( COORD(:,I1) - COORD(:,I2) )
-          D13=NORM( COORD(:,I1) - COORD(:,I3) )
-          D23=NORM( COORD(:,I2) - COORD(:,I3) )
-          IF (IDEBUG.GE.2) PRINT *, D12, D13, D23
-         END DO
-      ENDIF
-!
-! find the second nearest neighbours of atom i : they are
-! the nearest neighbours of the nearest neighbours of i except i.
-      DO I=1,NC
-         NVOIS=0
-         DO J=1,3
-            IND=NEIGHB1(J,I)
-            IF (IND.EQ.0) CYCLE
-            DO K=1,3
-               IF (NEIGHB1(K,IND).NE.I) THEN
-                  NVOIS = NVOIS + 1
-                  IF (NVOIS.GT.6) THEN
-                     PRINT *,'error : too many 2nd nearest neighbours'
-                     PRINT *,'for atom nb :',I
-                     PRINT *,(NEIGHB1(L,I),L=1,3)
-                     PRINT *,(NEIGHB2(L,I),L=1,6)
-                     PRINT *,(NPOINT(L,I),L=1,6)
-                     PRINT *,NVOIS
-                  END IF
-                  NEIGHB2(NVOIS,I)=NEIGHB1(K,IND)
-                  NPOINT(NVOIS,I)=IND
-               END IF
-            END DO
-         END DO
-         DO J=NVOIS+1,6
-            NEIGHB2(J,I)=0
-            NPOINT(J,I)=0
-         END DO
-      END DO
-
-      IF ( PRESENT(NEIGHB2_OUT) ) NEIGHB2_OUT = NEIGHB2
-      IF ( PRESENT(NPOINT_OUT) ) NPOINT_OUT = NPOINT
-!
-! store coordinates
-      OPEN(UNIT=1,FILE="geom." // TRIM(ROOTNAME) )
-      IF (IDEBUG.GE.2) OPEN(UNIT=2,FILE="neighb2." // TRIM(ROOTNAME) )
-      DO 150 I=1,NC
-         WRITE(1,1070) NEIGHB1(1,I),NEIGHB1(2,I),NEIGHB1(3,I),COORD(:,I)
- 1070    FORMAT(3I5,3F12.3)
-       IF (IDEBUG.GE.2) WRITE(2,*) (NEIGHB2(J,I),J=1,6),  &
-     &                               (NPOINT(J,I),J=1,6)
- 150  CONTINUE
-      PRINT *, "file geom." // TRIM(ROOTNAME) // " written with ",       &
-     &            NC, " atoms"
-      CLOSE(1)
-      IF (IDEBUG.GE.2) CLOSE(2)
-!
-! Try to find the indices of the atoms composing the same
-! pentagon or the same hexagon or the same heptagon
-      NHEXA=0
-      NPENTA=0
-      NHEPTA=0
-      DO 200 I=1,NC
-         DO 210 J=1,6
-! loop on the second nearest neighbours of atom i
-! ind1 is the index of the j th second nearest neighbour of i
-          IND1=NEIGHB2(J,I)
-          IF (IND1.EQ.0) GOTO 210
-! npo1 is the index of the atom which is between atoms i and ind1
-          NPO1=NPOINT(J,I)
-! if ind1 < i or npo1 < i then the polygon must have already been found
-          IF (IND1.LE.I.OR.NPO1.LE.I) GOTO 210
-            DO 220 K=J+1,6
-! find between the other second nearest neighbours of atom i
-! which one is also a second nearest neighbour of atom ind1 without
-! having a nearest neighbour in common with atom ind1
-             IND2=NEIGHB2(K,I)
-             IF (IND2.EQ.0) GOTO 220
-! npo2 is the index of the atom which is between atoms i and ind2
-             NPO2=NPOINT(K,I)
-!            PRINT *,'I,IND1,NPO1,IND2,NPO2',I,IND1,NPO1,IND2,NPO2
-! if ind2 < i or npo2 < i then the polygon must have already been found
-! if npo1=npo2 ind1,ind2 and i have a common nearest neighbour ->
-! they belong to different polygons
-             IF (IND2.LE.I.OR.NPO2.LE.I.OR.NPO1.EQ.NPO2) GOTO 220
-! first deal with all the possible cases to get a pentagon, because
-! when a pentagon is near an heptagon, it can be mismatched for
-! the heptagon
-             IF (NEIGHB1(1,IND1).EQ.IND2.OR.                             &
-     &           NEIGHB1(2,IND1).EQ.IND2.OR.                             &
-     &           NEIGHB1(3,IND1).EQ.IND2) THEN
-! We have found a pentagon ! store it !
-                NPENTA=NPENTA+1
-                  IPENTA(1,NPENTA)=I
-                IPENTA(2,NPENTA)=NPO1
-            IPENTA(3,NPENTA)=IND1
-            IPENTA(4,NPENTA)=IND2
-            IPENTA(5,NPENTA)=NPO2
-! the secound nearest neighbours belong only to one polygon
-! in common with i
-            GOTO 210
-             ENDIF
-               DO 230 L=1,3
-            NIND1=NEIGHB1(L,IND1)
-            IF (NIND1.EQ.0) GOTO 230
-            IF (NIND1.EQ.NPO1.OR.NIND1.LE.I)  GOTO 230
-! if it is not a pentagon it must be an hexagon or an heptagon ->
-!     is ind1 a second nearest neighbour to ind2 ?
-            DO 240 N=1,3
-               NIND2=NEIGHB1(N,IND2)
-               IF (NIND2.EQ.0.OR.NIND2.EQ.NPO2) GOTO 240
-!              PRINT *,'NIND1,NIND2',NIND1,NIND2
-               IF (NIND2.EQ.NIND1) THEN
-! We have completed an hexagon ! Find the indices of the members
-! of this hexagon.
-                        NHEXA=NHEXA+1
-                        IHEXA(1,NHEXA)=I
-                        IHEXA(2,NHEXA)=NPO1
-                  IHEXA(3,NHEXA)=IND1
-                  IHEXA(4,NHEXA)=NIND2
-                  IHEXA(5,NHEXA)=IND2
-                  IHEXA(6,NHEXA)=NPO2
-                  GOTO 210
-               ELSE
-! May be an heptagon ? Is NIND1 a nearest neighbour to NIND2
-                  DO M=1,3
-                 IF (NEIGHB1(M,NIND1).EQ.NIND2) THEN
-! It IS an heptagon ! store it
-                              NHEPTA=NHEPTA+1
-                    IHEPTA(1,NHEPTA)=I
-                    IHEPTA(2,NHEPTA)=NPO1
-                    IHEPTA(3,NHEPTA)=IND1
-                    IHEPTA(4,NHEPTA)=NIND1
-                    IHEPTA(5,NHEPTA)=NIND2
-                    IHEPTA(6,NHEPTA)=IND2
-                    IHEPTA(7,NHEPTA)=NPO2
-                        GOTO 210
-                           ENDIF
-                        ENDDO
-               ENDIF
- 240              CONTINUE
- 230           CONTINUE
- 220        CONTINUE
- 210     CONTINUE
- 200  CONTINUE
-!
-      IF (IDEBUG.GE.1) PRINT *,'Hexagons :'
-      IF ( NHEXA .GT. 0 ) THEN
-         OPEN(UNIT=16,FILE="hexa." // TRIM(ROOTNAME) )
-         DO I=1,NHEXA
-          IF (IDEBUG.GE.1) PRINT *,(IHEXA(J,I),J=1,6)
-          WRITE(16,*) (IHEXA(J,I),J=1,6)
-         ENDDO
-         CLOSE(16)
-       PRINT *, "file hexa." // TRIM(ROOTNAME) // " written with ",      &
-     &            NHEXA, " hexagons"
-      END IF
-      IF ( NPENTA .GT. 0 ) THEN
-         IF (IDEBUG.GE.1) PRINT *,'Pentagons :'
-         OPEN(UNIT=15,FILE="penta." // TRIM(ROOTNAME) )
-         DO I=1,NPENTA
-          IF (IDEBUG.GE.1) PRINT *,(IPENTA(J,I),J=1,5)
-          WRITE(15,*) (IPENTA(J,I),J=1,5)
-         ENDDO
-         CLOSE(15)
-       PRINT *, "file penta." // TRIM(ROOTNAME) // " written with ",     &
-     &            NPENTA, " pentagons"
-      END IF
-      IF ( NHEPTA .GT. 0 ) THEN
-         IF (IDEBUG.GE.1) PRINT *,'heptagons :'
-         OPEN(UNIT=17,FILE="hepta." // TRIM(ROOTNAME) )
-         DO I=1,NHEPTA
-          IF (IDEBUG.GE.1) PRINT *,(IHEPTA(J,I),J=1,7)
-          WRITE(17,*) (IHEPTA(J,I),J=1,7)
-         ENDDO
-         CLOSE(17)
-       PRINT *, "file hepta." // TRIM(ROOTNAME) // " written with ",     &
-     &            NHEPTA, " heptagons"
-      END IF
-
-      Contains
-
-       Real(kind=8) Function Norm(VECT)
-         use kinds
-
-         IMPLICIT NONE
-
-         Real(kind=r_),intent(in) :: VECT(:)
-         NORM = SQRT( DOT_PRODUCT(VECT,VECT) )
-      END Function NORM
-
- 9999 END SUBROUTINE Get_geom

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug314450.f03 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug314450.f03
deleted file mode 100644
index 02e8d9a..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug314450.f03
+++ /dev/null

@@ -1,7 +0,0 @@
-program bug314450
-
-select type (xx)
-type is (xmotion)
-end select
-
-end program bug314450

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug320148.f b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug320148.f
deleted file mode 100644
index 6108a2c..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug320148.f
+++ /dev/null

@@ -1,26 +0,0 @@
-      complex*16    H(ldh,m), wsp(lwsp)
-
-      double precision jj
-      double complex  complex
-      double complex*16  j2
-
-      doubleprecision kk
-      doublecomplex  doublecomplex
-      doublecomplex*16  k2
-
-      double complex :: n
-
-      complex l
-      complex :: m
-
-      integer a /3/
-      integer b /4/, c /6/
-
-      goto 10
-   10 assign 30 to next
-
-      do 300 h=1,2
-        print *, "!"
-      end do
-
-      end

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug320148.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug320148.f90
deleted file mode 100644
index 6108a2c..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug320148.f90
+++ /dev/null

@@ -1,26 +0,0 @@
-      complex*16    H(ldh,m), wsp(lwsp)
-
-      double precision jj
-      double complex  complex
-      double complex*16  j2
-
-      doubleprecision kk
-      doublecomplex  doublecomplex
-      doublecomplex*16  k2
-
-      double complex :: n
-
-      complex l
-      complex :: m
-
-      integer a /3/
-      integer b /4/, c /6/
-
-      goto 10
-   10 assign 30 to next
-
-      do 300 h=1,2
-        print *, "!"
-      end do
-
-      end

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug329745a1.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug329745a1.f90
deleted file mode 100644
index 44cfdb5..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug329745a1.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-program test_preprocessor
-    implicit none
-
-#   ifdef __linux
-     character, parameter :: sep = '/'
-#   else
-     character, parameter :: sep = '\'
-#   endif
-
-end program test_preprocessor

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug329745a2.F90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug329745a2.F90
deleted file mode 100644
index 44cfdb5..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug329745a2.F90
+++ /dev/null

@@ -1,10 +0,0 @@
-program test_preprocessor
-    implicit none
-
-#   ifdef __linux
-     character, parameter :: sep = '/'
-#   else
-     character, parameter :: sep = '\'
-#   endif
-
-end program test_preprocessor

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug329745b.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug329745b.f90
deleted file mode 100644
index d0443a2..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug329745b.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-module test_import
-    implicit none
-
-    use something, only: method_a
-
-    abstract interface
-        function interface_record(this) result(status)
-            import
-            logical :: status
-            class(method_a), target, intent(INOUT) :: this
-        end function
-    end interface
-
-end module test_import

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug329745c.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug329745c.f90
deleted file mode 100644
index b420268..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug329745c.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-program test_case
-
-    use somemodule
-
-    implicit none
-
-    MAIN_LOOP: do
-        select case (mode)
-            case (SOMETHING)
-                if (.NOT. object%method(DO_IT = .TRUE.)) goto 300
-            case default
-                exit MAIN_LOOP
-        end select
-    enddo MAIN_LOOP
-
-    stop
-
-300 stop 'Failure'
-
-end program test_case

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug331850.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug331850.f90
deleted file mode 100644
index 9c5dd10..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug331850.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-forall (i=1:10, j=1:10) A(i,j) = 2.0
-
-forall (i=1:10, j=1:10)
-  A(i,j) = 2.0
-end forall
-
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug337623.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug337623.f90
deleted file mode 100644
index 65f2bc6..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/bug337623.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-PROGRAM main
-
-    CALL MySub(5)
-
-END PROGRAM
-
-SUBROUTINE MySub(n)
-
-      implicit           logical (a-z)
-      integer            n
-      integer            nzloc(n)
-
-END SUBROUTINE

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/formatbugs.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/formatbugs.f90
deleted file mode 100644
index fe4e648..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/formatbugs.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-10    format(F5.4,3E2.1)
-
-148       FORMAT (/ ' *TestForBackup*  Backup due to too large a fractional ', 'change in core power.' / )
-149       FORMAT ( / ' *TestForBackup*  Backup due to too large a fractional ', 'change in core power.' /)
-150       FORMAT ( / ' *TestForBackup*  Backup due to too large a fractional change in core power.', // )
-
-         ictl(1:6) = ( / ictl1, ictl2, 1, 0, 0, 0 / )
-         ictl(1:6) = (/ ictl1, ictl2, 1, 0, 0, 0 /)
-
-FORMAT(1X,I10,1X,I10,1X,E15.7,I10,1X,I10,1X,I3/)
-
-data radii/(12*(fcasts+1))*0/
-
-9973 FORMAT(/,1X,'!!!!!! EXECUTION WILL NOW BE TERMINATED !!!!!!',//)
-
-      end
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/valref.f90 b/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/valref.f90
deleted file mode 100644
index d5f0553..0000000
--- a/org.eclipse.photran.core.vpg.tests/parser-test-code/reg_tests/valref.f90
+++ /dev/null

@@ -1,5 +0,0 @@
-subroutine s(%val(f), %ref(g))
-end subroutine
-
-function f(%val(f), %ref(g))
-end function
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test1/test1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test1/test1.f90
deleted file mode 100644
index e7806dd..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test1/test1.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-program p

-    a = 3

-    d = 4

-

-    stop

-    contains

-	recursive subroutine s !<<<<<7,5,7,15,pass

-

-	integer ::a

-	call s

-	end subroutine

-

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test1/test1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test1/test1.f90.result
deleted file mode 100644
index fbb5508..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test1/test1.f90.result
+++ /dev/null

@@ -1,7 +0,0 @@
-program p

-    a = 3

-    d = 4

-

-    stop

-

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test2/test2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test2/test2.f90
deleted file mode 100644
index a0e281d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test2/test2.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-program p

-    a = 3

-    d = 4

-	call s 

-    stop

-    contains

-	subroutine s !<<<<<7,5,7,15,fail-initial

-

-	integer ::a

-	call s

-	end subroutine

-

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test3/test3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test3/test3.f90
deleted file mode 100644
index 6909d96..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test3/test3.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-program p

-    a = 3

-    d = 4

-  interface

-    subroutine s

-    end subroutine s

-  end interface

-    stop

-end program

-

-subroutine s !<<<<<11,1,11,11,fail-initial

-

-	integer ::a

-	call s

-	end subroutine

-


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test4/test4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test4/test4.f90
deleted file mode 100644
index 22c2e16..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test4/test4.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-program p

-    a = 3

-    d = 4

-   stop

-end program

-

-    subroutine s !<<<<<7,5,7,15,fail-initial

-

-	integer ::a

-	call s

-	end subroutine

-


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test5/test5.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test5/test5.f90
deleted file mode 100644
index c42929d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test5/test5.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-module class_test

-

- private :: s

-

- integer :: a

-

- contains

-

- subroutine s !<<<<<9,2,9,12,pass

-  integer ::a

-

-	end subroutine

-

-

-end module class_test

-program main; use class_test; a = 2; end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test5/test5.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test5/test5.f90.result
deleted file mode 100644
index 7c2fcb2..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/Safe-Delete-Internal-Subprogram/test5/test5.f90.result
+++ /dev/null

@@ -1,7 +0,0 @@
-module class_test

-

- integer :: a

-

-

-end module class_test

-program main; use class_test; a = 2; end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test1/test1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test1/test1.f90
deleted file mode 100644
index e97eb87..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test1/test1.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-program fortrantest !<<<<< 1,1,pass
-
-print *, "Main program!"
-
-end program fortrantest
-
-subroutine do_stuff
-
-	print *,"Hi!"
-
-end subroutine
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test1/test1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test1/test1.f90.result
deleted file mode 100644
index 586b30b..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test1/test1.f90.result
+++ /dev/null

@@ -1,11 +0,0 @@
-program fortrantest !<<<<< 1,1,pass
-
-print *, "Main program!"
-
-end program fortrantest
-
-subroutine do_stuff
-
-	print *,"Hi!"
-
-end subroutine do_stuff

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test2/test2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test2/test2.f90
deleted file mode 100644
index 785f713..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test2/test2.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-program fortrantest !<<<<< 1,1,pass
-
-print *, "Main program!"
-
-end program
-
-subroutine do_stuff
-
-	print *,"Hi!"
-
-end subroutine
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test2/test2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test2/test2.f90.result
deleted file mode 100644
index 586b30b..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test2/test2.f90.result
+++ /dev/null

@@ -1,11 +0,0 @@
-program fortrantest !<<<<< 1,1,pass
-
-print *, "Main program!"
-
-end program fortrantest
-
-subroutine do_stuff
-
-	print *,"Hi!"
-
-end subroutine do_stuff

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test3/test3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test3/test3.f90
deleted file mode 100644
index 39c76a6..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test3/test3.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-module testmodule
-	integer :: xfromtestmodule
-end module
-
-program fortrantest !<<<<< 1,1,pass
-
-print *, "Main program!"
-
-end program
-
-subroutine do_stuff
-
-	print *,"Hi!"
-
-end subroutine
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test3/test3.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test3/test3.f90.result
deleted file mode 100644
index f7f9b07..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test3/test3.f90.result
+++ /dev/null

@@ -1,15 +0,0 @@
-module testmodule
-	integer :: xfromtestmodule
-end module testmodule
-
-program fortrantest !<<<<< 1,1,pass
-
-print *, "Main program!"
-
-end program fortrantest
-
-subroutine do_stuff
-
-	print *,"Hi!"
-
-end subroutine do_stuff

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test4/test4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test4/test4.f90
deleted file mode 100644
index 1ebc9b2..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test4/test4.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-module testmodule
-	integer :: xfromtestmodule
-end module
-
-function testfunction(A)
-	integer, intent(in) :: A
-	testfunction = 4;
-end function
-
-program fortrantest !<<<<< 1,1,pass
-
-print *, "Main program!"
-
-end program
-
-subroutine do_stuff
-
-	print *,"Hi!"
-
-end subroutine
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test4/test4.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test4/test4.f90.result
deleted file mode 100644
index d157c83..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test4/test4.f90.result
+++ /dev/null

@@ -1,20 +0,0 @@
-module testmodule
-	integer :: xfromtestmodule
-end module testmodule
-
-function testfunction(A)
-	integer, intent(in) :: A
-	testfunction = 4;
-end function testfunction
-
-program fortrantest !<<<<< 1,1,pass
-
-print *, "Main program!"
-
-end program fortrantest
-
-subroutine do_stuff
-
-	print *,"Hi!"
-
-end subroutine do_stuff

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test5/test5.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test5/test5.f90
deleted file mode 100644
index c80c33d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test5/test5.f90
+++ /dev/null

@@ -1,28 +0,0 @@
-module testmodule
-	integer :: xfromtestmodule
-end
-
-function testfunction(A)
-	integer, intent(in) :: A
-	testfunction = 4;
-end
-
-program fortrantest !<<<<< 1,1,pass
-
-	print *, "Main program!"
-
-contains
-	integer function testfunction(A)
-		integer, intent(in) :: A
-		testfunction = 4;
-	end function
-	subroutine do_stuff
-		print *,"Hi!"
-	end subroutine
-end
-
-subroutine do_stuff
-
-	print *,"Hi!"
-
-end
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test5/test5.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test5/test5.f90.result
deleted file mode 100644
index f3a7d96..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test5/test5.f90.result
+++ /dev/null

@@ -1,28 +0,0 @@
-module testmodule
-	integer :: xfromtestmodule
-end module testmodule
-
-function testfunction(A)
-	integer, intent(in) :: A
-	testfunction = 4;
-end function testfunction
-
-program fortrantest !<<<<< 1,1,pass
-
-	print *, "Main program!"
-
-contains
-	integer function testfunction(A)
-		integer, intent(in) :: A
-		testfunction = 4;
-	end function testfunction
-	subroutine do_stuff
-		print *,"Hi!"
-	end subroutine do_stuff
-end program fortrantest
-
-subroutine do_stuff
-
-	print *,"Hi!"
-
-end subroutine do_stuff

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test6/test6.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test6/test6.f90
deleted file mode 100644
index 44aa350..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test6/test6.f90
+++ /dev/null

@@ -1,29 +0,0 @@
-module testmodule
-	integer :: xfromtestmodule
-10 end
-
-function testfunction(A)
-	integer, intent(in) :: A
-	testfunction = 4;
-20 end ! Hey this is a comment in a weird spot!!!
-
-!<<<<< 1,1,pass
-
-	print *, "Main program!"
-
-contains
-	integer function testfunction(A)
-		integer, intent(in) :: A
-		testfunction = 4;
-30	end function
-	subroutine do_stuff
-		print *,"Hi!"
-40	end subroutine
-! I am a big fan of printing greetings
-end
-
-subroutine do_stuff
-
-	print *,"Hi!"
-! What a weird place to put a comment, right?
-50 end
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test6/test6.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test6/test6.f90.result
deleted file mode 100644
index 1621832..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-identifier-to-end/test6/test6.f90.result
+++ /dev/null

@@ -1,29 +0,0 @@
-module testmodule
-	integer :: xfromtestmodule
-10 end module testmodule
-
-function testfunction(A)
-	integer, intent(in) :: A
-	testfunction = 4;
-20 end function testfunction ! Hey this is a comment in a weird spot!!!
-
-!<<<<< 1,1,pass
-
-	print *, "Main program!"
-
-contains
-	integer function testfunction(A)
-		integer, intent(in) :: A
-		testfunction = 4;
-30	end function testfunction
-	subroutine do_stuff
-		print *,"Hi!"
-40	end subroutine do_stuff
-! I am a big fan of printing greetings
-end
-
-subroutine do_stuff
-
-	print *,"Hi!"
-! What a weird place to put a comment, right?
-50 end subroutine do_stuff

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test1/module2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test1/module2.f90
deleted file mode 100644
index fbc4a9a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test1/module2.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-module module2

-    implicit none

-

-    contains

-    subroutine help_common2

-        common /block/ d, e, f

-        integer :: d

-        real :: e

-        double precision :: f

-    end subroutine help_common2

-end module module2


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test1/module3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test1/module3.f90
deleted file mode 100644
index b029e6a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test1/module3.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-module module3

-    implicit none

-    integer :: onlyTest = 2

-

-    contains

-    subroutine help_common3

-        common /block/ r, s, t

-        integer :: r

-        real :: s

-        double precision :: t

-

-		print *, onlyTest

-    end subroutine help_common3

-end module module3


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test1/module4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test1/module4.f90
deleted file mode 100644
index 1df11d8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test1/module4.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-module module4

-    implicit none

-	integer f

-

-    contains

-    subroutine help_common4

-        common /mem/ a, b, c

-        integer :: a, b, c

-    end subroutine help_common4

-end module module4


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test1/test1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test1/test1.f90
deleted file mode 100644
index 0a54ff8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test1/test1.f90
+++ /dev/null

@@ -1,27 +0,0 @@
-program program1 !basic test, add no list, leave the file the same

-use module2

-use module3 !<<<<< 3, 5, 3, 12,, pass

-use module4, only: help_common4

-implicit none

-

-common /block/ a, b, c, /mem/ r, f, t

-integer :: a

-real :: b

-double precision :: c

-

-integer :: r, f, t

-

-a = 5

-b = 4.6

-c = 2.345

-

-call helper

-end program program1

-

-subroutine helper

-implicit none

-common /block/ e, f, g

-integer :: e

-real :: f

-double precision :: g

-end subroutine helper


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test1/test1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test1/test1.f90.result
deleted file mode 100644
index fc8f8ce..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test1/test1.f90.result
+++ /dev/null

@@ -1,27 +0,0 @@
-program program1 !basic test, add no list, leave the file the same

-use module2

-use module3

-use module4, only: help_common4

-implicit none

-

-common /block/ a, b, c, /mem/ r, f, t

-integer :: a

-real :: b

-double precision :: c

-

-integer :: r, f, t

-

-a = 5

-b = 4.6

-c = 2.345

-

-call helper

-end program program1

-

-subroutine helper

-implicit none

-common /block/ e, f, g

-integer :: e

-real :: f

-double precision :: g

-end subroutine helper


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test2/module2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test2/module2.f90
deleted file mode 100644
index fbc4a9a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test2/module2.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-module module2

-    implicit none

-

-    contains

-    subroutine help_common2

-        common /block/ d, e, f

-        integer :: d

-        real :: e

-        double precision :: f

-    end subroutine help_common2

-end module module2


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test2/module3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test2/module3.f90
deleted file mode 100644
index b029e6a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test2/module3.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-module module3

-    implicit none

-    integer :: onlyTest = 2

-

-    contains

-    subroutine help_common3

-        common /block/ r, s, t

-        integer :: r

-        real :: s

-        double precision :: t

-

-		print *, onlyTest

-    end subroutine help_common3

-end module module3


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test2/module4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test2/module4.f90
deleted file mode 100644
index 1df11d8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test2/module4.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-module module4

-    implicit none

-	integer f

-

-    contains

-    subroutine help_common4

-        common /mem/ a, b, c

-        integer :: a, b, c

-    end subroutine help_common4

-end module module4


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test2/test2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test2/test2.f90
deleted file mode 100644
index 3613028..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test2/test2.f90
+++ /dev/null

@@ -1,27 +0,0 @@
-program program1 !basic test, add list of given names

-use module2

-use module3 !<<<<< 3, 5, 3, 12, help_common3, onlyTest, pass

-use module4, only: help_common4

-implicit none

-

-common /block/ a, b, c, /mem/ r, f, t

-integer :: a

-real :: b

-double precision :: c

-

-integer :: r, f, t

-

-a = 5

-b = 4.6

-c = 2.345

-

-call helper

-end program program1

-

-subroutine helper

-implicit none

-common /block/ e, f, g

-integer :: e

-real :: f

-double precision :: g

-end subroutine helper


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test2/test2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test2/test2.f90.result
deleted file mode 100644
index 9fd5791..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test2/test2.f90.result
+++ /dev/null

@@ -1,27 +0,0 @@
-program program1 !basic test, add list of given names

-use module2

-use module3, only: help_common3, onlytest

-use module4, only: help_common4

-implicit none

-

-common /block/ a, b, c, /mem/ r, f, t

-integer :: a

-real :: b

-double precision :: c

-

-integer :: r, f, t

-

-a = 5

-b = 4.6

-c = 2.345

-

-call helper

-end program program1

-

-subroutine helper

-implicit none

-common /block/ e, f, g

-integer :: e

-real :: f

-double precision :: g

-end subroutine helper


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test3/module2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test3/module2.f90
deleted file mode 100644
index fbc4a9a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test3/module2.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-module module2

-    implicit none

-

-    contains

-    subroutine help_common2

-        common /block/ d, e, f

-        integer :: d

-        real :: e

-        double precision :: f

-    end subroutine help_common2

-end module module2


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test3/module3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test3/module3.f90
deleted file mode 100644
index b029e6a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test3/module3.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-module module3

-    implicit none

-    integer :: onlyTest = 2

-

-    contains

-    subroutine help_common3

-        common /block/ r, s, t

-        integer :: r

-        real :: s

-        double precision :: t

-

-		print *, onlyTest

-    end subroutine help_common3

-end module module3


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test3/module4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test3/module4.f90
deleted file mode 100644
index 1df11d8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test3/module4.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-module module4

-    implicit none

-	integer f

-

-    contains

-    subroutine help_common4

-        common /mem/ a, b, c

-        integer :: a, b, c

-    end subroutine help_common4

-end module module4


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test3/module5.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test3/module5.f90
deleted file mode 100644
index 0888ffa..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test3/module5.f90
+++ /dev/null

@@ -1,3 +0,0 @@
-module module5

-    implicit none

-end module module5


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test3/test3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test3/test3.f90
deleted file mode 100644
index 8cf53d5..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test3/test3.f90
+++ /dev/null

@@ -1,28 +0,0 @@
-program program1 !precondition test - give an empty selection for module name

-use module2

-use module3 !<<<<< 3, 5, 3, 5,, fail-initial

-use module4, only: help_common4

-use module5

-implicit none

-

-common /block/ a, b, c, /mem/ r, f, t

-integer :: a

-real :: b

-double precision :: c

-

-integer :: r, f, t

-

-a = 5

-b = 4.6

-c = 2.345

-

-call helper

-end program program1

-

-subroutine helper

-implicit none

-common /block/ e, f, g

-integer :: e

-real :: f

-double precision :: g

-end subroutine helper


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test4/module2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test4/module2.f90
deleted file mode 100644
index fbc4a9a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test4/module2.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-module module2

-    implicit none

-

-    contains

-    subroutine help_common2

-        common /block/ d, e, f

-        integer :: d

-        real :: e

-        double precision :: f

-    end subroutine help_common2

-end module module2


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test4/module3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test4/module3.f90
deleted file mode 100644
index b029e6a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test4/module3.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-module module3

-    implicit none

-    integer :: onlyTest = 2

-

-    contains

-    subroutine help_common3

-        common /block/ r, s, t

-        integer :: r

-        real :: s

-        double precision :: t

-

-		print *, onlyTest

-    end subroutine help_common3

-end module module3


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test4/module4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test4/module4.f90
deleted file mode 100644
index 1df11d8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test4/module4.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-module module4

-    implicit none

-	integer f

-

-    contains

-    subroutine help_common4

-        common /mem/ a, b, c

-        integer :: a, b, c

-    end subroutine help_common4

-end module module4


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test4/module5.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test4/module5.f90
deleted file mode 100644
index 0888ffa..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test4/module5.f90
+++ /dev/null

@@ -1,3 +0,0 @@
-module module5

-    implicit none

-end module module5


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test4/test3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test4/test3.f90
deleted file mode 100644
index 4027086..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test4/test3.f90
+++ /dev/null

@@ -1,28 +0,0 @@
-program program1 !precondition test - give a non-existent module name

-use module2

-use module3

-use module4, only: help_common4

-use module5

-implicit none

-

-common /block/ a, b, c, /mem/ r, f, t !<<<<< 8, 9, 8, 14,, fail-initial 

-integer :: a

-real :: b

-double precision :: c

-

-integer :: r, f, t

-

-a = 5

-b = 4.6

-c = 2.345

-

-call helper

-end program program1

-

-subroutine helper

-implicit none

-common /block/ e, f, g

-integer :: e

-real :: f

-double precision :: g

-end subroutine helper


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test5/module2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test5/module2.f90
deleted file mode 100644
index fbc4a9a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test5/module2.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-module module2

-    implicit none

-

-    contains

-    subroutine help_common2

-        common /block/ d, e, f

-        integer :: d

-        real :: e

-        double precision :: f

-    end subroutine help_common2

-end module module2


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test5/module3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test5/module3.f90
deleted file mode 100644
index b029e6a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test5/module3.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-module module3

-    implicit none

-    integer :: onlyTest = 2

-

-    contains

-    subroutine help_common3

-        common /block/ r, s, t

-        integer :: r

-        real :: s

-        double precision :: t

-

-		print *, onlyTest

-    end subroutine help_common3

-end module module3


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test5/module4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test5/module4.f90
deleted file mode 100644
index 1df11d8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test5/module4.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-module module4

-    implicit none

-	integer f

-

-    contains

-    subroutine help_common4

-        common /mem/ a, b, c

-        integer :: a, b, c

-    end subroutine help_common4

-end module module4


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test5/module5.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test5/module5.f90
deleted file mode 100644
index 0888ffa..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test5/module5.f90
+++ /dev/null

@@ -1,3 +0,0 @@
-module module5

-    implicit none

-end module module5


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test5/test3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test5/test3.f90
deleted file mode 100644
index 83d2bd0..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test5/test3.f90
+++ /dev/null

@@ -1,28 +0,0 @@
-program program1 !precondition test - give a module containing no declarations

-use module2

-use module3

-use module4, only: help_common4

-use module5 !<<<<< 5,5,5,12,,fail-initial

-implicit none

-

-common /block/ a, b, c, /mem/ r, f, t !<<<<< 8, 9, 8, 14,, fail-initial 

-integer :: a

-real :: b

-double precision :: c

-

-integer :: r, f, t

-

-a = 5

-b = 4.6

-c = 2.345

-

-call helper

-end program program1

-

-subroutine helper

-implicit none

-common /block/ e, f, g

-integer :: e

-real :: f

-double precision :: g

-end subroutine helper


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test6/module4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test6/module4.f90
deleted file mode 100644
index 1df11d8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test6/module4.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-module module4

-    implicit none

-	integer f

-

-    contains

-    subroutine help_common4

-        common /mem/ a, b, c

-        integer :: a, b, c

-    end subroutine help_common4

-end module module4


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test6/test6.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test6/test6.f90
deleted file mode 100644
index eaf413d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test6/test6.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program test6 !pass

-    use module4 !<<<<< 2, 9, 2, 16, f, pass

-    implicit none

-    integer f

-    f = 4

-end program test6


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test7/module4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test7/module4.f90
deleted file mode 100644
index 1df11d8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test7/module4.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-module module4

-    implicit none

-	integer f

-

-    contains

-    subroutine help_common4

-        common /mem/ a, b, c

-        integer :: a, b, c

-    end subroutine help_common4

-end module module4


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test7/test7.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test7/test7.f90
deleted file mode 100644
index 20ea8a8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test7/test7.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-program test7 !precondition test - have 2 modules in project with same name

-    use module4 !<<<<< 2, 9, 2, 16,, fail-initial

-    implicit none

-

-end program test7

-

-module module4

-    implicit none

-    contains

-        subroutine help

-        end subroutine

-end module


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test8/module4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test8/module4.f90
deleted file mode 100644
index 1df11d8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test8/module4.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-module module4

-    implicit none

-	integer f

-

-    contains

-    subroutine help_common4

-        common /mem/ a, b, c

-        integer :: a, b, c

-    end subroutine help_common4

-end module module4


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test8/test8.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test8/test8.f90
deleted file mode 100644
index d18a3a1..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test8/test8.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-program test8 !precondition test - have 2 declarations of subroutine in same project

-    use module4 !<<<<< 2, 9, 2, 16,, pass

-    implicit none

-

-    call help_common4

-end program test8

-

-subroutine help_common4

-    implicit none

-    real blah

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test8/test8.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test8/test8.f90.result
deleted file mode 100644
index 6a07d76..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test8/test8.f90.result
+++ /dev/null

@@ -1,11 +0,0 @@
-program test8 !precondition test - have 2 declarations of subroutine in same project

-    use module4, only: help_common4

-    implicit none

-

-    call help_common4

-end program test8

-

-subroutine help_common4

-    implicit none

-    real blah

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test9/module.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test9/module.f90
deleted file mode 100644
index 5d60272..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test9/module.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-module module1

-    implicit none

-    integer :: accessed_variable = 1, assigned_variable, unused_variable

-    integer, private :: private_variable

-    private :: private_subroutine

-contains

-    subroutine called_subroutine; end subroutine

-    subroutine unused_subroutine; end subroutine

-    subroutine private_subroutine; end subroutine

-end module module1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test9/test9.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test9/test9.f90
deleted file mode 100644
index f53a6f5..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test9/test9.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-program main !requires refactoring to add entities already being used in the module to the ONLY list

-    use module1 !<<<<< 2, 9, 2, 16,, pass

-    implicit none

-

-    assigned_variable = accessed_variable

-    call called_subroutine

-end program main


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test9/test9.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test9/test9.f90.result
deleted file mode 100644
index 056b310..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-only-to-use-stmt/test9/test9.f90.result
+++ /dev/null

@@ -1,7 +0,0 @@
-program main !requires refactoring to add entities already being used in the module to the ONLY list

-    use module1, only: accessed_variable, assigned_variable, called_subroutine

-    implicit none

-

-    assigned_variable = accessed_variable

-    call called_subroutine

-end program main


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test1-basic/add_subroutine_parameter_1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test1-basic/add_subroutine_parameter_1.f90
deleted file mode 100644
index 6434c52..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test1-basic/add_subroutine_parameter_1.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program basic ! basic test, adding an integer with intent in, default value 0, at position 0.

-

-end program basic

-subroutine sub(z) !<<<<< 4, 1, 4, 5, integer; intent(in) :: y, 0, 0, pass

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test1-basic/add_subroutine_parameter_1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test1-basic/add_subroutine_parameter_1.f90.result
deleted file mode 100644
index 974b32c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test1-basic/add_subroutine_parameter_1.f90.result
+++ /dev/null

@@ -1,7 +0,0 @@
-program basic ! basic test, adding an integer with intent in, default value 0, at position 0.

-

-end program basic

-subroutine sub(y,z) !<<<<< 4, 1, 4, 5, integer; intent(in) :: y, 0, 0, pass

-    integer, intent(in) :: y

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test10-fail-invalidtype/add_subroutine_parameter_10.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test10-fail-invalidtype/add_subroutine_parameter_10.f90
deleted file mode 100644
index cb501f4..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test10-fail-invalidtype/add_subroutine_parameter_10.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program invalidtype ! Fails because the type specified is invalid in the declaration line.

-

-end program invalidtype

-subroutine sub(z) !<<<<< 4, 1, 4, 5, invalidtype :: y, 0, 0, fail-final

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test11-updatecallsitewhenvariablenamesaddedincall/add_subroutine_parameter_11.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test11-updatecallsitewhenvariablenamesaddedincall/add_subroutine_parameter_11.f90
deleted file mode 100644
index 30773eb..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test11-updatecallsitewhenvariablenamesaddedincall/add_subroutine_parameter_11.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-program variablenameaddedincallsite ! Tests that when y is added, the call site adds y=0

-    implicit none

-    call sub(z=2)

-end program variablenameaddedincallsite

-subroutine sub(z) !<<<<< 5, 1, 5, 5, integer; intent(in) :: y, 1, 0, pass

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test11-updatecallsitewhenvariablenamesaddedincall/add_subroutine_parameter_11.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test11-updatecallsitewhenvariablenamesaddedincall/add_subroutine_parameter_11.f90.result
deleted file mode 100644
index 30a7722..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test11-updatecallsitewhenvariablenamesaddedincall/add_subroutine_parameter_11.f90.result
+++ /dev/null

@@ -1,8 +0,0 @@
-program variablenameaddedincallsite ! Tests that when y is added, the call site adds y=0

-    implicit none

-    call sub(z=2,y=0)

-end program variablenameaddedincallsite

-subroutine sub(z,y) !<<<<< 5, 1, 5, 5, integer; intent(in) :: y, 1, 0, pass

-    integer, intent(in) :: y

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test12-includevalidattributes/add_subroutine_parameter_12.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test12-includevalidattributes/add_subroutine_parameter_12.f90
deleted file mode 100644
index de084a3..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test12-includevalidattributes/add_subroutine_parameter_12.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program validattributes ! Tests that valid attributes (intent(inout)) are allowed.

-

-end program validattributes

-subroutine sub(z) !<<<<< 4, 1, 4, 5, integer; intent(inout) :: y, 0, 0, pass

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test12-includevalidattributes/add_subroutine_parameter_12.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test12-includevalidattributes/add_subroutine_parameter_12.f90.result
deleted file mode 100644
index 46c97da..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test12-includevalidattributes/add_subroutine_parameter_12.f90.result
+++ /dev/null

@@ -1,7 +0,0 @@
-program validattributes ! Tests that valid attributes (intent(inout)) are allowed.

-

-end program validattributes

-subroutine sub(y,z) !<<<<< 4, 1, 4, 5, integer; intent(inout) :: y, 0, 0, pass

-    integer, intent(inout) :: y

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test13-fail-invalidattribute/add_subroutine_parameter_13.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test13-fail-invalidattribute/add_subroutine_parameter_13.f90
deleted file mode 100644
index 250e531..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test13-fail-invalidattribute/add_subroutine_parameter_13.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program invalidvalidattributes ! Tests that invalid attributes fail

-

-end program invalidvalidattributes

-subroutine sub(z) !<<<<< 4, 1, 4, 5, integer; intent(inoot) :: y, 0, 0, fail-final

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test14-fail-conflictingattributes/add_subroutine_parameter_14.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test14-fail-conflictingattributes/add_subroutine_parameter_14.f90
deleted file mode 100644
index 5e5bd5d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test14-fail-conflictingattributes/add_subroutine_parameter_14.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program conflictingattributes ! Tests that conflicting attributes (two types) fail.

-

-end program conflictingattributes

-subroutine sub(z) !<<<<< 4, 1, 4, 5, integer; real; intent(out) :: y, 0, 0, fail-final

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test15-fail-conflictingvariablenames/add_subroutine_parameter_15.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test15-fail-conflictingvariablenames/add_subroutine_parameter_15.f90
deleted file mode 100644
index 25b2a26..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test15-fail-conflictingvariablenames/add_subroutine_parameter_15.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-program conflictingvariablenames ! Tests that a parameter cannot be given the same name as another in scope.

-

-end program conflictingvariablenames

-subroutine sub(z) !<<<<< 4, 1, 4, 5, integer; intent(in) :: alreadyused, 0, 0, fail-final

-	real :: alreadyused

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test16-fail-whitespacevariablename/add_subroutine_parameter_16.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test16-fail-whitespacevariablename/add_subroutine_parameter_16.f90
deleted file mode 100644
index ec2f807..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test16-fail-whitespacevariablename/add_subroutine_parameter_16.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program whitespacevariablename ! Tests that a variable name cannot be set to just white space.

-

-end program whitespacevariablename

-subroutine sub(z) !<<<<< 4, 1, 4, 5, integer; intent(inout) ::  	, 0, 0, fail-final

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test17-fail-parameternamebeginswithnumber/add_subroutine_parameter_17.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test17-fail-parameternamebeginswithnumber/add_subroutine_parameter_17.f90
deleted file mode 100644
index bd0d49e..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test17-fail-parameternamebeginswithnumber/add_subroutine_parameter_17.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program parameternamebeginswithnumber ! Tests that the variable name cannot begin with a number

-

-end program parameternamebeginswithnumber

-subroutine sub(z) !<<<<< 4, 1, 4, 5, integer :: 1y, 0, 0, fail-final

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test18-fail-defaultvalueisvariablestartingwithnumber/add_subroutine_parameter_18.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test18-fail-defaultvalueisvariablestartingwithnumber/add_subroutine_parameter_18.f90
deleted file mode 100644
index 3a81081..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test18-fail-defaultvalueisvariablestartingwithnumber/add_subroutine_parameter_18.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program defaultvalueisvariablestartingwithnumber ! Tests that the default value cannot be set to an invalid variable name

-

-end program defaultvalueisvariablestartingwithnumber

-subroutine sub(z) !<<<<< 4, 1, 4, 5, integer :: y, 0, 1defval, fail-final

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test19-fail-defaultvalueisrealwhentypeisinteger/add_subroutine_parameter_19.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test19-fail-defaultvalueisrealwhentypeisinteger/add_subroutine_parameter_19.f90
deleted file mode 100644
index d4d2534..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test19-fail-defaultvalueisrealwhentypeisinteger/add_subroutine_parameter_19.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program defaultvalueisrealforinteger ! Tests that an integer cannot be given a real default value.

-

-end program defaultvalueisrealforinteger

-subroutine sub(z) !<<<<< 4, 1, 4, 5, integer :: y, 0, 1.7, fail-final

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test2-updatecallsite/add_subroutine_parameter_2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test2-updatecallsite/add_subroutine_parameter_2.f90
deleted file mode 100644
index 9f7df91..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test2-updatecallsite/add_subroutine_parameter_2.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-program updatecallsite ! Tests that the call site is updated appropriately - basic.

-    implicit none

-    call sub(2)

-end program updatecallsite

-subroutine sub(z) !<<<<< 5, 1, 5, 5, integer; intent(in) :: y, 0, 0, pass

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test2-updatecallsite/add_subroutine_parameter_2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test2-updatecallsite/add_subroutine_parameter_2.f90.result
deleted file mode 100644
index 80ad088..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test2-updatecallsite/add_subroutine_parameter_2.f90.result
+++ /dev/null

@@ -1,8 +0,0 @@
-program updatecallsite ! Tests that the call site is updated appropriately - basic.

-    implicit none

-    call sub(0,2)

-end program updatecallsite

-subroutine sub(y,z) !<<<<< 5, 1, 5, 5, integer; intent(in) :: y, 0, 0, pass

-    integer, intent(in) :: y

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test20-fail-defaultvalueisnumberwhentypeisnonnumber/add_subroutine_parameter_20.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test20-fail-defaultvalueisnumberwhentypeisnonnumber/add_subroutine_parameter_20.f90
deleted file mode 100644
index 9374ac3..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test20-fail-defaultvalueisnumberwhentypeisnonnumber/add_subroutine_parameter_20.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program defaultvalueisnumberfornonnumbertype ! Tests that non number types cannot be given a number as a default value.

-

-end program defaultvalueisnumberfornonnumbertype

-subroutine sub(z) !<<<<< 4, 1, 4, 5, logical :: y, 0, 1, fail-final

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test21-fail-defaultvalueisnullwhentypeisnotpointer/add_subroutine_parameter_21.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test21-fail-defaultvalueisnullwhentypeisnotpointer/add_subroutine_parameter_21.f90
deleted file mode 100644
index efe6785..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test21-fail-defaultvalueisnullwhentypeisnotpointer/add_subroutine_parameter_21.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program defaultvalueisnullfornonpointer ! Tests that null cannot be the default value for a non pointer

-

-end program defaultvalueisnullfornonpointer

-subroutine sub(z) !<<<<< 4, 1, 4, 5, integer :: y, 0, null, fail-final

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test22-basicpointer/add_subroutine_parameter_22.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test22-basicpointer/add_subroutine_parameter_22.f90
deleted file mode 100644
index e7b0840..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test22-basicpointer/add_subroutine_parameter_22.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program basicpointer ! Tests that pointers can be passed as a parameter.

-

-end program basicpointer

-subroutine sub(z) !<<<<< 4, 1, 4, 5, integer; intent(in); pointer :: y, 0, null, pass

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test22-basicpointer/add_subroutine_parameter_22.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test22-basicpointer/add_subroutine_parameter_22.f90.result
deleted file mode 100644
index 61a51df..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test22-basicpointer/add_subroutine_parameter_22.f90.result
+++ /dev/null

@@ -1,7 +0,0 @@
-program basicpointer ! Tests that pointers can be passed as a parameter.

-

-end program basicpointer

-subroutine sub(y,z) !<<<<< 4, 1, 4, 5, integer; intent(in); pointer :: y, 0, null, pass

-    integer, intent(in), pointer :: y

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test3-updatecallsitewithorder/add_subroutine_parameter_3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test3-updatecallsitewithorder/add_subroutine_parameter_3.f90
deleted file mode 100644
index fad689b..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test3-updatecallsitewithorder/add_subroutine_parameter_3.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-program updatecallsitewithorder ! Tests that the position of the parameter is correctly set.

-    implicit none

-    call sub(2)

-end program updatecallsitewithorder

-subroutine sub(z) !<<<<< 5, 1, 5, 5, integer; intent(in) :: y, 1, 0, pass

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test3-updatecallsitewithorder/add_subroutine_parameter_3.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test3-updatecallsitewithorder/add_subroutine_parameter_3.f90.result
deleted file mode 100644
index d6a7c87..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test3-updatecallsitewithorder/add_subroutine_parameter_3.f90.result
+++ /dev/null

@@ -1,8 +0,0 @@
-program updatecallsitewithorder ! Tests that the position of the parameter is correctly set.

-    implicit none

-    call sub(2,0)

-end program updatecallsitewithorder

-subroutine sub(z,y) !<<<<< 5, 1, 5, 5, integer; intent(in) :: y, 1, 0, pass

-    integer, intent(in) :: y

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test4-fail-negativeposition/add_subroutine_parameter_4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test4-fail-negativeposition/add_subroutine_parameter_4.f90
deleted file mode 100644
index 5c38557..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test4-fail-negativeposition/add_subroutine_parameter_4.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program negativeposition ! Tests that the refactoring fails with negative positions requested.

-

-end program negativeposition

-subroutine sub(z) !<<<<< 4, 1, 4, 5, integer; intent(in) :: y, -1, 0, fail-final

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test5-fail-outofboundsposition/add_subroutine_parameter_5.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test5-fail-outofboundsposition/add_subroutine_parameter_5.f90
deleted file mode 100644
index 0f8e0e4..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test5-fail-outofboundsposition/add_subroutine_parameter_5.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program outofbounds ! Tests that the refactoring fails for requests to place the new parameter in a position that is out of bounds.

-

-end program outofbounds

-subroutine sub(z) !<<<<< 4, 1, 4, 5, integer; intent(in) :: y, 3, 0, fail-final

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test6-fail-whitespacedefaultvalue/add_subroutine_parameter_6.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test6-fail-whitespacedefaultvalue/add_subroutine_parameter_6.f90
deleted file mode 100644
index da6ea2b..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test6-fail-whitespacedefaultvalue/add_subroutine_parameter_6.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program whitespacedefaultvalue ! Tests that the refactoring does not allow the default value to be white space

-

-end program whitespacedefaultvalue

-subroutine sub(z) !<<<<< 4, 1, 4, 5, integer; intent(in) :: y, 0,    	, fail-final

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test7-basicarray/add_subroutine_parameter_7.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test7-basicarray/add_subroutine_parameter_7.f90
deleted file mode 100644
index 88457cf..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test7-basicarray/add_subroutine_parameter_7.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program basicarray ! Tests that arrays can be passed.

-

-end program basicarray

-subroutine sub(z) !<<<<< 4, 1, 4, 5, integer; intent(in); dimension(2) :: y, 0, (/ 2; 3 /), pass

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test7-basicarray/add_subroutine_parameter_7.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test7-basicarray/add_subroutine_parameter_7.f90.result
deleted file mode 100644
index eb316a0..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test7-basicarray/add_subroutine_parameter_7.f90.result
+++ /dev/null

@@ -1,7 +0,0 @@
-program basicarray ! Tests that arrays can be passed.

-

-end program basicarray

-subroutine sub(y,z) !<<<<< 4, 1, 4, 5, integer; intent(in); dimension(2) :: y, 0, (/ 2; 3 /), pass

-    integer, intent(in), dimension(2) :: y

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test8-logicalbasic/add_subroutine_parameter_8.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test8-logicalbasic/add_subroutine_parameter_8.f90
deleted file mode 100644
index c29c929..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test8-logicalbasic/add_subroutine_parameter_8.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program logicalbasic ! Tests that logical parameters work correctly.

-

-end program logicalbasic

-subroutine sub(z) !<<<<< 4, 1, 4, 5, logical; intent(in) :: y, 0, .true., pass

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test8-logicalbasic/add_subroutine_parameter_8.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test8-logicalbasic/add_subroutine_parameter_8.f90.result
deleted file mode 100644
index 8e0040f..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test8-logicalbasic/add_subroutine_parameter_8.f90.result
+++ /dev/null

@@ -1,7 +0,0 @@
-program logicalbasic ! Tests that logical parameters work correctly.

-

-end program logicalbasic

-subroutine sub(y,z) !<<<<< 4, 1, 4, 5, logical; intent(in) :: y, 0, .true., pass

-    logical, intent(in) :: y

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test9-dontsetvariabletype/add_subroutine_parameter_9.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test9-dontsetvariabletype/add_subroutine_parameter_9.f90
deleted file mode 100644
index 94c832b..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test9-dontsetvariabletype/add_subroutine_parameter_9.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program dontsetvariabletype ! Tests that the default variable type is set to real

-

-end program dontsetvariabletype

-subroutine sub(z) !<<<<< 4, 1, 4, 5, intent(in) :: y, 0, 3, pass

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test9-dontsetvariabletype/add_subroutine_parameter_9.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test9-dontsetvariabletype/add_subroutine_parameter_9.f90.result
deleted file mode 100644
index e200fa0..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/add-subroutine-parameter/test9-dontsetvariabletype/add_subroutine_parameter_9.f90.result
+++ /dev/null

@@ -1,7 +0,0 @@
-program dontsetvariabletype ! Tests that the default variable type is set to real

-

-end program dontsetvariabletype

-subroutine sub(y,z) !<<<<< 4, 1, 4, 5, intent(in) :: y, 0, 3, pass

-    real, intent(in) :: y

-    integer, intent(in) :: z

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test-array/test-array.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test-array/test-array.f90
deleted file mode 100644
index c8b0fa9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test-array/test-array.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-program testarray !<<<<< 1,1,fail-final
-    integer :: myArray(5)
-    integer :: a,x,y,z
-    integer :: matrix(5,5)
-    
-    data x / 2 /
-    
-    data y,myArray,z /2, 3,4,5,6,7, 4/
-    
-    data ((matrix(i,j), i=1,5,2), j=1,5) / 15*0 /
-    
-    data a / 3 /
-
-end program testarray
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test-array/test-array.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test-array/test-array.f90.result
deleted file mode 100644
index 370130c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test-array/test-array.f90.result
+++ /dev/null

@@ -1,15 +0,0 @@
-program testarray !<<<<< 1,1,fail-final
-    integer :: myArray(5)
-    integer :: a,x,y,z
-    integer :: matrix(5,5)
-    
-    parameter ( x = 2 )
-    
-    data myArray, z / 3,4,5,6,7, 4/
-    parameter ( y = 2 )
-    
-    data ((matrix(i,j), i=1,5,2), j=1,5) / 15*0 /
-    
-    parameter ( a = 3 )
-
-end program testarray

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test-pointer/test-pointer.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test-pointer/test-pointer.f90
deleted file mode 100644
index c6b0515..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test-pointer/test-pointer.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-program testpointer !<<<<< 1,1,fail-final
-    integer, pointer :: p
-    integer :: q,x,y,z
-    
-    data x / 1 /
-    
-    data q,p,y / 3, null(), 1 /
-    
-    data z / 2 /
-
-end program testpointer
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test-pointer/test-pointer.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test-pointer/test-pointer.f90.result
deleted file mode 100644
index 6e154f4..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test-pointer/test-pointer.f90.result
+++ /dev/null

@@ -1,12 +0,0 @@
-program testpointer !<<<<< 1,1,fail-final
-    integer, pointer :: p
-    integer :: q,x,y,z
-    
-    parameter ( x = 1 )
-    
-    data p, y / null(), 1 /
-    parameter ( q = 3 )
-    
-    parameter ( z = 2 )
-
-end program testpointer

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test1/dataToParameter.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test1/dataToParameter.f90
deleted file mode 100644
index 2e66b18..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test1/dataToParameter.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-program dataToParameter !<<<<<1,1,pass

-	implicit none

-	real :: x, y, z

-	integer :: a, b, c !A comment

-	!Another comment on a new line

-	data x,y,z/1.,2.,3./ !Those values are assigned

-	!About to assign more values

-	data a/10/,b/15/,c/20/ !More values are assigned

-	!About to change some assigned values

-	x = 5.4

-	b = 6

-

-end program dataToParameter


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test1/dataToParameter.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test1/dataToParameter.f90.result
deleted file mode 100644
index b2b12a6..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/data-to-parameter/test1/dataToParameter.f90.result
+++ /dev/null

@@ -1,17 +0,0 @@
-program dataToParameter !<<<<<1,1,pass

-	implicit none

-	real :: x, y, z

-	integer :: a, b, c !A comment

-	!Another comment on a new line

-	data x/1./ !Those values are assigned

-	parameter ( z = 3. ) !Those values are assigned

-	parameter ( y = 2. ) !Those values are assigned

-		!About to assign more values

-	data b/15/ !More values are assigned

-	parameter ( c = 20 ) !More values are assigned

-	parameter ( a = 10 ) !More values are assigned

-	!About to change some assigned values

-	x = 5.4

-	b = 6

-

-end program dataToParameter


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-dt/test-encap-01c-basic-dt.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-dt/test-encap-01c-basic-dt.f90
deleted file mode 100644
index 2ee865b..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-dt/test-encap-01c-basic-dt.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-module mod

-  implicit none

-

-  type point

-    double precision x, y, z

-  end type

-

-  type(point) :: variable  !<<<<< 8, 18, 8, pass

-end module

-

-program encap1

-  use mod

-  implicit none

-  print *, variable

-  variable = point(1.0, 2.0, 3.0)

-  print *, variable

-end program encap1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-dt/test-encap-01c-basic-dt.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-dt/test-encap-01c-basic-dt.f90.result
deleted file mode 100644
index 48a96ee..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-dt/test-encap-01c-basic-dt.f90.result
+++ /dev/null

@@ -1,30 +0,0 @@
-module mod

-  implicit none

-

-  type point

-    double precision x, y, z

-  end type

-

-  type(point) :: variable  !<<<<< 8, 18, 8, pass

-  private :: variable

-contains

-    subroutine setVariable(value)

-        implicit none

-        type(point), intent(in) :: value

-        variable = value

-    end subroutine

-

-    type(point) function getVariable()

-        implicit none

-        getVariable = variable

-    end function

-

-end module

-

-program encap1

-  use mod

-  implicit none

-  print *,getVariable()

-  call setVariable(point(1.0, 2.0, 3.0))

-  print *,getVariable()

-end program encap1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-integer/test-encap-01a-basic-integer.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-integer/test-encap-01a-basic-integer.f90
deleted file mode 100644
index 0c26d86..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-integer/test-encap-01a-basic-integer.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-module mod

-  implicit none

-  integer :: variable  !<<<<< 3, 14, 8, pass

-end module

-

-program encap1

-  use mod

-  implicit none

-  print *, variable

-  variable = 3

-  print *, variable

-end program encap1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-integer/test-encap-01a-basic-integer.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-integer/test-encap-01a-basic-integer.f90.result
deleted file mode 100644
index 26b78df..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-integer/test-encap-01a-basic-integer.f90.result
+++ /dev/null

@@ -1,25 +0,0 @@
-module mod

-  implicit none

-  integer :: variable  !<<<<< 3, 14, 8, pass

-  private :: variable

-contains

-    subroutine setVariable(value)

-        implicit none

-        integer, intent(in) :: value

-        variable = value

-    end subroutine

-

-    integer function getVariable()

-        implicit none

-        getVariable = variable

-    end function

-

-end module

-

-program encap1

-  use mod

-  implicit none

-  print *,getVariable()

-  call setVariable(3)

-  print *,getVariable()

-end program encap1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-real/test-encap-01b-basic-real.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-real/test-encap-01b-basic-real.f90
deleted file mode 100644
index 0029e99..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-real/test-encap-01b-basic-real.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-module mod

-  implicit none

-  real :: variable !<<<<< 3, 11, 8, pass

-end module

-

-program encap1

-  use mod

-  implicit none

-  print *, variable

-  variable = 3.0

-  print *, variable

-end program encap1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-real/test-encap-01b-basic-real.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-real/test-encap-01b-basic-real.f90.result
deleted file mode 100644
index cb521b8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-basic-real/test-encap-01b-basic-real.f90.result
+++ /dev/null

@@ -1,25 +0,0 @@
-module mod

-  implicit none

-  real :: variable !<<<<< 3, 11, 8, pass

-  private :: variable

-contains

-    subroutine setVariable(value)

-        implicit none

-        real, intent(in) :: value

-        variable = value

-    end subroutine

-

-    real function getVariable()

-        implicit none

-        getVariable = variable

-    end function

-

-end module

-

-program encap1

-  use mod

-  implicit none

-  print *,getVariable()

-  call setVariable(3.0)

-  print *,getVariable()

-end program encap1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-contains/test-encap-02-contains.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-contains/test-encap-02-contains.f90
deleted file mode 100644
index 94e3c64..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-contains/test-encap-02-contains.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-module mod

-  implicit none

-  integer :: variable !<<<<< 3, 14, 8, pass

-contains

-  integer function three()

-    three = 3

-  end function

-end module

-

-program encap1

-  use mod

-  implicit none

-  print *, variable

-  variable = 3

-  print *, variable

-end program encap1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-contains/test-encap-02-contains.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-contains/test-encap-02-contains.f90.result
deleted file mode 100644
index 4bfc7e6..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-contains/test-encap-02-contains.f90.result
+++ /dev/null

@@ -1,28 +0,0 @@
-module mod

-  implicit none

-  integer :: variable !<<<<< 3, 14, 8, pass

-  private :: variable

-contains

-  subroutine setVariable(value)

-      implicit none

-      integer, intent(in) :: value

-      variable = value

-  end subroutine

-

-  integer function getVariable()

-      implicit none

-      getVariable = variable

-  end function

-

-  integer function three()

-    three = 3

-  end function

-end module

-

-program encap1

-  use mod

-  implicit none

-  print *,getVariable()

-  call setVariable(3)

-  print *,getVariable()

-end program encap1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-expr/test-encap-03-expr.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-expr/test-encap-03-expr.f90
deleted file mode 100644
index 97a3fe6..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-expr/test-encap-03-expr.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-module mod

-  implicit none

-  integer :: variable !<<<<< 3, 14, 8, pass

-end module

-

-program encap1

-  use mod

-  implicit none

-  variable = 3

-  !                            9 + 1

-  variable = variable * variable + (variable - 2)

-  print *, variable, " should be equal to ", 10

-end program encap1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-expr/test-encap-03-expr.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-expr/test-encap-03-expr.f90.result
deleted file mode 100644
index a009be3..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-expr/test-encap-03-expr.f90.result
+++ /dev/null

@@ -1,26 +0,0 @@
-module mod

-  implicit none

-  integer :: variable !<<<<< 3, 14, 8, pass

-  private :: variable

-contains

-    subroutine setVariable(value)

-        implicit none

-        integer, intent(in) :: value

-        variable = value

-    end subroutine

-

-    integer function getVariable()

-        implicit none

-        getVariable = variable

-    end function

-

-end module

-

-program encap1

-  use mod

-  implicit none

-  call setVariable(3)

-  !                            9 + 1

-  call setVariable(getVariable() *getVariable() + (getVariable() - 2))

-  print *,getVariable(), " should be equal to ", 10

-end program encap1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-allocatable1/test-encap-06c-fail-allocatable1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-allocatable1/test-encap-06c-fail-allocatable1.f90
deleted file mode 100644
index 02bfc2f..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-allocatable1/test-encap-06c-fail-allocatable1.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-module mod

-  implicit none

-  integer, dimension(:), allocatable :: array !<<<<< 3, 27, 5, fail-initial

-end module

-

-program encap1

-  use mod

-  implicit none

-

-  allocate (array(5))

-  array = (/ 10, 20, 30, 40, 50 /)

-  print *, array

-  deallocate (array)

-end program encap1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-allocatable2/test-encap-06d-fail-allocatable2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-allocatable2/test-encap-06d-fail-allocatable2.f90
deleted file mode 100644
index 743d6f8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-allocatable2/test-encap-06d-fail-allocatable2.f90
+++ /dev/null

@@ -1,21 +0,0 @@
-module mod

-  implicit none

-  integer, dimension(:), allocatable :: array !<<<<< 3, 27, 5, fail-initial

-contains

-  subroutine alloc

-    allocate (array(5))

-  end subroutine

-  subroutine dealloc

-    deallocate (array)

-  end subroutine

-end module

-

-program encap1

-  use mod

-  implicit none

-

-  call alloc

-  array = (/ 10, 20, 30, 40, 50 /)

-  print *, array

-  call dealloc

-end program encap1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-array/test-encap-06a-fail-array.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-array/test-encap-06a-fail-array.f90
deleted file mode 100644
index ec7e5a5..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-array/test-encap-06a-fail-array.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-module mod

-  implicit none

-  integer, dimension(3) :: variable !<<<<< 3, 28, 8, fail-initial

-end module

-

-program encap1

-  use mod

-  implicit none

-  variable = (/ 1, 2, 3 /)

-  print *, variable

-end program encap1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-conflict/test-encap-05a-fail-conflict.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-conflict/test-encap-05a-fail-conflict.f90
deleted file mode 100644
index 9fd03e2..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-conflict/test-encap-05a-fail-conflict.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-module mod

-  implicit none

-  integer :: variable !<<<<< 3, 14, 8, fail-final

-contains

-  integer function getVariable()

-    getVariable = 99999

-  end function

-end module

-

-program encap1

-  use mod

-  implicit none

-  print *, variable

-  variable = 3

-  print *, variable

-end program encap1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-pointer/test-encap-06b-fail-pointer.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-pointer/test-encap-06b-fail-pointer.f90
deleted file mode 100644
index 9c01ea2..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-pointer/test-encap-06b-fail-pointer.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-module mod

-  implicit none

-  integer, pointer :: ptr !<<<<< 3, 23, 3, fail-initial

-end module

-

-program encap1

-  use mod

-  implicit none

-

-  integer, target :: int

-  int = 3

-  ptr => int

-  int = 4

-  print *, ptr

-end program encap1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-target/test-encap-06e-fail-target.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-target/test-encap-06e-fail-target.f90
deleted file mode 100644
index 4d181cb..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-fail-target/test-encap-06e-fail-target.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-module mod

-  implicit none

-  integer, target :: int

-end module

-

-program encap1

-  use mod

-  implicit none

-

-  integer, pointer :: ptr !<<<<< 3, 22, 3, fail-initial

-  int = 3

-  ptr => int

-  int = 4

-  print *, ptr

-end program encap1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-nosetter-parameter/test-encap-04-nosetter-parameter.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-nosetter-parameter/test-encap-04-nosetter-parameter.f90
deleted file mode 100644
index 51d8bb3..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-nosetter-parameter/test-encap-04-nosetter-parameter.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-module mod

-  implicit none

-  integer, parameter :: CONSTANT = 10 !<<<<< 3, 25, 8, fail-initial

-end module

-

-program encap1

-  use mod

-  implicit none

-

-  print *, CONSTANT

-end program encap1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-simple/module1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-simple/module1.f90
deleted file mode 100644
index 5728a5a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-simple/module1.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-module module1

-	implicit none

-	integer :: i,j,k

-	

-contains

-

-end module
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-simple/module1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-simple/module1.f90.result
deleted file mode 100644
index fdf23ab..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-simple/module1.f90.result
+++ /dev/null

@@ -1,19 +0,0 @@
-module module1

-	implicit none

-	integer :: i,j,k

-	private :: i

-	

-contains

-    subroutine setI(value)

-        implicit none

-        integer, intent(in) :: value

-        i = value

-    end subroutine

-

-    integer function getI()

-        implicit none

-        getI = i

-    end function

-

-

-end module


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-simple/test-simple01.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-simple/test-simple01.f90
deleted file mode 100644
index 6de8d9c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-simple/test-simple01.f90
+++ /dev/null

@@ -1,19 +0,0 @@
-program main

-    use module1

-    implicit none

-    integer :: blah

-    

-    blah = i + j + k !<<<<< 6, 12, 6, 13, pass

-    

-    i = blah + j

-    

-    call mult(i,j,blah)

-    

-contains

-    subroutine mult(a,b,c)

-        integer, intent(in) :: a, b, c

-        integer :: temp

-        temp = a*b*c

-    end subroutine

-

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-simple/test-simple01.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-simple/test-simple01.f90.result
deleted file mode 100644
index c8fa539..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/encapsulate-variable/test-simple/test-simple01.f90.result
+++ /dev/null

@@ -1,19 +0,0 @@
-program main

-    use module1

-    implicit none

-    integer :: blah

-    

-    blah =getI() + j + k !<<<<< 6, 12, 6, 13, pass

-    

-    call setI(blah + j)

-    

-    call mult(getI(),j,blah)

-    

-contains

-    subroutine mult(a,b,c)

-        integer, intent(in) :: a, b, c

-        integer :: temp

-        temp = a*b*c

-    end subroutine

-

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test1-basic/extract_local_1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test1-basic/extract_local_1.f90
deleted file mode 100644
index 449452c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test1-basic/extract_local_1.f90
+++ /dev/null

@@ -1,5 +0,0 @@
-program extract_local

-    implicit none

-    print *, "This is a test"

-    print *, 3+4*5+6 !<<<<< 4, 16, 4, 19, integer :: var, pass

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test1-basic/extract_local_1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test1-basic/extract_local_1.f90.result
deleted file mode 100644
index 876b255..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test1-basic/extract_local_1.f90.result
+++ /dev/null

@@ -1,7 +0,0 @@
-program extract_local

-    implicit none

-    integer :: var

-    print *, "This is a test"

-    var = 4*5

-    print *, 3+var+6 !<<<<< 4, 16, 4, 19, integer :: var, pass

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test2-formatting/extract_local_2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test2-formatting/extract_local_2.f90
deleted file mode 100644
index 247809e..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test2-formatting/extract_local_2.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-program extract_local

-    implicit none

-    real :: numbers(5) = (/ 1.2, 3.4, 5.6, 7.8, 9.0 /)

-    print *, sum(numbers)    &

-                  /          &

-             size(numbers,1) !<<<<< 6, 14, 6, 29, integer :: count, pass

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test2-formatting/extract_local_2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test2-formatting/extract_local_2.f90.result
deleted file mode 100644
index 403e1c3..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test2-formatting/extract_local_2.f90.result
+++ /dev/null

@@ -1,9 +0,0 @@
-program extract_local

-    implicit none

-    real :: numbers(5) = (/ 1.2, 3.4, 5.6, 7.8, 9.0 /)

-    integer :: count

-    count = size(numbers,1)

-    print *, sum(numbers)    &

-                  /          &

-             count !<<<<< 6, 14, 6, 29, integer :: count, pass

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test3-fail-precedence/extract_local_3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test3-fail-precedence/extract_local_3.f90
deleted file mode 100644
index b707cf2..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test3-fail-precedence/extract_local_3.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program extract_local

-    implicit none

-    print *, "This is a test"

-    ! Attempting to extract 5+6 should fail

-    print *, 3+4*5+6 !<<<<< 5, 18, 5, 21, integer :: var, fail-initial

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test4-fail-conflict/extract_local_4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test4-fail-conflict/extract_local_4.f90
deleted file mode 100644
index d84c4ae..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-local-variable/test4-fail-conflict/extract_local_4.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program extract_local

-    implicit none

-    integer :: var ! Attempting to extract to var should fail since that variable already exists

-    print *, "This is a test"

-    print *, 3+4*5+6 !<<<<< 5, 16, 5, 19, integer :: var, fail-final

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test01-simple.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test01-simple.f90
deleted file mode 100644
index 5860258..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test01-simple.f90
+++ /dev/null

@@ -1,5 +0,0 @@
-subroutine sub
-    print *, "Hello" !<<<<<START !<<<<<END
-end subroutine
-
-program main; call sub; call flush; stop; end program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test01-simple.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test01-simple.f90.result
deleted file mode 100644
index d854233..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test01-simple.f90.result
+++ /dev/null

@@ -1,11 +0,0 @@
-subroutine sub
-    call new_procedure()
-end subroutine
-
-subroutine new_procedure()
-    implicit none
-    print *, "Hello" !<<<<<START !<<<<<END
-end subroutine
-
-
-program main; call sub; call flush; stop; end program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test02-locals.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test02-locals.f90
deleted file mode 100644
index 42a27c5..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test02-locals.f90
+++ /dev/null

@@ -1,19 +0,0 @@
-call sub1(); call flush; stop
-contains
-
-    subroutine sub1
-        integer :: a, b
-        dimension a(3, 4:5)
-        do b = 1, 3; a(b, :) = b*10; enddo; implicit1 = 20; implicit2 = 30
-        print *, a                  !<<<<<START
-        print *, b
-        print *, implicit1
-        print *, implicit2
-        if (implicit2 .gt. 3) then
-          print *, "OK"
-        end if                      !<<<<<END
-    end subroutine
-
-    subroutine x
-    end subroutine x
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test02-locals.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test02-locals.f90.result
deleted file mode 100644
index 74591b0..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test02-locals.f90.result
+++ /dev/null

@@ -1,29 +0,0 @@
-call sub1(); call flush; stop
-contains
-
-    subroutine sub1
-        integer :: a, b
-        dimension a(3, 4:5)
-        do b = 1, 3; a(b, :) = b*10; enddo; implicit1 = 20; implicit2 = 30
-        call new_procedure(a, b, implicit1, implicit2)
-    end subroutine
-
-    subroutine new_procedure(a, b, implicit1, implicit2)
-        implicit none
-        integer :: a(3, 4:5)
-        integer :: b
-        integer :: implicit1
-        integer :: implicit2
-        print *, a                  !<<<<<START
-        print *, b
-        print *, implicit1
-        print *, implicit2
-        if (implicit2 .gt. 3) then
-          print *, "OK"
-        end if                      !<<<<<END
-    end subroutine
-
-
-    subroutine x
-    end subroutine x
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test03-locals2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test03-locals2.f90
deleted file mode 100644
index fed5543..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test03-locals2.f90
+++ /dev/null

@@ -1,19 +0,0 @@
-call sub1(); call flush; stop
-contains
-
-    subroutine sub1
-        integer :: a, b
-        dimension a(3, 4:5)
-        do b = 1, 3; a(b, :) = b*10; enddo; implicit1 = 20; implicit2 = 30
-        print *, a
-        print *, b                  !<<<<<START !<<<<<END
-        print *, implicit1
-        print *, implicit2
-        if (implicit2 .gt. 3) then
-          print *, "OK"
-        end if
-    end subroutine
-
-    subroutine x
-    end subroutine x
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test03-locals2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test03-locals2.f90.result
deleted file mode 100644
index 5b0f312..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test03-locals2.f90.result
+++ /dev/null

@@ -1,26 +0,0 @@
-call sub1(); call flush; stop
-contains
-
-    subroutine sub1
-        integer :: a, b
-        dimension a(3, 4:5)
-        do b = 1, 3; a(b, :) = b*10; enddo; implicit1 = 20; implicit2 = 30
-        print *, a
-        call new_procedure(b)
-        print *, implicit1
-        print *, implicit2
-        if (implicit2 .gt. 3) then
-          print *, "OK"
-        end if
-    end subroutine
-
-    subroutine new_procedure(b)
-        implicit none
-        integer :: b
-        print *, b                  !<<<<<START !<<<<<END
-    end subroutine
-
-
-    subroutine x
-    end subroutine x
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test04-in-loop.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test04-in-loop.f90
deleted file mode 100644
index a4af97e..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test04-in-loop.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-subroutine hmmm
-    do 10 i = 1, 5
-       print *, i                   !<<<<<START
-       if (i .gt. 3) then
-         print *, i * 10
-       end if                       !<<<<<END
-       print *, i
-10  continue
-end subroutine
-
-program main; call hmmm; call flush; stop; end program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test04-in-loop.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test04-in-loop.f90.result
deleted file mode 100644
index f17e531..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test04-in-loop.f90.result
+++ /dev/null

@@ -1,18 +0,0 @@
-subroutine hmmm
-    do 10 i = 1, 5
-       call new_procedure(i)
-       print *, i
-10  continue
-end subroutine
-
-subroutine new_procedure(i)
-    implicit none
-    integer :: i
-    print *, i                   !<<<<<START
-    if (i .gt. 3) then
-      print *, i * 10
-    end if                       !<<<<<END
-end subroutine
-
-
-program main; call hmmm; call flush; stop; end program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test05-parameter.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test05-parameter.f90
deleted file mode 100644
index def65e6..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test05-parameter.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-subroutine prob
-        integer, parameter :: SIZE = 5
-        real :: matrix(SIZE, SIZE)
-        matrix(:, :) = 0.0          !<<<<<START !<<<<<END
-        print *, matrix
-end subroutine
-
-program main; call prob; call flush; stop; end program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test05-parameter.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test05-parameter.f90.result
deleted file mode 100644
index 26bfbf6..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test05-parameter.f90.result
+++ /dev/null

@@ -1,16 +0,0 @@
-subroutine prob
-        integer, parameter :: SIZE = 5
-        real :: matrix(SIZE, SIZE)
-        call new_procedure(SIZE, matrix)
-        print *, matrix
-end subroutine
-
-subroutine new_procedure(SIZE, matrix)
-    implicit none
-    integer :: SIZE
-    real :: matrix(SIZE, SIZE)
-    matrix(:, :) = 0.0          !<<<<<START !<<<<<END
-end subroutine
-
-
-program main; call prob; call flush; stop; end program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test06-parameter.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test06-parameter.f90
deleted file mode 100644
index ce0d9b1..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test06-parameter.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-subroutine prob
-        integer, parameter :: ROWS = 5, COLS = 7
-        real :: matrix(ROWS, COLS)
-        matrix(:, :) = 0.0          !<<<<<START !<<<<<END
-        print *, matrix
-end subroutine
-
-program main; call prob; call flush; stop; end program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test06-parameter.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test06-parameter.f90.result
deleted file mode 100644
index 255bebd..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test06-parameter.f90.result
+++ /dev/null

@@ -1,17 +0,0 @@
-subroutine prob
-        integer, parameter :: ROWS = 5, COLS = 7
-        real :: matrix(ROWS, COLS)
-        call new_procedure(COLS, ROWS, matrix)
-        print *, matrix
-end subroutine
-
-subroutine new_procedure(COLS, ROWS, matrix)
-    implicit none
-    integer :: COLS
-    integer :: ROWS
-    real :: matrix(ROWS, COLS)
-    matrix(:, :) = 0.0          !<<<<<START !<<<<<END
-end subroutine
-
-
-program main; call prob; call flush; stop; end program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test07-attribs.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test07-attribs.f90
deleted file mode 100644
index 2f547d2..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test07-attribs.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-subroutine prob(m, n)
-        implicit none
-        integer, intent(in) :: m
-        integer, intent(out) :: n
-        integer, save :: saved = 10
-        target :: saved
-        integer, pointer :: p_saved
-        integer, parameter :: ROWS = 5, COLS = 7
-        real :: matrix(ROWS, COLS)
-        p_saved => saved
-        matrix(:, :) = 0.0           !<<<<<START
-        n = 5 * m
-        saved = 2
-        !p_saved => saved
-        !p_saved = p_saved + 1
-        print *, n, m, saved !<<<<<END
-        print *, n, m, saved, p_saved
-end subroutine
-
-program main; call prob(3, n); call prob(3, n); print *, n; call flush; stop; end program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test07-attribs.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test07-attribs.f90.result
deleted file mode 100644
index 035c9c1..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test07-attribs.f90.result
+++ /dev/null

@@ -1,32 +0,0 @@
-subroutine prob(m, n)
-        implicit none
-        integer, intent(in) :: m
-        integer, intent(out) :: n
-        integer, save :: saved = 10
-        target :: saved
-        integer, pointer :: p_saved
-        integer, parameter :: ROWS = 5, COLS = 7
-        real :: matrix(ROWS, COLS)
-        p_saved => saved
-        call new_procedure(COLS, ROWS, m, matrix, n, saved)
-        print *, n, m, saved, p_saved
-end subroutine
-
-subroutine new_procedure(COLS, ROWS, m, matrix, n, saved)
-    implicit none
-    integer :: COLS
-    integer :: ROWS
-    integer, intent(in) :: m
-    real :: matrix(ROWS, COLS)
-    integer, intent(out) :: n
-    integer, target :: saved
-    matrix(:, :) = 0.0           !<<<<<START
-    n = 5 * m
-    saved = 2
-    !p_saved => saved
-    !p_saved = p_saved + 1
-    print *, n, m, saved !<<<<<END
-end subroutine
-
-
-program main; call prob(3, n); call prob(3, n); print *, n; call flush; stop; end program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test08-charlen.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test08-charlen.f90
deleted file mode 100644
index d50fa5d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test08-charlen.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program refactor
-    implicit none
-    character(3) :: charvar
-    charvar = 'abc'
-    print *, charvar !<<<<<START !<<<<<END
-end program refactor

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test08-charlen.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test08-charlen.f90.result
deleted file mode 100644
index 6e8236b..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/extract-procedure/test08-charlen.f90.result
+++ /dev/null

@@ -1,14 +0,0 @@
-program refactor
-    implicit none
-    character(3) :: charvar
-    charvar = 'abc'
-    call new_procedure(charvar)
-contains
-
-    subroutine new_procedure(charvar)
-        implicit none
-        character(3) :: charvar
-        print *, charvar !<<<<<START !<<<<<END
-    end subroutine
-
-end program refactor

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/increment-decrement-fusion/incrementDecrementTest.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/increment-decrement-fusion/incrementDecrementTest.f90
deleted file mode 100644
index 2213485..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/increment-decrement-fusion/incrementDecrementTest.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i, j

-    !<<<<<6,1,10,1,pass

-    do i=2,6

-        print *, i

-    end do

-

-    do j=6,2,-1

-        print *, j

-    end do

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/increment-decrement-fusion/incrementDecrementTest.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/increment-decrement-fusion/incrementDecrementTest.f90.result
deleted file mode 100644
index 3b25bd0..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/increment-decrement-fusion/incrementDecrementTest.f90.result
+++ /dev/null

@@ -1,12 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i, j

-    !<<<<<6,1,10,1,pass

-    do i=0,4,1

-        print *, (i*1+2)

-        print *, (i*-1+6)

-    end do

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/simple-fuse-test/simpleFusionTest.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/simple-fuse-test/simpleFusionTest.f90
deleted file mode 100644
index 5565d53..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/simple-fuse-test/simpleFusionTest.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i, j

-    !<<<<<6,1,10,1,pass

-    do i=11,15,1

-        print *, i

-    end do

-

-    do j=1,5

-        print *, j

-    end do

-

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/simple-fuse-test/simpleFusionTest.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/simple-fuse-test/simpleFusionTest.f90.result
deleted file mode 100644
index f65f75b..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/simple-fuse-test/simpleFusionTest.f90.result
+++ /dev/null

@@ -1,13 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i, j

-    !<<<<<6,1,10,1,pass

-    do i=0,4,1

-        print *, (i*1+11)

-        print *, (i*1+1)

-    end do

-

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/two-decremented-loops/decrementedLoopsTest.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/two-decremented-loops/decrementedLoopsTest.f90
deleted file mode 100644
index bafca69..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/two-decremented-loops/decrementedLoopsTest.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i, j, n = 2

-    !<<<<<6,1,10,1,pass

-    do i=10,1,-2

-        print *, i*i

-    end do

-

-    do j= 5,1,-1

-        n = n+j

-    end do

-	print *, n

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/two-decremented-loops/decrementedLoopsTest.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/two-decremented-loops/decrementedLoopsTest.f90.result
deleted file mode 100644
index f706ca2..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/fuse-loops/two-decremented-loops/decrementedLoopsTest.f90.result
+++ /dev/null

@@ -1,13 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i, j, n = 2

-    !<<<<<6,1,10,1,pass

-    do i=0,4,1

-        print *, (i*-2+10)*(i*-2+10)

-        n = n+(i*-1+5)

-    end do

-	print *, n

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test01-fail-notAValidIfStatement/convertIfStatementToIfConstruct_InvalidIfStatement.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test01-fail-notAValidIfStatement/convertIfStatementToIfConstruct_InvalidIfStatement.f90
deleted file mode 100644
index 396bf68..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test01-fail-notAValidIfStatement/convertIfStatementToIfConstruct_InvalidIfStatement.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-program notAValidIf

-    implicit none

-    print *, "This is a test"

-    print *, 3+4*5+6 !<<<<< 4, 5, 4, 22, fail-initial

-    

-    !!! This test shows the refactoring failing the initial precondition because the selected text is a print statement, and

-    !!! not a valid IF statement or construct

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test02-convert_ifConstructToIfStmt/convert_ifConstruct.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test02-convert_ifConstructToIfStmt/convert_ifConstruct.f90
deleted file mode 100644
index f336130..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test02-convert_ifConstructToIfStmt/convert_ifConstruct.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-program convert_ifConstructToIfStmt

-    implicit none

-    print *, "This is a test"

-    if(.true.) then

-      a = 1

-    end if

-    !<<<<< 4, 5, 6, 11, pass

-    

-    !!! This test shows the refactoring successfully refactoring a simple valid IF construct into a valid IF statement.

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test02-convert_ifConstructToIfStmt/convert_ifConstruct.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test02-convert_ifConstructToIfStmt/convert_ifConstruct.f90.result
deleted file mode 100644
index ffa06b4..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test02-convert_ifConstructToIfStmt/convert_ifConstruct.f90.result
+++ /dev/null

@@ -1,8 +0,0 @@
-program convert_ifConstructToIfStmt

-    implicit none

-    print *, "This is a test"

-    if (.true.) a = 1

-    !<<<<< 4, 5, 6, 11, pass

-    

-    !!! This test shows the refactoring successfully refactoring a simple valid IF construct into a valid IF statement.

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test03-fail-ifNamedVariable/convert_ifStatement_ifNamedVariable.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test03-fail-ifNamedVariable/convert_ifStatement_ifNamedVariable.f90
deleted file mode 100644
index b481db0..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test03-fail-ifNamedVariable/convert_ifStatement_ifNamedVariable.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-program convert_ifStatementToIfConstruct_incorrectSelection

-    implicit none

-    print *, "This is a test"

-    integer :: if

-    if = 5 !<<<<< 5, 5, 5, 11, fail-initial

-    

-    !!! This test shows the refactoring failing the initial precondition because the selected text is not a valid

-    !!! IF statement or construct, even though the first token is "if"

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test04-complexboolean/ifStmtComplexBoolean_1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test04-complexboolean/ifStmtComplexBoolean_1.f90
deleted file mode 100644
index d8d53d5..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test04-complexboolean/ifStmtComplexBoolean_1.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-program ifStmtComplexBoolean_1

-    implicit none

-    integer :: x, y, a

-    print *, "This is a test"

-    if (x .LT. y .OR. y .GT. 5 .AND. 6 .GE. 6) a = 1 !<<<<< 5, 5, 5, 53, pass

-    

-    !!! This tests shows the refactoring successfully converting a valid IF statement to a valid IF construct, even

-    !!! with a complex boolean guardian expression.

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test04-complexboolean/ifStmtComplexBoolean_1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test04-complexboolean/ifStmtComplexBoolean_1.f90.result
deleted file mode 100644
index 01d6b07..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test04-complexboolean/ifStmtComplexBoolean_1.f90.result
+++ /dev/null

@@ -1,12 +0,0 @@
-program ifStmtComplexBoolean_1

-    implicit none

-    integer :: x, y, a

-    print *, "This is a test"

-    if (x .LT. y .OR. y .GT. 5 .AND. 6 .GE. 6) then

-        a = 1 !<<<<< 5, 5, 5, 53, pass

-        !can add more statements here

-    end if

-    

-    !!! This tests shows the refactoring successfully converting a valid IF statement to a valid IF construct, even

-    !!! with a complex boolean guardian expression.

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test05-complexboolean/ifStmtComplexBoolean_2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test05-complexboolean/ifStmtComplexBoolean_2.f90
deleted file mode 100644
index 4e1c731..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test05-complexboolean/ifStmtComplexBoolean_2.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-program ifStmtComplexBoolean_2

-    implicit none

-    integer :: x, y, z, a

-    print *, "This is a test"

-    if ((x*2+3)/z .GE. y) a = 1 !<<<<< 5, 5, 5, 32, pass

-    

-    !!! This tests shows the refactoring successfully converting a valid IF statement to a valid IF construct, even

-    !!! with a complex boolean guardian expression.

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test05-complexboolean/ifStmtComplexBoolean_2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test05-complexboolean/ifStmtComplexBoolean_2.f90.result
deleted file mode 100644
index f4ebcf1..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test05-complexboolean/ifStmtComplexBoolean_2.f90.result
+++ /dev/null

@@ -1,12 +0,0 @@
-program ifStmtComplexBoolean_2

-    implicit none

-    integer :: x, y, z, a

-    print *, "This is a test"

-    if ((x*2+3)/z .GE. y) then

-        a = 1 !<<<<< 5, 5, 5, 32, pass

-        !can add more statements here

-    end if

-    

-    !!! This tests shows the refactoring successfully converting a valid IF statement to a valid IF construct, even

-    !!! with a complex boolean guardian expression.

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test06-convertifStmt/convertIfStatementToIfConstruct.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test06-convertifStmt/convertIfStatementToIfConstruct.f90
deleted file mode 100644
index 5a310f3..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test06-convertifStmt/convertIfStatementToIfConstruct.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-program convertIfStatementToIfConstruct

-    implicit none

-    integer :: var1, var2

-    print *, "This is an if construct example."

-    var1 = 4

-    var2 = 5

-    if (var1 < var2) print *, var1, " is less than ", var2, " using if-stmt." !<<<<< 7, 5, 7, 78, pass

-    

-    !!! This tests shows the refactoring successfully converting a valid IF statement to a valid IF construct.

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test06-convertifStmt/convertIfStatementToIfConstruct.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test06-convertifStmt/convertIfStatementToIfConstruct.f90.result
deleted file mode 100644
index e7ed947..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test06-convertifStmt/convertIfStatementToIfConstruct.f90.result
+++ /dev/null

@@ -1,13 +0,0 @@
-program convertIfStatementToIfConstruct

-    implicit none

-    integer :: var1, var2

-    print *, "This is an if construct example."

-    var1 = 4

-    var2 = 5

-    if (var1 < var2) then

-        print *, var1, " is less than ", var2, " using if-stmt." !<<<<< 7, 5, 7, 78, pass

-        !can add more statements here

-    end if

-    

-    !!! This tests shows the refactoring successfully converting a valid IF statement to a valid IF construct.

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test07-ifConstructToStmtBasic/ifConstructToStmtBasic_1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test07-ifConstructToStmtBasic/ifConstructToStmtBasic_1.f90
deleted file mode 100644
index bf234fd..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test07-ifConstructToStmtBasic/ifConstructToStmtBasic_1.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-program ifConstructToStmtBasic_1

-    if (.true.) then

-	    a = 2

-    end if

-    !<<<<< 2, 5, 4, 11, pass

-    

-    !!! This tests shows the refactoring successfully converting a valid IF construct to a valid IF statement.

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test07-ifConstructToStmtBasic/ifConstructToStmtBasic_1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test07-ifConstructToStmtBasic/ifConstructToStmtBasic_1.f90.result
deleted file mode 100644
index 30f6efe..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test07-ifConstructToStmtBasic/ifConstructToStmtBasic_1.f90.result
+++ /dev/null

@@ -1,6 +0,0 @@
-program ifConstructToStmtBasic_1

-    if (.true.) a = 2

-    !<<<<< 2, 5, 4, 11, pass

-    

-    !!! This tests shows the refactoring successfully converting a valid IF construct to a valid IF statement.

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test08-nonIfToken/nonIfToken_fail.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test08-nonIfToken/nonIfToken_fail.f90
deleted file mode 100644
index adedeab..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test08-nonIfToken/nonIfToken_fail.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-program nonIfToken_1

-	integer :: i, j

-	integer :: k, z

-	do j = 1, 10 !<<<<< 4, 5, 10, 11, fail-initial

-		print *, i                   

-   		if (i .gt. j) then

-     		print *, i * 10

-   		end if                      

-   		print *, i

-	end do

-    

-    !!! This tests shows the refactoring failing the initial precondition because the selected text is not a valid

-    !!! IF statement or construct, since the first token is "do"

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test09-ifConstructComplexBoolean/ifConstructComplexBoolean_1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test09-ifConstructComplexBoolean/ifConstructComplexBoolean_1.f90
deleted file mode 100644
index 8b23839..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test09-ifConstructComplexBoolean/ifConstructComplexBoolean_1.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-program ifConstructComplexBoolean_1

-    implicit none

-    integer :: x, y, a

-    print *, "This is a test"

-    if (x .LT. y .OR. y .GT. 5 .AND. 6 .GE. 6) then

-        a = 1

-    end if

-    !<<<<< 5, 5, 7, 11, pass

-    

-    !!! This tests shows the refactoring successfully converting a valid IF construct to a valid IF statement, even

-    !!! with a complex boolean guardian expression.

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test09-ifConstructComplexBoolean/ifConstructComplexBoolean_1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test09-ifConstructComplexBoolean/ifConstructComplexBoolean_1.f90.result
deleted file mode 100644
index 51edf89..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test09-ifConstructComplexBoolean/ifConstructComplexBoolean_1.f90.result
+++ /dev/null

@@ -1,10 +0,0 @@
-program ifConstructComplexBoolean_1

-    implicit none

-    integer :: x, y, a

-    print *, "This is a test"

-    if (x .LT. y .OR. y .GT. 5 .AND. 6 .GE. 6) a = 1

-    !<<<<< 5, 5, 7, 11, pass

-    

-    !!! This tests shows the refactoring successfully converting a valid IF construct to a valid IF statement, even

-    !!! with a complex boolean guardian expression.

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test10-namedIfConstruct/namedIfConstruct_fail.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test10-namedIfConstruct/namedIfConstruct_fail.f90
deleted file mode 100644
index 18378e7..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test10-namedIfConstruct/namedIfConstruct_fail.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-program namedIfConstruct_fail

-    myifconstruct: if (.true.) then

-        a = 3

-    end if myifconstruct

-    print *, "This test tries to convert a named if construct to if statement" !<<<<< 2, 5, 4, 11, fail-initial

-    

-    !!! This test shows the refactoring failing the initial precondition because while the selected text is a

-    !!! valid IF construct, it is a named IF construct, and therefore is not refactorable to an IF statement

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test11-multiLineIfConstructToIfStatement-failure/multiLineIfConstructToIfStmt.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test11-multiLineIfConstructToIfStatement-failure/multiLineIfConstructToIfStmt.f90
deleted file mode 100644
index 62bface..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test11-multiLineIfConstructToIfStatement-failure/multiLineIfConstructToIfStmt.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-program convert_multiLineIfConstructToIfStatement

-    if (.true.) then

-        a = 2

-        print *, 'hello'

-        print *, 'world'

-    end if

-    print *, 3+4*5+6 !<<<<< 2, 5, 6, 11, fail-initial

-    

-    !!! This test shows the refactoring failing the initial precondition because while the selected text is a valid

-    !!! IF construct, the body contains multiple lines of valid statements, and therefore, is not refactorable to

-    !!! an IF statement.

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test12-generalIfConstToIfStmt-failure/generalIfConstToIfStmt.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test12-generalIfConstToIfStmt-failure/generalIfConstToIfStmt.f90
deleted file mode 100644
index 90ce71a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test12-generalIfConstToIfStmt-failure/generalIfConstToIfStmt.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-program convert_blockIfConstructToIfStatement

-    if (x .LT. 1) then

-        a = 2

-    else if (x .GE. 1) then

-        a = 4

-    else

-        a = 6

-    end if !<<<<< 2, 5, 8, 11, fail-initial

-    

-    !!! This test shows the refactoring failing the initial precondition because while the selected text is a valid

-    !!! IF construct, the body contains multiple lines of valid statements, and therefore, is not refactorable to

-    !!! an IF statement.

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test13-fail-multipleIfSelections1/multipleIfSelections1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test13-fail-multipleIfSelections1/multipleIfSelections1.f90
deleted file mode 100644
index bb9653c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test13-fail-multipleIfSelections1/multipleIfSelections1.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-program multipleIfSelections1

-    if (x .LT. y .OR. y .GT. 5 .AND. 6 .GE. 6) a = 1

-    if (.true.) then

-	    a = 2

-    end if 

-    !<<<<< 2, 5, 5, 11, fail-initial

-    

-    !!! This test shows the refactoring failing the initial precondition because multiple IF statements and IF

-    !!! constructs are selected, while the refactoring can only handle one at a time.

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test14-fail-multipleIfSelections2/multipleIfSelections2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test14-fail-multipleIfSelections2/multipleIfSelections2.f90
deleted file mode 100644
index 78b529d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test14-fail-multipleIfSelections2/multipleIfSelections2.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-program multipleIfSelections2

-    if (.true.) then

-	    a = 2

-    end if 

-    if (x .LT. y .OR. y .GT. 5 .AND. 6 .GE. 6) a = 1

-    !<<<<< 2, 5, 5, 53, fail-initial

-    

-    !!! This test shows the refactoring failing the initial precondition because multiple IF statements and IF

-    !!! constructs are selected, while the refactoring can only handle one at a time.

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test15-commentInIfConstructToIfStmt/commentIfConstructToIfStmt.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test15-commentInIfConstructToIfStmt/commentIfConstructToIfStmt.f90
deleted file mode 100644
index e11f441..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test15-commentInIfConstructToIfStmt/commentIfConstructToIfStmt.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-program commentIfConstructToIfStmt

-    implicit none

-    integer :: x, y, a

-    if (x .LT. y .OR. y .GT. 5 .AND. 6 .GE. 6) then

-        a = 1 !This is an if statement

-    end if

-    print *, "This is a test" !<<<<< 4, 5, 6, 11, pass

-    

-    !!! This test shows the refactoring successfully converting a valid IF construct to a valid IF statement, while

-    !!! also preserving the included comment.

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test15-commentInIfConstructToIfStmt/commentIfConstructToIfStmt.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test15-commentInIfConstructToIfStmt/commentIfConstructToIfStmt.f90.result
deleted file mode 100644
index 145fc78..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test15-commentInIfConstructToIfStmt/commentIfConstructToIfStmt.f90.result
+++ /dev/null

@@ -1,9 +0,0 @@
-program commentIfConstructToIfStmt

-    implicit none

-    integer :: x, y, a

-    if (x .LT. y .OR. y .GT. 5 .AND. 6 .GE. 6) a = 1 !This is an if statement

-    print *, "This is a test" !<<<<< 4, 5, 6, 11, pass

-    

-    !!! This test shows the refactoring successfully converting a valid IF construct to a valid IF statement, while

-    !!! also preserving the included comment.

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test16-commentInIfStmtToIfConstruct/commentInIfStmtToIfConst.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test16-commentInIfStmtToIfConstruct/commentInIfStmtToIfConst.f90
deleted file mode 100644
index 9534180..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test16-commentInIfStmtToIfConstruct/commentInIfStmtToIfConst.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-program commentIfStmtToIfConstruct

-    implicit none

-    integer :: x, y, a

-    if (x .LT. y .OR. y .GT. 5 .AND. 6 .GE. 6) a = 1 !This is an if statement

-    print *, "This is a test" !<<<<< 4, 5, 4, 78, pass

-    

-    !!! This test shows the refactoring successfully converting a valid IF statement to a valid IF construct, while

-    !!! also preserving the included comment.

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test16-commentInIfStmtToIfConstruct/commentInIfStmtToIfConst.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test16-commentInIfStmtToIfConstruct/commentInIfStmtToIfConst.f90.result
deleted file mode 100644
index d1d3c16..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test16-commentInIfStmtToIfConstruct/commentInIfStmtToIfConst.f90.result
+++ /dev/null

@@ -1,12 +0,0 @@
-program commentIfStmtToIfConstruct

-    implicit none

-    integer :: x, y, a

-    if (x .LT. y .OR. y .GT. 5 .AND. 6 .GE. 6) then

-        a = 1 !This is an if statement

-        !can add more statements here

-    end if

-    print *, "This is a test" !<<<<< 4, 5, 4, 78, pass

-    

-    !!! This test shows the refactoring successfully converting a valid IF statement to a valid IF construct, while

-    !!! also preserving the included comment.

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test17-reindentIfConstruct/reindentIfConstruct.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test17-reindentIfConstruct/reindentIfConstruct.f90
deleted file mode 100644
index bce0c4d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test17-reindentIfConstruct/reindentIfConstruct.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-program reindentIfConstruct

-                                     if (1 .GE. 1) then

-                                     	a = 1

-                                     end if

-    !<<<<< 2, 38, 4, 44, pass

-    

-    !!! This test shows the refactoring successfully converting a valid IF construct to a valid IF statement, and 

-    !!! then reindenting the section of code to the correct location, based on code context.

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test17-reindentIfConstruct/reindentIfConstruct.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test17-reindentIfConstruct/reindentIfConstruct.f90.result
deleted file mode 100644
index 16b3b46..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test17-reindentIfConstruct/reindentIfConstruct.f90.result
+++ /dev/null

@@ -1,7 +0,0 @@
-program reindentIfConstruct

-    if (1 .GE. 1) a = 1

-    !<<<<< 2, 38, 4, 44, pass

-    

-    !!! This test shows the refactoring successfully converting a valid IF construct to a valid IF statement, and 

-    !!! then reindenting the section of code to the correct location, based on code context.

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test18-commentHandling/commentHandling.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test18-commentHandling/commentHandling.f90
deleted file mode 100644
index ee06043..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test18-commentHandling/commentHandling.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-program commentHandling

-    implicit none

-    integer :: x, y, a

-    if (x .LT. y .OR. y .GT. 5 .AND. 6 .GE. 6) then

-        a = 1 !This is an if statement

-        !can add more statements here

-        !more comments here

-    end if

-    print *, "This is a test" !<<<<< 4, 5, 8, 11, pass

-    

-    !!! This test shows the refactoring successfully converting a valid IF construct to a valid IF statement. Even though the IF

-    !!! construct has multiple lines of code, only one of which is a valid statement, so it is therefore still refactorable. The

-    !!! refactoring will then take the lines of comments and append them to the end of the IF statement in order to preserve them.

-    !!! The user can then reformat the comments as they feel fit.

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test18-commentHandling/commentHandling.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test18-commentHandling/commentHandling.f90.result
deleted file mode 100644
index a821b66..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test18-commentHandling/commentHandling.f90.result
+++ /dev/null

@@ -1,14 +0,0 @@
-program commentHandling

-    implicit none

-    integer :: x, y, a

-    if (x .LT. y .OR. y .GT. 5 .AND. 6 .GE. 6) a = 1 !This is an if statement

-        !can add more statements here

-        !more comments here

-    

-    print *, "This is a test" !<<<<< 4, 5, 8, 11, pass

-    

-    !!! This test shows the refactoring successfully converting a valid IF construct to a valid IF statement. Even though the IF

-    !!! construct has multiple lines of code, only one of which is a valid statement, so it is therefore still refactorable. The

-    !!! refactoring will then take the lines of comments and append them to the end of the IF statement in order to preserve them.

-    !!! The user can then reformat the comments as they feel fit.

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test19-optionalElse/optionalElse.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test19-optionalElse/optionalElse.f90
deleted file mode 100644
index f37fb85..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test19-optionalElse/optionalElse.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-program convertIfStatementToIfConstructWithOptionalElseBlock

-    implicit none

-    integer :: var1, var2

-    print *, "This is an if construct example."

-    var1 = 4

-    var2 = 5

-    if (var1 < var2) print *, var1, " is less than ", var2, " using if-stmt." !<<<<< 7, 5, 7, 78, IfStmtToIfConstruct, TRUE, pass

-    

-    !!! This test shows the refactoring successfully converting a valid IF statement to a valid IF construct, and then based

-    !!! on the user's affirmative selection of the option, will add on an else construct block to the end of it.

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test19-optionalElse/optionalElse.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test19-optionalElse/optionalElse.f90.result
deleted file mode 100644
index e79b0b1..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test19-optionalElse/optionalElse.f90.result
+++ /dev/null

@@ -1,16 +0,0 @@
-program convertIfStatementToIfConstructWithOptionalElseBlock

-    implicit none

-    integer :: var1, var2

-    print *, "This is an if construct example."

-    var1 = 4

-    var2 = 5

-    if (var1 < var2) then

-        print *, var1, " is less than ", var2, " using if-stmt." !<<<<< 7, 5, 7, 78, IfStmtToIfConstruct, TRUE, pass

-        !can add more statements here

-    else

-        !can add more statements here

-    end if

-    

-    !!! This test shows the refactoring successfully converting a valid IF statement to a valid IF construct, and then based

-    !!! on the user's affirmative selection of the option, will add on an else construct block to the end of it.

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test20-optionalElseNotAdded/optionalElseNotAdded.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test20-optionalElseNotAdded/optionalElseNotAdded.f90
deleted file mode 100644
index 843a7cc..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test20-optionalElseNotAdded/optionalElseNotAdded.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-program convertIfStatementToIfConstructWithOutOptionalElseBlock

-    implicit none

-    integer :: var1, var2

-    print *, "This is an if construct example."

-    var1 = 4

-    var2 = 5

-    if (var1 < var2) print *, var1, " is less than ", var2, " using if-stmt." !<<<<< 7, 5, 7, 78, IfStmtToIfConstruct, FALSE, pass

-    

-    !!! This test shows the refactoring successfully converting a valid IF statement to a valid IF construct, and then based

-    !!! on the user's negative selection of the option, will now add on an else construct block to the end of it.

-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test20-optionalElseNotAdded/optionalElseNotAdded.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test20-optionalElseNotAdded/optionalElseNotAdded.f90.result
deleted file mode 100644
index 2d1d692..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/if-construct-statement-conversion/test20-optionalElseNotAdded/optionalElseNotAdded.f90.result
+++ /dev/null

@@ -1,14 +0,0 @@
-program convertIfStatementToIfConstructWithOutOptionalElseBlock

-    implicit none

-    integer :: var1, var2

-    print *, "This is an if construct example."

-    var1 = 4

-    var2 = 5

-    if (var1 < var2) then

-        print *, var1, " is less than ", var2, " using if-stmt." !<<<<< 7, 5, 7, 78, IfStmtToIfConstruct, FALSE, pass

-        !can add more statements here

-    end if

-    

-    !!! This test shows the refactoring successfully converting a valid IF statement to a valid IF construct, and then based

-    !!! on the user's negative selection of the option, will now add on an else construct block to the end of it.

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/check-can-add-decl/external.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/check-can-add-decl/external.f90
deleted file mode 100644
index d437ea8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/check-can-add-decl/external.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-subroutine declared_external_subroutine
-    implicit none
-    print *, "Called declared_external_subroutine"
-end subroutine declared_external_subroutine
-
-subroutine undeclared_external_subroutine
-    implicit none
-    print *, "Called undeclared_external_subroutine"
-end subroutine undeclared_external_subroutine

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/check-can-add-decl/main.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/check-can-add-decl/main.f90
deleted file mode 100644
index b348b08..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/check-can-add-decl/main.f90
+++ /dev/null

@@ -1,42 +0,0 @@
-program program                                                      ! LINE 1
-    use module
-    implicit none
-
-    external declared_external_subroutine
-    integer :: unused_local_variable
-    integer :: assigned_local_variable
-    integer :: local_variable_accessed_from_internal_subroutine
-
-    ! Don't call unused_defined_external_subroutine
-    call defined_external_subroutine
-    call declared_external_subroutine
-    call undeclared_external_subroutine
-    call internal_subroutine
-    call used_module_subroutine
-
-    assigned_local_variable = local_variable_accessed_from_internal_subroutine
-
-    print *, assigned_local_variable
-
-contains
-
-    subroutine internal_subroutine                                   ! LINE 23
-        print *, "Called internal_subroutine"
-        local_variable_accessed_from_internal_subroutine = 12345
-    end subroutine internal_subroutine
-
-    subroutine unused_internal_subroutine
-        print *, "Called unused_internal_subroutine"
-    end subroutine unused_internal_subroutine
-
-end program program
-
-subroutine defined_external_subroutine
-    implicit none
-    print *, "Called defined_external_subroutine"
-end subroutine defined_external_subroutine
-
-subroutine unused_defined_external_subroutine
-    implicit none
-    print *, "Called unused_defined_external_subroutine"
-end subroutine unused_defined_external_subroutine

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/check-can-add-decl/module.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/check-can-add-decl/module.f90
deleted file mode 100644
index b3f0d51..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/check-can-add-decl/module.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-module module                                                        ! LINE 1
-    implicit none
-    
-    private :: private_module_subroutine
-    
-contains
-    
-    subroutine used_module_subroutine
-        print *, "Called used_module_subroutine"
-    end subroutine used_module_subroutine
-    
-    subroutine unused_module_subroutine
-        print *, "Called unused_module_subroutine"
-    end subroutine unused_module_subroutine
-    
-    subroutine private_module_subroutine
-        print *, "Called private_module_subroutine"
-    end subroutine private_module_subroutine
-    
-end module module

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/01-simple.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/01-simple.f90
deleted file mode 100644
index 8d0d2f4..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/01-simple.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-program program
-  implicit none
-! Don't forget about comments
-  ! That would be bad
-print *, "Hello" !<<<<<START !<<<<<END
-  stop
-end program program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/01-simple.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/01-simple.f90.result
deleted file mode 100644
index a979aeb..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/01-simple.f90.result
+++ /dev/null

@@ -1,7 +0,0 @@
-program program
-  implicit none
-  ! Don't forget about comments
-    ! That would be bad
-  print *, "Hello" !<<<<<START !<<<<<END
-  stop
-end program program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/02-end-after.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/02-end-after.f90
deleted file mode 100644
index 33fb83d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/02-end-after.f90
+++ /dev/null

@@ -1,4 +0,0 @@
-program program
-  implicit none
-print *, "Hello" !<<<<<START !<<<<<END
-end program program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/02-end-after.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/02-end-after.f90.result
deleted file mode 100644
index 3063bdd..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/02-end-after.f90.result
+++ /dev/null

@@ -1,4 +0,0 @@
-program program
-  implicit none
-  print *, "Hello" !<<<<<START !<<<<<END
-end program program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/03-blank-after.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/03-blank-after.f90
deleted file mode 100644
index 3550349..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/03-blank-after.f90
+++ /dev/null

@@ -1,3 +0,0 @@
-    subroutine s     !<<<<<START
-      print *, 'Yip'
-    end subroutine   !<<<<<END

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/03-blank-after.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/03-blank-after.f90.result
deleted file mode 100644
index 283be06..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/03-blank-after.f90.result
+++ /dev/null

@@ -1,3 +0,0 @@
-subroutine s     !<<<<<START
-  print *, 'Yip'
-end subroutine   !<<<<<END

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/04-guess-indent.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/04-guess-indent.f90
deleted file mode 100644
index 54bdeb1..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/04-guess-indent.f90
+++ /dev/null

@@ -1,3 +0,0 @@
-program program
-print *, "Hello" !<<<<<START !<<<<<END
-end program program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/04-guess-indent.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/04-guess-indent.f90.result
deleted file mode 100644
index 4f26825..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/04-guess-indent.f90.result
+++ /dev/null

@@ -1,3 +0,0 @@
-program program
-    print *, "Hello" !<<<<<START !<<<<<END
-end program program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/05-eachline-test.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/05-eachline-test.f90
deleted file mode 100644
index 6ba1b56..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/05-eachline-test.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-            program program !<<<<<START
-          print *, "Hello"
-    end program program
-
-      subroutine s
-        integer :: i
-          do i = 3, 4
-        do j = 5, 6
-                  print *, i + j
-                     end do
-                             end do
-end subroutine !<<<<<END

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/05-eachline-test.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/05-eachline-test.f90.result
deleted file mode 100644
index e2f0ef3..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/05-eachline-test.f90.result
+++ /dev/null

@@ -1,12 +0,0 @@
-program program !<<<<<START
-    print *, "Hello"
-end program program
-
-subroutine s
-    integer :: i
-    do i = 3, 4
-        do j = 5, 6
-            print *, i + j
-        end do
-    end do
-end subroutine !<<<<<END

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/06-continuation-test.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/06-continuation-test.f90
deleted file mode 100644
index ec68a43..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/06-continuation-test.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program continuation !<<<<<START
-implicit none 
-							print &
-		*,&
-					"work"
-      end program continuation !<<<<<END

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/06-continuation-test.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/06-continuation-test.f90.result
deleted file mode 100644
index b584980..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/06-continuation-test.f90.result
+++ /dev/null

@@ -1,6 +0,0 @@
-program continuation !<<<<<START
-    implicit none 
-    print &
-    *,&
-    "work"
-end program continuation !<<<<<END

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/07-singleLineIf-test.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/07-singleLineIf-test.f90
deleted file mode 100644
index e83a76a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/07-singleLineIf-test.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-   program singlelineif !<<<<<START
-   		implicit none
-                                                      integer :: i,j
-             i = 1 
-             j = 2
-                     if(i == 1) print *, ""
-           if(j == 2)then
-           		print *,"asdf"
-           		   end if
-     end program singlelineif !<<<<<END
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/07-singleLineIf-test.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/07-singleLineIf-test.f90.result
deleted file mode 100644
index 8fef750..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/07-singleLineIf-test.f90.result
+++ /dev/null

@@ -1,10 +0,0 @@
-program singlelineif !<<<<<START
-    implicit none
-    integer :: i,j
-    i = 1 
-    j = 2
-    if(i == 1) print *, ""
-    if(j == 2)then
-        print *,"asdf"
-    end if
-end program singlelineif !<<<<<END

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/08-labelAndComments-test.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/08-labelAndComments-test.f90
deleted file mode 100644
index 52c38ec..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/08-labelAndComments-test.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-program labelAndComment !<<<<<START
-	implicit none
-	integer :: x, y, z
-	
-		!now, I will assign values to these variables
-		x = 5
-		y = 10
-		z = 20 !this is my favorite number
-		
-		2 if(x == 5) print *, "Hello"
-				end program !<<<<<END
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/08-labelAndComments-test.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/08-labelAndComments-test.f90.result
deleted file mode 100644
index 97afd61..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/08-labelAndComments-test.f90.result
+++ /dev/null

@@ -1,11 +0,0 @@
-program labelAndComment !<<<<<START
-    implicit none
-    integer :: x, y, z
-	
-    !now, I will assign values to these variables
-    x = 5
-    y = 10
-    z = 20 !this is my favorite number
-		
-2   if(x == 5) print *, "Hello"
-end program !<<<<<END

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/09-bug331904.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/09-bug331904.f90
deleted file mode 100644
index 1c36880..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/09-bug331904.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-program comment_surrounding_goto !<<<<<START
-    implicit none
-    integer anotherlabel
-
-    ! before comment
-    assign 10000 to anotherlabel ! line comment
-    ! after comment
-
-    ! before comment
-10000    goto anotherlabel ! line comment
-    ! after comment
-
-end program comment_surrounding_goto !<<<<<END

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/09-bug331904.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/09-bug331904.f90.result
deleted file mode 100644
index 346c432..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/09-bug331904.f90.result
+++ /dev/null

@@ -1,13 +0,0 @@
-program comment_surrounding_goto !<<<<<START
-    implicit none
-    integer anotherlabel
-
-    ! before comment
-    assign 10000 to anotherlabel ! line comment
-    ! after comment
-
-    ! before comment
-10000 goto anotherlabel ! line comment
-    ! after comment
-
-end program comment_surrounding_goto !<<<<<END

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/10-continue.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/10-continue.f90
deleted file mode 100644
index 5cdff36..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/10-continue.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-program p !<<<<<START
-      implicit none
-
-lbl:  DO I = 1, 10
-      end do
-
-      do 100 i = 1, 10
-          print *, i
-100           CONTINUE
-
-      print *, "Done"
-      stop
-end program !<<<<<END

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/10-continue.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/10-continue.f90.result
deleted file mode 100644
index 85a7bb8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/10-continue.f90.result
+++ /dev/null

@@ -1,13 +0,0 @@
-program p !<<<<<START
-    implicit none
-
-    lbl:  DO I = 1, 10
-    end do
-
-    do 100 i = 1, 10
-        print *, i
-100 CONTINUE
-
-    print *, "Done"
-    stop
-end program !<<<<<END

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/11-select-case.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/11-select-case.f90
deleted file mode 100644
index d99e542..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/11-select-case.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-program p !<<<<<START
-read *, i
-SELECT CASE (i)
-CASE (1)
-print *, "One"
-CASE (2)
-print *, "Two"
-CASE (3)
-print *, "Three"
-CASE DEFAULT
-print *, "Not one, two, or three"
-END SELECT
-end program !<<<<<END

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/11-select-case.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/11-select-case.f90.result
deleted file mode 100644
index b14e343..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/11-select-case.f90.result
+++ /dev/null

@@ -1,13 +0,0 @@
-program p !<<<<<START
-    read *, i
-    SELECT CASE (i)
-        CASE (1)
-            print *, "One"
-        CASE (2)
-            print *, "Two"
-        CASE (3)
-            print *, "Three"
-        CASE DEFAULT
-            print *, "Not one, two, or three"
-    END SELECT
-end program !<<<<<END

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/12-line-continuations.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/12-line-continuations.f90
deleted file mode 100644
index d5b668c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/12-line-continuations.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-            program & !<<<<<START
-            program
-          print *, &
-           "Hello"
-    end&
-    program program
-
-      subroutine s
-        integer :: i
-          do i = 3, 4
-        do j =&
-          5, 6
-                  print *, i + j
-                     end do
-                             end&
- do
-end subroutine !<<<<<END

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/12-line-continuations.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/12-line-continuations.f90.result
deleted file mode 100644
index 51552b8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/reindenter/12-line-continuations.f90.result
+++ /dev/null

@@ -1,17 +0,0 @@
-program & !<<<<<START
-program
-    print *, &
-    "Hello"
-end&
-program program
-
-subroutine s
-    integer :: i
-    do i = 3, 4
-        do j =&
-        5, 6
-            print *, i + j
-        end do
-    end&
-    do
-end subroutine !<<<<<END

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-1-initial.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-1-initial.f90
deleted file mode 100644
index 28819a2..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-1-initial.f90
+++ /dev/null

@@ -1,21 +0,0 @@
-! This is a Fortran file
-! for testing
-program proggie ! Yes, a program
-	integer, parameter :: TWENTY = 20 ! a constant
-	print *, "Kon'nichiwa, Photran refactoring engine!"
-contains
-  subroutine q
-  end
-  
-  ! Subroutine comment
-  subroutine s(x) ! sub sub
-    real, intent(in) :: x ! This is x
-    print *, x ! Printing
-  end subroutine
-  
-  subroutine r
-  end
-end
-
-subroutine t
-end subroutine ! EOF comment
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-2-proggie-shorter.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-2-proggie-shorter.f90
deleted file mode 100644
index 1153ad5..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-2-proggie-shorter.f90
+++ /dev/null

@@ -1,21 +0,0 @@
-! This is a Fortran file
-! for testing
-program p ! Yes, a program
-	integer, parameter :: TWENTY = 20 ! a constant
-	print *, "Kon'nichiwa, Photran refactoring engine!"
-contains
-  subroutine q
-  end
-  
-  ! Subroutine comment
-  subroutine s(x) ! sub sub
-    real, intent(in) :: x ! This is x
-    print *, x ! Printing
-  end subroutine
-  
-  subroutine r
-  end
-end
-
-subroutine t
-end subroutine ! EOF comment
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-3-proggie-longer.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-3-proggie-longer.f90
deleted file mode 100644
index 37a8bf0..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-3-proggie-longer.f90
+++ /dev/null

@@ -1,21 +0,0 @@
-! This is a Fortran file
-! for testing
-program proggiedoggie ! Yes, a program
-	integer, parameter :: TWENTY = 20 ! a constant
-	print *, "Kon'nichiwa, Photran refactoring engine!"
-contains
-  subroutine q
-  end
-  
-  ! Subroutine comment
-  subroutine s(x) ! sub sub
-    real, intent(in) :: x ! This is x
-    print *, x ! Printing
-  end subroutine
-  
-  subroutine r
-  end
-end
-
-subroutine t
-end subroutine ! EOF comment
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-4-q-cut.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-4-q-cut.f90
deleted file mode 100644
index 80be11c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-4-q-cut.f90
+++ /dev/null

@@ -1,19 +0,0 @@
-! This is a Fortran file
-! for testing
-program proggie ! Yes, a program
-	integer, parameter :: TWENTY = 20 ! a constant
-	print *, "Kon'nichiwa, Photran refactoring engine!"
-contains
-  
-  ! Subroutine comment
-  subroutine s(x) ! sub sub
-    real, intent(in) :: x ! This is x
-    print *, x ! Printing
-  end subroutine
-  
-  subroutine r
-  end
-end
-
-subroutine t
-end subroutine ! EOF comment
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-5-q-pasted.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-5-q-pasted.f90
deleted file mode 100644
index 7b5c1a2..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-5-q-pasted.f90
+++ /dev/null

@@ -1,21 +0,0 @@
-! This is a Fortran file
-! for testing
-program proggie ! Yes, a program
-	integer, parameter :: TWENTY = 20 ! a constant
-	print *, "Kon'nichiwa, Photran refactoring engine!"
-contains
-  
-  ! Subroutine comment
-  subroutine s(x) ! sub sub
-    real, intent(in) :: x ! This is x
-    print *, x ! Printing
-  end subroutine
-  
-  subroutine r
-  end
-end
-  subroutine q
-  end
-
-subroutine t
-end subroutine ! EOF comment
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-6-q-pasted-at-bottom.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-6-q-pasted-at-bottom.f90
deleted file mode 100644
index 19d94da..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-6-q-pasted-at-bottom.f90
+++ /dev/null

@@ -1,21 +0,0 @@
-! This is a Fortran file
-! for testing
-program proggie ! Yes, a program
-	integer, parameter :: TWENTY = 20 ! a constant
-	print *, "Kon'nichiwa, Photran refactoring engine!"
-contains
-  
-  ! Subroutine comment
-  subroutine s(x) ! sub sub
-    real, intent(in) :: x ! This is x
-    print *, x ! Printing
-  end subroutine
-  
-  subroutine r
-  end
-end
-
-subroutine t
-end subroutine ! EOF comment
-  subroutine q
-  end
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-7-q-pasted-formatted.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-7-q-pasted-formatted.f90
deleted file mode 100644
index df092d0..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-7-q-pasted-formatted.f90
+++ /dev/null

@@ -1,21 +0,0 @@
-! This is a Fortran file
-! for testing
-program proggie ! Yes, a program
-	integer, parameter :: TWENTY = 20 ! a constant
-	print *, "Kon'nichiwa, Photran refactoring engine!"
-contains
-  
-  ! Subroutine comment
-  subroutine s(x) ! sub sub
-    real, intent(in) :: x ! This is x
-    print *, x ! Printing
-  end subroutine
-  
-  subroutine r
-  end
-end
-subroutine q
-end
-
-subroutine t
-end subroutine ! EOF comment
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-8-q-pasted-at-bottom-formatted.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-8-q-pasted-at-bottom-formatted.f90
deleted file mode 100644
index e48bad7..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-8-q-pasted-at-bottom-formatted.f90
+++ /dev/null

@@ -1,21 +0,0 @@
-! This is a Fortran file
-! for testing
-program proggie ! Yes, a program
-	integer, parameter :: TWENTY = 20 ! a constant
-	print *, "Kon'nichiwa, Photran refactoring engine!"
-contains
-  
-  ! Subroutine comment
-  subroutine s(x) ! sub sub
-    real, intent(in) :: x ! This is x
-    print *, x ! Printing
-  end subroutine
-  
-  subroutine r
-  end
-end
-
-subroutine t
-end subroutine ! EOF comment
-subroutine q
-end
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-9-t-above-q.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-9-t-above-q.f90
deleted file mode 100644
index f1031ae..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/hello-9-t-above-q.f90
+++ /dev/null

@@ -1,21 +0,0 @@
-! This is a Fortran file
-! for testing
-program proggie ! Yes, a program
-	integer, parameter :: TWENTY = 20 ! a constant
-	print *, "Kon'nichiwa, Photran refactoring engine!"
-contains
-
-    subroutine t
-    end subroutine ! EOF comment
-  subroutine q
-  end
-  
-  ! Subroutine comment
-  subroutine s(x) ! sub sub
-    real, intent(in) :: x ! This is x
-    print *, x ! Printing
-  end subroutine
-  
-  subroutine r
-  end
-end
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-single/test-single-loop.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-single/test-single-loop.f90
deleted file mode 100644
index 58d8d40..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-single/test-single-loop.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-subroutine main()

-	integer :: i, j

-	integer :: k, z

-	

-	

-	do j = 1, 10 !<<<<< 6, 5, 12, 11, fail-initial

-		print *, i                   

-   		if (i .gt. j) then

-     		print *, i * 10

-   		end if                      

-   		print *, i

-	end do

-	

-

-end subroutine
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-single/test-single-loop.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-single/test-single-loop.f90.result
deleted file mode 100644
index f448f4d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-single/test-single-loop.f90.result
+++ /dev/null

@@ -1,15 +0,0 @@
-subroutine main()

-	integer :: i, j

-	integer :: k, z

-	

-	!<<<<<START

-	do j = 1, 10

-		print *, i                   

-   		if (i .gt. j) then

-     		print *, i * 10

-   		end if                      

-   		print *, i

-	end do

-	!<<<<<END

-

-end subroutine
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-triple1/test-triple-loop.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-triple1/test-triple-loop.f90
deleted file mode 100644
index c1c9103..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-triple1/test-triple-loop.f90
+++ /dev/null

@@ -1,19 +0,0 @@
-subroutine main()

-    integer :: i, j

-    integer :: k, z

-

-

-    do j = 1, 10

-        do i = 1, 10 !<<<<< 7, 9, 15, 15, pass

-            do k = 2, 20

-                print *, i

-                   if (i .gt. j) then

-                     print *, i * 10

-                   end if

-                   print *, i

-               end do

-        end do

-    end do

-

-

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-triple1/test-triple-loop.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-triple1/test-triple-loop.f90.result
deleted file mode 100644
index 8a4eb34..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-triple1/test-triple-loop.f90.result
+++ /dev/null

@@ -1,19 +0,0 @@
-subroutine main()

-    integer :: i, j

-    integer :: k, z

-

-

-    do j = 1, 10

-        do k = 2, 20

-            do i = 1, 10 !<<<<< 7, 9, 15, 15, pass

-                print *, i

-                if (i .gt. j) then

-                    print *, i * 10

-                end if

-                print *, i

-            end do

-        end do

-    end do

-

-

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-triple2/test-triple-loop2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-triple2/test-triple-loop2.f90
deleted file mode 100644
index 8c3aa3d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-triple2/test-triple-loop2.f90
+++ /dev/null

@@ -1,19 +0,0 @@
-subroutine main()

-	integer :: i, j

-	integer :: k, z

-	

-	

-	do i = 1, 10 !<<<<< 6, 5, 16, 11, pass

-		do j = 1, 15

-			do k = 1,20

-				print *, i                   

-	       		if (i .gt. j) then

-	         		print *, i * 10

-	       		end if                      

-	       		print *, i

-	       	end do

-		end do

-	end do

-	

-

-end subroutine
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-triple2/test-triple-loop2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-triple2/test-triple-loop2.f90.result
deleted file mode 100644
index 7f7ff75..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test-triple2/test-triple-loop2.f90.result
+++ /dev/null

@@ -1,19 +0,0 @@
-subroutine main()

-	integer :: i, j

-	integer :: k, z

-	

-	

-	do j = 1, 15

-	    do i = 1, 10 !<<<<< 6, 5, 16, 11, pass

-	        do k = 1,20

-	            print *, i                   

-	            if (i .gt. j) then

-	                print *, i * 10

-	            end if                      

-	            print *, i

-	        end do

-	    end do

-	end do

-	

-

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test1-simple/test01-simple.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test1-simple/test01-simple.f90
deleted file mode 100644
index 5b6515c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test1-simple/test01-simple.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-program main

-	integer :: i, j 

-	

-	

-	do j = 1, 10

-		do i = 1, 10 !<<<<< 5, 5, 9, 11, pass

-			print *, i+j

-		end do

-	end do

-	

-

-end program main
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test1-simple/test01-simple.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test1-simple/test01-simple.f90.result
deleted file mode 100644
index 51a4ac9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test1-simple/test01-simple.f90.result
+++ /dev/null

@@ -1,12 +0,0 @@
-program main

-	integer :: i, j 

-	

-	

-	do i = 1, 10 !<<<<< 5, 5, 9, 11, pass

-	    do j = 1, 10

-	        print *, i+j

-	    end do

-	end do

-	

-

-end program main


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test2-simple/test02-simple.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test2-simple/test02-simple.f90
deleted file mode 100644
index 953a97a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test2-simple/test02-simple.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-program main

-	integer :: i, j

-	integer :: k, z

-	

-	

-	do j = 1, 10 !<<<<< 6, 5, 14, 11, pass

-	    do i = 2, 15

-	        print *, i                   

-	        if (i .gt. j) then

-	            print *, i * 10

-	        end if                      

-	        print *, i

-	    end do

-	end do

-	

-

-end program main


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test2-simple/test02-simple.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test2-simple/test02-simple.f90.result
deleted file mode 100644
index cfa5b21..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/interchange-loops/test2-simple/test02-simple.f90.result
+++ /dev/null

@@ -1,17 +0,0 @@
-program main

-	integer :: i, j

-	integer :: k, z

-	

-	

-	do i = 2, 15

-	    do j = 1, 10 !<<<<< 6, 5, 14, 11, pass

-	        print *, i                   

-	        if (i .gt. j) then

-	            print *, i * 10

-	        end if                      

-	        print *, i

-	    end do

-	end do

-	

-

-end program main


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-big-expression/bigexpression.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-big-expression/bigexpression.f90
deleted file mode 100644
index 37907b3..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-big-expression/bigexpression.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-program p !<<<<< 1, 9, pass

-	integer :: hello

-	intrinsic flush

-	call s

-	call flush; stop

-contains

-	subroutine s

-		parameter (THREE = 3)

-		print *, THREE + 2 + 63 * twice(4)

-	end subroutine

-

-	integer function twice(n)

-		intent(in) :: n

-		twice = 2 * n

-	end function

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-big-expression/bigexpression.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-big-expression/bigexpression.f90.result
deleted file mode 100644
index 4cfd75c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-big-expression/bigexpression.f90.result
+++ /dev/null

@@ -1,21 +0,0 @@
-program p !<<<<< 1, 9, pass

-	implicit none

-	integer :: hello

-	intrinsic flush

-	call s

-	call flush; stop

-contains

-	subroutine s

-		implicit none

-		real :: three

-		parameter (THREE = 3)

-		print *, THREE + 2 + 63 * twice(4)

-	end subroutine

-

-	integer function twice(n)

-		implicit none

-		integer :: n

-		intent(in) :: n

-		twice = 2 * n

-	end function

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-crazy-implicits/crazyimplicits.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-crazy-implicits/crazyimplicits.f90
deleted file mode 100644
index f843f31..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-crazy-implicits/crazyimplicits.f90
+++ /dev/null

@@ -1,27 +0,0 @@
-program p !<<<<< 1, 9, pass

-    intrinsic flush

-    type t

-        integer n

-    end type

-    type(t) u

-

-    a = 1

-    d = 1

-    u = t(5)

-    call s

-    print *, a, d, u

-    call flush; stop

-contains

-  subroutine s

-    implicit integer (a-c,g), real (d-e), type(t) (f), complex (h)

-

-    a = 3

-    b = 3

-    c = 3

-    d = 3.0

-    e = 3.0

-    f%n = 3

-    g = 3

-    h = (3, 4)

-  end subroutine

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-crazy-implicits/crazyimplicits.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-crazy-implicits/crazyimplicits.f90.result
deleted file mode 100644
index aabb8b7..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-crazy-implicits/crazyimplicits.f90.result
+++ /dev/null

@@ -1,36 +0,0 @@
-program p !<<<<< 1, 9, pass

-    implicit none

-    real :: a

-    real :: d

-    intrinsic flush

-    type t

-        integer n

-    end type

-    type(t) u

-

-    a = 1

-    d = 1

-    u = t(5)

-    call s

-    print *, a, d, u

-    call flush; stop

-contains

-  subroutine s

-    implicit none

-    integer :: b

-    integer :: c

-    real :: e

-    type(t) :: f

-    integer :: g

-    complex :: h

-

-    a = 3

-    b = 3

-    c = 3

-    d = 3.0

-    e = 3.0

-    f%n = 3

-    g = 3

-    h = (3, 4)

-  end subroutine

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-format-stmt/bug306444.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-format-stmt/bug306444.f90
deleted file mode 100644
index 59684bc..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-format-stmt/bug306444.f90
+++ /dev/null

@@ -1,3 +0,0 @@
-9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL', 'S)' )
-     print 9999, "X", 3
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-format-stmt/bug306444.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-format-stmt/bug306444.f90.result
deleted file mode 100644
index 1e4713e..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-format-stmt/bug306444.f90.result
+++ /dev/null

@@ -1,4 +0,0 @@
-     implicit none
-9999 FORMAT( ' ', A6, ' PASSED THE COMPUTATIONAL TESTS (', I6, ' CALL', 'S)' )
-     print 9999, "X", 3
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-fortran/fortran.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-fortran/fortran.f90
deleted file mode 100644
index 216d5c9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-fortran/fortran.f90
+++ /dev/null

@@ -1,34 +0,0 @@
-program functioncalling !<<<<< 1, 9, pass

-  intrinsic flush

-  print *, 'This is the Fortran program; I am going to call some functions now...'

-  call sum(1.0,2.0,3.0)

-  call factorial(3)

-  print *, 'Done'

-  call flush; stop

-

-contains

-

-  subroutine sum(x,y,z)

-

-

-	  !x = x+y+z ! gfortran 4.4.0 on Mac OS X 10.5.7 gives "Bus error"

-	  print *, x

-  end subroutine sum

-

-  subroutine factorial(j)

-	  p=1

-	  i=1

-	  do i=1,j

-	    p=p*i

-	  end do

-

-	  print *, j, "! = ", p

-  end subroutine factorial

-

-  subroutine sum2(x,y)

-	  implicit none

-	  real :: p

-	  integer :: x, y

-	  p = x+y

-  end subroutine sum2

-end


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-fortran/fortran.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-fortran/fortran.f90.result
deleted file mode 100644
index 2758d35..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-fortran/fortran.f90.result
+++ /dev/null

@@ -1,43 +0,0 @@
-program functioncalling !<<<<< 1, 9, pass

-  implicit none

-  intrinsic flush

-  print *, 'This is the Fortran program; I am going to call some functions now...'

-  call sum(1.0,2.0,3.0)

-  call factorial(3)

-  print *, 'Done'

-  call flush; stop

-

-contains

-

-  subroutine sum(x,y,z)

-	  implicit none

-	  real :: x

-	  real :: y

-	  real :: z

-

-

-	  !x = x+y+z ! gfortran 4.4.0 on Mac OS X 10.5.7 gives "Bus error"

-	  print *, x

-  end subroutine sum

-

-  subroutine factorial(j)

-	  implicit none

-	  integer :: i

-	  integer :: j

-	  real :: p

-	  p=1

-	  i=1

-	  do i=1,j

-	    p=p*i

-	  end do

-

-	  print *, j, "! = ", p

-  end subroutine factorial

-

-  subroutine sum2(x,y)

-	  implicit none

-	  real :: p

-	  integer :: x, y

-	  p = x+y

-  end subroutine sum2

-end


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-implicit-subprog/implicit-subprog.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-implicit-subprog/implicit-subprog.f90
deleted file mode 100644
index b8adbf6..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-implicit-subprog/implicit-subprog.f90
+++ /dev/null

@@ -1,3 +0,0 @@
-some_variable = 3.0 !<<<<<1, 9, pass

-call some_subprogram

-end


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-implicit-subprog/implicit-subprog.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-implicit-subprog/implicit-subprog.f90.result
deleted file mode 100644
index c508ed4..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-implicit-subprog/implicit-subprog.f90.result
+++ /dev/null

@@ -1,5 +0,0 @@
-implicit none

-real :: some_variable

-some_variable = 3.0 !<<<<<1, 9, pass

-call some_subprogram

-end


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-two-files1/crazyimplicits.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-two-files1/crazyimplicits.f90
deleted file mode 100644
index f843f31..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-two-files1/crazyimplicits.f90
+++ /dev/null

@@ -1,27 +0,0 @@
-program p !<<<<< 1, 9, pass

-    intrinsic flush

-    type t

-        integer n

-    end type

-    type(t) u

-

-    a = 1

-    d = 1

-    u = t(5)

-    call s

-    print *, a, d, u

-    call flush; stop

-contains

-  subroutine s

-    implicit integer (a-c,g), real (d-e), type(t) (f), complex (h)

-

-    a = 3

-    b = 3

-    c = 3

-    d = 3.0

-    e = 3.0

-    f%n = 3

-    g = 3

-    h = (3, 4)

-  end subroutine

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-two-files1/crazyimplicits.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-two-files1/crazyimplicits.f90.result
deleted file mode 100644
index aabb8b7..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-two-files1/crazyimplicits.f90.result
+++ /dev/null

@@ -1,36 +0,0 @@
-program p !<<<<< 1, 9, pass

-    implicit none

-    real :: a

-    real :: d

-    intrinsic flush

-    type t

-        integer n

-    end type

-    type(t) u

-

-    a = 1

-    d = 1

-    u = t(5)

-    call s

-    print *, a, d, u

-    call flush; stop

-contains

-  subroutine s

-    implicit none

-    integer :: b

-    integer :: c

-    real :: e

-    type(t) :: f

-    integer :: g

-    complex :: h

-

-    a = 3

-    b = 3

-    c = 3

-    d = 3.0

-    e = 3.0

-    f%n = 3

-    g = 3

-    h = (3, 4)

-  end subroutine

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-two-files2/fortran.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-two-files2/fortran.f90
deleted file mode 100644
index 216d5c9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-two-files2/fortran.f90
+++ /dev/null

@@ -1,34 +0,0 @@
-program functioncalling !<<<<< 1, 9, pass

-  intrinsic flush

-  print *, 'This is the Fortran program; I am going to call some functions now...'

-  call sum(1.0,2.0,3.0)

-  call factorial(3)

-  print *, 'Done'

-  call flush; stop

-

-contains

-

-  subroutine sum(x,y,z)

-

-

-	  !x = x+y+z ! gfortran 4.4.0 on Mac OS X 10.5.7 gives "Bus error"

-	  print *, x

-  end subroutine sum

-

-  subroutine factorial(j)

-	  p=1

-	  i=1

-	  do i=1,j

-	    p=p*i

-	  end do

-

-	  print *, j, "! = ", p

-  end subroutine factorial

-

-  subroutine sum2(x,y)

-	  implicit none

-	  real :: p

-	  integer :: x, y

-	  p = x+y

-  end subroutine sum2

-end


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-two-files2/fortran.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-two-files2/fortran.f90.result
deleted file mode 100644
index 2758d35..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/intro-implicit-none/test-two-files2/fortran.f90.result
+++ /dev/null

@@ -1,43 +0,0 @@
-program functioncalling !<<<<< 1, 9, pass

-  implicit none

-  intrinsic flush

-  print *, 'This is the Fortran program; I am going to call some functions now...'

-  call sum(1.0,2.0,3.0)

-  call factorial(3)

-  print *, 'Done'

-  call flush; stop

-

-contains

-

-  subroutine sum(x,y,z)

-	  implicit none

-	  real :: x

-	  real :: y

-	  real :: z

-

-

-	  !x = x+y+z ! gfortran 4.4.0 on Mac OS X 10.5.7 gives "Bus error"

-	  print *, x

-  end subroutine sum

-

-  subroutine factorial(j)

-	  implicit none

-	  integer :: i

-	  integer :: j

-	  real :: p

-	  p=1

-	  i=1

-	  do i=1,j

-	    p=p*i

-	  end do

-

-	  print *, j, "! = ", p

-  end subroutine factorial

-

-  subroutine sum2(x,y)

-	  implicit none

-	  real :: p

-	  integer :: x, y

-	  p = x+y

-  end subroutine sum2

-end


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/simple1/01-simple.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/simple1/01-simple.f90
deleted file mode 100644
index 53fef12..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/simple1/01-simple.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-! Taken from reindenter-test-code in org.eclipse.photran.core.vpg.tests

-program program !<<<<< 2, 1, 8, 20, false, pass

-  implicit none

-! Don't forget about comments

-  ! That would be bad

-print *, "Hello"

-  stop

-end program program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/simple1/01-simple.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/simple1/01-simple.f90.result
deleted file mode 100644
index cc510cd..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/simple1/01-simple.f90.result
+++ /dev/null

@@ -1,8 +0,0 @@
-! Taken from reindenter-test-code in org.eclipse.photran.core.vpg.tests

-PROGRAM program !<<<<< 2, 1, 8, 20, false, pass

-  IMPLICIT NONE

-! Don't forget about comments

-  ! That would be bad

-PRINT *, "Hello"

-  STOP

-END PROGRAM program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/two-files1/01-simple.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/two-files1/01-simple.f90
deleted file mode 100644
index 53fef12..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/two-files1/01-simple.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-! Taken from reindenter-test-code in org.eclipse.photran.core.vpg.tests

-program program !<<<<< 2, 1, 8, 20, false, pass

-  implicit none

-! Don't forget about comments

-  ! That would be bad

-print *, "Hello"

-  stop

-end program program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/two-files1/01-simple.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/two-files1/01-simple.f90.result
deleted file mode 100644
index cc510cd..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/two-files1/01-simple.f90.result
+++ /dev/null

@@ -1,8 +0,0 @@
-! Taken from reindenter-test-code in org.eclipse.photran.core.vpg.tests

-PROGRAM program !<<<<< 2, 1, 8, 20, false, pass

-  IMPLICIT NONE

-! Don't forget about comments

-  ! That would be bad

-PRINT *, "Hello"

-  STOP

-END PROGRAM program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/two-files2/02-end-after.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/two-files2/02-end-after.f90
deleted file mode 100644
index 9d1c945..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/two-files2/02-end-after.f90
+++ /dev/null

@@ -1,5 +0,0 @@
-! Taken from reindenter-test-code in org.eclipse.photran.core.vpg.tests

-program program1 !<<<<< 2, 1, 5, 20, false, pass

-implicit none

-print *, "Hello"

-end program program1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/two-files2/02-end-after.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/two-files2/02-end-after.f90.result
deleted file mode 100644
index eb4b879..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/keyword-case/two-files2/02-end-after.f90.result
+++ /dev/null

@@ -1,5 +0,0 @@
-! Taken from reindenter-test-code in org.eclipse.photran.core.vpg.tests

-PROGRAM program1 !<<<<< 2, 1, 5, 20, false, pass

-IMPLICIT NONE

-PRINT *, "Hello"

-END PROGRAM program1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test0.1/justCommons1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test0.1/justCommons1.f90
deleted file mode 100644
index 3d96046..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test0.1/justCommons1.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-program common1

-    common /block/ a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, &

-                   a1, b1, c1, d1, e1, f1, g1, h1, i1, j1, k1, l1, m1, n1, o1, p1, q1, r1, s1, t1, u1, v1, w1, x1, y1, z1

-end program common1

-

-subroutine s

-    common /block/ i, j !<<<<< 7, 13, 7, 18,, pass

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test0.1/justCommons1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test0.1/justCommons1.f90.result
deleted file mode 100644
index 2a0e2b7..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test0.1/justCommons1.f90.result
+++ /dev/null

@@ -1,8 +0,0 @@
-program common1

-    common /block/ i_common, j_common, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, &

-                   a1, b1, c1, d1, e1, f1, g1, h1, i1, j1, k1, l1, m1, n1, o1, p1, q1, r1, s1, t1, u1, v1, w1, x1, y1, z1

-end program common1

-

-subroutine s

-    common /block/ i_common, j_common !<<<<< 7, 13, 7, 18,, pass

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test0.2/justCommons2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test0.2/justCommons2.f90
deleted file mode 100644
index 878bc97..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test0.2/justCommons2.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-program common1 !<<<<< 2, 13, 2, 18,, pass

-    common /block/ a, b, c, d, e,&

-                   f, g, h, i, j,&

-                   k, l, m, n, o,&

-                   p, q, r, s, t,&

-                   u, v, w, x, y, z,&

-                   a1, b1, c1, d1, e1, f1,&

-                   g1, h1, i1, j1, k1, l1,&

-                   m1, n1, o1, p1, q1, r1,&

-                   s1, t1, u1, v1, w1, x1,&

-                   y1, z1

-end program common1

-

-subroutine s

-    common /block/ i, j

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test0.2/justCommons2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test0.2/justCommons2.f90.result
deleted file mode 100644
index b0303e2..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test0.2/justCommons2.f90.result
+++ /dev/null

@@ -1,16 +0,0 @@
-program common1 !<<<<< 2, 13, 2, 18,, pass

-    common /block/ a_common, b_common, c_common, d_common, e_common,&

-                   f_common, g_common, h_common, i_common, j_common,&

-                   k_common, l_common, m_common, n_common, o_common,&

-                   p_common, q_common, r_common, s_common, t_common,&

-                   u_common, v_common, w_common, x_common, y_common, z_common,&

-                   a1_common, b1_common, c1_common, d1_common, e1_common, f1_common,&

-                   g1_common, h1_common, i1_common, j1_common, k1_common, l1_common,&

-                   m1_common, n1_common, o1_common, p1_common, q1_common, r1_common,&

-                   s1_common, t1_common, u1_common, v1_common, w1_common, x1_common,&

-                   y1_common, z1_common

-end program common1

-

-subroutine s_common

-    common /block/ a_common, b_common

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common1.f90
deleted file mode 100644
index baa5def..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common1.f90
+++ /dev/null

@@ -1,27 +0,0 @@
-program common1

-!use common2

-!use common3

-!use common4

-implicit none

-

-common /block/ a, b, c, /mem/ r, f, t !<<<<< 7, 9, 7, 14,, pass

-integer :: a

-real :: b

-double precision :: c

-

-integer :: r, f, t

-

-a = 5

-b = 4.6

-c = 2.345

-

-call helper

-end program common1

-

-subroutine helper

-implicit none

-common /block/ e, f, g

-integer :: e

-real :: f

-double precision :: g

-end subroutine helper


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common1.f90.result
deleted file mode 100644
index fc8a432..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common1.f90.result
+++ /dev/null

@@ -1,27 +0,0 @@
-program common1

-!use common2

-!use common3

-!use common4

-implicit none

-

-common /block/ a_common, b_common, c_common, /mem/ r, f, t !<<<<< 7, 9, 7, 14,, pass

-integer :: a_common

-real :: b_common

-double precision :: c_common

-

-integer :: r, f, t

-

-a_common = 5

-b_common = 4.6

-c_common = 2.345

-

-call helper

-end program common1

-

-subroutine helper

-implicit none

-common /block/ a_common, b_common, c_common

-integer :: a_common

-real :: b_common

-double precision :: c_common

-end subroutine helper


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common2.f90
deleted file mode 100644
index dfbe524..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common2.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-module common2

-    implicit none

-

-    contains

-    subroutine help_common2

-        common /block/ d, e, f

-        integer :: d

-        real :: e

-        double precision :: f

-    end subroutine help_common2

-end module common2


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common2.f90.result
deleted file mode 100644
index 1ecb2bc..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common2.f90.result
+++ /dev/null

@@ -1,11 +0,0 @@
-module common2

-    implicit none

-

-    contains

-    subroutine help_common2

-        common /block/ a_common, b_common, c_common

-        integer :: a_common

-        real :: b_common

-        double precision :: c_common

-    end subroutine help_common2

-end module common2


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common3.f90
deleted file mode 100644
index 529bbee..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common3.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-module common3

-    implicit none

-

-    contains

-    subroutine help_common3

-        common /block/ r, s, t

-        integer :: r

-        real :: s

-        double precision :: t

-

-        common /mem/ a, b, c

-        integer :: a, b, c

-    end subroutine help_common3

-end module common3


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common3.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common3.f90.result
deleted file mode 100644
index 86dfe27..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common3.f90.result
+++ /dev/null

@@ -1,14 +0,0 @@
-module common3

-    implicit none

-

-    contains

-    subroutine help_common3

-        common /block/ a_common, b_common, c_common

-        integer :: a_common

-        real :: b_common

-        double precision :: c_common

-

-        common /mem/ a, b, c

-        integer :: a, b, c

-    end subroutine help_common3

-end module common3


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common4.f90
deleted file mode 100644
index 393355c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common4.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-module common4

-    implicit none

-

-    contains

-    subroutine help_common4

-        common /mem/ a, b, c

-        integer :: a, b, c

-    end subroutine help_common4

-end module common4


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common4.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common4.f90.result
deleted file mode 100644
index 393355c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test1/common4.f90.result
+++ /dev/null

@@ -1,9 +0,0 @@
-module common4

-    implicit none

-

-    contains

-    subroutine help_common4

-        common /mem/ a, b, c

-        integer :: a, b, c

-    end subroutine help_common4

-end module common4


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test2.1/namesProv1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test2.1/namesProv1.f90
deleted file mode 100644
index 31b4bc3..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test2.1/namesProv1.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-program namesProv

-    implicit none

-    common /names/ a, b, c !<<<<< 3, 13, 3, 18, a_hello, b_hello, c_hello, pass

-    integer :: a, b, c

-

-    print *, "Test the test case program with given names"

-end program namesProv


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test2.1/namesProv1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test2.1/namesProv1.f90.result
deleted file mode 100644
index 6f605e8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test2.1/namesProv1.f90.result
+++ /dev/null

@@ -1,7 +0,0 @@
-program namesProv

-    implicit none

-    common /names/ a_hello, b_hello, c_hello !<<<<< 3, 13, 3, 18, a_hello, b_hello, c_hello, pass

-    integer :: a_hello, b_hello, c_hello

-

-    print *, "Test the test case program with given names"

-end program namesProv


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test2.2/namesProv2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test2.2/namesProv2.f90
deleted file mode 100644
index b6d5c7e..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test2.2/namesProv2.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-program namesProv2

-    implicit none

-    common /names/ q, w, e !<<<<< 3, 13, 3, 18, a_hello, b_hello, c_hello, pass

-    integer q, w, e

-

-    q = 2

-    w = 4

-    e = q + w

-end program namesProv2


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test2.2/namesProv2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test2.2/namesProv2.f90.result
deleted file mode 100644
index 307ce00..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test2.2/namesProv2.f90.result
+++ /dev/null

@@ -1,9 +0,0 @@
-program namesProv2

-    implicit none

-    common /names/ a_hello, b_hello, c_hello !<<<<< 3, 13, 3, 18, a_hello, b_hello, c_hello, pass

-    integer a_hello, b_hello, c_hello

-

-    a_hello = 2

-    b_hello = 4

-    c_hello = a_hello + b_hello

-end program namesProv2


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test4.1/short1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test4.1/short1.f90
deleted file mode 100644
index 03e73df..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test4.1/short1.f90
+++ /dev/null

@@ -1,26 +0,0 @@
-program common1

-  implicit none

-

-  common /block/ a, b, c !<<<<< 4, 11, 4, 16, aaa, bbb, ccc, pass

-  integer :: a

-  real :: b

-  double precision :: c

-

-  a = 5

-  b = 4.6

-  c = 2.345

-  print *, a, b, c

-

-  call helper

-  print *, a, b, c

-end program common1

-

-subroutine helper

-  implicit none

-  common /block/ e, f

-  integer :: e

-  real :: f

-  

-  e = 50

-  f = 40.6

-end subroutine helper


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test4.1/short1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test4.1/short1.f90.result
deleted file mode 100644
index c4af663..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test4.1/short1.f90.result
+++ /dev/null

@@ -1,26 +0,0 @@
-program common1

-  implicit none

-

-  common /block/ aaa, bbb, ccc !<<<<< 4, 11, 4, 16, aaa, bbb, ccc, pass

-  integer :: aaa

-  real :: bbb

-  double precision :: ccc

-

-  aaa = 5

-  bbb = 4.6

-  ccc = 2.345

-  print *, aaa, bbb, ccc

-

-  call helper

-  print *, aaa, bbb, ccc

-end program common1

-

-subroutine helper

-  implicit none

-  common /block/ aaa, bbb

-  integer :: aaa

-  real :: bbb

-  

-  aaa = 50

-  bbb = 40.6

-end subroutine helper


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test4.2/short2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test4.2/short2.f90
deleted file mode 100644
index 258cb81..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test4.2/short2.f90
+++ /dev/null

@@ -1,26 +0,0 @@
-program common1

-  implicit none

-

-  common /block/ a, b, c

-  integer :: a

-  real :: b

-  double precision :: c

-

-  a = 5

-  b = 4.6

-  c = 2.345

-  print *, a, b, c

-

-  call helper

-  print *, a, b, c

-end program common1

-

-subroutine helper

-  implicit none

-  common /block/ e, f !<<<<< 20, 11, 20, 16, aaa, bbb, pass

-  integer :: e

-  real :: f

-  

-  e = 50

-  f = 40.6

-end subroutine helper


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test4.2/short2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test4.2/short2.f90.result
deleted file mode 100644
index a25ebb8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test4.2/short2.f90.result
+++ /dev/null

@@ -1,26 +0,0 @@
-program common1

-  implicit none

-

-  common /block/ aaa, bbb, c

-  integer :: aaa

-  real :: bbb

-  double precision :: c

-

-  aaa = 5

-  bbb = 4.6

-  c = 2.345

-  print *, aaa, bbb, c

-

-  call helper

-  print *, aaa, bbb, c

-end program common1

-

-subroutine helper

-  implicit none

-  common /block/ aaa, bbb !<<<<< 20, 11, 20, 16, aaa, bbb, pass

-  integer :: aaa

-  real :: bbb

-  

-  aaa = 50

-  bbb = 40.6

-end subroutine helper


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.1/common1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.1/common1.f90
deleted file mode 100644
index 3cd3b05..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.1/common1.f90
+++ /dev/null

@@ -1,27 +0,0 @@
-program common1

-!use common2

-!use common3

-!use common4

-implicit none

-

-common /block/ a, b, c, /mem/ r, f, t !<<<<< 7, 9, 7, 14, a_hello, helper, c_hello, fail-final

-integer :: a

-real :: b

-double precision :: c

-

-integer :: r, f, t

-

-a = 5

-b = 4.6

-c = 2.345

-

-call helper

-end program common1

-

-subroutine helper

-implicit none

-common /block/ e, f, g

-integer :: e

-real :: f

-double precision :: g

-end subroutine helper


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.1/common2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.1/common2.f90
deleted file mode 100644
index dfbe524..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.1/common2.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-module common2

-    implicit none

-

-    contains

-    subroutine help_common2

-        common /block/ d, e, f

-        integer :: d

-        real :: e

-        double precision :: f

-    end subroutine help_common2

-end module common2


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.1/common3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.1/common3.f90
deleted file mode 100644
index 529bbee..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.1/common3.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-module common3

-    implicit none

-

-    contains

-    subroutine help_common3

-        common /block/ r, s, t

-        integer :: r

-        real :: s

-        double precision :: t

-

-        common /mem/ a, b, c

-        integer :: a, b, c

-    end subroutine help_common3

-end module common3


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.1/common4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.1/common4.f90
deleted file mode 100644
index 393355c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.1/common4.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-module common4

-    implicit none

-

-    contains

-    subroutine help_common4

-        common /mem/ a, b, c

-        integer :: a, b, c

-    end subroutine help_common4

-end module common4


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.2/common1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.2/common1.f90
deleted file mode 100644
index 88259ce..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.2/common1.f90
+++ /dev/null

@@ -1,27 +0,0 @@
-program common1

-!use common2

-!use common3

-!use common4

-implicit none

-

-common /block/ a, b, c, /mem/ r, f, t !<<<<< 7, 9, 7, 11, help_common2, b_hello, c_hello, fail-initial

-integer :: a

-real :: b

-double precision :: c

-

-integer :: r, f, t

-

-a = 5

-b = 4.6

-c = 2.345

-

-call helper

-end program common1

-

-subroutine helper

-implicit none

-common /block/ e, f, g

-integer :: e

-real :: f

-double precision :: g

-end subroutine helper


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.2/common2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.2/common2.f90
deleted file mode 100644
index dfbe524..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.2/common2.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-module common2

-    implicit none

-

-    contains

-    subroutine help_common2

-        common /block/ d, e, f

-        integer :: d

-        real :: e

-        double precision :: f

-    end subroutine help_common2

-end module common2


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.2/common3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.2/common3.f90
deleted file mode 100644
index 529bbee..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.2/common3.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-module common3

-    implicit none

-

-    contains

-    subroutine help_common3

-        common /block/ r, s, t

-        integer :: r

-        real :: s

-        double precision :: t

-

-        common /mem/ a, b, c

-        integer :: a, b, c

-    end subroutine help_common3

-end module common3


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.2/common4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.2/common4.f90
deleted file mode 100644
index 393355c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test5.2/common4.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-module common4

-    implicit none

-

-    contains

-    subroutine help_common4

-        common /mem/ a, b, c

-        integer :: a, b, c

-    end subroutine help_common4

-end module common4


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test6.1/typesDiffer1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test6.1/typesDiffer1.f90
deleted file mode 100644
index 76989fc..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test6.1/typesDiffer1.f90
+++ /dev/null

@@ -1,26 +0,0 @@
-program common1

-  implicit none

-

-  common /block/ a, b, c !<<<<< 4, 11, 4, 16, fail-final

-  integer :: a

-  real :: b

-  double precision :: c

-

-  a = 5

-  b = 4.6

-  c = 2.345

-  print *, a, b, c

-

-  call helper

-  print *, a, b, c

-end program common1

-

-subroutine helper

-  implicit none

-  common /block/ e, f

-  integer :: e

-  double precision :: f  ! type differs

-  

-  e = 50

-  f = 40.6

-end subroutine helper


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test6.2/typesDiffer1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test6.2/typesDiffer1.f90
deleted file mode 100644
index 0a9d064..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test6.2/typesDiffer1.f90
+++ /dev/null

@@ -1,26 +0,0 @@
-program common1

-  implicit none

-

-  common /block/ a, b, c

-  integer :: a

-  real :: b

-  double precision :: c

-

-  a = 5

-  b = 4.6

-  c = 2.345

-  print *, a, b, c

-

-  call helper

-  print *, a, b, c

-end program common1

-

-subroutine helper

-  implicit none

-  common /block/ e, f !<<<<< 20, 11, 20, 16, fail-final

-  integer :: e

-  double precision :: f  ! type differs

-  

-  e = 50

-  f = 40.6

-end subroutine helper


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test6.3/typesDiffer2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test6.3/typesDiffer2.f90
deleted file mode 100644
index 0317d3f..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-common-var-names-consistent/test6.3/typesDiffer2.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-program differ

-   common /block/ a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x, y, z, & !<<<<< 2, 12, 2, 17, fail-final

-                  a1, b1, c1, d1, e1, f1, g1, h1, i1, j1, k1, l1, m1, n1, o1, p1, q1, r1, s1, t1, u1, v1, w1, x1, y1, z1

-   integer a, b

-   end program differ

-

-subroutine s

-   common /block/ i, j

-   real i, j

-end subroutine


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/priv1/priv1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/priv1/priv1.f90
deleted file mode 100644
index 3e179a8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/priv1/priv1.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-module priv1

-    implicit none

-    integer a, b, c

-    private a, c !<<<<< 4, 13, 4, 14, pass

-end module priv1

-

-program p

-	use priv1

-end program p


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/priv1/priv1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/priv1/priv1.f90.result
deleted file mode 100644
index c267a3c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/priv1/priv1.f90.result
+++ /dev/null

@@ -1,10 +0,0 @@
-module priv1

-    implicit none

-    integer a, b, c

-    private c !<<<<< 4, 13, 4, 14, pass

-    public a

-end module priv1

-

-program p

-	use priv1

-end program p


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/priv2/priv2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/priv2/priv2.f90
deleted file mode 100644
index 64380b7..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/priv2/priv2.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-module priv2

-    implicit none

-    double precision f

-    real q

-    private f !<<<<< 5, 13, 5, 14, pass

-    public q

-end module priv2

-

-program p

-	use priv2

-end program p


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/priv2/priv2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/priv2/priv2.f90.result
deleted file mode 100644
index 25324ec..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/priv2/priv2.f90.result
+++ /dev/null

@@ -1,11 +0,0 @@
-module priv2

-    implicit none

-    double precision f

-    real q

-    public f !<<<<< 5, 13, 5, 14, pass

-    public q

-end module priv2

-

-program p

-	use priv2

-end program p


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test10/priv2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test10/priv2.f90
deleted file mode 100644
index 2fd17ae..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test10/priv2.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-program priv2

-    implicit none

-    double precision f

-    real q

-    private f

-    public q !<<<<< 6, 12, 6, 13, fail-initial

-end program priv2


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test10/testFile1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test10/testFile1.f90
deleted file mode 100644
index c932629..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test10/testFile1.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-program testFile

-    real a, b

-    double precision dd

-    integer g

-    public a, b

-    private dd

-end program testFile

-

-subroutine help

-    integer q, w, e

-    public q, w !<<<<< 11, 15, 11, 16, fail-initial

-    private e

-end subroutine help


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test12/test12.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test12/test12.f90
deleted file mode 100644
index 25b73d4..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test12/test12.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-module test

-    implicit none

-    private

-    real :: blah, hi

-contains

-    subroutine helpMe !<<<<< 6, 16, 6, 22, pass

-    end subroutine

-end module test

-

-program p

-	use test

-end program p


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test12/test12.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test12/test12.f90.result
deleted file mode 100644
index 8bd8e1a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test12/test12.f90.result
+++ /dev/null

@@ -1,13 +0,0 @@
-module test

-    implicit none

-    private

-    public helpMe

-    real :: blah, hi

-contains

-    subroutine helpMe !<<<<< 6, 16, 6, 22, pass

-    end subroutine

-end module test

-

-program p

-	use test

-end program p


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test13/test13.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test13/test13.f90
deleted file mode 100644
index 2d1935b..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test13/test13.f90
+++ /dev/null

@@ -1,18 +0,0 @@
-program private

-    implicit none

-    real, private :: blah

-    integer, private, optional :: priv, blah

-    real :: hi

-    private :: hi

-

-    intrinsic hello

-    external goodbye

-    private hello

-contains

-    subroutine hello

-    private

-    end subroutine

-

-    function FFF() !<<<<< 16, 14, 16, 17, fail-initial

-    end function

-end program private


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test3/test3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test3/test3.f90
deleted file mode 100644
index 74ccab3..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test3/test3.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-module test3

-    implicit none

-    integer, private :: var !<<<<< 3, 25, 3, 26, pass

-end module test3

-

-program p

-	use test3

-end program p


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test3/test3.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test3/test3.f90.result
deleted file mode 100644
index 98f3dd7..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test3/test3.f90.result
+++ /dev/null

@@ -1,8 +0,0 @@
-module test3

-    implicit none

-    integer,public :: var !<<<<< 3, 25, 3, 26, pass

-end module test3

-

-program p

-	use test3

-end program p


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test4/test4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test4/test4.f90
deleted file mode 100644
index ef2cc2d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test4/test4.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-module test4

-    implicit none

-    real, private :: blah, hi !<<<<< 3, 22, 3, 26, pass

-end module test4

-

-program p

-	use test4

-end program p


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test4/test4.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test4/test4.f90.result
deleted file mode 100644
index 4820943..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test4/test4.f90.result
+++ /dev/null

@@ -1,9 +0,0 @@
-module test4

-    implicit none

-    real, private :: hi !<<<<< 3, 22, 3, 26, pass

-    real, public :: blah

-end module test4

-

-program p

-	use test4

-end program p


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test5/test5.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test5/test5.f90
deleted file mode 100644
index 11032cd..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test5/test5.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-module test5

-    implicit none

-    integer, private :: attrs !<<<<< 3, 25, 3, 30, pass

-end module test5

-

-program p

-	use test5

-end program p


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test5/test5.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test5/test5.f90.result
deleted file mode 100644
index 703bea6..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test5/test5.f90.result
+++ /dev/null

@@ -1,8 +0,0 @@
-module test5

-    implicit none

-    integer,public :: attrs !<<<<< 3, 25, 3, 30, pass

-end module test5

-

-program p

-	use test5

-end program p


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test6/test6.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test6/test6.f90
deleted file mode 100644
index 9409cc9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test6/test6.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-module test6

-    implicit none

-    integer, private :: attrs, blah !<<<<< 3, 32, 3, 36, pass

-end module test6

-

-program p

-	use test6

-end program p


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test6/test6.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test6/test6.f90.result
deleted file mode 100644
index 00308bd..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test6/test6.f90.result
+++ /dev/null

@@ -1,9 +0,0 @@
-module test6

-    implicit none

-    integer, private :: attrs !<<<<< 3, 32, 3, 36, pass

-    integer, public :: blah

-end module test6

-

-program p

-	use test6

-end program p


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test7/test7.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test7/test7.f90
deleted file mode 100644
index 776ec6b..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test7/test7.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-module test7

-    implicit none

-    private

-    real :: r

-    integer five

-    real :: blah !<<<<< 6, 13, 6, 17, pass

-end module test7

-

-program p

-	use test7

-end program p


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test7/test7.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test7/test7.f90.result
deleted file mode 100644
index f784e8d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test7/test7.f90.result
+++ /dev/null

@@ -1,11 +0,0 @@
-module test7

-    implicit none

-    private

-    real :: r

-    integer five

-    real, public :: blah

-end module test7

-

-program p

-	use test7

-end program p


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test7_1/test7_1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test7_1/test7_1.f90
deleted file mode 100644
index 4fa8604..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test7_1/test7_1.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-module test7_1

-    implicit none

-    private

-    real :: r

-    integer five

-    real :: blah, ok !<<<<< 6, 13, 6, 17, pass

-end module test7_1

-

-program p

-	use test7_1

-end program p


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test7_1/test7_1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test7_1/test7_1.f90.result
deleted file mode 100644
index 6d60128..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test7_1/test7_1.f90.result
+++ /dev/null

@@ -1,12 +0,0 @@
-module test7_1

-    implicit none

-    private

-    real :: r

-    integer five

-    real :: ok !<<<<< 6, 13, 6, 17, pass

-    real, public :: blah

-end module test7_1

-

-program p

-	use test7_1

-end program p


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test8/priv1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test8/priv1.f90
deleted file mode 100644
index 651147f..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test8/priv1.f90
+++ /dev/null

@@ -1,5 +0,0 @@
-program priv1

-    implicit none

-    integer a, b, c !<<<<< 3, 13, 3, 13, fail-initial

-    private a, c

-end program priv1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test9/priv1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test9/priv1.f90
deleted file mode 100644
index 28712c0..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test9/priv1.f90
+++ /dev/null

@@ -1,5 +0,0 @@
-program priv1

-    implicit none

-    integer a, b, c !<<<<< 3, 16, 3, 17, fail-initial

-    private a, c

-end program priv1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test9/testFile1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test9/testFile1.f90
deleted file mode 100644
index c932629..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-private-entity-public/test9/testFile1.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-program testFile

-    real a, b

-    double precision dd

-    integer g

-    public a, b

-    private dd

-end program testFile

-

-subroutine help

-    integer q, w, e

-    public q, w !<<<<< 11, 15, 11, 16, fail-initial

-    private e

-end subroutine help


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.1/make_save_1_1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.1/make_save_1_1.f90
deleted file mode 100644
index 7682ced..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.1/make_save_1_1.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-! USER STORY 1, TEST 1

-! Adds SAVE attribute to the initialized declaration statement for variable

-! call_counter

-

-! EXAMPLE FROM USER STORY

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER :: call_counter = 0

-  call_counter = call_counter + 1

-  PRINT *, 'called:', call_counter

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.1/make_save_1_1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.1/make_save_1_1.f90.result
deleted file mode 100644
index 035c398..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.1/make_save_1_1.f90.result
+++ /dev/null

@@ -1,16 +0,0 @@
-! USER STORY 1, TEST 1

-! Adds SAVE attribute to the initialized declaration statement for variable

-! call_counter

-

-! EXAMPLE FROM USER STORY

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER, SAVE :: call_counter = 0

-  call_counter = call_counter + 1

-  PRINT *, 'called:', call_counter

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.2/make_save_1_2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.2/make_save_1_2.f90
deleted file mode 100644
index f716eb4..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.2/make_save_1_2.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-! USER STORY 1, TEST 2

-! Adds SAVE attribute to the initialized declaration statements for variables

-! first_call_counter and second_call_counter

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER :: first_call_counter = 0

-  INTEGER :: second_call_counter = 10

-  first_call_counter = first_call_counter + 1

-  second_call_counter = second_call_counter + 1

-  PRINT *, 'called:', first_call_counter

-  PRINT *, 'called:', second_call_counter

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.2/make_save_1_2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.2/make_save_1_2.f90.result
deleted file mode 100644
index 2ac2517..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.2/make_save_1_2.f90.result
+++ /dev/null

@@ -1,17 +0,0 @@
-! USER STORY 1, TEST 2

-! Adds SAVE attribute to the initialized declaration statements for variables

-! first_call_counter and second_call_counter

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER, SAVE :: first_call_counter = 0

-  INTEGER, SAVE :: second_call_counter = 10

-  first_call_counter = first_call_counter + 1

-  second_call_counter = second_call_counter + 1

-  PRINT *, 'called:', first_call_counter

-  PRINT *, 'called:', second_call_counter

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.3/make_save_1_3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.3/make_save_1_3.f90
deleted file mode 100644
index 83b622f..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.3/make_save_1_3.f90
+++ /dev/null

@@ -1,21 +0,0 @@
-! USER STORY 1, TEST 3

-! Adds SAVE attribute to the initialized declaration statement for variable

-! first_call_counter, but not to the non-initialized declaration statement for

-! variable second_call_counter

-

-! EXAMPLE FROM USER STORY

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER :: first_call_counter = 0

-  INTEGER :: second_call_counter

-  second_call_counter = 10

-  first_call_counter = first_call_counter + 1

-  second_call_counter = second_call_counter + 1

-  PRINT *, 'called:', first_call_counter

-  PRINT *, 'called:', second_call_counter

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.3/make_save_1_3.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.3/make_save_1_3.f90.result
deleted file mode 100644
index 726cc23..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.3/make_save_1_3.f90.result
+++ /dev/null

@@ -1,21 +0,0 @@
-! USER STORY 1, TEST 3

-! Adds SAVE attribute to the initialized declaration statement for variable

-! first_call_counter, but not to the non-initialized declaration statement for

-! variable second_call_counter

-

-! EXAMPLE FROM USER STORY

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER, SAVE :: first_call_counter = 0

-  INTEGER :: second_call_counter

-  second_call_counter = 10

-  first_call_counter = first_call_counter + 1

-  second_call_counter = second_call_counter + 1

-  PRINT *, 'called:', first_call_counter

-  PRINT *, 'called:', second_call_counter

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.4/make_save_1_4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.4/make_save_1_4.f90
deleted file mode 100644
index 104d8dc..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.4/make_save_1_4.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-! USER STORY 1, TEST 4

-! Adds SAVE attribute to the initialized declaration statement for array

-! myArray

-

-PROGRAM MyProgram !<<<<< 11, 18, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER, DIMENSION(3) :: myArray = (/ 1, 2, 3 /)

-  myArray(1) = myArray(1) + 1

-  myArray(2) = myArray(2) + 2

-  myArray(3) = myArray(3) + 3

-  PRINT *, 'myArray:', myArray(1), myArray(2), myArray(3)

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.4/make_save_1_4.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.4/make_save_1_4.f90.result
deleted file mode 100644
index a10d6cd..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-1/test-1.4/make_save_1_4.f90.result
+++ /dev/null

@@ -1,16 +0,0 @@
-! USER STORY 1, TEST 4

-! Adds SAVE attribute to the initialized declaration statement for array

-! myArray

-

-PROGRAM MyProgram !<<<<< 11, 18, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER, DIMENSION(3), SAVE :: myArray = (/ 1, 2, 3 /)

-  myArray(1) = myArray(1) + 1

-  myArray(2) = myArray(2) + 2

-  myArray(3) = myArray(3) + 3

-  PRINT *, 'myArray:', myArray(1), myArray(2), myArray(3)

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.1/make_save_2_1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.1/make_save_2_1.f90
deleted file mode 100644
index f00bc82..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.1/make_save_2_1.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-! USER STORY 2, TEST 1

-! Does not add SAVE attribute to the initialized declaration statement for

-! variable j due to the presence of the unspecified SAVE statement in the same

-! subroutine

-

-! EXAMPLE FROM USER STORY

-

-PROGRAM MyProgram !<<<<< 1, 1, pass 

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  SAVE

-  INTEGER :: i

-  INTEGER :: j = 0

-  i = i + 1

-  j = j + 5

-  PRINT *, 'i=', i, ', j=', j

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.1/make_save_2_1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.1/make_save_2_1.f90.result
deleted file mode 100644
index f00bc82..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.1/make_save_2_1.f90.result
+++ /dev/null

@@ -1,20 +0,0 @@
-! USER STORY 2, TEST 1

-! Does not add SAVE attribute to the initialized declaration statement for

-! variable j due to the presence of the unspecified SAVE statement in the same

-! subroutine

-

-! EXAMPLE FROM USER STORY

-

-PROGRAM MyProgram !<<<<< 1, 1, pass 

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  SAVE

-  INTEGER :: i

-  INTEGER :: j = 0

-  i = i + 1

-  j = j + 5

-  PRINT *, 'i=', i, ', j=', j

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.2/make_save_2_2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.2/make_save_2_2.f90
deleted file mode 100644
index f04cdb9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.2/make_save_2_2.f90
+++ /dev/null

@@ -1,29 +0,0 @@
-! USER STORY 2, TEST 2

-! Does not add SAVE attribute to the initialized declaration statement for

-! variable j due to the presence of the unspecified SAVE statement in the same

-! subroutine, but does add SAVE attribute to the initialized declaration

-! statement for variable n with no SAVE statement in the same subroutine

-

-PROGRAM MyProgram !<<<<< 1, 1, pass 

-  CALL MySubOne

-  CALL MySubOne

-  CALL MySubTwo

-  CALL MySubTwo

-END PROGRAM MyProgram

-

-SUBROUTINE MySubOne

-  SAVE

-  INTEGER :: i

-  INTEGER :: j = 0

-  i = i + 1

-  j = j + 5

-  PRINT *, 'i=', i, ', j=', j

-END SUBROUTINE MySubOne

-

-SUBROUTINE MySubTwo

-  INTEGER :: m

-  INTEGER :: n = 0

-  m = m + 1

-  n = n + 5

-  PRINT *, 'm=', m, ', n=', n

-END SUBROUTINE MySubTwo


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.2/make_save_2_2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.2/make_save_2_2.f90.result
deleted file mode 100644
index 050de40..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.2/make_save_2_2.f90.result
+++ /dev/null

@@ -1,29 +0,0 @@
-! USER STORY 2, TEST 2

-! Does not add SAVE attribute to the initialized declaration statement for

-! variable j due to the presence of the unspecified SAVE statement in the same

-! subroutine, but does add SAVE attribute to the initialized declaration

-! statement for variable n with no SAVE statement in the same subroutine

-

-PROGRAM MyProgram !<<<<< 1, 1, pass 

-  CALL MySubOne

-  CALL MySubOne

-  CALL MySubTwo

-  CALL MySubTwo

-END PROGRAM MyProgram

-

-SUBROUTINE MySubOne

-  SAVE

-  INTEGER :: i

-  INTEGER :: j = 0

-  i = i + 1

-  j = j + 5

-  PRINT *, 'i=', i, ', j=', j

-END SUBROUTINE MySubOne

-

-SUBROUTINE MySubTwo

-  INTEGER :: m

-  INTEGER, SAVE :: n = 0

-  m = m + 1

-  n = n + 5

-  PRINT *, 'm=', m, ', n=', n

-END SUBROUTINE MySubTwo


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.3/make_save_2_3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.3/make_save_2_3.f90
deleted file mode 100644
index 7235bea..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.3/make_save_2_3.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-! USER STORY 2, TEST 3

-! Adds SAVE attribute to the initialized declaration statement for variable j

-! with a SAVE statement for a different variable in the same subroutine

-

-PROGRAM MyProgram !<<<<< 7, 9, pass 

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  SAVE i

-  INTEGER :: i

-  INTEGER :: j = 0

-  i = i + 1

-  j = j + 5

-  PRINT *, 'i=', i, ', j=', j

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.3/make_save_2_3.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.3/make_save_2_3.f90.result
deleted file mode 100644
index 3cc4b0c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-2/test-2.3/make_save_2_3.f90.result
+++ /dev/null

@@ -1,17 +0,0 @@
-! USER STORY 2, TEST 3

-! Adds SAVE attribute to the initialized declaration statement for variable j

-! with a SAVE statement for a different variable in the same subroutine

-

-PROGRAM MyProgram !<<<<< 7, 9, pass 

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  SAVE i

-  INTEGER :: i

-  INTEGER, SAVE :: j = 0

-  i = i + 1

-  j = j + 5

-  PRINT *, 'i=', i, ', j=', j

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-3/test-3.1/make_save_3_1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-3/test-3.1/make_save_3_1.f90
deleted file mode 100644
index ce5e8de..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-3/test-3.1/make_save_3_1.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-! USER STORY 3, TEST 1

-! Adds SAVE attribute to the declaration statement for variable sum initialized

-! through a DATA statement

-

-! EXAMPLE FROM USER STORY

-

-PROGRAM MyProgram !<<<<< 1, 1, pass 

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER :: sum

-  DATA sum /100/

-  sum = sum + sum

-  PRINT *, 'sum=', sum

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-3/test-3.1/make_save_3_1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-3/test-3.1/make_save_3_1.f90.result
deleted file mode 100644
index 47af927..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-3/test-3.1/make_save_3_1.f90.result
+++ /dev/null

@@ -1,17 +0,0 @@
-! USER STORY 3, TEST 1

-! Adds SAVE attribute to the declaration statement for variable sum initialized

-! through a DATA statement

-

-! EXAMPLE FROM USER STORY

-

-PROGRAM MyProgram !<<<<< 1, 1, pass 

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER, SAVE :: sum

-  DATA sum /100/

-  sum = sum + sum

-  PRINT *, 'sum=', sum

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-3/test-3.2/make_save_3_2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-3/test-3.2/make_save_3_2.f90
deleted file mode 100644
index c00b614..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-3/test-3.2/make_save_3_2.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-! USER STORY 3, TEST 2

-! Adds SAVE attribute to the declaration statement for array myArray

-! initialized through a DATA statement

-

-PROGRAM MyProgram !<<<<< 8,16, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER, DIMENSION(2) :: myArray

-  DATA myArray /100, 10/

-  myArray(1) = myArray(1) + 1

-  myArray(2) = myArray(2) + 1

-  PRINT *, 'myArray(1)=', myArray(1), 'myArray(2)=', myArray(2)

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-3/test-3.2/make_save_3_2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-3/test-3.2/make_save_3_2.f90.result
deleted file mode 100644
index 6c90873..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-3/test-3.2/make_save_3_2.f90.result
+++ /dev/null

@@ -1,16 +0,0 @@
-! USER STORY 3, TEST 2

-! Adds SAVE attribute to the declaration statement for array myArray

-! initialized through a DATA statement

-

-PROGRAM MyProgram !<<<<< 8,16, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER, DIMENSION(2), SAVE :: myArray

-  DATA myArray /100, 10/

-  myArray(1) = myArray(1) + 1

-  myArray(2) = myArray(2) + 1

-  PRINT *, 'myArray(1)=', myArray(1), 'myArray(2)=', myArray(2)

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.1/make_save_4_1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.1/make_save_4_1.f90
deleted file mode 100644
index 6b7224a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.1/make_save_4_1.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-! USER STORY 4, TEST 1

-! Adds SAVE attribute to the declaration statements for variables sumOne and

-! sumTwo initialized through the same DATA statement

-

-PROGRAM MyProgram !<<<<< 1, 1, pass 

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER :: sumOne

-  INTEGER :: sumTwo

-  DATA sumOne /100/ sumTwo /10/

-  sumOne = sumOne + sumOne

-  sumTwo = sumTwo + sumTwo

-  PRINT *, 'sumOne=', sumOne, 'sumTwo=', sumTwo

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.1/make_save_4_1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.1/make_save_4_1.f90.result
deleted file mode 100644
index 74eeb49..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.1/make_save_4_1.f90.result
+++ /dev/null

@@ -1,17 +0,0 @@
-! USER STORY 4, TEST 1

-! Adds SAVE attribute to the declaration statements for variables sumOne and

-! sumTwo initialized through the same DATA statement

-

-PROGRAM MyProgram !<<<<< 1, 1, pass 

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER, SAVE :: sumOne

-  INTEGER, SAVE :: sumTwo

-  DATA sumOne /100/ sumTwo /10/

-  sumOne = sumOne + sumOne

-  sumTwo = sumTwo + sumTwo

-  PRINT *, 'sumOne=', sumOne, 'sumTwo=', sumTwo

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.2/make_save_4_2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.2/make_save_4_2.f90
deleted file mode 100644
index c862aa0..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.2/make_save_4_2.f90
+++ /dev/null

@@ -1,23 +0,0 @@
-! USER STORY 4, TEST 2

-! Adds SAVE attribute to the declaration statements for arrays myArray and

-! myArray2 initialized through the same DATA statement

-

-PROGRAM MyProgram !<<<<< 8,16, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER, DIMENSION(2) :: myArray

-  INTEGER, DIMENSION(2) :: myArray2

-  DATA myArray /10, 20/  myArray2 /30, 40/

-

-  myArray(1) = myArray(1) + 1

-  myArray(2) = myArray(2) + 1

-

-  myArray2(1) = myArray2(1) + 1

-  myArray2(2) = myArray2(2) + 1

-

-  PRINT *, 'myArray(1)=', myArray(1), 'myArray(2)=', myArray(2)

-  PRINT *, 'myArray2(1)=', myArray2(1), 'myArray2(2)=', myArray2(2)

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.2/make_save_4_2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.2/make_save_4_2.f90.result
deleted file mode 100644
index b0b9237..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.2/make_save_4_2.f90.result
+++ /dev/null

@@ -1,23 +0,0 @@
-! USER STORY 4, TEST 2

-! Adds SAVE attribute to the declaration statements for arrays myArray and

-! myArray2 initialized through the same DATA statement

-

-PROGRAM MyProgram !<<<<< 8,16, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER, DIMENSION(2), SAVE :: myArray

-  INTEGER, DIMENSION(2), SAVE :: myArray2

-  DATA myArray /10, 20/  myArray2 /30, 40/

-

-  myArray(1) = myArray(1) + 1

-  myArray(2) = myArray(2) + 1

-

-  myArray2(1) = myArray2(1) + 1

-  myArray2(2) = myArray2(2) + 1

-

-  PRINT *, 'myArray(1)=', myArray(1), 'myArray(2)=', myArray(2)

-  PRINT *, 'myArray2(1)=', myArray2(1), 'myArray2(2)=', myArray2(2)

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.3/make_save_4_3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.3/make_save_4_3.f90
deleted file mode 100644
index 43bce98..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.3/make_save_4_3.f90
+++ /dev/null

@@ -1,22 +0,0 @@
-! USER STORY 4, TEST 3

-! Adds SAVE attribute to the declaration statements for variables i, j, and k

-! initialized through the same DATA statement (alternate arrangement of DATA

-! statement)

-

-PROGRAM MyProgram !<<<<< 8,16, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER :: i

-  INTEGER :: j

-  INTEGER :: k

-  DATA i,j,k /10, 20, 35/

-

-  i = i + 1

-  j = j + 1

-  k = k + 1

-

-  PRINT *, 'i=', i, 'j=', j, 'k=', k

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.3/make_save_4_3.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.3/make_save_4_3.f90.result
deleted file mode 100644
index 9d03b96..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.3/make_save_4_3.f90.result
+++ /dev/null

@@ -1,22 +0,0 @@
-! USER STORY 4, TEST 3

-! Adds SAVE attribute to the declaration statements for variables i, j, and k

-! initialized through the same DATA statement (alternate arrangement of DATA

-! statement)

-

-PROGRAM MyProgram !<<<<< 8,16, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER, SAVE :: i

-  INTEGER, SAVE :: j

-  INTEGER, SAVE :: k

-  DATA i,j,k /10, 20, 35/

-

-  i = i + 1

-  j = j + 1

-  k = k + 1

-

-  PRINT *, 'i=', i, 'j=', j, 'k=', k

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.4/make_save_4_4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.4/make_save_4_4.f90
deleted file mode 100644
index b151e09..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.4/make_save_4_4.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-! USER STORY 4, TEST 4

-! Adds SAVE attribute to the declaration statements for variables sum1 and sum2

-! initialized through the same DATA statement (alternate arrangement of DATA

-! statement)

-

-! EXAMPLE FROM USER STORY

-

-PROGRAM MyProgram

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER :: sum1, sum2

-  DATA sum1, sum2 /100, 200/

-  sum1 = sum1 + sum1

-  sum2 = sum2 + sum2 !<<<<< 1,11, pass

-  PRINT *, 'sum1=', sum1

-  PRINT *, 'sum2=', sum2

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.4/make_save_4_4.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.4/make_save_4_4.f90.result
deleted file mode 100644
index d1a87de..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.4/make_save_4_4.f90.result
+++ /dev/null

@@ -1,20 +0,0 @@
-! USER STORY 4, TEST 4

-! Adds SAVE attribute to the declaration statements for variables sum1 and sum2

-! initialized through the same DATA statement (alternate arrangement of DATA

-! statement)

-

-! EXAMPLE FROM USER STORY

-

-PROGRAM MyProgram

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER, SAVE :: sum1, sum2

-  DATA sum1, sum2 /100, 200/

-  sum1 = sum1 + sum1

-  sum2 = sum2 + sum2 !<<<<< 1,11, pass

-  PRINT *, 'sum1=', sum1

-  PRINT *, 'sum2=', sum2

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.5/make_save_4_5.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.5/make_save_4_5.f90
deleted file mode 100644
index 87d2a22..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.5/make_save_4_5.f90
+++ /dev/null

@@ -1,19 +0,0 @@
-! USER STORY 4, TEST 5

-! Adds SAVE attribute to the declaration statements for variables sum1 and sum2

-! initialized through the same DATA statement

-

-! EXAMPLE FROM USER STORY

-

-PROGRAM MyProgram

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

- !<<<<< 1,1, pass

-SUBROUTINE MySub

-  INTEGER :: sum1, sum2

-  DATA sum1 /100/, sum2 /200/

-  sum1 = sum1 + sum1

-  sum2 = sum2 + sum2

-  PRINT *, 'sum1=', sum1

-  PRINT *, 'sum2=', sum2

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.5/make_save_4_5.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.5/make_save_4_5.f90.result
deleted file mode 100644
index 54691a3..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-4/test-4.5/make_save_4_5.f90.result
+++ /dev/null

@@ -1,19 +0,0 @@
-! USER STORY 4, TEST 5

-! Adds SAVE attribute to the declaration statements for variables sum1 and sum2

-! initialized through the same DATA statement

-

-! EXAMPLE FROM USER STORY

-

-PROGRAM MyProgram

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

- !<<<<< 1,1, pass

-SUBROUTINE MySub

-  INTEGER, SAVE :: sum1, sum2

-  DATA sum1 /100/, sum2 /200/

-  sum1 = sum1 + sum1

-  sum2 = sum2 + sum2

-  PRINT *, 'sum1=', sum1

-  PRINT *, 'sum2=', sum2

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.1/make_save_5_1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.1/make_save_5_1.f90
deleted file mode 100644
index fb78fe1..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.1/make_save_5_1.f90
+++ /dev/null

@@ -1,19 +0,0 @@
-! USER STORY 5, TEST 1

-! Adds SAVE statement for variables sum1 and sum2 due to variables not 

-! having declaration statements while being initialized by a DATA statement

-

-! EXAMPLE FROM USER STORY

-

-PROGRAM MyProgram

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  DATA sum1, sum2 /100, 200/

-  sum1 = sum1 + sum1

-  sum2 = sum2 + sum2

-  PRINT *, 'sum1=', sum1

-  PRINT *, 'sum2=', sum2

-END SUBROUTINE MySub

-!<<<<< 1,1, pass


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.1/make_save_5_1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.1/make_save_5_1.f90.result
deleted file mode 100644
index d1ba72d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.1/make_save_5_1.f90.result
+++ /dev/null

@@ -1,20 +0,0 @@
-! USER STORY 5, TEST 1

-! Adds SAVE statement for variables sum1 and sum2 due to variables not 

-! having declaration statements while being initialized by a DATA statement

-

-! EXAMPLE FROM USER STORY

-

-PROGRAM MyProgram

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  SAVE sum1, sum2

-  DATA sum1, sum2 /100, 200/

-  sum1 = sum1 + sum1

-  sum2 = sum2 + sum2

-  PRINT *, 'sum1=', sum1

-  PRINT *, 'sum2=', sum2

-END SUBROUTINE MySub

-!<<<<< 1,1, pass


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.2/make_save_5_2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.2/make_save_5_2.f90
deleted file mode 100644
index 1647ec4..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.2/make_save_5_2.f90
+++ /dev/null

@@ -1,19 +0,0 @@
-! USER STORY 5, TEST 2

-! Adds variable sum2 to a previously existing SAVE statement due to variable not

-! having a declaration statement while being initialized by a DATA statement

-

-! EXAMPLE FROM USER STORY

-

-PROGRAM MyProgram !<<<<< 1,1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  DATA sum1, sum2 /100, 200/

-  SAVE sum1

-  sum1 = sum1 + sum1

-  sum2 = sum2 + sum2

-  PRINT *, 'sum1=', sum1

-  PRINT *, 'sum2=', sum2

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.2/make_save_5_2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.2/make_save_5_2.f90.result
deleted file mode 100644
index 4a388e9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.2/make_save_5_2.f90.result
+++ /dev/null

@@ -1,19 +0,0 @@
-! USER STORY 5, TEST 2

-! Adds variable sum2 to a previously existing SAVE statement due to variable not

-! having a declaration statement while being initialized by a DATA statement

-

-! EXAMPLE FROM USER STORY

-

-PROGRAM MyProgram !<<<<< 1,1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  DATA sum1, sum2 /100, 200/

-  SAVE sum1, sum2

-  sum1 = sum1 + sum1

-  sum2 = sum2 + sum2

-  PRINT *, 'sum1=', sum1

-  PRINT *, 'sum2=', sum2

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.3/make_save_5_3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.3/make_save_5_3.f90
deleted file mode 100644
index 66faef7..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.3/make_save_5_3.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-! USER STORY 5, TEST 3

-! Adds SAVE statement for variable i due to variable not having declaration

-! statement while being initialized by a DATA statement (variable unused,

-! otherwise), but does not add SAVE statement for variable j due to variable

-! having neither a declaration statement nor a DATA statement for its

-! initialization

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  DATA i /0/

-  j = 0

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.3/make_save_5_3.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.3/make_save_5_3.f90.result
deleted file mode 100644
index 4f53bc5..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.3/make_save_5_3.f90.result
+++ /dev/null

@@ -1,17 +0,0 @@
-! USER STORY 5, TEST 3

-! Adds SAVE statement for variable i due to variable not having declaration

-! statement while being initialized by a DATA statement (variable unused,

-! otherwise), but does not add SAVE statement for variable j due to variable

-! having neither a declaration statement nor a DATA statement for its

-! initialization

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  SAVE i

-  DATA i /0/

-  j = 0

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.4/make_save_5_4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.4/make_save_5_4.f90
deleted file mode 100644
index dd3df55..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.4/make_save_5_4.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-! USER STORY 5, TEST 4

-! Does not add variable i to existing SAVE statement due to variable names

-! being case-insensitive, meaning that variable i is already explicitly saved

-! due to the existing SAVE statement

-

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  SAVE I

-  DATA i /0/

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.4/make_save_5_4.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.4/make_save_5_4.f90.result
deleted file mode 100644
index dd3df55..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-5/test-5.4/make_save_5_4.f90.result
+++ /dev/null

@@ -1,15 +0,0 @@
-! USER STORY 5, TEST 4

-! Does not add variable i to existing SAVE statement due to variable names

-! being case-insensitive, meaning that variable i is already explicitly saved

-! due to the existing SAVE statement

-

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  SAVE I

-  DATA i /0/

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.1/make_save_6_1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.1/make_save_6_1.f90
deleted file mode 100644
index 611a7e4..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.1/make_save_6_1.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-! USER STORY 6, TEST 1

-! Adds SAVE statement for variable call_counter due to variable being

-! initialized in its declaration statement while sharing the same declaration

-! statement with non-initialized variable other_var

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER :: call_counter = 0, other_var

-  call_counter = call_counter + 1

-  PRINT *, 'called:', call_counter

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.1/make_save_6_1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.1/make_save_6_1.f90.result
deleted file mode 100644
index afbee06..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.1/make_save_6_1.f90.result
+++ /dev/null

@@ -1,16 +0,0 @@
-! USER STORY 6, TEST 1

-! Adds SAVE statement for variable call_counter due to variable being

-! initialized in its declaration statement while sharing the same declaration

-! statement with non-initialized variable other_var

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  SAVE call_counter

-  INTEGER :: call_counter = 0, other_var

-  call_counter = call_counter + 1

-  PRINT *, 'called:', call_counter

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.2/make_save_6_2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.2/make_save_6_2.f90
deleted file mode 100644
index 59d9dc1..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.2/make_save_6_2.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-! USER STORY 6, TEST 2

-! Adds variable call_counter to a previously existing SAVE statement due to

-! variable being initialized in its declaration statement while sharing the

-! same declaration statement with non-initialized variable other_var

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  SAVE third_var

-  INTEGER :: call_counter = 0, other_var

-  INTEGER :: third_var

-  call_counter = call_counter + 1

-  PRINT *, 'called:', call_counter

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.2/make_save_6_2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.2/make_save_6_2.f90.result
deleted file mode 100644
index a5bf146..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.2/make_save_6_2.f90.result
+++ /dev/null

@@ -1,17 +0,0 @@
-! USER STORY 6, TEST 2

-! Adds variable call_counter to a previously existing SAVE statement due to

-! variable being initialized in its declaration statement while sharing the

-! same declaration statement with non-initialized variable other_var

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  SAVE third_var, call_counter

-  INTEGER :: call_counter = 0, other_var

-  INTEGER :: third_var

-  call_counter = call_counter + 1

-  PRINT *, 'called:', call_counter

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.3/make_save_6_3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.3/make_save_6_3.f90
deleted file mode 100644
index 6cedc52..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.3/make_save_6_3.f90
+++ /dev/null

@@ -1,18 +0,0 @@
-! USER STORY 6, TEST 3

-! Adds SAVE attribute to the declaration statement for variables

-! first_call_counter and second_call_counter since both variables are

-! implicitly saved by some means

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER :: first_call_counter = 0, second_call_counter

-  DATA second_call_counter /10/

-  first_call_counter = first_call_counter + 1

-  second_call_counter = second_call_counter + 1

-  PRINT *, 'called:', first_call_counter

-  PRINT *, 'called:', second_call_counter

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.3/make_save_6_3.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.3/make_save_6_3.f90.result
deleted file mode 100644
index 23af7a0..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.3/make_save_6_3.f90.result
+++ /dev/null

@@ -1,18 +0,0 @@
-! USER STORY 6, TEST 3

-! Adds SAVE attribute to the declaration statement for variables

-! first_call_counter and second_call_counter since both variables are

-! implicitly saved by some means

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER, SAVE :: first_call_counter = 0, second_call_counter

-  DATA second_call_counter /10/

-  first_call_counter = first_call_counter + 1

-  second_call_counter = second_call_counter + 1

-  PRINT *, 'called:', first_call_counter

-  PRINT *, 'called:', second_call_counter

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.4/make_save_6_4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.4/make_save_6_4.f90
deleted file mode 100644
index 867ed30..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.4/make_save_6_4.f90
+++ /dev/null

@@ -1,18 +0,0 @@
-! USER STORY 6, TEST 4

-! Adds SAVE statement for variables first_call_counter and second_call_counter

-! since both variables are implicitly saved by some means while sharing the

-! same declaration statement with a variable that is not implicitly saved

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER :: first_call_counter = 0, second_call_counter, other_var

-  DATA second_call_counter /10/

-  first_call_counter = first_call_counter + 1

-  second_call_counter = second_call_counter + 1

-  PRINT *, 'called:', first_call_counter

-  PRINT *, 'called:', second_call_counter

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.4/make_save_6_4.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.4/make_save_6_4.f90.result
deleted file mode 100644
index 938ead2..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.4/make_save_6_4.f90.result
+++ /dev/null

@@ -1,19 +0,0 @@
-! USER STORY 6, TEST 4

-! Adds SAVE statement for variables first_call_counter and second_call_counter

-! since both variables are implicitly saved by some means while sharing the

-! same declaration statement with a variable that is not implicitly saved

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  SAVE first_call_counter, second_call_counter

-  INTEGER :: first_call_counter = 0, second_call_counter, other_var

-  DATA second_call_counter /10/

-  first_call_counter = first_call_counter + 1

-  second_call_counter = second_call_counter + 1

-  PRINT *, 'called:', first_call_counter

-  PRINT *, 'called:', second_call_counter

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.5/make_save_6_5.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.5/make_save_6_5.f90
deleted file mode 100644
index 46de0b5..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.5/make_save_6_5.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-! USER STORY 6, TEST 5

-! Adds variable call_counter to SAVE statement for variable other_var due to

-! call_counter being initialized in its declaration statement while sharing the

-! same declaration statement with explicitly-saved variable other_var

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  SAVE other_var

-  INTEGER :: other_var, call_counter = 0

-  call_counter = call_counter + 1

-  PRINT *, 'called:', call_counter

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.5/make_save_6_5.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.5/make_save_6_5.f90.result
deleted file mode 100644
index 034b488..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-6/test-6.5/make_save_6_5.f90.result
+++ /dev/null

@@ -1,16 +0,0 @@
-! USER STORY 6, TEST 5

-! Adds variable call_counter to SAVE statement for variable other_var due to

-! call_counter being initialized in its declaration statement while sharing the

-! same declaration statement with explicitly-saved variable other_var

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  SAVE other_var, call_counter

-  INTEGER :: other_var, call_counter = 0

-  call_counter = call_counter + 1

-  PRINT *, 'called:', call_counter

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.1/make_save_7_1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.1/make_save_7_1.f90
deleted file mode 100644
index cd41aca..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.1/make_save_7_1.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-! USER STORY 7, TEST 1

-! Adds SAVE statement for variable call_counter due to variable being

-! initialized in its declaration statement without :: operator

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER call_counter = 0

-  call_counter = call_counter + 1

-  PRINT *, 'called:', call_counter

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.1/make_save_7_1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.1/make_save_7_1.f90.result
deleted file mode 100644
index a5b9891..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.1/make_save_7_1.f90.result
+++ /dev/null

@@ -1,14 +0,0 @@
-! USER STORY 7, TEST 1

-! Adds SAVE statement for variable call_counter due to variable being

-! initialized in its declaration statement without :: operator

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER, SAVE :: call_counter = 0

-  call_counter = call_counter + 1

-  PRINT *, 'called:', call_counter

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.2/make_save_7_2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.2/make_save_7_2.f90
deleted file mode 100644
index 2cf84a0..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.2/make_save_7_2.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-! USER STORY 7, TEST 1

-! Adds SAVE statement for variable call_counter due to variable being

-! implicitly saved in a data block

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER call_counter

-  data call_counter /10/

-  call_counter = call_counter + 1

-  PRINT *, 'called:', call_counter

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.2/make_save_7_2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.2/make_save_7_2.f90.result
deleted file mode 100644
index 9a13578..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.2/make_save_7_2.f90.result
+++ /dev/null

@@ -1,15 +0,0 @@
-! USER STORY 7, TEST 1

-! Adds SAVE statement for variable call_counter due to variable being

-! implicitly saved in a data block

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER, SAVE :: call_counter

-  data call_counter /10/

-  call_counter = call_counter + 1

-  PRINT *, 'called:', call_counter

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.3/make_save_7_3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.3/make_save_7_3.f90
deleted file mode 100644
index f44c098..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.3/make_save_7_3.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-! USER STORY 7, TEST 1

-! Adds SAVE statement for variable call_counter and call_counter2  

-! due to variables being implicitly saved 

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER call_counter = 10, call_counter2 = 20

-  call_counter = call_counter + 1

-  call_counter2 = call_counter2 + 2

-  PRINT *, 'called:', call_counter, call_counter2

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.3/make_save_7_3.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.3/make_save_7_3.f90.result
deleted file mode 100644
index 49c4900..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-7/test-7.3/make_save_7_3.f90.result
+++ /dev/null

@@ -1,15 +0,0 @@
-! USER STORY 7, TEST 1

-! Adds SAVE statement for variable call_counter and call_counter2  

-! due to variables being implicitly saved 

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER, SAVE :: call_counter = 10, call_counter2 = 20

-  call_counter = call_counter + 1

-  call_counter2 = call_counter2 + 2

-  PRINT *, 'called:', call_counter, call_counter2

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.1/make_save_8_1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.1/make_save_8_1.f90
deleted file mode 100644
index 65d4586..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.1/make_save_8_1.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-! USER STORY 8, TEST 1

-! Adds SAVE attribute to the initialized declaration statement for variable j

-! in subroutine MySub, but not to the initialized declaration statement for

-! variable i in program MyProgram

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  INTEGER :: i = 0

-  i = i + 1

-  PRINT *, 'called:', i

-  i = i + 1

-  PRINT *, 'called:', i

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER :: j = 10

-  j = j + 1

-  PRINT *, 'called:', j

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.1/make_save_8_1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.1/make_save_8_1.f90.result
deleted file mode 100644
index 9f9657c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.1/make_save_8_1.f90.result
+++ /dev/null

@@ -1,20 +0,0 @@
-! USER STORY 8, TEST 1

-! Adds SAVE attribute to the initialized declaration statement for variable j

-! in subroutine MySub, but not to the initialized declaration statement for

-! variable i in program MyProgram

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  INTEGER :: i = 0

-  i = i + 1

-  PRINT *, 'called:', i

-  i = i + 1

-  PRINT *, 'called:', i

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER, SAVE :: j = 10

-  j = j + 1

-  PRINT *, 'called:', j

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.2/make_save_8_2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.2/make_save_8_2.f90
deleted file mode 100644
index 158f753..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.2/make_save_8_2.f90
+++ /dev/null

@@ -1,23 +0,0 @@
-! USER STORY 8, TEST 2

-! Adds SAVE attribute to the declaration statement for variable j initialized

-! through a DATA statement in subroutine MySub, but not to the declaration

-! statement for variable i also initialized through a DATA statement in program

-! MyProgram

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  INTEGER :: i

-  DATA i /0/

-  i = i + 1

-  PRINT *, 'called:', i

-  i = i + 1

-  PRINT *, 'called:', i

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER :: j

-  DATA j /0/

-  j = j + 1

-  PRINT *, 'called:', j

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.2/make_save_8_2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.2/make_save_8_2.f90.result
deleted file mode 100644
index 4c77a4f..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.2/make_save_8_2.f90.result
+++ /dev/null

@@ -1,23 +0,0 @@
-! USER STORY 8, TEST 2

-! Adds SAVE attribute to the declaration statement for variable j initialized

-! through a DATA statement in subroutine MySub, but not to the declaration

-! statement for variable i also initialized through a DATA statement in program

-! MyProgram

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  INTEGER :: i

-  DATA i /0/

-  i = i + 1

-  PRINT *, 'called:', i

-  i = i + 1

-  PRINT *, 'called:', i

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  INTEGER, SAVE :: j

-  DATA j /0/

-  j = j + 1

-  PRINT *, 'called:', j

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.3/make_save_8_3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.3/make_save_8_3.f90
deleted file mode 100644
index fe29b2a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.3/make_save_8_3.f90
+++ /dev/null

@@ -1,21 +0,0 @@
-! USER STORY 8, TEST 3

-! Adds SAVE statement for variables j due to variable not having declaration

-! statement while being initialized by a DATA statement in subroutine MySub,

-! but doesn't add it for variables i due to variable not having declaration

-! statement while being initialized by a DATA statement in program MyProgram

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  DATA i /0/

-  i = i + 1

-  PRINT *, 'called:', i

-  i = i + 1

-  PRINT *, 'called:', i

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  DATA j /0/

-  j = j + 1

-  PRINT *, 'called:', j

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.3/make_save_8_3.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.3/make_save_8_3.f90.result
deleted file mode 100644
index eed7304..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/make-save-explicit/user-story-8/test-8.3/make_save_8_3.f90.result
+++ /dev/null

@@ -1,22 +0,0 @@
-! USER STORY 8, TEST 3

-! Adds SAVE statement for variables j due to variable not having declaration

-! statement while being initialized by a DATA statement in subroutine MySub,

-! but doesn't add it for variables i due to variable not having declaration

-! statement while being initialized by a DATA statement in program MyProgram

-

-PROGRAM MyProgram !<<<<< 1, 1, pass

-  DATA i /0/

-  i = i + 1

-  PRINT *, 'called:', i

-  i = i + 1

-  PRINT *, 'called:', i

-  CALL MySub

-  CALL MySub

-END PROGRAM MyProgram

-

-SUBROUTINE MySub

-  SAVE j

-  DATA j /0/

-  j = j + 1

-  PRINT *, 'called:', j

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test1/module.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test1/module.f90
deleted file mode 100644
index 2d8c83a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test1/module.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-module module

-    implicit none

-    integer :: i

-contains

-    subroutine helper

-        print *, "You've been helped."

-    end subroutine helper

-end module module


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test1/test1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test1/test1.f90
deleted file mode 100644
index 9f7b5d3..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test1/test1.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-program test

-    use module, only: i, helper !<<<<< 2, 9, 2, 15, pass

-    implicit none

-    i = 5

-    call helper

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test1/test1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test1/test1.f90.result
deleted file mode 100644
index cf5c012..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test1/test1.f90.result
+++ /dev/null

@@ -1,6 +0,0 @@
-program test

-    use module

-    implicit none

-    i = 5

-    call helper

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test10/program1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test10/program1.f90
deleted file mode 100644
index 86459e1..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test10/program1.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-module m

-   integer :: used, unused

-end module

-

-program modules

-    use m !<<<<< 6, 9, 6, 10, pass

-    implicit none

-

-    used = 3

-end program modules


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test10/program1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test10/program1.f90.result
deleted file mode 100644
index 2273a4f..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test10/program1.f90.result
+++ /dev/null

@@ -1,10 +0,0 @@
-module m

-   integer :: used, unused

-end module

-

-program modules

-    use m, only: used

-    implicit none

-

-    used = 3

-end program modules


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test2/module.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test2/module.f90
deleted file mode 100644
index 2d8c83a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test2/module.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-module module

-    implicit none

-    integer :: i

-contains

-    subroutine helper

-        print *, "You've been helped."

-    end subroutine helper

-end module module


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test2/test2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test2/test2.f90
deleted file mode 100644
index 94d103e..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test2/test2.f90
+++ /dev/null

@@ -1,5 +0,0 @@
-program test2

-    use module, only: i, helper !<<<<< 2, 9, 2, 15, pass

-    implicit none

-    call helper

-end program test2


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test2/test2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test2/test2.f90.result
deleted file mode 100644
index 1caf92c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test2/test2.f90.result
+++ /dev/null

@@ -1,5 +0,0 @@
-program test2

-    use module, only: helper

-    implicit none

-    call helper

-end program test2


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test3/module.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test3/module.f90
deleted file mode 100644
index 2d8c83a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test3/module.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-module module

-    implicit none

-    integer :: i

-contains

-    subroutine helper

-        print *, "You've been helped."

-    end subroutine helper

-end module module


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test3/test3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test3/test3.f90
deleted file mode 100644
index 422fe3b..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test3/test3.f90
+++ /dev/null

@@ -1,4 +0,0 @@
-program test3

-    use module, only: i, helper !<<<<< 2, 9, 2, 15, pass

-    implicit none

-end program test3


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test3/test3.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test3/test3.f90.result
deleted file mode 100644
index 297f3b4..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test3/test3.f90.result
+++ /dev/null

@@ -1,3 +0,0 @@
-program test3

-    implicit none

-end program test3


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test4/module.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test4/module.f90
deleted file mode 100644
index 2d8c83a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test4/module.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-module module

-    implicit none

-    integer :: i

-contains

-    subroutine helper

-        print *, "You've been helped."

-    end subroutine helper

-end module module


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test4/test4_5.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test4/test4_5.f90
deleted file mode 100644
index 2dc4ae4..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test4/test4_5.f90
+++ /dev/null

@@ -1,5 +0,0 @@
-program test

-    use module, only: i, helper !<<<<< 2, 9, 2, 9, fail-initial

-    use emptyModule, only: help

-    implicit none

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test5/module.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test5/module.f90
deleted file mode 100644
index 2d8c83a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test5/module.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-module module

-    implicit none

-    integer :: i

-contains

-    subroutine helper

-        print *, "You've been helped."

-    end subroutine helper

-end module module


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test5/test4_5.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test5/test4_5.f90
deleted file mode 100644
index f8a6d44..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test5/test4_5.f90
+++ /dev/null

@@ -1,5 +0,0 @@
-program test

-    use module, only: i, helper

-    use emptyModule, only: help !<<<<< 3, 9, 3, 20, fail-initial

-    implicit none

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test6/module.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test6/module.f90
deleted file mode 100644
index 2d8c83a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test6/module.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-module module

-    implicit none

-    integer :: i

-contains

-    subroutine helper

-        print *, "You've been helped."

-    end subroutine helper

-end module module


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test6/test6.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test6/test6.f90
deleted file mode 100644
index 6ae0b4d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test6/test6.f90
+++ /dev/null

@@ -1,5 +0,0 @@
-program test

-    use module, only: i, helper

-    use nonexistant, only: what !<<<<< 3, 9, 3, 20, fail-initial

-    implicit none

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test7/module.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test7/module.f90
deleted file mode 100644
index 2d8c83a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test7/module.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-module module

-    implicit none

-    integer :: i

-contains

-    subroutine helper

-        print *, "You've been helped."

-    end subroutine helper

-end module module


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test7/test7.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test7/test7.f90
deleted file mode 100644
index 7eb0b6b..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test7/test7.f90
+++ /dev/null

@@ -1,5 +0,0 @@
-program test

-    use module, only: i, helper

-    implicit none

-    integer :: q !<<<<< 4, 16, 4, 17, fail-initial

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test8/program3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test8/program3.f90
deleted file mode 100644
index a3e1779..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test8/program3.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-module m

-   integer :: used, unused

-end module

-

-program modules

-    use m, only: whatever => used, unused !<<<<< 6, 9, 6, 10, pass

-    implicit none

-

-    whatever = 3

-end program modules


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test8/program3.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test8/program3.f90.result
deleted file mode 100644
index 9e34ea8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test8/program3.f90.result
+++ /dev/null

@@ -1,10 +0,0 @@
-module m

-   integer :: used, unused

-end module

-

-program modules

-    use m, only: whatever => used

-    implicit none

-

-    whatever = 3

-end program modules


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test9/program2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test9/program2.f90
deleted file mode 100644
index a836b58..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test9/program2.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-module m

-   integer :: used, unused

-end module

-

-program modules

-    use m, only: used, unused !<<<<< 6, 9, 6, 10, pass

-    implicit none

-

-    used = 3

-end program modules


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test9/program2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test9/program2.f90.result
deleted file mode 100644
index 2273a4f..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/min-only-list/test9/program2.f90.result
+++ /dev/null

@@ -1,10 +0,0 @@
-module m

-   integer :: used, unused

-end module

-

-program modules

-    use m, only: used

-    implicit none

-

-    used = 3

-end program modules


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/move-saved-to-common-block/test1/test1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/move-saved-to-common-block/test1/test1.f90
deleted file mode 100644
index edac470..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/move-saved-to-common-block/test1/test1.f90
+++ /dev/null

@@ -1,94 +0,0 @@
-MODULE MySeparateFileMod

-

-END MODULE

-

-PROGRAM MyMain

-

-    USE MySeparateFileMod

-

-    COMMON /MyTestFun_common1/ aVar

-

-    REAL :: a_xxx1

-

-    REAL :: comVar

-

-    REAL :: aVar

-

-    COMMON /CB1/ comVar

-

-    print *, test

-

-    print *, internalModVar

-

-    comVar = 5.5

-

-    CONTAINS

-

-    REAL FUNCTION MyTestFun() !<<<<< 27, 10, pass

-

-        REAL :: com

-

-        COMMON /MyTestFun_common2/ com

-

-        REAL :: q = 3.3, w, e = 5.5

-

-        REAL, DIMENSION(5) :: r, t

-

-        REAL, SAVE :: u = 1.1

-

-        REAL, SAVE :: o

-

-        REAL, POINTER :: p

-

-        POINTER o

-

-        REAL :: b, c, d

-

-        REAL, POINTER :: a

-

-        POINTER c, d

-

-        SAVE a, r, p, b, c

-

-        DIMENSION b(10)

-

-        c = 1.2

-

-        MyTestFun = 3.3

-

-    END FUNCTION MyTestFun

-

-    REAL FUNCTION MyTestFun2(aVar)

-

-        REAL, DIMENSION (10:10) :: aVar

-

-        CHARACTER (LEN=30) :: char

-

-        REAL :: bVar(100:100)

-

-        DOUBLE PRECISION :: cVar(10)

-

-        REAL, PARAMETER :: b = 1.1

-

-        REAL c

-

-        POINTER c

-

-        SAVE

-

-        MyTestFun2 = 0.0

-

-    END FUNCTION MyTestFun2

-

-END PROGRAM MyMain

-

-SUBROUTINE MySub

-

-    REAL :: test

-    COMMON /CB1/ comVar

-

-    test = 1.1

-

-    comVar = comVar + comVar

-

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/move-saved-to-common-block/test1/test1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/move-saved-to-common-block/test1/test1.f90.result
deleted file mode 100644
index b42c1b0..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/move-saved-to-common-block/test1/test1.f90.result
+++ /dev/null

@@ -1,114 +0,0 @@
-MODULE MySeparateFileMod

-

-END MODULE

-

-PROGRAM MyMain

-

-    USE MySeparateFileMod

-

-    REAL, POINTER :: a_xxx2

-

-    REAL, DIMENSION(10) :: b_xxx1

-

-    REAL, POINTER :: c_xxx1

-

-    REAL :: e_xxx1 = 5.5

-

-    REAL, POINTER :: o_xxx1

-

-    REAL, POINTER :: p_xxx1

-

-    REAL :: q_xxx1 = 3.3

-

-    REAL, DIMENSION(5) :: r_xxx1

-

-    REAL :: u_xxx1 = 1.1

-

-    COMMON /MyTestFun_common3/ a_xxx2,b_xxx1,c_xxx1,e_xxx1,o_xxx1,p_xxx1,q_xxx1,r_xxx1,u_xxx1

-

-    COMMON /MyTestFun_common1/ aVar

-

-    REAL :: a_xxx1

-

-    REAL :: comVar

-

-    REAL :: aVar

-

-    COMMON /CB1/ comVar

-

-    print *, test

-

-    print *, internalModVar

-

-    comVar = 5.5

-

-    CONTAINS

-

-    REAL FUNCTION MyTestFun() !<<<<< 27, 10, pass

-

-        COMMON /MyTestFun_common3/ a_xxx2,b_xxx1,c_xxx1,e_xxx1,o_xxx1,p_xxx1,q_xxx1,r_xxx1,u_xxx1

-

-        REAL :: com

-

-        COMMON /MyTestFun_common2/ com

-

-        REAL :: q_xxx1, w, e_xxx1

-

-        REAL, DIMENSION(5) :: r_xxx1, t

-

-        REAL :: u_xxx1

-

-        REAL :: o_xxx1

-

-        REAL, POINTER :: p_xxx1

-

-        POINTER o_xxx1

-

-        REAL :: b_xxx1, c_xxx1, d

-

-        REAL, POINTER :: a_xxx2

-

-        POINTER c_xxx1, d

-

-        DIMENSION b_xxx1(10)

-

-        c_xxx1 = 1.2

-

-        MyTestFun = 3.3

-

-    END FUNCTION MyTestFun

-

-    REAL FUNCTION MyTestFun2(aVar)

-

-        REAL, DIMENSION (10:10) :: aVar

-

-        CHARACTER (LEN=30) :: char

-

-        REAL :: bVar(100:100)

-

-        DOUBLE PRECISION :: cVar(10)

-

-        REAL, PARAMETER :: b = 1.1

-

-        REAL c

-

-        POINTER c

-

-        SAVE

-

-        MyTestFun2 = 0.0

-

-    END FUNCTION MyTestFun2

-

-END PROGRAM MyMain

-

-SUBROUTINE MySub

-

-    REAL :: test

-    COMMON /CB1/ comVar

-

-    test = 1.1

-

-    comVar = comVar + comVar

-

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/move-saved-to-common-block/test2/test2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/move-saved-to-common-block/test2/test2.f90
deleted file mode 100644
index 2a86463..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/move-saved-to-common-block/test2/test2.f90
+++ /dev/null

@@ -1,93 +0,0 @@
-MODULE MySeparateFileMod

-

-END MODULE

-

-PROGRAM MyMain

-

-    USE MySeparateFileMod

-

-    COMMON /MyTestFun_common1/ aVar

-

-    REAL :: a_xxx1

-

-    REAL :: comVar

-

-    REAL :: aVar

-

-    COMMON /CB1/ comVar

-

-    print *, test

-

-    print *, internalModVar

-

-    comVar = 5.5

-

-    CONTAINS

-

-    REAL FUNCTION MyTestFun()

-

-        REAL :: com

-

-        COMMON /MyTestFun_common2/ com

-

-        REAL :: q = 3.3, w, e = 5.5

-

-        REAL, DIMENSION(5) :: r, t

-

-        REAL, SAVE :: u = 1.1

-

-        REAL, SAVE :: o

-

-        REAL, POINTER :: p

-

-        POINTER o

-

-        REAL :: b, c, d

-

-        REAL, POINTER :: a

-

-        POINTER c, d

-

-        SAVE a, r, p, b, c

-

-        DIMENSION b(10)

-

-        c = 1.2

-

-        MyTestFun = 3.3

-

-    END FUNCTION MyTestFun

-

-    REAL FUNCTION MyTestFun2(aVar) !<<<<< 61, 10, pass

-

-        REAL, DIMENSION (10:10) :: aVar

-

-        CHARACTER (LEN=30) :: char

-

-        REAL :: bVar(100:100)

-

-        DOUBLE PRECISION :: cVar(10)

-

-        REAL, PARAMETER :: b = 1.1

-

-        REAL c

-

-        POINTER c

-

-        SAVE

-

-        MyTestFun2 = 0.0

-    END FUNCTION MyTestFun2

-

-END PROGRAM MyMain

-

-SUBROUTINE MySub

-

-    REAL :: test

-    COMMON /CB1/ comVar

-

-    test = 1.1

-

-    comVar = comVar + comVar

-

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/move-saved-to-common-block/test2/test2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/move-saved-to-common-block/test2/test2.f90.result
deleted file mode 100644
index 7b80ab9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/move-saved-to-common-block/test2/test2.f90.result
+++ /dev/null

@@ -1,103 +0,0 @@
-MODULE MySeparateFileMod

-

-END MODULE

-

-PROGRAM MyMain

-

-    USE MySeparateFileMod

-

-    REAL :: bvar_xxx1(100:100)

-

-    REAL, POINTER :: c_xxx1

-

-    CHARACTER (LEN=30) :: char_xxx1

-

-    DOUBLE PRECISION :: cvar_xxx1(10)

-

-    COMMON /MyTestFun2_common1/ bvar_xxx1,c_xxx1,char_xxx1,cvar_xxx1

-

-    COMMON /MyTestFun_common1/ aVar

-

-    REAL :: a_xxx1

-

-    REAL :: comVar

-

-    REAL :: aVar

-

-    COMMON /CB1/ comVar

-

-    print *, test

-

-    print *, internalModVar

-

-    comVar = 5.5

-

-    CONTAINS

-

-    REAL FUNCTION MyTestFun()

-

-        REAL :: com

-

-        COMMON /MyTestFun_common2/ com

-

-        REAL :: q = 3.3, w, e = 5.5

-

-        REAL, DIMENSION(5) :: r, t

-

-        REAL, SAVE :: u = 1.1

-

-        REAL, SAVE :: o

-

-        REAL, POINTER :: p

-

-        POINTER o

-

-        REAL :: b, c, d

-

-        REAL, POINTER :: a

-

-        POINTER c, d

-

-        SAVE a, r, p, b, c

-

-        DIMENSION b(10)

-

-        c = 1.2

-

-        MyTestFun = 3.3

-

-    END FUNCTION MyTestFun

-

-    REAL FUNCTION MyTestFun2(aVar) !<<<<< 61, 10, pass

-

-        COMMON /MyTestFun2_common1/ bvar_xxx1,c_xxx1,char_xxx1,cvar_xxx1

-

-        REAL, DIMENSION (10:10) :: aVar

-

-        CHARACTER (LEN=30) :: char_xxx1

-

-        REAL :: bvar_xxx1(100:100)

-

-        DOUBLE PRECISION :: cvar_xxx1(10)

-

-        REAL, PARAMETER :: b = 1.1

-

-        REAL c_xxx1

-

-        POINTER c_xxx1

-

-        MyTestFun2 = 0.0

-    END FUNCTION MyTestFun2

-

-END PROGRAM MyMain

-

-SUBROUTINE MySub

-

-    REAL :: test

-    COMMON /CB1/ comVar

-

-    test = 1.1

-

-    comVar = comVar + comVar

-

-END SUBROUTINE MySub


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-alternate-return/test-alternate-return.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-alternate-return/test-alternate-return.f90
deleted file mode 100644
index bd57f51..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-alternate-return/test-alternate-return.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-program testaltreturn
-    call testsub(4,3,200,10,200,E=10,D=2)
-    
-200 print *, "hello, world!"
-
-end program
-
-subroutine testsub(A,B,*,C,*,D,E) !<<<<< 8,1,8,5,2,1,0,4,3,6,5,pass
-
-end subroutine
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-alternate-return/test-alternate-return.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-alternate-return/test-alternate-return.f90.result
deleted file mode 100644
index 15f53cb..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-alternate-return/test-alternate-return.f90.result
+++ /dev/null

@@ -1,10 +0,0 @@
-program testaltreturn
-    call testsub(200,3,4,200,10,E=10,D=2)
-    
-200 print *, "hello, world!"
-
-end program
-
-subroutine testsub(*,B,A,*,C,E,D) !<<<<< 8,1,8,5,2,1,0,4,3,6,5,pass
-
-end subroutine

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-basic/test-basic.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-basic/test-basic.f90
deleted file mode 100644
index 10c87dd..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-basic/test-basic.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-program basictest
-    call simple(4,3,2)
-    
-    call simple(4,Gamma=2,Beta=3)
-end program basictest
-
-subroutine simple(Alpha, Beta, Gamma) !<<<<< 7,1,7,5,2,1,0,pass
-    integer, intent(in) :: Alpha
-    integer, intent(out) :: Beta
-    integer, intent(inout) :: Gamma
-end subroutine
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-basic/test-basic.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-basic/test-basic.f90.result
deleted file mode 100644
index 447bb2d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-basic/test-basic.f90.result
+++ /dev/null

@@ -1,11 +0,0 @@
-program basictest
-    call simple(2,3,4)
-    
-    call simple(Gamma=2,Beta=3,Alpha=4)
-end program basictest
-
-subroutine simple( Gamma, Beta,Alpha) !<<<<< 7,1,7,5,2,1,0,pass
-    integer, intent(in) :: Alpha
-    integer, intent(out) :: Beta
-    integer, intent(inout) :: Gamma
-end subroutine

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-interface/test-interface.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-interface/test-interface.f90
deleted file mode 100644
index 2ee2a7a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-interface/test-interface.f90
+++ /dev/null

@@ -1,33 +0,0 @@
-program testoptional
-    interface
-        subroutine testsub(A,B,*,*,C,D,E,F)
-            integer, optional :: C
-            integer, optional :: E
-        end subroutine
-    end interface
-
-    call testsub(1,2,200,200,3,4,5,6)
-
-    call testsub(1,2,200,200,F=3,D=4)
-
-200 print *, "hello, world!"
-end program testoptional
-
-subroutine testsub(A,B,*,*,C,D,E,F) !<<<<< 16,1,16,5,2,1,3,0,5,4,6,7,pass
-    integer, optional :: C
-    integer, optional :: E
-end subroutine
-
-subroutine testsub2
-    interface
-        subroutine testsub(A,B,*,*,C,D,E,F)
-            integer, optional :: C
-            integer, optional :: E
-        end subroutine
-    end interface
-
-    call testsub(1,2,300,300,D=20,E=30,F=2,C=5)
-
-300 print *, "world, hello!!"
-
-end subroutine

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-interface/test-interface.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-interface/test-interface.f90.result
deleted file mode 100644
index 36bbf87..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-interface/test-interface.f90.result
+++ /dev/null

@@ -1,33 +0,0 @@
-program testoptional
-    interface
-        subroutine testsub(*,B,*,A,D,C,E,F)
-            integer, optional :: C
-            integer, optional :: E
-        end subroutine
-    end interface
-
-    call testsub(200,2,200,1,4,3,5,6)
-
-    call testsub(200,2,200,1,D=4,F=3)
-
-200 print *, "hello, world!"
-end program testoptional
-
-subroutine testsub(*,B,*,A,D,C,E,F) !<<<<< 16,1,16,5,2,1,3,0,5,4,6,7,pass
-    integer, optional :: C
-    integer, optional :: E
-end subroutine
-
-subroutine testsub2
-    interface
-        subroutine testsub(*,B,*,A,D,C,E,F)
-            integer, optional :: C
-            integer, optional :: E
-        end subroutine
-    end interface
-
-    call testsub(300,2,300,1,D=20,C=5,E=30,F=2)
-
-300 print *, "world, hello!!"
-
-end subroutine

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-interface2/test-interface2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-interface2/test-interface2.f90
deleted file mode 100644
index fad6c69..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-interface2/test-interface2.f90
+++ /dev/null

@@ -1,37 +0,0 @@
-program testoptional
-    interface
-        subroutine testsub(A,B,*,*,C,D,E,F)
-            integer, optional :: C
-            integer, optional :: E
-        end subroutine
-    end interface
-
-    call testsub(1,2,200,200,3,4,5,6)
-
-    call testsub(1,2,200,200,F=3,D=4)
-
-200 print *, "hello, world!"
-end program testoptional
-
-subroutine testsub(A,B,*,*,C,D,E,F) !<<<<< 16,1,16,5,2,1,3,0,5,4,6,7,pass
-    integer, optional :: C
-    integer, optional :: E
-end subroutine
-
-subroutine testsub2
-    interface
-        subroutine testsub(A,B,*,*,C,D,E,F)
-            integer, optional :: C
-            integer, optional :: E
-        end subroutine
-
-        subroutine testsub(A)
-            integer :: A
-        end subroutine
-    end interface
-
-    call testsub(1,2,300,300,D=20,E=30,F=2,C=5)
-
-300 print *, "world, hello!!"
-
-end subroutine

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-interface2/test-interface2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-interface2/test-interface2.f90.result
deleted file mode 100644
index 425a255..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-interface2/test-interface2.f90.result
+++ /dev/null

@@ -1,37 +0,0 @@
-program testoptional
-    interface
-        subroutine testsub(*,B,*,A,D,C,E,F)
-            integer, optional :: C
-            integer, optional :: E
-        end subroutine
-    end interface
-
-    call testsub(200,2,200,1,4,3,5,6)
-
-    call testsub(200,2,200,1,D=4,F=3)
-
-200 print *, "hello, world!"
-end program testoptional
-
-subroutine testsub(*,B,*,A,D,C,E,F) !<<<<< 16,1,16,5,2,1,3,0,5,4,6,7,pass
-    integer, optional :: C
-    integer, optional :: E
-end subroutine
-
-subroutine testsub2
-    interface
-        subroutine testsub(*,B,*,A,D,C,E,F)
-            integer, optional :: C
-            integer, optional :: E
-        end subroutine
-
-        subroutine testsub(A)
-            integer :: A
-        end subroutine
-    end interface
-
-    call testsub(300,2,300,1,D=20,C=5,E=30,F=2)
-
-300 print *, "world, hello!!"
-
-end subroutine

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-internal-subroutine/test-internal-subroutine.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-internal-subroutine/test-internal-subroutine.f90
deleted file mode 100644
index bbc89e0..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-internal-subroutine/test-internal-subroutine.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-program testaltreturn
-    call testsub(4,3,200,10,200,E=10,D=2)
-    
-200 print *, "hello, world!"
-
-contains
-
-    subroutine testsub(A,B,*,C,*,D,E) !<<<<< 8,5,8,9,2,1,0,4,3,6,5,pass
-
-    end subroutine
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-internal-subroutine/test-internal-subroutine.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-internal-subroutine/test-internal-subroutine.f90.result
deleted file mode 100644
index a153c58..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-internal-subroutine/test-internal-subroutine.f90.result
+++ /dev/null

@@ -1,11 +0,0 @@
-program testaltreturn
-    call testsub(200,3,4,200,10,E=10,D=2)
-    
-200 print *, "hello, world!"
-
-contains
-
-    subroutine testsub(*,B,A,*,C,E,D) !<<<<< 8,5,8,9,2,1,0,4,3,6,5,pass
-
-    end subroutine
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-no-arguments/test-no-arguments.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-no-arguments/test-no-arguments.f90
deleted file mode 100644
index 07ad314..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-no-arguments/test-no-arguments.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-program testnoarg
-
-    call testsub
-    
-end program
-
-subroutine testsub !<<<<< 7,1,7,5,pass
-
-end subroutine
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-optional-arguments/test-optional-arguments.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-optional-arguments/test-optional-arguments.f90
deleted file mode 100644
index 477a3d9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-optional-arguments/test-optional-arguments.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-program testoptional
-    call testsub(1,2,200,200,3,4,5,6)
-    
-    call testsub(1,2,200,200,F=3,D=4)
-    
-    call testsub(1,2,200,200,E=5,F=3,D=4)
-
-200 print *, "hello, world!"
-end program testoptional
-
-subroutine testsub(A,B,*,*,C,D,E,F) !<<<<< 11,1,11,5,2,1,3,0,5,4,6,7,pass
-    integer, optional :: C
-    integer, optional :: E
-end subroutine
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-optional-arguments/test-optional-arguments.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-optional-arguments/test-optional-arguments.f90.result
deleted file mode 100644
index 761e583..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/permute-subroutine-args/test-optional-arguments/test-optional-arguments.f90.result
+++ /dev/null

@@ -1,14 +0,0 @@
-program testoptional
-    call testsub(200,2,200,1,4,3,5,6)
-    
-    call testsub(200,2,200,1,D=4,F=3)
-    
-    call testsub(200,2,200,1,D=4,E=5,F=3)
-
-200 print *, "hello, world!"
-end program testoptional
-
-subroutine testsub(*,B,*,A,D,C,E,F) !<<<<< 11,1,11,5,2,1,3,0,5,4,6,7,pass
-    integer, optional :: C
-    integer, optional :: E
-end subroutine

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test1/test1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test1/test1.f90
deleted file mode 100644
index f8c7074..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test1/test1.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-program test1 !<<<<< 1,1,pass
-
-INTEGER :: chicken = 0
-INTEGER :: rice
-
-if (chicken) 10,20,30
-
-10 rice = 1
-	goto 40
-20 rice = 2
-	goto 40
-30 rice = &
-	& 3
-
-40 print *, rice
-
-end program test1
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test1/test1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test1/test1.f90.result
deleted file mode 100644
index 8d5a9b7..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test1/test1.f90.result
+++ /dev/null

@@ -1,23 +0,0 @@
-program test1 !<<<<< 1,1,pass
-
-INTEGER :: chicken = 0
-INTEGER :: rice
-
-if(chicken< 0) then
-    goto 10
-else if(chicken == 0) then 
-    goto 20
-else 
-    goto 30
-end if
-
-10 rice = 1
-	goto 40
-20 rice = 2
-	goto 40
-30 rice = &
-	& 3
-
-40 print *, rice
-
-end program test1

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test2/test2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test2/test2.f90
deleted file mode 100644
index daa8f6d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test2/test2.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-program test2 !<<<<< 1,1,pass
-
-integer :: test = -3
-
-if(test) 10,10,10
-
-if(test) 10,10,10
-
-if(test) 10,10,10
-
-10 print *, "Hi!"
-
-end program test2
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test2/test2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test2/test2.f90.result
deleted file mode 100644
index 7f26db2..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test2/test2.f90.result
+++ /dev/null

@@ -1,31 +0,0 @@
-program test2 !<<<<< 1,1,pass
-
-integer :: test = -3
-
-if(test< 0) then
-    goto 10
-else if(test == 0) then 
-    goto 10
-else 
-    goto 10
-end if
-
-if(test< 0) then
-    goto 10
-else if(test == 0) then 
-    goto 10
-else 
-    goto 10
-end if
-
-if(test< 0) then
-    goto 10
-else if(test == 0) then 
-    goto 10
-else 
-    goto 10
-end if
-
-10 print *, "Hi!"
-
-end program test2

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test3/test3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test3/test3.f90
deleted file mode 100644
index e1a5548..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test3/test3.f90
+++ /dev/null

@@ -1,19 +0,0 @@
-program test3 !<<<<< 1,1,pass
-
-INTEGER :: chicken = 0
-INTEGER :: rice
-
-! This is a comment before the refactored line
-if (chicken) 10,20,30 ! This is a comment on the refactored line
-! This is a comment after the refactored line
-
-10 rice = 1
-	goto 40
-20 rice = 2
-	goto 40
-30 rice = &
-	& 3
-
-40 print *, rice
-
-end program test3
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test3/test3.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test3/test3.f90.result
deleted file mode 100644
index dfc1ac5..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test3/test3.f90.result
+++ /dev/null

@@ -1,25 +0,0 @@
-program test3 !<<<<< 1,1,pass
-
-INTEGER :: chicken = 0
-INTEGER :: rice
-
-! This is a comment before the refactored line
-if(chicken< 0) then ! This is a comment on the refactored line
-    goto 10
-else if(chicken == 0) then 
-    goto 20
-else 
-    goto 30
-end if
-! This is a comment after the refactored line
-
-10 rice = 1
-	goto 40
-20 rice = 2
-	goto 40
-30 rice = &
-	& 3
-
-40 print *, rice
-
-end program test3

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test4/test4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test4/test4.f90
deleted file mode 100644
index b80d7d9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test4/test4.f90
+++ /dev/null

@@ -1,21 +0,0 @@
-program test4 !<<<<< 1,1,pass
-
-INTEGER :: chicken = 0
-INTEGER :: rice
-
-do
-	! This is a comment before the refactored line
-	if (chicken) 10,20,30 ! This is a comment on the refactored line
-	! This is a comment after the refactored line
-end do
-
-10 rice = 1
-	goto 40
-20 rice = 2
-	goto 40
-30 rice = &
-	& 3
-
-40 print *, rice
-
-end program test4
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test4/test4.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test4/test4.f90.result
deleted file mode 100644
index dc13105..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test4/test4.f90.result
+++ /dev/null

@@ -1,27 +0,0 @@
-program test4 !<<<<< 1,1,pass
-
-INTEGER :: chicken = 0
-INTEGER :: rice
-
-do
-    ! This is a comment before the refactored line
-    if(chicken< 0) then ! This is a comment on the refactored line
-        goto 10
-    else if(chicken == 0) then 
-        goto 20
-    else 
-        goto 30
-    end if
-	! This is a comment after the refactored line
-end do
-
-10 rice = 1
-	goto 40
-20 rice = 2
-	goto 40
-30 rice = &
-	& 3
-
-40 print *, rice
-
-end program test4

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test5/bug335794.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test5/bug335794.f90
deleted file mode 100644
index 8277e40..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test5/bug335794.f90
+++ /dev/null

@@ -1,4 +0,0 @@
-      if(ifcur-2)120,60,120 !<<<<< 1,1,pass
-   60 if(4*ip2-ip4)80,80,120
-   80 if(ifact(if+1)-2)120,100,120
-end

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test5/bug335794.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test5/bug335794.f90.result
deleted file mode 100644
index 08c83ce..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-arithmetic-if-stmt/test5/bug335794.f90.result
+++ /dev/null

@@ -1,22 +0,0 @@
-if(ifcur-2< 0) then !<<<<< 1,1,pass
-    goto 120
-else if(ifcur-2 == 0) then 
-    goto 60
-else 
-    goto 120
-end if
-60 if(4*ip2-ip4< 0) then
-    goto 80
-else if(4*ip2-ip4 == 0) then 
-    goto 80
-else 
-    goto 120
-end if
-80 if(ifact(if+1)-2< 0) then
-    goto 120
-else if(ifact(if+1)-2 == 0) then 
-    goto 100
-else 
-    goto 120
-end if
-end

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos-white-box/one_label_no_goto.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos-white-box/one_label_no_goto.f90
deleted file mode 100644
index dca753b..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos-white-box/one_label_no_goto.f90
+++ /dev/null

@@ -1,5 +0,0 @@
-! Test 1: 1 ASSIGN Label, No GOTO statement !<<<<< 1, 1, 5, 12, pass

-program one_label_no_goto

-    assign 100 to label

-100 stop

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos-white-box/one_label_no_goto.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos-white-box/one_label_no_goto.f90.result
deleted file mode 100644
index e29895a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos-white-box/one_label_no_goto.f90.result
+++ /dev/null

@@ -1,5 +0,0 @@
-! Test 1: 1 ASSIGN Label, No GOTO statement !<<<<< 1, 1, 5, 12, pass

-program one_label_no_goto

-    label = 100

-100 stop

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test01/one_label_no_goto.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test01/one_label_no_goto.f90
deleted file mode 100644
index 1a0e1b9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test01/one_label_no_goto.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-! Test 1: 1 ASSIGN Label, No GOTO statement

-! This test passes and replaces the assign statement with an assignment

-program one_label_no_goto !<<<<< 1, 1, 6, 12, true, pass

-    assign 100 to label

-100 stop

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test01/one_label_no_goto.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test01/one_label_no_goto.f90.result
deleted file mode 100644
index 3dd0a99..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test01/one_label_no_goto.f90.result
+++ /dev/null

@@ -1,6 +0,0 @@
-! Test 1: 1 ASSIGN Label, No GOTO statement

-! This test passes and replaces the assign statement with an assignment

-program one_label_no_goto !<<<<< 1, 1, 6, 12, true, pass

-    label = 100

-100 stop

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test02/one_label_one_address.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test02/one_label_one_address.f90
deleted file mode 100644
index b998f13..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test02/one_label_one_address.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-!Test 2:  1 ASSIGN Label, 1 goto address 

-!Test passes and replaces the assigned goto statements with a select case

-program one_label_one_address !<<<<< 1, 1, 12, 12, true, pass

-

-    assign 100 to label

-    goto 1000

-100   stop

-

-! Here is the intended "subroutine"

-1000 print *, "hello"

-    goto label

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test02/one_label_one_address.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test02/one_label_one_address.f90.result
deleted file mode 100644
index 7e01383..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test02/one_label_one_address.f90.result
+++ /dev/null

@@ -1,15 +0,0 @@
-!Test 2:  1 ASSIGN Label, 1 goto address 

-!Test passes and replaces the assigned goto statements with a select case

-program one_label_one_address !<<<<< 1, 1, 12, 12, true, pass

-

-    label = 100

-    goto 1000

-100   stop

-

-! Here is the intended "subroutine"

-1000 print *, "hello"

-     select case (label)

-     case (100); goto 100

-     case default; stop "Unknown label"

-     end select

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test03/one_label_three_addresses.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test03/one_label_three_addresses.f90
deleted file mode 100644
index 3000fdf..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test03/one_label_three_addresses.f90
+++ /dev/null

@@ -1,26 +0,0 @@
-! Test 3:  1 ASSIGN Label, 3 goto address

-! Test passes and replaces the three assigns and gotos with a select case

-! (Modified test case from the user stories)

-program one_label_three_addresses !<<<<< 1, 1, 26, 12, true, pass

-

-     character*50 message

-

-     message = "setting initial label address"

-     assign 100 to label

-     goto 9000

-

-100  message = "changing label addr for the first time"

-     assign 200 to label

-     goto 9000

-

-200  message = "changing label address 2nd time."

-     assign 300 to label

-     goto 9000

-

-300  stop

-

-! This is the "subroutine"

-9000 print *, message

-     goto label

-

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test03/one_label_three_addresses.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test03/one_label_three_addresses.f90.result
deleted file mode 100644
index f65cbcf..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test03/one_label_three_addresses.f90.result
+++ /dev/null

@@ -1,31 +0,0 @@
-! Test 3:  1 ASSIGN Label, 3 goto address

-! Test passes and replaces the three assigns and gotos with a select case

-! (Modified test case from the user stories)

-program one_label_three_addresses !<<<<< 1, 1, 26, 12, true, pass

-

-     character*50 message

-

-     message = "setting initial label address"

-     label = 100

-     goto 9000

-

-100  message = "changing label addr for the first time"

-     label = 200

-     goto 9000

-

-200  message = "changing label address 2nd time."

-     label = 300

-     goto 9000

-

-300  stop

-

-! This is the "subroutine"

-9000 print *, message

-     select case (label)

-     case (100); goto 100

-     case (200); goto 200

-     case (300); goto 300

-     case default; stop "Unknown label"

-     end select

-

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test04/two_labels_no_goto.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test04/two_labels_no_goto.f90
deleted file mode 100644
index 5e44069..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test04/two_labels_no_goto.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-! Test 4: 2 ASSIGN Labels, No GOTO statement

-! Test passes and replaces two assign statements with assignments 

-program two_labels_no_goto !<<<<< 1, 1, 7, 12, true, pass

-    assign 100 to label1

-    assign 325 to label2

-100 continue

-325 stop

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test04/two_labels_no_goto.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test04/two_labels_no_goto.f90.result
deleted file mode 100644
index 65258e6..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test04/two_labels_no_goto.f90.result
+++ /dev/null

@@ -1,8 +0,0 @@
-! Test 4: 2 ASSIGN Labels, No GOTO statement

-! Test passes and replaces two assign statements with assignments 

-program two_labels_no_goto !<<<<< 1, 1, 7, 12, true, pass

-    label1 = 100

-    label2 = 325

-100 continue

-325 stop

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test05/two_labels_one_address.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test05/two_labels_one_address.f90
deleted file mode 100644
index cb57746..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test05/two_labels_one_address.f90
+++ /dev/null

@@ -1,22 +0,0 @@
-! Test 5: 2 ASSIGN Labels, One GOTO address each

-! Test passes and replaces two assigned gotos and creates two select case statements

-program two_labels_one_address !<<<<< 1, 1, 22, 12, true, pass

-    real :: area

-    real :: radius

-

-    assign 100 to label1

-    goto 7000

-

-100 radius = 3.0

-    assign 325 to label2

-    goto 9000

-

-325 stop

-

-7000 print *, "hello"

-    goto label1

-

-9000 area = 3.1415 * r**2

-    goto label2

-

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test05/two_labels_one_address.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test05/two_labels_one_address.f90.result
deleted file mode 100644
index 589c62e..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test05/two_labels_one_address.f90.result
+++ /dev/null

@@ -1,28 +0,0 @@
-! Test 5: 2 ASSIGN Labels, One GOTO address each

-! Test passes and replaces two assigned gotos and creates two select case statements

-program two_labels_one_address !<<<<< 1, 1, 22, 12, true, pass

-    real :: area

-    real :: radius

-

-    label1 = 100

-    goto 7000

-

-100 radius = 3.0

-    label2 = 325

-    goto 9000

-

-325 stop

-

-7000 print *, "hello"

-     select case (label1)

-     case (100); goto 100

-     case default; stop "Unknown label"

-     end select

-

-9000 area = 3.1415 * r**2

-     select case (label2)

-     case (325); goto 325

-     case default; stop "Unknown label"

-     end select

-

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test06/two_labels_three_addresses.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test06/two_labels_three_addresses.f90
deleted file mode 100644
index b709f89..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test06/two_labels_three_addresses.f90
+++ /dev/null

@@ -1,38 +0,0 @@
-! Test 6: 2 ASSIGN Labels, Three GOTO address each

-! Test passes and creates two select cases and replaces the assign statements

-program two_labels_one_address !<<<<< 1, 1, 38, 12, true, pass

-    real :: area

-    real :: radius

-

-    assign 20 to label1

-    goto 7000

-

-10  assign 30 to label1

-    goto 7000

-

-20  assign 10 to label1

-    goto 7000

-    stop

-

-

-30  radius = 3.0

-    assign 200 to label2

-    goto 9000

-

-200 radius = 4.0

-    assign 300 to label2

-    goto 9000

-

-300 radius = 5.0

-    assign 325 to label2

-    goto 9000

-

-325 stop

-

-7000 print *, "hello"

-    goto label1

-

-9000 area = 3.1415 * r**2

-    goto label2

-

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test06/two_labels_three_addresses.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test06/two_labels_three_addresses.f90.result
deleted file mode 100644
index f1a3072..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test06/two_labels_three_addresses.f90.result
+++ /dev/null

@@ -1,48 +0,0 @@
-! Test 6: 2 ASSIGN Labels, Three GOTO address each

-! Test passes and creates two select cases and replaces the assign statements

-program two_labels_one_address !<<<<< 1, 1, 38, 12, true, pass

-    real :: area

-    real :: radius

-

-    label1 = 20

-    goto 7000

-

-10  label1 = 30

-    goto 7000

-

-20  label1 = 10

-    goto 7000

-    stop

-

-

-30  radius = 3.0

-    label2 = 200

-    goto 9000

-

-200 radius = 4.0

-    label2 = 300

-    goto 9000

-

-300 radius = 5.0

-    label2 = 325

-    goto 9000

-

-325 stop

-

-7000 print *, "hello"

-     select case (label1)

-     case (10); goto 10

-     case (20); goto 20

-     case (30); goto 30

-     case default; stop "Unknown label"

-     end select

-

-9000 area = 3.1415 * r**2

-     select case (label2)

-     case (200); goto 200

-     case (300); goto 300

-     case (325); goto 325

-     case default; stop "Unknown label"

-     end select

-

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test07/one_label_reassign_address.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test07/one_label_reassign_address.f90
deleted file mode 100644
index e217c18..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test07/one_label_reassign_address.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-! Test 7: 1 ASSIGN Label, Change value on label 

-! Test passes and changes the assign statements to one variable to assignments

-program one_label_reassign_address !<<<<< 1, 1, 8, 12, true, pass

-    assign 100 to label1

-    assign 200 to label1

-200 continue

-100 stop

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test07/one_label_reassign_label.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test07/one_label_reassign_label.f90.result
deleted file mode 100644
index 7fee385..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test07/one_label_reassign_label.f90.result
+++ /dev/null

@@ -1,8 +0,0 @@
-! Test 7: 1 ASSIGN Label, Change value on label 

-! Test passes and changes the assign statements to one variable to assignments

-program one_label_reassign_address !<<<<< 1, 1, 8, 12, true, pass

-    label1 = 100

-    label1 = 200

-200 continue

-100 stop

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test08/two_label_same_address.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test08/two_label_same_address.f90
deleted file mode 100644
index adea11e..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test08/two_label_same_address.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-! Test 8:  2 ASSIGN Labels, goto same address

-! Test passes, creating two select case statements

-program two_labels_same_address !<<<<< 1, 1, 20, 12, true, pass

-

-    assign 100 to label1

-    goto 1000

-100   print *, "Return to here"

-    stop

-

-    assign 100 to label2

-    goto 2000

-

-! Here is the intended "subroutine"

-1000 print *, "This code will get executed"

-    goto label1

-

-2000 print *, "This will not get executed since we return back since the other case stops"

-    goto label2

-

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test08/two_labels_same_address.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test08/two_labels_same_address.f90.result
deleted file mode 100644
index 834c4ba..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test08/two_labels_same_address.f90.result
+++ /dev/null

@@ -1,26 +0,0 @@
-! Test 8:  2 ASSIGN Labels, goto same address

-! Test passes, creating two select case statements

-program two_labels_same_address !<<<<< 1, 1, 20, 12, true, pass

-

-    label1 = 100

-    goto 1000

-100   print *, "Return to here"

-    stop

-

-    label2 = 100

-    goto 2000

-

-! Here is the intended "subroutine"

-1000 print *, "This code will get executed"

-    select case (label1)

-    case (100); goto 100

-    case default; stop "Unknown label"

-    end select

-

-2000 print *, "This will not get executed since we return back since the other case stops"

-    select case (label2)

-    case (100); goto 100

-    case default; stop "Unknown label"

-    end select

-

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test09/one_label_goto_two_different_addresses.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test09/one_label_goto_two_different_addresses.f90
deleted file mode 100644
index 4d29696..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test09/one_label_goto_two_different_addresses.f90
+++ /dev/null

@@ -1,18 +0,0 @@
-! Test 9:  1 ASSIGN Label, goto 2 different addresses

-! Test passes with two select case statements for the single label

-program one_label_goto_two_different_addresses !<<<<< 1, 1, 17, 12, true, pass

-

-    assign 100 to label

-    goto 1000

-

-100 assign 200 to label

-    goto 2000

-

-200 stop

-

-1000 print *, "First goto reaches here"

-    goto label

-

-2000 print *, "Second goto reaches here"

-    goto label

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test09/one_label_goto_two_different_addresses.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test09/one_label_goto_two_different_addresses.f90.result
deleted file mode 100644
index 74b98ac..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test09/one_label_goto_two_different_addresses.f90.result
+++ /dev/null

@@ -1,26 +0,0 @@
-! Test 9:  1 ASSIGN Label, goto 2 different addresses

-! Test passes with two select case statements for the single label

-program one_label_goto_two_different_addresses !<<<<< 1, 1, 17, 12, true, pass

-

-    label = 100

-    goto 1000

-

-100 label = 200

-    goto 2000

-

-200 stop

-

-1000 print *, "First goto reaches here"

-     select case (label)

-     case (100); goto 100

-     case (200); goto 200

-     case default; stop "Unknown label"

-     end select

-

-2000 print *, "Second goto reaches here"

-     select case (label)

-     case (100); goto 100

-     case (200); goto 200

-     case default; stop "Unknown label"

-     end select

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test10/comment_assign_and_goto.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test10/comment_assign_and_goto.f90
deleted file mode 100644
index b1f739f..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test10/comment_assign_and_goto.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-! Test 10: Comment ASSIGN and GOTO statement

-! Test fails because the assign and goto statements are commented out

-program comment_assign_and_goto !<<<<< 1, 1, 11, 12, true, fail-initial

-

-    !assign 100 to label

-    !goto 1000

-100 stop

-

-1000 print *, "Should not get here"

-    goto 100

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test11/comment_assign_valid_goto.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test11/comment_assign_valid_goto.f90
deleted file mode 100644
index 6788778..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test11/comment_assign_valid_goto.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-! Test 11: Comment ASSIGN have a valid GOTO statement

-! Test fails because the assign statement is commented out

-program comment_assign_valid_goto !<<<<< 1, 1, 11, 12, true, fail-initial

-

-    !assign 100 to label

-    goto 1000

-100 stop

-

-1000 print *, "We will get here"

-    goto 100

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test12/valid_assign_comment_goto.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test12/valid_assign_comment_goto.f90
deleted file mode 100644
index c9a92b2..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test12/valid_assign_comment_goto.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-! Test 12: Valid ASSIGN and comment GOTO statement

-! Test passes and only replaces the assign because the goto is commented out

-program valid_assign_comment_goto !<<<<< 1, 1, 11, 12, true, pass

-

-    assign 100 to label

-    !goto 1000

-100 stop

-

-1000 print *, "Should not get here"

-    goto 100

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test12/valid_assign_comment_goto.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test12/valid_assign_comment_goto.f90.result
deleted file mode 100644
index 3a6d945..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test12/valid_assign_comment_goto.f90.result
+++ /dev/null

@@ -1,11 +0,0 @@
-! Test 12: Valid ASSIGN and comment GOTO statement

-! Test passes and only replaces the assign because the goto is commented out

-program valid_assign_comment_goto !<<<<< 1, 1, 11, 12, true, pass

-

-    label = 100

-    !goto 1000

-100 stop

-

-1000 print *, "Should not get here"

-    goto 100

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test13/split_assign_to_two_lines.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test13/split_assign_to_two_lines.f90
deleted file mode 100644
index 03bcdfd..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test13/split_assign_to_two_lines.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-! Test 13: Split assign statement with ampersand

-! Test passes by replacing the split-up assigned goto and creating a select case

-program split_assign_to_two_lines !<<<<< 1, 1, 13, 12, true, pass

-

-    assign 100 &

-    to &

-    label

-    goto 1000

-100 stop

-

-1000 print *, "Subroutine like stuff here"

-    goto label

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test13/split_assign_to_two_lines.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test13/split_assign_to_two_lines.f90.result
deleted file mode 100644
index 86846f0..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test13/split_assign_to_two_lines.f90.result
+++ /dev/null

@@ -1,14 +0,0 @@
-! Test 13: Split assign statement with ampersand

-! Test passes by replacing the split-up assigned goto and creating a select case

-program split_assign_to_two_lines !<<<<< 1, 1, 13, 12, true, pass

-

-    label = 100

-    goto 1000

-100 stop

-

-1000 print *, "Subroutine like stuff here"

-     select case (label)

-     case (100); goto 100

-     case default; stop "Unknown label"

-     end select

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test14/one_label_no_goto_no_address.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test14/one_label_no_goto_no_address.f90
deleted file mode 100644
index 5b69ff0..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test14/one_label_no_goto_no_address.f90
+++ /dev/null

@@ -1,5 +0,0 @@
-! Test 14: 1 ASSIGN Label, No GOTO statement, No address

-! Test fails because there is no statement 100

-program one_label_no_goto_no_address !<<<<< 1, 1, 5, 12, true, fail-initial

-    assign 100 to label

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test15/use_label_in_equivalence.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test15/use_label_in_equivalence.f90
deleted file mode 100644
index c171557..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test15/use_label_in_equivalence.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-! Test Case 15 Label Used in Equivalence

-! Test passes because equivalence is not an action statement

-program use_label_in_equivalence !<<<<< 1, 1, 12, 37, true, pass

-    implicit none

-    real :: flabel

-    integer :: label

-    equivalence (label, flabel)

-    assign 20 to label

-    goto label

-

-20  continue

-end program use_label_in_equivalence


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test15/use_label_in_equivalence.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test15/use_label_in_equivalence.f90.result
deleted file mode 100644
index 57592e2..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test15/use_label_in_equivalence.f90.result
+++ /dev/null

@@ -1,15 +0,0 @@
-! Test Case 15 Label Used in Equivalence

-! Test passes because equivalence is not an action statement

-program use_label_in_equivalence !<<<<< 1, 1, 12, 37, true, pass

-    implicit none

-    real :: flabel

-    integer :: label

-    equivalence (label, flabel)

-    label = 20

-    select case (label)

-    case (20); goto 20

-    case default; stop "Unknown label"

-    end select

-

-20  continue

-end program use_label_in_equivalence


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test16/use_label_in_subroutine.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test16/use_label_in_subroutine.f90
deleted file mode 100644
index 88a09ea..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test16/use_label_in_subroutine.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-! Test Case 16 Labels Used in a Subroutine

-! Test fails because a subroutine is an action statement

-program use_label_in_subroutine !<<<<< 1, 1, 15, 4, true, fail-final

-    implicit none

-    integer label

-    assign 20 to label

-    goto label

-20  call print_label(label)

-

-end program use_label_in_subroutine

-

-subroutine print_label( label1 )

-    integer :: label1

-    print *,label1

-end


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test17/use_label_in_write.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test17/use_label_in_write.f90
deleted file mode 100644
index f1a45f4..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test17/use_label_in_write.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-! Test Case 17 Label Used in Write

-! Test fails because a write is an action statement

-program use_label_in_write !<<<<< 1, 1, 11, 31, true, fail-final

-    implicit none

-    integer label

-    assign 20 to label

-    goto label

-    write (6, label)

-20  format("6xTrying specify this line with label")

-

-end program use_label_in_write


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test18/use_label_in_assignment.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test18/use_label_in_assignment.f90
deleted file mode 100644
index 1de76b1..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test18/use_label_in_assignment.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-! Test Case 18 Label Used in Assignment

-! Test fails because an assignment is an action statement

-program use_label_in_assignment !<<<<< 1, 1, 8, 36, true, fail-final

-    implicit none

-    integer label

-    assign 20 to label

-    goto label

-    label = 40

-20  continue

-end program use_label_in_assignment


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test19/use_label_in_declaration.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test19/use_label_in_declaration.f90
deleted file mode 100644
index 33487c5..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test19/use_label_in_declaration.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-! Test Case 19 Label Used in Declaration

-! Test passes because a declaration is not an action statement

-program use_label_in_declaration !<<<<< 1, 1, 10, 37, true, pass

-    implicit none

-    integer label

-    assign 20 to label

-    goto label

-

-20  continue

-end program use_label_in_declaration


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test19/use_label_in_declaration.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test19/use_label_in_declaration.f90.result
deleted file mode 100644
index 0b31e19..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test19/use_label_in_declaration.f90.result
+++ /dev/null

@@ -1,13 +0,0 @@
-! Test Case 19 Label Used in Declaration

-! Test passes because a declaration is not an action statement

-program use_label_in_declaration !<<<<< 1, 1, 10, 37, true, pass

-    implicit none

-    integer label

-    label = 20

-    select case (label)

-    case (20); goto 20

-    case default; stop "Unknown label"

-    end select

-

-20  continue

-end program use_label_in_declaration


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test20/use_label_in_common_block.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test20/use_label_in_common_block.f90
deleted file mode 100644
index 95a6dce..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test20/use_label_in_common_block.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-! Test Case 20 Label Used in Common Block

-! Test passes because a common block is not an action statement

-program use_label_in_common_block !<<<<< 1, 1, 11, 38, true, pass

-    implicit none

-    common /test/ label

-    integer label

-    assign 20 to label

-    goto label

-

-20  continue

-end program use_label_in_common_block


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test20/use_label_in_common_block.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test20/use_label_in_common_block.f90.result
deleted file mode 100644
index 81965ff..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test20/use_label_in_common_block.f90.result
+++ /dev/null

@@ -1,14 +0,0 @@
-! Test Case 20 Label Used in Common Block

-! Test passes because a common block is not an action statement

-program use_label_in_common_block !<<<<< 1, 1, 11, 38, true, pass

-    implicit none

-    common /test/ label

-    integer label

-    label = 20

-    select case (label)

-    case (20); goto 20

-    case default; stop "Unknown label"

-    end select

-

-20  continue

-end program use_label_in_common_block


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test21/two_assign_same_label_withgotos.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test21/two_assign_same_label_withgotos.f90
deleted file mode 100644
index a2f356d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test21/two_assign_same_label_withgotos.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-! Test Case 21 Two of the Same Assign Statements

-! Test passes and creates one select case statement with one select case 

-program two_assign_same_label_withgotos !<<<<< 1, 1, 13, 12, true, pass

-

-    assign 100 to label

-    goto 1000

-    

-100 assign 100 to label

-    goto 1000

-

-1000 print *, "Infinite loop"

-    goto label

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test21/two_assign_same_label_withgotos.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test21/two_assign_same_label_withgotos.f90.result
deleted file mode 100644
index ce03930..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test21/two_assign_same_label_withgotos.f90.result
+++ /dev/null

@@ -1,16 +0,0 @@
-! Test Case 21 Two of the Same Assign Statements

-! Test passes and creates one select case statement with one select case 

-program two_assign_same_label_withgotos !<<<<< 1, 1, 13, 12, true, pass

-

-    label = 100

-    goto 1000

-    

-100 label = 100

-    goto 1000

-

-1000 print *, "Infinite loop"

-     select case (label)

-     case (100); goto 100

-     case default; stop "Unknown label"

-     end select

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test22/one_label_one_address_no_default.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test22/one_label_one_address_no_default.f90
deleted file mode 100644
index 12ebd12..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test22/one_label_one_address_no_default.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-! Test Case 22 1 ASSIGN Label, 1 Goto Address No Default Case

-! Test passes but does not include a default case in the select case statement

-program one_label_one_address !<<<<< 1, 1, 12, 12, false, pass

-

-    assign 100 to label

-    goto 1000

-100   stop

-

-! Here is the intended "subroutine"

-1000 print *, "hello"

-    goto label

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test22/one_label_one_address_no_default.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test22/one_label_one_address_no_default.f90.result
deleted file mode 100644
index a36c88f..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test22/one_label_one_address_no_default.f90.result
+++ /dev/null

@@ -1,14 +0,0 @@
-! Test Case 22 1 ASSIGN Label, 1 Goto Address No Default Case

-! Test passes but does not include a default case in the select case statement

-program one_label_one_address !<<<<< 1, 1, 12, 12, false, pass

-

-    label = 100

-    goto 1000

-100   stop

-

-! Here is the intended "subroutine"

-1000 print *, "hello"

-     select case (label)

-     case (100); goto 100

-     end select

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test23/one_label_goto_two_different_addresses_no_default.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test23/one_label_goto_two_different_addresses_no_default.f90
deleted file mode 100644
index e6bf710..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test23/one_label_goto_two_different_addresses_no_default.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-! Test Case 23 1 ASSIGN Label, goto 2 different addresses, without the default case

-! Test passes but does not include the default case in the two select case statements

-program one_label_goto_two_different_addresses !<<<<< 1, 1, 20, 12, false, pass

-

-    assign 100 to label

-    goto 1000

-

-100 assign 200 to label

-    goto 2000

-

-200 stop

-

-1000 print *, "First goto reaches here"

-    goto label

-

-2000 print *, "Second goto reaches here"

-    goto label

-

-3000 print *, "Fall-through"

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test23/one_label_goto_two_different_addresses_no_default.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test23/one_label_goto_two_different_addresses_no_default.f90.result
deleted file mode 100644
index 7b34996..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test23/one_label_goto_two_different_addresses_no_default.f90.result
+++ /dev/null

@@ -1,26 +0,0 @@
-! Test Case 23 1 ASSIGN Label, goto 2 different addresses, without the default case

-! Test passes but does not include the default case in the two select case statements

-program one_label_goto_two_different_addresses !<<<<< 1, 1, 20, 12, false, pass

-

-    label = 100

-    goto 1000

-

-100 label = 200

-    goto 2000

-

-200 stop

-

-1000 print *, "First goto reaches here"

-     select case (label)

-     case (100); goto 100

-     case (200); goto 200

-     end select

-

-2000 print *, "Second goto reaches here"

-     select case (label)

-     case (100); goto 100

-     case (200); goto 200

-     end select

-

-3000 print *, "Fall-through"

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test24/one_goto_with_statement_label.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test24/one_goto_with_statement_label.f90
deleted file mode 100644
index 5d686d0..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test24/one_goto_with_statement_label.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-! Test Case 24 with one of the assigned goto has a statement label.

-! Test passes to include the statement label at the start of the select case section.

-program one_goto_with_stmt_label !<<<<< 1, 1, 17, 31, true, pass

-implicit none

-integer labelinaction

-integer anotherlabel

-

-assign 20 to labelinaction

-goto labelinaction

-

-assign 30 to anotherlabel

-

-write (6, labelinaction)

-20  format("6xTrying specify this line with label")

-

-30  goto anotherlabel

-end program one_goto_with_stmt_label
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test24/one_goto_with_statement_label.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test24/one_goto_with_statement_label.f90.result
deleted file mode 100644
index 73c730f..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-assign-gotos/test24/one_goto_with_statement_label.f90.result
+++ /dev/null

@@ -1,20 +0,0 @@
-! Test Case 24 with one of the assigned goto has a statement label.

-! Test passes to include the statement label at the start of the select case section.

-program one_goto_with_stmt_label !<<<<< 1, 1, 17, 31, true, pass

-implicit none

-integer labelinaction

-integer anotherlabel

-

-assign 20 to labelinaction

-goto labelinaction

-

-anotherlabel = 30

-

-write (6, labelinaction)

-20  format("6xTrying specify this line with label")

-

-30  select case (anotherlabel)

-    case (30); goto 30

-    case default; stop "Unknown label"

-    end select

-end program one_goto_with_stmt_label


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_from_Inside_and_outside_if_block/branch_from_Inside_and_outside_if_block.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_from_Inside_and_outside_if_block/branch_from_Inside_and_outside_if_block.f90
deleted file mode 100644
index c0c6a6e..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_from_Inside_and_outside_if_block/branch_from_Inside_and_outside_if_block.f90
+++ /dev/null

@@ -1,29 +0,0 @@
-! More complicated PROGRAM to check that outer GOTOs
-! are retargetted to existing CONTINUE statement
-! but END IF label is not removed since inner GOTO
-! targets it.
-
-PROGRAM branch_from_inside_and_outside_if_block
-   INTEGER :: sum, i
-   sum = 0
-   DO 20, i = 1, 10
-     IF (MOD(i,2).eq.0) THEN
-       sum = sum + i
-       IF (sum.ge.100) THEN
-          GOTO 30
-       ELSE
-          sum = sum + sum
-          GOTO 50
-30     END IF
-40     CONTINUE
-10 END IF
-20 CONTINUE
-   PRINT *, 'sum:', sum
-   IF (sum.ge.100) THEN
-       PRINT *, 'sum:', sum
-    ELSE
-       sum = sum + sum
-       GOTO 50
-50 END IF	!<<<<< 27, 1, 27, 9, pass
-60 CONTINUE
-END PROGRAM branch_from_inside_and_outside_if_block

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_from_Inside_and_outside_if_block/branch_from_Inside_and_outside_if_block.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_from_Inside_and_outside_if_block/branch_from_Inside_and_outside_if_block.f90.result
deleted file mode 100644
index eef821e..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_from_Inside_and_outside_if_block/branch_from_Inside_and_outside_if_block.f90.result
+++ /dev/null

@@ -1,29 +0,0 @@
-! More complicated PROGRAM to check that outer GOTOs
-! are retargetted to existing CONTINUE statement
-! but END IF label is not removed since inner GOTO
-! targets it.
-
-PROGRAM branch_from_inside_and_outside_if_block
-   INTEGER :: sum, i
-   sum = 0
-   DO 20, i = 1, 10
-     IF (MOD(i,2).eq.0) THEN
-       sum = sum + i
-       IF (sum.ge.100) THEN
-          GOTO 30
-       ELSE
-          sum = sum + sum
-          GOTO 60
-30     END IF
-40     CONTINUE
-10 END IF
-20 CONTINUE
-   PRINT *, 'sum:', sum
-   IF (sum.ge.100) THEN
-       PRINT *, 'sum:', sum
-    ELSE
-       sum = sum + sum
-       GOTO 50
-50 END IF	!<<<<< 27, 1, 27, 9, pass
-60 CONTINUE
-END PROGRAM branch_from_inside_and_outside_if_block

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_from_inside_and_outside_if_block_no_do_loop/branch_from_inside_and_outside_if_block_no_do_loop.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_from_inside_and_outside_if_block_no_do_loop/branch_from_inside_and_outside_if_block_no_do_loop.f90
deleted file mode 100644
index 8ca5cb5..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_from_inside_and_outside_if_block_no_do_loop/branch_from_inside_and_outside_if_block_no_do_loop.f90
+++ /dev/null

@@ -1,26 +0,0 @@
-! More complicated PROGRAM to check that outer GOTOs
-! are retargetted a CONTINUE statement that is inserted
-! but END IF label is not removed since inner GOTO
-! targets it.
-
-PROGRAM branch_from_inside_and_outside_if_block_no_do_loop
-   INTEGER :: sum, i
-   sum = 0
-   IF (MOD(i,2).eq.0) THEN
-      sum = sum + i
-      IF (sum.ge.100) THEN
-         GOTO 30
-      ELSE
-         sum = sum + sum
-         GOTO 50
-30    END IF
-10 END IF
-
-   PRINT *, 'sum:', sum
-   IF (sum.ge.100) THEN
-       PRINT *, 'sum:', sum
-    ELSE
-       sum = sum + sum
-       GOTO 50
-50 END IF	!<<<<< 25, 1, 25, 9, pass
-END PROGRAM branch_from_inside_and_outside_if_block_no_do_loop

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_from_inside_and_outside_if_block_no_do_loop/branch_from_inside_and_outside_if_block_no_do_loop.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_from_inside_and_outside_if_block_no_do_loop/branch_from_inside_and_outside_if_block_no_do_loop.f90.result
deleted file mode 100644
index 5756e74..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_from_inside_and_outside_if_block_no_do_loop/branch_from_inside_and_outside_if_block_no_do_loop.f90.result
+++ /dev/null

@@ -1,27 +0,0 @@
-! More complicated PROGRAM to check that outer GOTOs
-! are retargetted a CONTINUE statement that is inserted
-! but END IF label is not removed since inner GOTO
-! targets it.
-
-PROGRAM branch_from_inside_and_outside_if_block_no_do_loop
-   INTEGER :: sum, i
-   sum = 0
-   IF (MOD(i,2).eq.0) THEN
-      sum = sum + i
-      IF (sum.ge.100) THEN
-         GOTO 30
-      ELSE
-         sum = sum + sum
-         GOTO 60
-30    END IF
-10 END IF
-
-   PRINT *, 'sum:', sum
-   IF (sum.ge.100) THEN
-       PRINT *, 'sum:', sum
-    ELSE
-       sum = sum + sum
-       GOTO 50
-50 END IF	!<<<<< 25, 1, 25, 9, pass
-60 CONTINUE
-END PROGRAM branch_from_inside_and_outside_if_block_no_do_loop

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_to_immediate_end_if_from_else/branch_to_immediate_end_if_from_else.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_to_immediate_end_if_from_else/branch_to_immediate_end_if_from_else.f90
deleted file mode 100644
index 19a63e0..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_to_immediate_end_if_from_else/branch_to_immediate_end_if_from_else.f90
+++ /dev/null

@@ -1,21 +0,0 @@
-! END IF selected that only has its own GOTO targetting
-! it so no refactoring is performed by design and 
-! user it told so.
-
-PROGRAM branch_to_immediate_end_if_from_else
-   INTEGER :: sum, i
-   sum = 0
-   DO 20, i = 1, 10
-     IF (MOD(i,2).eq.0) THEN
-       sum = sum + i
-       IF (sum.ge.100) THEN
-          GOTO 10
-       ELSE
-          sum = sum + sum
-          GOTO 30
-30     END IF	!<<<<< 16, 1, 16, 9, fail-initial
-40     CONTINUE
-10 END IF
-20 CONTINUE
-   PRINT *, 'sum:', sum
-END PROGRAM branch_to_immediate_end_if_from_else

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_to_immediate_end_if_from_else/branch_to_immediate_end_if_from_else.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_to_immediate_end_if_from_else/branch_to_immediate_end_if_from_else.f90.result
deleted file mode 100644
index 6f595b4..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/branch_to_immediate_end_if_from_else/branch_to_immediate_end_if_from_else.f90.result
+++ /dev/null

@@ -1,22 +0,0 @@
-! More complicated PROGRAM to check that outer GOTOs
-! are retargeted a CONTINUE statement that is inserted
-! but END IF label is not removed since inner GOTO
-! targets it.
-
-PROGRAM branch_to_immediate_end_if_from_else
-   INTEGER :: sum, i
-   sum = 0
-   DO 20, i = 1, 10
-     IF (MOD(i,2).eq.0) THEN
-       sum = sum + i
-       IF (sum.ge.100) THEN
-          GOTO 10
-       ELSE
-          sum = sum + sum
-          GOTO 30
-30     END IF	!<<<<< 16, 1, 16, 9, fail-initial
-40     CONTINUE
-10 END IF
-20 CONTINUE
-   PRINT *, 'sum:', sum
-END PROGRAM branch_to_immediate_end_if_from_else

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_If_block_branch_from_else/nested_If_block_branch_from_else.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_If_block_branch_from_else/nested_If_block_branch_from_else.f90
deleted file mode 100644
index ea4406a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_If_block_branch_from_else/nested_If_block_branch_from_else.f90
+++ /dev/null

@@ -1,22 +0,0 @@
-! With a DO statement enclosing nested IF blocks make sure
-! existing CONTINUE statement is targeted for outer GOTOs
-! and since no inner GOTO exists remove the label of 
-! selected END IF (check reindentation as well).
-
-PROGRAM nested_if_block_branch_from_else
-   INTEGER :: sum, i
-   sum = 0
-   DO 20, i = 1, 10
-     IF (MOD(i,2).eq.0) THEN
-       sum = sum + i
-       IF (sum.ge.100) THEN
-          GOTO 30
-       ELSE
-          sum = sum + sum
-          GOTO 10
-30     END IF
-40     CONTINUE
-10 END IF                           !<<<<< 19, 1, 19, 9, fail-initial
-20 CONTINUE
-   PRINT *, 'sum:', sum
-END PROGRAM nested_if_block_branch_from_else

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_If_block_branch_from_else/nested_If_block_branch_from_else.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_If_block_branch_from_else/nested_If_block_branch_from_else.f90.result
deleted file mode 100644
index 8036a81..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_If_block_branch_from_else/nested_If_block_branch_from_else.f90.result
+++ /dev/null

@@ -1,22 +0,0 @@
-! With a DO statement enclosing nested IF blocks make sure
-! existing CONTINUE statement is targeted for outer GOTOs
-! and since no inner GOTO exists remove the label of 
-! selected END IF (check reindentation as well).
-
-PROGRAM nested_if_block_branch_from_else
-   INTEGER :: sum, i
-   sum = 0
-   DO 20, i = 1, 10
-     IF (MOD(i,2).eq.0) THEN
-       sum = sum + i
-       IF (sum.ge.100) THEN
-          GOTO 30
-       ELSE
-          sum = sum + sum
-          GOTO 20
-30     END IF
-40     CONTINUE
-     END IF                           !<<<<< 19, 1, 19, 9, fail-initial
-20 CONTINUE
-   PRINT *, 'sum:', sum
-END PROGRAM nested_if_block_branch_from_else

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_basic/nested_if_block_basic.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_basic/nested_if_block_basic.f90
deleted file mode 100644
index 46cb4c5..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_basic/nested_if_block_basic.f90
+++ /dev/null

@@ -1,21 +0,0 @@
-! Using a nested IF block check that GOTO of inner IF
-! block is still considered an outer GOTO statement 
-! so a CONTINUE statement is inserted and that GOTO
-! (and other outer GOTOs) target the new CONTINUE statement
-
-PROGRAM NestedIfBlockBasic
-   INTEGER :: k, i
-   READ(*,*) k
-   IF (k.lt.10) THEN
-     GOTO 20
-   END IF
-   i = k - 10
-   IF (i.gt.100)  THEN
-     i = i - 100
-     IF (i.lt.10) THEN
-       GOTO 20
-     END IF
-     i = i - 10
-20 END IF                       !<<<<< 19, 1, 19, 10, pass
-   PRINT *, i
-END PROGRAM NestedIfBlockBasic

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_basic/nested_if_block_basic.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_basic/nested_if_block_basic.f90.result
deleted file mode 100644
index 889755c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_basic/nested_if_block_basic.f90.result
+++ /dev/null

@@ -1,22 +0,0 @@
-! Using a nested IF block check that GOTO of inner IF
-! block is still considered an outer GOTO statement 
-! so a CONTINUE statement is inserted and that GOTO
-! (and other outer GOTOs) target the new CONTINUE statement
-
-PROGRAM NestedIfBlockBasic
-   INTEGER :: k, i
-   READ(*,*) k
-   IF (k.lt.10) THEN
-     GOTO 30
-   END IF
-   i = k - 10
-   IF (i.gt.100)  THEN
-     i = i - 100
-     IF (i.lt.10) THEN
-       GOTO 20
-     END IF
-     i = i - 10
-20 END IF                       !<<<<< 19, 1, 19, 10, pass
-30 CONTINUE
-   PRINT *, i
-END PROGRAM NestedIfBlockBasic

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_branch_to_immediate_inner_end_if/nested_if_block_branch_to_immediate_inner_end_if.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_branch_to_immediate_inner_end_if/nested_if_block_branch_to_immediate_inner_end_if.f90
deleted file mode 100644
index 0361b62..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_branch_to_immediate_inner_end_if/nested_if_block_branch_to_immediate_inner_end_if.f90
+++ /dev/null

@@ -1,21 +0,0 @@
-! Only GOTO targets the selected END IF for refactoring
-! but since a refactoring would not make any changes
-! by design we fail and warn the user that no change
-! would occur.
-
-PROGRAM nested_if_block_branch_to_immediate_inner_end_if
-   INTEGER :: sum, i
-   sum = 0
-   DO 20, i = 1, 10
-     IF (MOD(i,2).eq.0) THEN
-       sum = sum + i
-       IF (sum.ge.100) THEN
-          GOTO 30
-       ELSE
-          sum = sum + sum
-30     END IF		!<<<<< 16, 1, 16, 9, fail-initial
-40     CONTINUE
-10 END IF
-20 CONTINUE
-   PRINT *, 'sum:', sum
-END PROGRAM nested_if_block_branch_to_immediate_inner_end_if

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_branch_to_immediate_inner_end_if/nested_if_block_branch_to_immediate_inner_end_if.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_branch_to_immediate_inner_end_if/nested_if_block_branch_to_immediate_inner_end_if.f90.result
deleted file mode 100644
index 0361b62..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_branch_to_immediate_inner_end_if/nested_if_block_branch_to_immediate_inner_end_if.f90.result
+++ /dev/null

@@ -1,21 +0,0 @@
-! Only GOTO targets the selected END IF for refactoring
-! but since a refactoring would not make any changes
-! by design we fail and warn the user that no change
-! would occur.
-
-PROGRAM nested_if_block_branch_to_immediate_inner_end_if
-   INTEGER :: sum, i
-   sum = 0
-   DO 20, i = 1, 10
-     IF (MOD(i,2).eq.0) THEN
-       sum = sum + i
-       IF (sum.ge.100) THEN
-          GOTO 30
-       ELSE
-          sum = sum + sum
-30     END IF		!<<<<< 16, 1, 16, 9, fail-initial
-40     CONTINUE
-10 END IF
-20 CONTINUE
-   PRINT *, 'sum:', sum
-END PROGRAM nested_if_block_branch_to_immediate_inner_end_if

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_branch_to_immediate_outer_end_if/nested_if_block_branch_to_immediate_outer_end_if.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_branch_to_immediate_outer_end_if/nested_if_block_branch_to_immediate_outer_end_if.f90
deleted file mode 100644
index d9aae02..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_branch_to_immediate_outer_end_if/nested_if_block_branch_to_immediate_outer_end_if.f90
+++ /dev/null

@@ -1,22 +0,0 @@
-! Only GOTO targets the selected END IF for refactoring
-! but since a refactoring would not make any changes
-! by design we fail and warn the user that no change
-! would occur. (Other GOTOs target other labels.)
-
-PROGRAM nested_if_block_branch_to_immediate_inner_end_ifsubroutine
-   INTEGER :: sum, i
-   sum = 0
-   DO 20, i = 1, 10
-     IF (MOD(i,2).eq.0) THEN
-       sum = sum + i
-       IF (sum.ge.100) THEN
-          GOTO 30
-       ELSE
-          sum = sum + sum
-30     END IF
-40     CONTINUE
-       GOTO 10
-10 END IF                           !<<<<< 19, 1, 19, 9, fail-initial
-20 CONTINUE
-   PRINT *, 'sum:', sum
-END PROGRAM nested_if_block_branch_to_immediate_inner_end_ifsubroutine

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_branch_to_immediate_outer_end_if/nested_if_block_branch_to_immediate_outer_end_if.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_branch_to_immediate_outer_end_if/nested_if_block_branch_to_immediate_outer_end_if.f90.result
deleted file mode 100644
index d9aae02..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/nested_if_block_branch_to_immediate_outer_end_if/nested_if_block_branch_to_immediate_outer_end_if.f90.result
+++ /dev/null

@@ -1,22 +0,0 @@
-! Only GOTO targets the selected END IF for refactoring
-! but since a refactoring would not make any changes
-! by design we fail and warn the user that no change
-! would occur. (Other GOTOs target other labels.)
-
-PROGRAM nested_if_block_branch_to_immediate_inner_end_ifsubroutine
-   INTEGER :: sum, i
-   sum = 0
-   DO 20, i = 1, 10
-     IF (MOD(i,2).eq.0) THEN
-       sum = sum + i
-       IF (sum.ge.100) THEN
-          GOTO 30
-       ELSE
-          sum = sum + sum
-30     END IF
-40     CONTINUE
-       GOTO 10
-10 END IF                           !<<<<< 19, 1, 19, 9, fail-initial
-20 CONTINUE
-   PRINT *, 'sum:', sum
-END PROGRAM nested_if_block_branch_to_immediate_inner_end_ifsubroutine

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_end_if_label/test-branch_end_if_label.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_end_if_label/test-branch_end_if_label.f90
deleted file mode 100644
index ade1aa4..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_end_if_label/test-branch_end_if_label.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-! Outer GOTO targets selected END IF so insert
-! a CONTINUE statement and retarget its label.
-! Remove END IF label since no inner GOTO
-! statement exists
-
-PROGRAM test_branch_end_if_label
-   INTEGER :: k, i
-   READ(*,*) k
-   IF (k.lt.10) THEN
-     GOTO 20
-   END IF
-   i = k - 10
-   IF (i.gt.100)  THEN
-     i = i - 100
-20 END IF  !<<<<< 15, 4, 15, 9, pass
-   PRINT *, i
-END PROGRAM test_branch_end_if_label
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_end_if_label/test-branch_end_if_label.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_end_if_label/test-branch_end_if_label.f90.result
deleted file mode 100644
index 5a288f2..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_end_if_label/test-branch_end_if_label.f90.result
+++ /dev/null

@@ -1,18 +0,0 @@
-! Outer GOTO targets selected END IF so insert
-! a CONTINUE statement and retarget its label.
-! Remove END IF label since no inner GOTO
-! statement exists
-
-PROGRAM test_branch_end_if_label
-   INTEGER :: k, i
-   READ(*,*) k
-   IF (k.lt.10) THEN
-     GOTO 20
-   END IF
-   i = k - 10
-   IF (i.gt.100)  THEN
-     i = i - 100
-   END IF  !<<<<< 15, 4, 15, 9, pass
-20 CONTINUE
-   PRINT *, i
-END PROGRAM test_branch_end_if_label

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_to_immediate_end_if/test-branch_to_immediate_end_if.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_to_immediate_end_if/test-branch_to_immediate_end_if.f90
deleted file mode 100644
index 6292ba9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_to_immediate_end_if/test-branch_to_immediate_end_if.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-! GOTO statement is inner GOTO for selected END IF
-! so no change is expected. By design we warn the
-! user that no change will be made.
-
-PROGRAM test_branch_to_immediate_end_if
-   INTEGER :: k, i
-   READ(*,*) k
-   IF (k.lt.10) THEN
-     GOTO 20
-20 END IF	!<<<<< 10, 1, 10, 9, fail-initial
-   i = k - 10
-   IF (i.gt.100)  THEN
-     i = i - 100  
-   END IF
-   PRINT *, i
-END PROGRAM test_branch_to_immediate_end_if
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_to_immediate_end_if/test-branch_to_immediate_end_if.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_to_immediate_end_if/test-branch_to_immediate_end_if.f90.result
deleted file mode 100644
index 6292ba9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_to_immediate_end_if/test-branch_to_immediate_end_if.f90.result
+++ /dev/null

@@ -1,16 +0,0 @@
-! GOTO statement is inner GOTO for selected END IF
-! so no change is expected. By design we warn the
-! user that no change will be made.
-
-PROGRAM test_branch_to_immediate_end_if
-   INTEGER :: k, i
-   READ(*,*) k
-   IF (k.lt.10) THEN
-     GOTO 20
-20 END IF	!<<<<< 10, 1, 10, 9, fail-initial
-   i = k - 10
-   IF (i.gt.100)  THEN
-     i = i - 100  
-   END IF
-   PRINT *, i
-END PROGRAM test_branch_to_immediate_end_if
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_to_immediate_end_if_with_continue_after_end_if/test-branch_to_immediate_end_if_with_continue_after_end_if.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_to_immediate_end_if_with_continue_after_end_if/test-branch_to_immediate_end_if_with_continue_after_end_if.f90
deleted file mode 100644
index d3e1cae..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_to_immediate_end_if_with_continue_after_end_if/test-branch_to_immediate_end_if_with_continue_after_end_if.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-! By design if no GOTOs target the END IF statement even
-! if a labels CONTINUE exists no refactoring should take
-! place and the user will be notified as such.
-
-PROGRAM branch_to_immediate_end_if_with_continue_after_end_if
-   INTEGER :: k, i
-   READ(*,*) k
-   IF (k.lt.10) THEN
-     GOTO 20
-20 END IF	!<<<<< 10, 1, 10, 9, fail-initial
-30 CONTINUE
-   i = k - 10
-   IF (i.gt.100)  THEN
-     i = i - 100  
-   END IF
-   PRINT *, i
-END PROGRAM branch_to_immediate_end_if_with_continue_after_end_if
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_to_immediate_end_if_with_continue_after_end_if/test-branch_to_immediate_end_if_with_continue_after_end_if.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_to_immediate_end_if_with_continue_after_end_if/test-branch_to_immediate_end_if_with_continue_after_end_if.f90.result
deleted file mode 100644
index d3e1cae..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-branch_to_immediate_end_if_with_continue_after_end_if/test-branch_to_immediate_end_if_with_continue_after_end_if.f90.result
+++ /dev/null

@@ -1,17 +0,0 @@
-! By design if no GOTOs target the END IF statement even
-! if a labels CONTINUE exists no refactoring should take
-! place and the user will be notified as such.
-
-PROGRAM branch_to_immediate_end_if_with_continue_after_end_if
-   INTEGER :: k, i
-   READ(*,*) k
-   IF (k.lt.10) THEN
-     GOTO 20
-20 END IF	!<<<<< 10, 1, 10, 9, fail-initial
-30 CONTINUE
-   i = k - 10
-   IF (i.gt.100)  THEN
-     i = i - 100  
-   END IF
-   PRINT *, i
-END PROGRAM branch_to_immediate_end_if_with_continue_after_end_if
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-end_if_label_between_branch_to_end_if/test-end_if_label_between_branch_to_end_if.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-end_if_label_between_branch_to_end_if/test-end_if_label_between_branch_to_end_if.f90
deleted file mode 100644
index 2bcadaf..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-end_if_label_between_branch_to_end_if/test-end_if_label_between_branch_to_end_if.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-! When two labeled END IF blocks the outer GOTO that 
-! targets the selected END IF block should be retargetted
-! to a new CONTINUE statement and the original END IF label
-! removed but other labeled END IF should remain.
-
-PROGRAM test_end_if_label_between_branch_to_end_if
-   INTEGER :: k, i
-   READ(*,*) k
-   IF (k.lt.10) THEN
-     GOTO 30
-20 END IF
-   i = k - 10
-   IF (i.gt.100)  THEN
-     i = i - 100  
-30 END IF	!<<<<< 15, 1, 15, 9, pass
-   PRINT *, i
-END PROGRAM test_end_if_label_between_branch_to_end_if
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-end_if_label_between_branch_to_end_if/test-end_if_label_between_branch_to_end_if.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-end_if_label_between_branch_to_end_if/test-end_if_label_between_branch_to_end_if.f90.result
deleted file mode 100644
index 938ab73..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-end_if_label_between_branch_to_end_if/test-end_if_label_between_branch_to_end_if.f90.result
+++ /dev/null

@@ -1,18 +0,0 @@
-! When two labeled END IF blocks the outer GOTO that 
-! targets the selected END IF block should be retargetted
-! to a new CONTINUE statement and the original END IF label
-! removed but other labeled END IF should remain.
-
-PROGRAM test_end_if_label_between_branch_to_end_if
-   INTEGER :: k, i
-   READ(*,*) k
-   IF (k.lt.10) THEN
-     GOTO 30
-20 END IF
-   i = k - 10
-   IF (i.gt.100)  THEN
-     i = i - 100  
-   END IF	!<<<<< 15, 1, 15, 9, pass
-30 CONTINUE
-   PRINT *, i
-END PROGRAM test_end_if_label_between_branch_to_end_if

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-endif_continue_branch-1/test-endif_continue_branch-1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-endif_continue_branch-1/test-endif_continue_branch-1.f90
deleted file mode 100644
index ca20c7c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-endif_continue_branch-1/test-endif_continue_branch-1.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-! With more DO and IF structures the outer GOTO
-! statement should still be retargetted to the 
-! existing CONTINUE statement and then remove the 
-! label of the selected END IF statement.
-
-PROGRAM test_endif_continue_branch_1
-   INTEGER :: sum, i
-   sum = 0
-   DO 20, i = 1, 10
-     IF (MOD(i,2).eq.0) THEN
-       GOTO 10
-     END IF
-     sum = sum + i
-     IF (sum.ge.100) THEN
-       sum = sum + sum
-       GOTO 30
-10   END IF                         !<<<<< 17, 1, 17, 12, pass
-20 CONTINUE
-30 PRINT *, 'sum:', sum
-END PROGRAM test_endif_continue_branch_1

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-endif_continue_branch-1/test-endif_continue_branch-1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-endif_continue_branch-1/test-endif_continue_branch-1.f90.result
deleted file mode 100644
index 2bcb963..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-endif_continue_branch-1/test-endif_continue_branch-1.f90.result
+++ /dev/null

@@ -1,20 +0,0 @@
-! With more DO and IF structures the outer GOTO
-! statement should still be retargetted to the 
-! existing CONTINUE statement and then remove the 
-! label of the selected END IF statement.
-
-PROGRAM test_endif_continue_branch_1
-   INTEGER :: sum, i
-   sum = 0
-   DO 20, i = 1, 10
-     IF (MOD(i,2).eq.0) THEN
-       GOTO 20
-     END IF
-     sum = sum + i
-     IF (sum.ge.100) THEN
-       sum = sum + sum
-       GOTO 30
-     END IF                         !<<<<< 17, 1, 17, 12, pass
-20 CONTINUE
-30 PRINT *, 'sum:', sum
-END PROGRAM test_endif_continue_branch_1

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-endif_duplicate_continue/test-endif_duplicate_continue.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-endif_duplicate_continue/test-endif_duplicate_continue.f90
deleted file mode 100644
index 093747c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-endif_duplicate_continue/test-endif_duplicate_continue.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-! With two CONTINUE statements (unique labels) the
-! outter GOTO statement should be refactored to target
-! the CONTINUE statement immediately following the
-! selected END IF statement.
-
-PROGRAM test_endif_duplicate_continue
-   INTEGER :: sum, i
-   sum = 0
-   DO 20, i = 1, 10
-     IF (MOD(i,2).eq.0) THEN
-       GOTO 10
-     END IF
-     sum = sum + i
-     IF (sum.ge.100) THEN
-       sum = sum + sum
-10   END IF                         !<<<<< 16, 1, 16, 12, pass
-20 CONTINUE
-30 CONTINUE
-40 PRINT *, 'sum:', sum
-END PROGRAM test_endif_duplicate_continue

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-endif_duplicate_continue/test-endif_duplicate_continue.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-endif_duplicate_continue/test-endif_duplicate_continue.f90.result
deleted file mode 100644
index e359f98..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-endif_duplicate_continue/test-endif_duplicate_continue.f90.result
+++ /dev/null

@@ -1,20 +0,0 @@
-! With two CONTINUE statements (unique labels) the
-! outter GOTO statement should be refactored to target
-! the CONTINUE statement immediately following the
-! selected END IF statement.
-
-PROGRAM test_endif_duplicate_continue
-   INTEGER :: sum, i
-   sum = 0
-   DO 20, i = 1, 10
-     IF (MOD(i,2).eq.0) THEN
-       GOTO 20
-     END IF
-     sum = sum + i
-     IF (sum.ge.100) THEN
-       sum = sum + sum
-     END IF                         !<<<<< 16, 1, 16, 12, pass
-20 CONTINUE
-30 CONTINUE
-40 PRINT *, 'sum:', sum
-END PROGRAM test_endif_duplicate_continue

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-invalid_selection/test-invalid_selection.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-invalid_selection/test-invalid_selection.f90
deleted file mode 100644
index f866dfc..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-invalid_selection/test-invalid_selection.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-! Refactoring requires that a labeled END IF is selected.
-! This test checks when user selects something else
-! the refactoring should not proceed.
-
-PROGRAM test_invalid_selection
-   INTEGER :: k, i
-   READ(*,*) k
-   IF (k.lt.10) THEN
-     PRINT *, k
-20 END IF
-   i = k - 10
-   IF (i.gt.100)  THEN
-     i = i - 100  
-30 END IF
-   PRINT *, i               !<<<<< 15, 4, 15, 14, fail-initial
-END PROGRAM test_invalid_selection

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-invalid_selection/test-invalid_selection.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-invalid_selection/test-invalid_selection.f90.result
deleted file mode 100644
index f866dfc..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-invalid_selection/test-invalid_selection.f90.result
+++ /dev/null

@@ -1,16 +0,0 @@
-! Refactoring requires that a labeled END IF is selected.
-! This test checks when user selects something else
-! the refactoring should not proceed.
-
-PROGRAM test_invalid_selection
-   INTEGER :: k, i
-   READ(*,*) k
-   IF (k.lt.10) THEN
-     PRINT *, k
-20 END IF
-   i = k - 10
-   IF (i.gt.100)  THEN
-     i = i - 100  
-30 END IF
-   PRINT *, i               !<<<<< 15, 4, 15, 14, fail-initial
-END PROGRAM test_invalid_selection

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-nested_if_blocks/test-nested_if_blocks.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-nested_if_blocks/test-nested_if_blocks.f90
deleted file mode 100644
index 2cf04b9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-nested_if_blocks/test-nested_if_blocks.f90
+++ /dev/null

@@ -1,21 +0,0 @@
-! Even with more complicated nested IF and DO structure
-! since any GOTO inside any statements of the selected
-! END IF line are considered inner IFs then it should
-! be retargetted to the following CONTINIUE statement
-! and the original END IF label removed.
-
-PROGRAM test_nested_if_blocks
-   INTEGER :: sum, i
-   sum = 0
-   DO 20, i = 1, 10
-     IF (MOD(i,2).eq.0) THEN
-       sum = sum + i
-       IF (sum.ge.100) THEN
-          GOTO 10
-       ELSE
-          sum = sum + sum
-       END IF
-10 END IF                           !<<<<< 18, 1, 18, 10, fail-initial
-20 CONTINUE
-   PRINT *, 'sum:', sum
-END PROGRAM test_nested_if_blocks

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-nested_if_blocks/test-nested_if_blocks.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-nested_if_blocks/test-nested_if_blocks.f90.result
deleted file mode 100644
index 2cf04b9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-nested_if_blocks/test-nested_if_blocks.f90.result
+++ /dev/null

@@ -1,21 +0,0 @@
-! Even with more complicated nested IF and DO structure
-! since any GOTO inside any statements of the selected
-! END IF line are considered inner IFs then it should
-! be retargetted to the following CONTINIUE statement
-! and the original END IF label removed.
-
-PROGRAM test_nested_if_blocks
-   INTEGER :: sum, i
-   sum = 0
-   DO 20, i = 1, 10
-     IF (MOD(i,2).eq.0) THEN
-       sum = sum + i
-       IF (sum.ge.100) THEN
-          GOTO 10
-       ELSE
-          sum = sum + sum
-       END IF
-10 END IF                           !<<<<< 18, 1, 18, 10, fail-initial
-20 CONTINUE
-   PRINT *, 'sum:', sum
-END PROGRAM test_nested_if_blocks

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-no_branch_to_end_if_label/test-no_branch_to_end_if_label.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-no_branch_to_end_if_label/test-no_branch_to_end_if_label.f90
deleted file mode 100644
index e2c8718..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-no_branch_to_end_if_label/test-no_branch_to_end_if_label.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-! Test if no GOTOs exist in PROGRAM then no change
-! will occur from the refactoring so the user is 
-! warned and the refactoring halted.
-
-PROGRAM test_no_branch_to_end_if_label
-   INTEGER :: k, i
-   READ(*,*) k
-   IF (k.lt.10) THEN
-     PRINT *, k
-20 END IF
-   i = k - 10
-   IF (i.gt.100)  THEN
-     i = i - 100  
-30 END IF	!<<<<< 14, 1, 14, 9, fail-initial
-   PRINT *, i
-END PROGRAM test_no_branch_to_end_if_label
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-no_branch_to_end_if_label/test-no_branch_to_end_if_label.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-no_branch_to_end_if_label/test-no_branch_to_end_if_label.f90.result
deleted file mode 100644
index e2c8718..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-no_branch_to_end_if_label/test-no_branch_to_end_if_label.f90.result
+++ /dev/null

@@ -1,16 +0,0 @@
-! Test if no GOTOs exist in PROGRAM then no change
-! will occur from the refactoring so the user is 
-! warned and the refactoring halted.
-
-PROGRAM test_no_branch_to_end_if_label
-   INTEGER :: k, i
-   READ(*,*) k
-   IF (k.lt.10) THEN
-     PRINT *, k
-20 END IF
-   i = k - 10
-   IF (i.gt.100)  THEN
-     i = i - 100  
-30 END IF	!<<<<< 14, 1, 14, 9, fail-initial
-   PRINT *, i
-END PROGRAM test_no_branch_to_end_if_label
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-numbered_statement_after_continue/test-numbered_statement_after_continue.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-numbered_statement_after_continue/test-numbered_statement_after_continue.f90
deleted file mode 100644
index aa2fcf9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-numbered_statement_after_continue/test-numbered_statement_after_continue.f90
+++ /dev/null

@@ -1,20 +0,0 @@
-! GOTO statement is an outer IF block so existing CONTINIUE
-! statement is targetted and since no inner GOTOs remain
-! END if label is removed. (more complicated DO/IF structure
-! to make sure refactoring is unaffected by other program  
-! structures.)
-
-PROGRAM test_numbered_statement_after_continue
-   INTEGER :: sum, i
-   sum = 0
-   DO 20, i = 1, 10
-     IF (MOD(i,2).eq.0) THEN
-       GOTO 10
-     END IF
-     sum = sum + i
-     IF (sum.ge.100) THEN
-       sum = sum + sum
-10   END IF                     !<<<<< 17, 1, 17, 12, pass
-20 CONTINUE
-30 PRINT *, 'sum:', sum
-END PROGRAM test_numbered_statement_after_continue

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-numbered_statement_after_continue/test-numbered_statement_after_continue.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-numbered_statement_after_continue/test-numbered_statement_after_continue.f90.result
deleted file mode 100644
index 7e8ccc5..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-branch-to-end-if/test-numbered_statement_after_continue/test-numbered_statement_after_continue.f90.result
+++ /dev/null

@@ -1,20 +0,0 @@
-! GOTO statement is an outer IF block so existing CONTINIUE
-! statement is targetted and since no inner GOTOs remain
-! END if label is removed. (more complicated DO/IF structure
-! to make sure refactoring is unaffected by other program  
-! structures.)
-
-PROGRAM test_numbered_statement_after_continue
-   INTEGER :: sum, i
-   sum = 0
-   DO 20, i = 1, 10
-     IF (MOD(i,2).eq.0) THEN
-       GOTO 20
-     END IF
-     sum = sum + i
-     IF (sum.ge.100) THEN
-       sum = sum + sum
-     END IF                     !<<<<< 17, 1, 17, 12, pass
-20 CONTINUE
-30 PRINT *, 'sum:', sum
-END PROGRAM test_numbered_statement_after_continue

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test1/test1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test1/test1.f90
deleted file mode 100644
index 9db6e1e..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test1/test1.f90
+++ /dev/null

@@ -1,25 +0,0 @@
-program test1

-    implicit none

-

-    integer :: n

-

-    n = 1

-

-    goto (10, 20, 30, 40) n !<<<<< 8, 5, 8, 28, pass

-

-    print *, "It wasn't handled"

-    stop

-

-10  print *, "It was one"

-    stop

-

-20  print *, "It was two"

-    stop

-

-30  print *, "It was three"

-    stop

-

-40  print *, "It was four"

-    stop

-

-end program test1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test1/test1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test1/test1.f90.result
deleted file mode 100644
index d9e5060..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test1/test1.f90.result
+++ /dev/null

@@ -1,34 +0,0 @@
-program test1

-    implicit none

-

-    integer :: n

-

-    n = 1

-

-    select case (n)

-    case (1)

-        go to 10

-    case (2)

-        go to 20

-    case (3)

-        go to 30

-    case (4)

-        go to 40

-    end select

-

-    print *, "It wasn't handled"

-    stop

-

-10  print *, "It was one"

-    stop

-

-20  print *, "It was two"

-    stop

-

-30  print *, "It was three"

-    stop

-

-40  print *, "It was four"

-    stop

-

-end program test1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test2/test2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test2/test2.f90
deleted file mode 100644
index d730500..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test2/test2.f90
+++ /dev/null

@@ -1,22 +0,0 @@
-program test2

-    implicit none

-

-    integer :: n

-

-    n = 1

-

-    goto (10, 20, 30) n*2 !<<<<< 8, 5, 8, 30, pass

-

-    print *, "It wasn't handled"

-    stop

-

-10  print *, "It was one"

-    stop

-

-20  print *, "It was two"

-    stop

-

-30  print *, "It was three"

-    stop

-

-end program test2


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test2/test2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test2/test2.f90.result
deleted file mode 100644
index aa8a632..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test2/test2.f90.result
+++ /dev/null

@@ -1,29 +0,0 @@
-program test2

-    implicit none

-

-    integer :: n

-

-    n = 1

-

-    select case (n*2)

-    case (1)

-        go to 10

-    case (2)

-        go to 20

-    case (3)

-        go to 30

-    end select

-

-    print *, "It wasn't handled"

-    stop

-

-10  print *, "It was one"

-    stop

-

-20  print *, "It was two"

-    stop

-

-30  print *, "It was three"

-    stop

-

-end program test2


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test3/test3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test3/test3.f90
deleted file mode 100644
index 93960d6..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test3/test3.f90
+++ /dev/null

@@ -1,24 +0,0 @@
-program test3

-    implicit none

-

-    integer :: n

-

-    n = 1

-

-    ! this is a comment

-    goto (10, 20, 30) n*2 !<<<<< 9, 5, 9, 26, pass

-    ! another comment

-

-    print *, "It wasn't handled"

-    stop

-

-10  print *, "It was one"

-    stop

-

-20  print *, "It was two"

-    stop

-

-30  print *, "It was three"

-    stop

-

-end program test3


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test3/test3.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test3/test3.f90.result
deleted file mode 100644
index adc2402..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test3/test3.f90.result
+++ /dev/null

@@ -1,31 +0,0 @@
-program test3

-    implicit none

-

-    integer :: n

-

-    n = 1

-

-    ! this is a comment

-    select case (n*2)

-    case (1)

-        go to 10

-    case (2)

-        go to 20

-    case (3)

-        go to 30

-    end select

-    ! another comment

-

-    print *, "It wasn't handled"

-    stop

-

-10  print *, "It was one"

-    stop

-

-20  print *, "It was two"

-    stop

-

-30  print *, "It was three"

-    stop

-

-end program test3


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test4/test4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test4/test4.f90
deleted file mode 100644
index ed2dbfc..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test4/test4.f90
+++ /dev/null

@@ -1,24 +0,0 @@
-program test4

-    implicit none

-

-    integer :: n

-

-    n = 1

-

-    ! this is a comment

-    goto (10, 20, 30) n*2 !<<<<< 8, 5, 8, 24, fail-initial

-    ! another comment

-

-    print *, "It wasn't handled"

-    stop

-

-10  print *, "It was one"

-    stop

-

-20  print *, "It was two"

-    stop

-

-30  print *, "It was three"

-    stop

-

-end program test4


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test5/test5.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test5/test5.f90
deleted file mode 100644
index a4f2855..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test5/test5.f90
+++ /dev/null

@@ -1,18 +0,0 @@
-program test5

-    implicit none

-

-    integer :: n

-

-    n = 1

-

-    ! this is a comment

-    goto (123) n*2 !<<<<< 9, 5, 9, 19, pass

-    ! another comment

-

-    print *, "It wasn't handled"

-    stop

-

-123 print *, "It was one"

-    stop

-

-end program test5


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test5/test5.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test5/test5.f90.result
deleted file mode 100644
index a0ea2f8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-computed-goto/test5/test5.f90.result
+++ /dev/null

@@ -1,21 +0,0 @@
-program test5

-    implicit none

-

-    integer :: n

-

-    n = 1

-

-    ! this is a comment

-    select case (n*2)

-    case (1)

-        go to 123

-    end select

-    ! another comment

-

-    print *, "It wasn't handled"

-    stop

-

-123 print *, "It was one"

-    stop

-

-end program test5


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_as_only_stmt/pause_as_only_stmt.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_as_only_stmt/pause_as_only_stmt.f90
deleted file mode 100644
index 8b3ed8b..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_as_only_stmt/pause_as_only_stmt.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-! Checks for basic replacement of a PAUSE statement
-! with PRINT and READ.
-
-PROGRAM pause_as_only_stmt
-   PAUSE 'mid job'	!<<<<< 5, 5, 5, 7, pass
-END PROGRAM pause_as_only_stmt

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_as_only_stmt/pause_as_only_stmt.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_as_only_stmt/pause_as_only_stmt.f90.result
deleted file mode 100644
index 45a0e53..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_as_only_stmt/pause_as_only_stmt.f90.result
+++ /dev/null

@@ -1,7 +0,0 @@
-! Checks for basic replacement of a PAUSE statement
-! with PRINT and READ.
-
-PROGRAM pause_as_only_stmt
-   PRINT *, 'mid job'	!<<<<< 5, 5, 5, 7, pass
-   READ (*, *)
-END PROGRAM pause_as_only_stmt

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_in_subroutine/pause_in_subroutine.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_in_subroutine/pause_in_subroutine.f90
deleted file mode 100644
index 67972ee..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_in_subroutine/pause_in_subroutine.f90
+++ /dev/null

@@ -1,18 +0,0 @@
-! Checks for basic replacement of a PAUSE statement
-! with PRINT and READ while PAUSE statement is in
-! unit other than PROGRAM, e.g. SUBROUTINE.
-
-PROGRAM PauseInSubroutine
-  INTEGER :: i
-  DO i = 1, 100
-    IF (i == 50) THEN
-      CALL CALLPRINT
-    END IF
-  END DO
-  PRINT *, 'i=', i
-END PROGRAM PauseInSubroutine
-
-
-SUBROUTINE CALLPRINT
-   PAUSE 'mid job'              !<<<<< 17, 4, 17, 19, pass
-END

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_in_subroutine/pause_in_subroutine.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_in_subroutine/pause_in_subroutine.f90.result
deleted file mode 100644
index 5f81221..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_in_subroutine/pause_in_subroutine.f90.result
+++ /dev/null

@@ -1,19 +0,0 @@
-! Checks for basic replacement of a PAUSE statement
-! with PRINT and READ while PAUSE statement is in
-! unit other than PROGRAM, e.g. SUBROUTINE.
-
-PROGRAM PauseInSubroutine
-  INTEGER :: i
-  DO i = 1, 100
-    IF (i == 50) THEN
-      CALL CALLPRINT
-    END IF
-  END DO
-  PRINT *, 'i=', i
-END PROGRAM PauseInSubroutine
-
-
-SUBROUTINE CALLPRINT
-   PRINT *, 'mid job'              !<<<<< 17, 4, 17, 19, pass
-   READ (*, *)
-END

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_nested_in_if_and_do_loop/pause_nested_in_if_and_do_loop.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_nested_in_if_and_do_loop/pause_nested_in_if_and_do_loop.f90
deleted file mode 100644
index 0856300..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_nested_in_if_and_do_loop/pause_nested_in_if_and_do_loop.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-! Checks for replacement of a PAUSE statement
-! with PRINT and READ while PAUSE statement is in
-! a nested DO/IF block to make sure there are no
-! dependencies on surrounding code.
-
-PROGRAM pause_nested_in_if_and_do_loop
-  INTEGER :: i
-  DO i = 1, 100
-    IF (i == 50) THEN
-      PAUSE 'mid job'	!<<<<< 10, 7, 10, 21, pass
-    END IF
-  END DO
-  PRINT *, 'i=', i
-END PROGRAM pause_nested_in_if_and_do_loop

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_nested_in_if_and_do_loop/pause_nested_in_if_and_do_loop.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_nested_in_if_and_do_loop/pause_nested_in_if_and_do_loop.f90.result
deleted file mode 100644
index 38ba20a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_nested_in_if_and_do_loop/pause_nested_in_if_and_do_loop.f90.result
+++ /dev/null

@@ -1,15 +0,0 @@
-! Checks for replacement of a PAUSE statement
-! with PRINT and READ while PAUSE statement is in
-! a nested DO/IF block to make sure there are no
-! dependencies on surrounding code.
-
-PROGRAM pause_nested_in_if_and_do_loop
-  INTEGER :: i
-  DO i = 1, 100
-    IF (i == 50) THEN
-      PRINT *, 'mid job'	!<<<<< 10, 7, 10, 21, pass
-      READ (*, *)
-    END IF
-  END DO
-  PRINT *, 'i=', i
-END PROGRAM pause_nested_in_if_and_do_loop

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_no_message/pause_no_message.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_no_message/pause_no_message.f90
deleted file mode 100644
index 81ca444..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_no_message/pause_no_message.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-! Check when no PAUSE message provided that
-! an empty string is inserted in the 
-! final refactoring.
-
-PROGRAM pause_no_message
-  INTEGER :: i
-  DO i = 1, 100
-    IF (i == 50) THEN
-      PAUSE	!<<<<< 9, 7, 9, 11, pass
-    END IF
-  END DO
-  PRINT *, 'i=', i
-END PROGRAM pause_no_message
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_no_message/pause_no_message.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_no_message/pause_no_message.f90.result
deleted file mode 100644
index 54a3589..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_no_message/pause_no_message.f90.result
+++ /dev/null

@@ -1,14 +0,0 @@
-! Check when no PAUSE message provided that
-! an empty string is inserted in the 
-! final refactoring.
-
-PROGRAM pause_no_message
-  INTEGER :: i
-  DO i = 1, 100
-    IF (i == 50) THEN
-      PRINT *, ''	!<<<<< 9, 7, 9, 11, pass
-      READ (*, *)
-    END IF
-  END DO
-  PRINT *, 'i=', i
-END PROGRAM pause_no_message

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_not_selected/pause_not_selected.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_not_selected/pause_not_selected.f90
deleted file mode 100644
index 5eb5727..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_not_selected/pause_not_selected.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-! Refactoring requires that PAUSE statement be
-! selected. Check that no refactoring occurs
-! when PAUSE is not selected.
-
-PROGRAM pause_not_selected
-  INTEGER :: i
-  DO i = 1, 100
-    IF (i == 50) THEN
-      PAUSE 'mid job'
-    END IF
-  END DO
-  PRINT *, 'i=', i	!<<<<< 12, 3, 12, 5, fail-initial
-END PROGRAM pause_not_selected

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_not_selected/pause_not_selected.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_not_selected/pause_not_selected.f90.result
deleted file mode 100644
index 5eb5727..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-pause-stmt/pause_not_selected/pause_not_selected.f90.result
+++ /dev/null

@@ -1,13 +0,0 @@
-! Refactoring requires that PAUSE statement be
-! selected. Check that no refactoring occurs
-! when PAUSE is not selected.
-
-PROGRAM pause_not_selected
-  INTEGER :: i
-  DO i = 1, 100
-    IF (i == 50) THEN
-      PAUSE 'mid job'
-    END IF
-  END DO
-  PRINT *, 'i=', i	!<<<<< 12, 3, 12, 5, fail-initial
-END PROGRAM pause_not_selected

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/equal-lb-ub/equal-lb-ub.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/equal-lb-ub/equal-lb-ub.f90
deleted file mode 100644
index b836844..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/equal-lb-ub/equal-lb-ub.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-! When upper and lower bounds are the same value
-! refactoring should proceed with same value used.
-
-PROGRAM EqualLbUb
-  REAL :: counter, sum
-  sum = 0.0
-  DO counter = 1.2, 1.2, 0.1        !<<<<< 7, 3, 7, 29, 0, pass
-    sum = sum + counter
-  END DO
-  PRINT *, sum
-END PROGRAM EqualLbUb

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/equal-lb-ub/equal-lb-ub.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/equal-lb-ub/equal-lb-ub.f90.result
deleted file mode 100644
index 4e1be67..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/equal-lb-ub/equal-lb-ub.f90.result
+++ /dev/null

@@ -1,16 +0,0 @@
-! When upper and lower bounds are the same value
-! refactoring should proceed with same value used.
-
-PROGRAM EqualLbUb
-  REAL :: counter, sum
-  sum = 0.0
-  counter = 1.2
-  DO                                !<<<<< 7, 3, 7, 29, 0, pass
-    sum = sum + counter
-    counter = counter - 0.1
-    IF(counter < 1.2) THEN
-      EXIT
-    END IF
-  END DO
-  PRINT *, sum
-END PROGRAM EqualLbUb

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/integer-control-variable/integer-control-variable.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/integer-control-variable/integer-control-variable.f90
deleted file mode 100644
index e10f7b2..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/integer-control-variable/integer-control-variable.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-! Loop control variable declared as an INTEGER.
-! Refactoring explicitly requires a REAL or DOUBLE
-! type to proceed.
-
-PROGRAM IntegerControlVariable
-  INTEGER :: counter, sum
-  sum = 0
-  DO counter = 1, 10, 1        !<<<<< 8, 3, 8, 24, 0, fail-initial
-    sum = sum + counter
-  END DO
-  PRINT *, sum
-END PROGRAM IntegerControlVariable

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/integer-control-variable/integer-control-variable.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/integer-control-variable/integer-control-variable.f90.result
deleted file mode 100644
index e4d3d42..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/integer-control-variable/integer-control-variable.f90.result
+++ /dev/null

@@ -1,12 +0,0 @@
-! Loop control variable declared as an INTEGER.
-! Refactoring explicitly requires a REAL or DOUBLE
-! type to proceed.
-
-PROGRAM IntegerControlVariable
-  INTEGER :: counter, sum
-  sum = 0
-  DO counter = 1, 10, 1        !<<<<< 8, 3, 8, 24, 0, fail-final
-    sum = sum + counter
-  END DO
-  PRINT *, sum
-END PROGRAM IntegerControlVariable

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-do-while/nested-do-double-inner-decrement-do-while.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-do-while/nested-do-double-inner-decrement-do-while.f90
deleted file mode 100644
index e7cfe0b..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-do-while/nested-do-double-inner-decrement-do-while.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select inner DO loop - DOUBLE data type
-! and decrement behavior - explicit step count.
-! (This test selecting to replace with DO WHILE loop.)
-
-PROGRAM NestedDoDoubleInnerDecrementDoWhile
-  DOUBLE PRECISION :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8, 0.1
-    sum = sum + counter
-    DO counterin = 1.8, 1.2, 0.1                    !<<<<< 12, 5, 12, 33, 1, pass
-      sumin = sumin + counterin
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoDoubleInnerDecrementDoWhile

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-do-while/nested-do-double-inner-decrement-do-while.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-do-while/nested-do-double-inner-decrement-do-while.f90.result
deleted file mode 100644
index a9af20c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-do-while/nested-do-double-inner-decrement-do-while.f90.result
+++ /dev/null

@@ -1,19 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select inner DO loop - DOUBLE data type
-! and decrement behavior - explicit step count.
-! (This test selecting to replace with DO WHILE loop.)
-
-PROGRAM NestedDoDoubleInnerDecrementDoWhile
-  DOUBLE PRECISION :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8, 0.1
-    sum = sum + counter
-    counterin = 1.8
-    DO WHILE (counterin >= 1.2)                    !<<<<< 12, 5, 12, 33, 1, pass
-      sumin = sumin + counterin
-      counterin = counterin - 0.1
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoDoubleInnerDecrementDoWhile

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-implicit-do-while/nested-do-double-inner-decrement-implicit-do-while.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-implicit-do-while/nested-do-double-inner-decrement-implicit-do-while.f90
deleted file mode 100644
index e67e8f7..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-implicit-do-while/nested-do-double-inner-decrement-implicit-do-while.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select inner DO loop - DOUBLE data type
-! and decrement behavior - implicit step count.
-! (This test selecting to replace with DO WHILE loop.)
-
-PROGRAM NestedDoDoubleInnerDecrementImplicit
-  DOUBLE PRECISION :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8, 0.1
-    sum = sum + counter
-    DO counterin = 1.8, 1.2                         !<<<<< 12, 5, 12, 33, 1, pass
-      sumin = sumin + counterin
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoDoubleInnerDecrementImplicit

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-implicit-do-while/nested-do-double-inner-decrement-implicit-do-while.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-implicit-do-while/nested-do-double-inner-decrement-implicit-do-while.f90.result
deleted file mode 100644
index 8be8c54..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-implicit-do-while/nested-do-double-inner-decrement-implicit-do-while.f90.result
+++ /dev/null

@@ -1,19 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select inner DO loop - DOUBLE data type
-! and decrement behavior - implicit step count.
-! (This test selecting to replace with DO WHILE loop.)
-
-PROGRAM NestedDoDoubleInnerDecrementImplicit
-  DOUBLE PRECISION :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8, 0.1
-    sum = sum + counter
-    counterin = 1.8
-    DO WHILE (counterin >= 1.2)                         !<<<<< 12, 5, 12, 33, 1, pass
-      sumin = sumin + counterin
-      counterin = counterin - 1
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoDoubleInnerDecrementImplicit

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-implicit/nested-do-double-inner-decrement-implicit.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-implicit/nested-do-double-inner-decrement-implicit.f90
deleted file mode 100644
index 314c257..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-implicit/nested-do-double-inner-decrement-implicit.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select inner DO loop - DOUBLE data type
-! and decrement behavior - implicit step count.
-
-PROGRAM NestedDoDoubleInnerDecrementImplicit
-  DOUBLE PRECISION :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8, 0.1
-    sum = sum + counter
-    DO counterin = 1.8, 1.2                         !<<<<< 11, 5, 11, 33, 0, pass
-      sumin = sumin + counterin
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoDoubleInnerDecrementImplicit

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-implicit/nested-do-double-inner-decrement-implicit.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-implicit/nested-do-double-inner-decrement-implicit.f90.result
deleted file mode 100644
index 8165968..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement-implicit/nested-do-double-inner-decrement-implicit.f90.result
+++ /dev/null

@@ -1,21 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select inner DO loop - DOUBLE data type
-! and decrement behavior - implicit step count.
-
-PROGRAM NestedDoDoubleInnerDecrementImplicit
-  DOUBLE PRECISION :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8, 0.1
-    sum = sum + counter
-    counterin = 1.8
-    DO                                              !<<<<< 11, 5, 11, 33, 0, pass
-      sumin = sumin + counterin
-      counterin = counterin - 1
-      IF(counterin < 1.2) THEN
-        EXIT
-      END IF
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoDoubleInnerDecrementImplicit

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement/nested-do-double-inner-decrement.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement/nested-do-double-inner-decrement.f90
deleted file mode 100644
index e7a2e43..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement/nested-do-double-inner-decrement.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select inner DO loop - DOUBLE data type
-! and decrement behavior - explicit step count.
-
-PROGRAM NestedDoDoubleInnerDecrement
-  DOUBLE PRECISION :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8, 0.1
-    sum = sum + counter
-    DO counterin = 1.8, 1.2, 0.1                    !<<<<< 11, 5, 11, 33, 0, pass
-      sumin = sumin + counterin
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoDoubleInnerDecrement

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement/nested-do-double-inner-decrement.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement/nested-do-double-inner-decrement.f90.result
deleted file mode 100644
index 51cea8c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-inner-decrement/nested-do-double-inner-decrement.f90.result
+++ /dev/null

@@ -1,21 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select inner DO loop - DOUBLE data type
-! and decrement behavior - explicit step count.
-
-PROGRAM NestedDoDoubleInnerDecrement
-  DOUBLE PRECISION :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8, 0.1
-    sum = sum + counter
-    counterin = 1.8
-    DO                                              !<<<<< 11, 5, 11, 33, 0, pass
-      sumin = sumin + counterin
-      counterin = counterin - 0.1
-      IF(counterin < 1.2) THEN
-        EXIT
-      END IF
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoDoubleInnerDecrement

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-do-while/nested-do-double-outer-increment-do-while.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-do-while/nested-do-double-outer-increment-do-while.f90
deleted file mode 100644
index e8cc643..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-do-while/nested-do-double-outer-increment-do-while.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select outer DO loop - DOUBLE data type
-! and increment behavior - explicit step count.
-! (This test selecting to replace with DO WHILE loop.)
-
-PROGRAM NestedDoDoubleOuterIncrement
-  DOUBLE PRECISION :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8, 0.1                    !<<<<< 10, 3, 10, 29, 1, pass
-    sum = sum + counter
-    DO counterin = 1.2, 1.8, 0.1
-      sumin = sumin + counterin
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoDoubleOuterIncrement

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-do-while/nested-do-double-outer-increment-do-while.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-do-while/nested-do-double-outer-increment-do-while.f90.result
deleted file mode 100644
index 11c6942..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-do-while/nested-do-double-outer-increment-do-while.f90.result
+++ /dev/null

@@ -1,19 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select outer DO loop - DOUBLE data type
-! and increment behavior - explicit step count.
-! (This test selecting to replace with DO WHILE loop.)
-
-PROGRAM NestedDoDoubleOuterIncrement
-  DOUBLE PRECISION :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  counter = 1.2
-  DO WHILE (counter <= 1.8)                    !<<<<< 10, 3, 10, 29, 1, pass
-    sum = sum + counter
-    DO counterin = 1.2, 1.8, 0.1
-      sumin = sumin + counterin
-    END DO
-    counter = counter + 0.1
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoDoubleOuterIncrement

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-implicit-do-while/nested-do-double-outer-increment-implicit-do-while.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-implicit-do-while/nested-do-double-outer-increment-implicit-do-while.f90
deleted file mode 100644
index cd768b3..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-implicit-do-while/nested-do-double-outer-increment-implicit-do-while.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select outer DO loop - DOUBLE data type
-! and increment behavior - implicit step count.
-! (This test selecting to replace with DO WHILE loop.)
-
-PROGRAM NestedDoDoubleOuterIncrementImplicit
-  DOUBLE PRECISION :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8                         !<<<<< 10, 3, 10, 29, 1, pass
-    sum = sum + counter
-    DO counterin = 1.2, 1.8, 0.1
-      sumin = sumin + counterin
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoDoubleOuterIncrementImplicit

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-implicit-do-while/nested-do-double-outer-increment-implicit-do-while.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-implicit-do-while/nested-do-double-outer-increment-implicit-do-while.f90.result
deleted file mode 100644
index 959469d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-implicit-do-while/nested-do-double-outer-increment-implicit-do-while.f90.result
+++ /dev/null

@@ -1,19 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select outer DO loop - DOUBLE data type
-! and increment behavior - implicit step count.
-! (This test selecting to replace with DO WHILE loop.)
-
-PROGRAM NestedDoDoubleOuterIncrementImplicit
-  DOUBLE PRECISION :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  counter = 1.2
-  DO WHILE (counter <= 1.8)                         !<<<<< 10, 3, 10, 29, 1, pass
-    sum = sum + counter
-    DO counterin = 1.2, 1.8, 0.1
-      sumin = sumin + counterin
-    END DO
-    counter = counter + 1
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoDoubleOuterIncrementImplicit

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-implicit/nested-do-double-outer-increment-implicit.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-implicit/nested-do-double-outer-increment-implicit.f90
deleted file mode 100644
index b71d90a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-implicit/nested-do-double-outer-increment-implicit.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select outer DO loop - DOUBLE data type
-! and increment behavior - implicit step count.
-
-PROGRAM NestedDoDoubleOuterIncrementImplicit
-  DOUBLE PRECISION :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8                         !<<<<< 9, 3, 9, 29, 0, pass
-    sum = sum + counter
-    DO counterin = 1.2, 1.8, 0.1
-      sumin = sumin + counterin
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoDoubleOuterIncrementImplicit

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-implicit/nested-do-double-outer-increment-implicit.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-implicit/nested-do-double-outer-increment-implicit.f90.result
deleted file mode 100644
index 7c26a88..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment-implicit/nested-do-double-outer-increment-implicit.f90.result
+++ /dev/null

@@ -1,21 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select outer DO loop - DOUBLE data type
-! and increment behavior - implicit step count.
-
-PROGRAM NestedDoDoubleOuterIncrementImplicit
-  DOUBLE PRECISION :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  counter = 1.2
-  DO                                            !<<<<< 9, 3, 9, 29, 0, pass
-    sum = sum + counter
-    DO counterin = 1.2, 1.8, 0.1
-      sumin = sumin + counterin
-    END DO
-    counter = counter + 1
-    IF(counter > 1.8) THEN
-      EXIT
-    END IF
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoDoubleOuterIncrementImplicit

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment/nested-do-double-outer-increment.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment/nested-do-double-outer-increment.f90
deleted file mode 100644
index 9b7b8e9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment/nested-do-double-outer-increment.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select outer DO loop - DOUBLE data type
-! and increment behavior - explicit step count.
-
-PROGRAM NestedDoDoubleOuterIncrement
-  DOUBLE PRECISION :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8, 0.1                    !<<<<< 9, 3, 9, 29, 0, pass
-    sum = sum + counter
-    DO counterin = 1.2, 1.8, 0.1
-      sumin = sumin + counterin
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoDoubleOuterIncrement

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment/nested-do-double-outer-increment.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment/nested-do-double-outer-increment.f90.result
deleted file mode 100644
index 9637318..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-double-outer-increment/nested-do-double-outer-increment.f90.result
+++ /dev/null

@@ -1,21 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select outer DO loop - DOUBLE data type
-! and increment behavior - explicit step count.
-
-PROGRAM NestedDoDoubleOuterIncrement
-  DOUBLE PRECISION :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  counter = 1.2
-  DO                                            !<<<<< 9, 3, 9, 29, 0, pass
-    sum = sum + counter
-    DO counterin = 1.2, 1.8, 0.1
-      sumin = sumin + counterin
-    END DO
-    counter = counter + 0.1
-    IF(counter > 1.8) THEN
-      EXIT
-    END IF
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoDoubleOuterIncrement

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-do-while/nested-do-real-inner-decrement-do-while.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-do-while/nested-do-real-inner-decrement-do-while.f90
deleted file mode 100644
index 8aab597..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-do-while/nested-do-real-inner-decrement-do-while.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select inner DO loop - REAL data type
-! and decrement behavior - explicit step count.
-! (This test selecting to replace with DO WHILE loop.)
-
-PROGRAM NestedDoRealInnerDecrement
-  REAL :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8, 0.1
-    sum = sum + counter
-    DO counterin = 1.8, 1.2, 0.1                !<<<<< 12, 5, 12, 33, 1, pass
-      sumin = sumin + counterin
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoRealInnerDecrement

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-do-while/nested-do-real-inner-decrement-do-while.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-do-while/nested-do-real-inner-decrement-do-while.f90.result
deleted file mode 100644
index 9d6fabc..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-do-while/nested-do-real-inner-decrement-do-while.f90.result
+++ /dev/null

@@ -1,19 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select inner DO loop - REAL data type
-! and decrement behavior - explicit step count.
-! (This test selecting to replace with DO WHILE loop.)
-
-PROGRAM NestedDoRealInnerDecrement
-  REAL :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8, 0.1
-    sum = sum + counter
-    counterin = 1.8
-    DO WHILE (counterin >= 1.2)                !<<<<< 12, 5, 12, 33, 1, pass
-      sumin = sumin + counterin
-      counterin = counterin - 0.1
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoRealInnerDecrement

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-implicit-do-while/nested-do-real-inner-decrement-implicit-do-while.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-implicit-do-while/nested-do-real-inner-decrement-implicit-do-while.f90
deleted file mode 100644
index 23f4b3d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-implicit-do-while/nested-do-real-inner-decrement-implicit-do-while.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select inner DO loop - REAL data type
-! and decrement behavior - implicit step count.
-! (This test selecting to replace with DO WHILE loop.)
-
-PROGRAM NestedDoRealInnerDecrementImplicit
-  REAL :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8, 0.1
-    sum = sum + counter
-    DO counterin = 1.8, 1.2                     !<<<<< 12, 5, 12, 33, 1, pass
-      sumin = sumin + counterin
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoRealInnerDecrementImplicit

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-implicit-do-while/nested-do-real-inner-decrement-implicit-do-while.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-implicit-do-while/nested-do-real-inner-decrement-implicit-do-while.f90.result
deleted file mode 100644
index 81d3479..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-implicit-do-while/nested-do-real-inner-decrement-implicit-do-while.f90.result
+++ /dev/null

@@ -1,19 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select inner DO loop - REAL data type
-! and decrement behavior - implicit step count.
-! (This test selecting to replace with DO WHILE loop.)
-
-PROGRAM NestedDoRealInnerDecrementImplicit
-  REAL :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8, 0.1
-    sum = sum + counter
-    counterin = 1.8
-    DO WHILE (counterin >= 1.2)                     !<<<<< 12, 5, 12, 33, 1, pass
-      sumin = sumin + counterin
-      counterin = counterin - 1
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoRealInnerDecrementImplicit

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-implicit/nested-do-real-inner-decrement-implicit.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-implicit/nested-do-real-inner-decrement-implicit.f90
deleted file mode 100644
index edf48f3..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-implicit/nested-do-real-inner-decrement-implicit.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select inner DO loop - REAL data type
-! and decrement behavior - implicit step count.
-
-PROGRAM NestedDoRealInnerDecrementImplicit
-  REAL :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8, 0.1
-    sum = sum + counter
-    DO counterin = 1.8, 1.2                     !<<<<< 11, 5, 11, 33, 0, pass
-      sumin = sumin + counterin
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoRealInnerDecrementImplicit

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-implicit/nested-do-real-inner-decrement-implicit.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-implicit/nested-do-real-inner-decrement-implicit.f90.result
deleted file mode 100644
index 98bc141..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement-implicit/nested-do-real-inner-decrement-implicit.f90.result
+++ /dev/null

@@ -1,21 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select inner DO loop - REAL data type
-! and decrement behavior - implicit step count.
-
-PROGRAM NestedDoRealInnerDecrementImplicit
-  REAL :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8, 0.1
-    sum = sum + counter
-    counterin = 1.8
-    DO                                          !<<<<< 11, 5, 11, 33, 0, pass
-      sumin = sumin + counterin
-      counterin = counterin - 1
-      IF(counterin < 1.2) THEN
-        EXIT
-      END IF
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoRealInnerDecrementImplicit

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement/nested-do-real-inner-decrement.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement/nested-do-real-inner-decrement.f90
deleted file mode 100644
index f660d8c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement/nested-do-real-inner-decrement.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select inner DO loop - REAL data type
-! and decrement behavior - explicit step count.
-
-PROGRAM NestedDoRealInnerDecrement
-  REAL :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8, 0.1
-    sum = sum + counter
-    DO counterin = 1.8, 1.2, 0.1                !<<<<< 11, 5, 11, 33, 0, pass
-      sumin = sumin + counterin
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoRealInnerDecrement

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement/nested-do-real-inner-decrement.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement/nested-do-real-inner-decrement.f90.result
deleted file mode 100644
index 477da4e..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-inner-decrement/nested-do-real-inner-decrement.f90.result
+++ /dev/null

@@ -1,21 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select inner DO loop - REAL data type
-! and decrement behavior - explicit step count.
-
-PROGRAM NestedDoRealInnerDecrement
-  REAL :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8, 0.1
-    sum = sum + counter
-    counterin = 1.8
-    DO                                          !<<<<< 11, 5, 11, 33, 0, pass
-      sumin = sumin + counterin
-      counterin = counterin - 0.1
-      IF(counterin < 1.2) THEN
-        EXIT
-      END IF
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoRealInnerDecrement

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-do-while/nested-do-real-outer-increment-do-while.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-do-while/nested-do-real-outer-increment-do-while.f90
deleted file mode 100644
index 816fe2a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-do-while/nested-do-real-outer-increment-do-while.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select outer DO loop - REAL data type
-! and decrement behavior - explicit step count.
-! (This test selecting to replace with DO WHILE loop.)
-
-PROGRAM NestedDoRealOuterIncrement
-  REAL :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8, 0.1                    !<<<<< 10, 3, 10, 29, 1, pass
-    sum = sum + counter
-    DO counterin = 1.2, 1.8, 0.1
-      sumin = sumin + counterin
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoRealOuterIncrement

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-do-while/nested-do-real-outer-increment-do-while.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-do-while/nested-do-real-outer-increment-do-while.f90.result
deleted file mode 100644
index 8edb5e0..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-do-while/nested-do-real-outer-increment-do-while.f90.result
+++ /dev/null

@@ -1,19 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select outer DO loop - REAL data type
-! and decrement behavior - explicit step count.
-! (This test selecting to replace with DO WHILE loop.)
-
-PROGRAM NestedDoRealOuterIncrement
-  REAL :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  counter = 1.2
-  DO WHILE (counter <= 1.8)                    !<<<<< 10, 3, 10, 29, 1, pass
-    sum = sum + counter
-    DO counterin = 1.2, 1.8, 0.1
-      sumin = sumin + counterin
-    END DO
-    counter = counter + 0.1
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoRealOuterIncrement

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-implicit-do-while/nested-do-real-outer-increment-implicit-do-while.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-implicit-do-while/nested-do-real-outer-increment-implicit-do-while.f90
deleted file mode 100644
index 81e7d7b..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-implicit-do-while/nested-do-real-outer-increment-implicit-do-while.f90
+++ /dev/null

@@ -1,17 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select outer DO loop - REAL data type
-! and decrement behavior - implicit step count.
-! (This test selecting to replace with DO WHILE loop.)
-
-PROGRAM NestedDoRealOuterIncrementImplicitDoWhile
-  REAL :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8                         !<<<<< 10, 3, 10, 29, 1, pass
-    sum = sum + counter
-    DO counterin = 1.2, 1.8, 0.1
-      sumin = sumin + counterin
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoRealOuterIncrementImplicitDoWhile

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-implicit-do-while/nested-do-real-outer-increment-implicit-do-while.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-implicit-do-while/nested-do-real-outer-increment-implicit-do-while.f90.result
deleted file mode 100644
index 3b446e4..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-implicit-do-while/nested-do-real-outer-increment-implicit-do-while.f90.result
+++ /dev/null

@@ -1,19 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select outer DO loop - REAL data type
-! and decrement behavior - implicit step count.
-! (This test selecting to replace with DO WHILE loop.)
-
-PROGRAM NestedDoRealOuterIncrementImplicitDoWhile
-  REAL :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  counter = 1.2
-  DO WHILE (counter <= 1.8)                         !<<<<< 10, 3, 10, 29, 1, pass
-    sum = sum + counter
-    DO counterin = 1.2, 1.8, 0.1
-      sumin = sumin + counterin
-    END DO
-    counter = counter + 1
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoRealOuterIncrementImplicitDoWhile

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-implicit/nested-do-real-outer-increment-implicit.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-implicit/nested-do-real-outer-increment-implicit.f90
deleted file mode 100644
index 48f5079..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-implicit/nested-do-real-outer-increment-implicit.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select outer DO loop - REAL data type
-! and decrement behavior - implicit step count.
-
-PROGRAM NestedDoRealOuterIncrementImplicit
-  REAL :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8                         !<<<<< 9, 3, 9, 29, 0, pass
-    sum = sum + counter
-    DO counterin = 1.2, 1.8, 0.1
-      sumin = sumin + counterin
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoRealOuterIncrementImplicit

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-implicit/nested-do-real-outer-increment-implicit.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-implicit/nested-do-real-outer-increment-implicit.f90.result
deleted file mode 100644
index 9504db3..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment-implicit/nested-do-real-outer-increment-implicit.f90.result
+++ /dev/null

@@ -1,21 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select outer DO loop - REAL data type
-! and decrement behavior - implicit step count.
-
-PROGRAM NestedDoRealOuterIncrementImplicit
-  REAL :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  counter = 1.2
-  DO                                            !<<<<< 9, 3, 9, 29, 0, pass
-    sum = sum + counter
-    DO counterin = 1.2, 1.8, 0.1
-      sumin = sumin + counterin
-    END DO
-    counter = counter + 1
-    IF(counter > 1.8) THEN
-      EXIT
-    END IF
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoRealOuterIncrementImplicit

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment/nested-do-real-outer-increment.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment/nested-do-real-outer-increment.f90
deleted file mode 100644
index 708207b..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment/nested-do-real-outer-increment.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select outer DO loop - REAL data type
-! and decrement behavior - explicit step count.
-
-PROGRAM NestedDoRealOuterIncrement
-  REAL :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  DO counter = 1.2, 1.8, 0.1                    !<<<<< 9, 3, 9, 29, 0, pass
-    sum = sum + counter
-    DO counterin = 1.2, 1.8, 0.1
-      sumin = sumin + counterin
-    END DO
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoRealOuterIncrement

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment/nested-do-real-outer-increment.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment/nested-do-real-outer-increment.f90.result
deleted file mode 100644
index a2b3e0f..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/nested-do-real-outer-increment/nested-do-real-outer-increment.f90.result
+++ /dev/null

@@ -1,21 +0,0 @@
-! Check that nested DO loop doesn't affect refactoring
-! behavior. Select outer DO loop - REAL data type
-! and decrement behavior - explicit step count.
-
-PROGRAM NestedDoRealOuterIncrement
-  REAL :: counter, sum, counterin, sumin
-  sum = 0.0
-  sumin = 0.0
-  counter = 1.2
-  DO                                            !<<<<< 9, 3, 9, 29, 0, pass
-    sum = sum + counter
-    DO counterin = 1.2, 1.8, 0.1
-      sumin = sumin + counterin
-    END DO
-    counter = counter + 0.1
-    IF(counter > 1.8) THEN
-      EXIT
-    END IF
-  END DO
-  PRINT *, sum
-END PROGRAM NestedDoRealOuterIncrement

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/test-invalid-selection/test-invalid-selection.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/test-invalid-selection/test-invalid-selection.f90
deleted file mode 100644
index 5c3ecce..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/test-invalid-selection/test-invalid-selection.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-! Controlled DO loop must be selected for refactoring.
-! Test invalid selection that refactoring will no proceed.
-
-PROGRAM TestInvalidSelection
-  REAL :: counter, sum
-  sum = 0.0
-  DO counter = 1.2, 1.8, 0.1
-    sum = sum + counter
-  END DO
-  PRINT *, sum                  !<<<<< 10,3,10,15, 0, fail-initial
-END PROGRAM TestInvalidSelection

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/test-invalid-selection/test-invalid-selection.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/test-invalid-selection/test-invalid-selection.result
deleted file mode 100644
index a02e2c9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/test-invalid-selection/test-invalid-selection.result
+++ /dev/null

@@ -1,11 +0,0 @@
-! Controlled DO loop must be selected for refactoring.
-! Test invalid selection that refactoring will no proceed.
-
-PROGRAM TestInvalidSelection
-  REAL :: counter, sum
-  sum = 0.0
-  DO counter = 1.2, 1.8, 0.1
-    sum = sum + counter
-  END DO
-  PRINT *, sum                  !<<<<< 10,3,10,15, 0, fail-final
-END PROGRAM TestInvalidSelection

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/uncontrolled-do-loop/uncontrolled-do-loop.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/uncontrolled-do-loop/uncontrolled-do-loop.f90
deleted file mode 100644
index 5e8f89d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/uncontrolled-do-loop/uncontrolled-do-loop.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-! DO loop selected for refactoring must be a controlled
-! DO loop otherwise refactoring will not proceed.
-
-PROGRAM UncontrolledDoLoop
-  REAL :: counter, sum
-  sum = 0.0
-  counter = 1.2
-  DO                                !<<<<< 8,3,8,5, 0, fail-initial
-    sum = sum + counter
-    counter = counter + 0.1
-    IF (counter > 1.8) THEN
-      EXIT
-    END IF
-  END DO
-  PRINT *, sum
-END PROGRAM UncontrolledDoLoop

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/uncontrolled-do-loop/uncontrolled-do-loop.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/uncontrolled-do-loop/uncontrolled-do-loop.result
deleted file mode 100644
index ff5e241..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-real-and-double-precision-loop-counters/uncontrolled-do-loop/uncontrolled-do-loop.result
+++ /dev/null

@@ -1,16 +0,0 @@
-! DO loop selected for refactoring must be a controlled
-! DO loop otherwise refactoring will not proceed.
-
-PROGRAM UncontrolledDoLoop
-  REAL :: counter, sum
-  sum = 0.0
-  counter = 1.2
-  DO                                !<<<<< 8,3,8,5, 0, fail-final
-    sum = sum + counter
-    counter = counter + 0.1
-    IF (counter > 1.8) THEN
-      EXIT
-    END IF
-  END DO
-  PRINT *, sum
-END PROGRAM UncontrolledDoLoop

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test1/remove-unreferenced-labels-test1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test1/remove-unreferenced-labels-test1.f90
deleted file mode 100644
index 49e3e47..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test1/remove-unreferenced-labels-test1.f90
+++ /dev/null

@@ -1,19 +0,0 @@
-program main

-  integer ::i

-      i=1

- 100  if (i.lt.10) then !<<<<< 1, 1, 19, 10, pass

-         i=1

- 101     continue

- 110  else

-      end if

-

-end program

-

-900   subroutine OneSubroutine

-          return

-      end subroutine

-

-      integer function OneFunc()

-      994 OneFunc=1

-      996 return

-      end
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test1/remove-unreferenced-labels-test1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test1/remove-unreferenced-labels-test1.f90.result
deleted file mode 100644
index e99ae47..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test1/remove-unreferenced-labels-test1.f90.result
+++ /dev/null

@@ -1,17 +0,0 @@
-program main

-  integer ::i

-      i=1

-      if (i.lt.10) then !<<<<< 1, 1, 19, 10, pass

-         i=1

-     else

-      end if

-

-end program

-subroutine OneSubroutine

-          return

-      end subroutine

-

-      integer function OneFunc()

-          OneFunc=1

-          return

-      end


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test2/remove-unreferenced-labels-test2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test2/remove-unreferenced-labels-test2.f90
deleted file mode 100644
index 0449b1f..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test2/remove-unreferenced-labels-test2.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-program main

-    implicit none

-

-    integer :: i,j

-

-

-    do i = 1,10

-        do j=1,10

-            print *,i+j

-        100 continue !<<<<< 1, 1, 14, 17, pass

-        end do

-    end do

-

-end program main


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test2/remove-unreferenced-labels-test2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test2/remove-unreferenced-labels-test2.f90.result
deleted file mode 100644
index 7ea4106..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test2/remove-unreferenced-labels-test2.f90.result
+++ /dev/null

@@ -1,13 +0,0 @@
-program main

-    implicit none

-

-    integer :: i,j

-

-

-    do i = 1,10

-        do j=1,10

-            print *,i+j

-        end do

-    end do

-

-end program main


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test3/remove-unreferenced-labels-test3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test3/remove-unreferenced-labels-test3.f90
deleted file mode 100644
index 47bbace..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test3/remove-unreferenced-labels-test3.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-program main

-    implicit none

-

-

-100 goto 200 !<<<<< 1, 1, 8, 17, pass

-200 print *,'200'

-

-end program main
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test3/remove-unreferenced-labels-test3.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test3/remove-unreferenced-labels-test3.f90.result
deleted file mode 100644
index 1063377..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unreferenced-labels/test3/remove-unreferenced-labels-test3.f90.result
+++ /dev/null

@@ -1,6 +0,0 @@
-program main

-    implicit none

-    goto 200 !<<<<< 1, 1, 8, 17, pass

-200 print *,'200'

-

-end program main


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unused-local-vars/test1/unused_variables.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unused-local-vars/test1/unused_variables.f90
deleted file mode 100644
index 8044426..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unused-local-vars/test1/unused_variables.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-program unused_variables !<<<<<1,1,pass

-    implicit none

-    integer x,y,z !Integers are declared

-    real :: a,b,c !Reals are declared

-    y = 6 !Only y is used so far

-    z = y + 9 !Now z is used as well

-    a = 7.0 !Value is assigned to variable a

-end program unused_variables


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unused-local-vars/test1/unused_variables.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unused-local-vars/test1/unused_variables.f90.result
deleted file mode 100644
index 669484a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unused-local-vars/test1/unused_variables.f90.result
+++ /dev/null

@@ -1,8 +0,0 @@
-program unused_variables !<<<<<1,1,pass

-    implicit none

-    integer y,z !Integers are declared

-    real :: a !Reals are declared

-    y = 6 !Only y is used so far

-    z = y + 9 !Now z is used as well

-    a = 7.0 !Value is assigned to variable a

-end program unused_variables


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unused-local-vars/test2/unused_variables_2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unused-local-vars/test2/unused_variables_2.f90
deleted file mode 100644
index 2e43102..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unused-local-vars/test2/unused_variables_2.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-program standardize_statements !<<<<<1,1,pass

-    implicit none

-    real, dimension(1:10) :: vector, vector2

-    integer a(4), b(20), c(6), d

-    dimension :: d(10)

-

-    a = (/1,2,3,4/)

-    vector(1:10) = 4.0

-

-end program standardize_statements


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unused-local-vars/test2/unused_variables_2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unused-local-vars/test2/unused_variables_2.f90.result
deleted file mode 100644
index f3eab90..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/remove-unused-local-vars/test2/unused_variables_2.f90.result
+++ /dev/null

@@ -1,10 +0,0 @@
-program standardize_statements !<<<<<1,1,pass

-    implicit none

-    real, dimension(1:10) :: vector

-    integer a(4), d

-    dimension :: d(10)

-

-    a = (/1,2,3,4/)

-    vector(1:10) = 4.0

-

-end program standardize_statements


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/.cvsignore b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/.cvsignore
deleted file mode 100644
index d8200e1..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/.cvsignore
+++ /dev/null

@@ -1,2 +0,0 @@
-rename?
-*.mod

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/Makefile b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/Makefile
deleted file mode 100644
index bace899..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/Makefile
+++ /dev/null

@@ -1,21 +0,0 @@
-FORTRAN=ifort
-FLAGS=-g -I.
-
-all:
-	$(FORTRAN) $(FLAGS) -o rename1 rename1.f90
-	$(FORTRAN) $(FLAGS) -o rename2 rename2.f90
-	
-	$(FORTRAN) $(FLAGS) -S rename3c.f90
-	$(FORTRAN) $(FLAGS) -S rename3a.f90 rename3b.f90
-	$(FORTRAN) $(FLAGS) -o rename3 rename3*.f90
-	rm -f *.mod *.s
-	
-	$(FORTRAN) $(FLAGS) -o rename4 rename4.f90
-	$(FORTRAN) $(FLAGS) -o rename5 rename5.f90
-	$(FORTRAN) $(FLAGS) -o rename6 rename6.f90
-	$(FORTRAN) $(FLAGS) -o rename7 rename7.f90
-	$(FORTRAN) $(FLAGS) -o rename8 rename8.f90
-	$(FORTRAN) $(FLAGS) -o rename9 rename9.f90 rename9a.f90
-
-clean:
-	rm -f rename? *.mod *.s

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278103-mod.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278103-mod.f90
deleted file mode 100644
index c5e94d7..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278103-mod.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-MODULE Mod1
-
-    INTEGER, PARAMETER :: DIM = 5 ! 3,27
-
-    CONTAINS
-
-        SUBROUTINE PrintDim
-
-            print *,'DIM IS:'
-
-            print *, DIM ! 11,22
-
-        END SUBROUTINE PrintDim
-
-END MODULE Mod1

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278103-prog.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278103-prog.f90
deleted file mode 100644
index ee1110a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278103-prog.f90
+++ /dev/null

@@ -1,18 +0,0 @@
-PROGRAM MyProgram
-
-    CALL MySub
-
-    CALL MySub2
-
-END PROGRAM MyProgram
-
-
-subroutine MySub
-
-    USE Mod1
-
-    INTEGER, DIMENSION(DIM) :: MyArray = (/1, 10, 100, 1000, 10000/) ! 14,24
-
-    print *, MyArray(DIM - 2) ! 16,22
-
-end subroutine MySub

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278103-subs.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278103-subs.f90
deleted file mode 100644
index b106a7c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278103-subs.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-subroutine MySub2
-
-    USE Mod1
-
-    REAL :: MyArray2(DIM) ! 5,22
-
-    SAVE MyArray2
-
-    MyArray2(DIM - 3) = 0.1 ! 9,14
-
-    print *, MyArray2(DIM - 3) ! 11,23
-
-    CALL PrintDim
-
-end subroutine MySub2

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278106-visibility.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278106-visibility.f90
deleted file mode 100644
index 9b279a8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278106-visibility.f90
+++ /dev/null

@@ -1,40 +0,0 @@
-module m1
-  integer :: m1a, m1b ! 2,14 !2,19
-end module m1
-
-module m2
-  use m1
-  private :: m1b ! 7,14
-end module m2
-
-subroutine s1
-  use m2
-  !integer :: m1a !! ILLEGAL
-  integer :: m1b ! 13,14
-  print *, m1a, m1b ! 14,12 14,17
-end subroutine s1
-
-module m3
-  use m1
-  private
-end module m3
-
-subroutine s2
-  use m3
-  integer :: m1a ! 24,14
-  integer :: m1b ! 25,14
-  print *, m1a, m1b ! 26,12 26,17
-end subroutine s2
-
-module m4
-  use m1
-  private
-  public :: m1a ! 32,13
-end module m4
-
-subroutine s3
-  use m4
-  !integer :: m1a !! ILLEGAL
-  integer :: m1b ! 38,14
-  print *, m1a, m1b ! 39,12 39,17
-end subroutine s3

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278320-mod.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278320-mod.f90
deleted file mode 100644
index 53d807f..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278320-mod.f90
+++ /dev/null

@@ -1,4 +0,0 @@
-MODULE Mod1
-  IMPLICIT NONE
-  INTEGER, DIMENSION(3) :: module_array  ! 3,28
-END MODULE Mod1

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278320-prog.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278320-prog.f90
deleted file mode 100644
index ef0f5c7..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278320-prog.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-PROGRAM MyProgram
-    USE Mod1
-    IMPLICIT NONE
-    INTEGER :: local_array(3)
-    module_array(1) = 1  ! 5,5
-    local_array(module_array(2)) = 1   ! 6,17
-END PROGRAM MyProgram

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278324.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278324.f90
deleted file mode 100644
index b136aa7..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/bug278324.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-PROGRAM MyProgram
-    IMPLICIT NONE
-    CHARACTER(len=5) :: parmValFormat   ! 3,25
-999 FORMAT('(A',I2,',')
-    WRITE(parmValFormat,999)  ! 5,11
-    WRITE(25, parmValFormat // "' = ', I10, ' [CHANGED]')")  ! 6,15
-END PROGRAM MyProgram

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename-extsub1-a.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename-extsub1-a.f90
deleted file mode 100644
index 3425639..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename-extsub1-a.f90
+++ /dev/null

@@ -1,25 +0,0 @@
-subroutine ext1 !1,12
-end subroutine ext1 !2,16
-
-program test
-  interface
-    subroutine ext1 !6,16
-    end subroutine ext1 !7,20
-
-    character(len=3) function ext2(i) !9,31
-      real, intent(in) :: i
-    end function ext2 !11,18
-
-    integer function ext3() !13,22
-    end function ext3 !14,18
-  end interface
-
-  call ext1 !17,8
-  print *, ext2(1.1) !18,12
-  print *, ext3() !19,12
-
-end program
-
-function ext3() result(j) !23,10
-  j = 3
-end function ext3 !25,14

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename-extsub1-b.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename-extsub1-b.f90
deleted file mode 100644
index 4a7eb67..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename-extsub1-b.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-character(len=3) function ext2(i) !1,27
-  real, intent(in) :: i
-  external ext3 !3,12
-
-  j = ext3() !5,7
-  ext2 = 'Bye' !6,3
-end function ext2 !7,14

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename-fn-result.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename-fn-result.f90
deleted file mode 100644
index dacc742..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename-fn-result.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-  print *, f()   ! 1,12
-contains
-  function f()   ! 3,12
-    integer :: f ! 4,16
-    f = 3        ! 5,5
-  end function f ! 6,16
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename-overloads.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename-overloads.f90
deleted file mode 100644
index 28f4f4c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename-overloads.f90
+++ /dev/null

@@ -1,49 +0,0 @@
-module module
-  interface module_overload !2,13
-    subroutine overload_int(value) !3,16
-      integer, intent(in) :: value
-    end subroutine overload_int !5,20
-    module procedure overload_char !6,22
-  end interface module_overload !7,17
-contains
-  subroutine overload_char(value) !9,14
-    character, intent(in) :: value
-    print *, "(Module) Character", value
-  end subroutine overload_char !12,18
-end module module
-
-subroutine overload_int(value) !15,12
-  integer, intent(in) :: value
-  print *, "Integer", value
-end subroutine overload_int !18,16
-
-program test
-  interface overload
-    subroutine overload_int(value) !22,16
-      integer, intent(in) :: value
-    end subroutine overload_int !24,20
-
-    subroutine overload_char(value) !26,16
-      character, intent(in) :: value
-    end subroutine overload_char !28,20
-  end interface overload !29,17
-
-  call overload(1)        !31,8
-  call overload('c')      !32,8
-  call overload_int(1)    !33,8
-  call overload_char('c') !34,8
-  call call_module
-contains
-  subroutine call_module
-    use module
-    call module_overload(2)   !39,10
-    call module_overload('d') !40,10
-    call overload_int(2)      !41,10
-    call overload_char('d')   !42,10
-  end subroutine call_module
-end program
-
-subroutine overload_char(value) !46,12
-  character, intent(in) :: value
-  print *, "Character", value
-end subroutine overload_char !49,16

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename1.f90
deleted file mode 100644
index 711180a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename1.f90
+++ /dev/null

@@ -1,33 +0,0 @@
-program Main
-    integer, parameter :: two = 2
-    integer, parameter :: three = selected_real_kind(3)
-    integer :: a, b = three
-    integer(three) :: not_shadowed = 98765
-    real(kind=three) :: c
-    complex :: shadow_this_1 = (three, two), shadow_this_2 = (2, three)
-    implicit = 13579
-    print *, a, b, c, two, three, not_shadowed, shadow_this_1, shadow_this_2, implicit
-    
-    call int
-    call ext
-    stop
-    
-contains
-
-    subroutine int
-      complex :: shadow_this_1
-      integer :: shadow_this_2
-      
-      print *, not_shadowed, shadow_this_1, shadow_this_2, implicit
-      call ext
-    end subroutine int
-    subroutine sub
-    end subroutine sub
-end program Main
-subroutine ext
-    print *, two
-contains
-    subroutine int
-        print *, two
-    end subroutine int
-end subroutine ext

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename2.f90
deleted file mode 100644
index 7fb2509..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename2.f90
+++ /dev/null

@@ -1,29 +0,0 @@
-! Header comment
-program Main ! After program name
-    implicit none
-    integer :: one ! After declaration
-    integer, parameter :: two = 2 ! After declaration assignment
-    integer :: three
-    
-    ! Between specifications
-    
-    integer(two) :: four
-
-    print *, one !
-    print *, two, &
-        three
-    print *, four &
-        , one
-    print *, two, & !
-        three !
-    print *, four & !
-        , one !
-
-    print *, "This is a really&
-            & long string"
-
-    stop
-! end
-end program Main !End
-! end of file
-! end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename3.f90
deleted file mode 100644
index ec7214d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename3.f90
+++ /dev/null

@@ -1,18 +0,0 @@
-program MyProgram ! 1,9
-  use module_a, a_renamed3 => a_sub3of3 ! 2,7 2,17 2,31
-  use module_b, only: b_sub2of3, b_renamed3 => b_sub3of3 ! 3,7 3,23 3,34 3,48
-
-  implicit none
-
-  call a_sub1of3  !  7,8
-  call a_sub2of3  !  8,8
-  call a_renamed3 !  9,8
-  call b_sub2of3  ! 10,8
-  call b_renamed3 ! 11,8
-  call contained  ! 12,8
-  call external   ! 13,8
-contains
-  subroutine contained; end subroutine ! 15,14
-end
-
-subroutine external; end subroutine ! 18,12

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename3a.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename3a.f90
deleted file mode 100644
index fe48524..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename3a.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-module module_a ! 1,8
-contains
-    subroutine a_sub1of3; end subroutine ! 3,16
-    subroutine a_sub2of3; end subroutine ! 4,16
-    subroutine a_sub3of3; end subroutine ! 5,16
-end module

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename3b.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename3b.f90
deleted file mode 100644
index eac8923..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename3b.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-module module_b ! 1,8
-    use module_c ! 2,9
-contains
-    subroutine b_sub1of3; end subroutine ! 4,16
-    subroutine b_sub2of3; end subroutine ! 5,16
-    subroutine b_sub3of3; ! 6,16
-      call c_sub ! 7,12
-    end subroutine
-end module

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename3c.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename3c.f90
deleted file mode 100644
index 7c06b6d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename3c.f90
+++ /dev/null

@@ -1,4 +0,0 @@
-module module_c ! 1,8
-contains
-    subroutine c_sub; end subroutine ! 3,16
-end module

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename4.f90
deleted file mode 100644
index b678a6e..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename4.f90
+++ /dev/null

@@ -1,5 +0,0 @@
-program MyProgram ! 1,9
-  include "rename4a.fh" ! Some include
-  print *, hello ! 3,12
-  include "rename4b.fh"
-end

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename4a.fh b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename4a.fh
deleted file mode 100644
index 9900890..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename4a.fh
+++ /dev/null

@@ -1,2 +0,0 @@
-integer :: hello   ! 1,12
-integer :: goodbye ! 2, 12
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename4b.fh b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename4b.fh
deleted file mode 100644
index f32f18b..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename4b.fh
+++ /dev/null

@@ -1 +0,0 @@
-print *, hello ! 1,10
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename5.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename5.f90
deleted file mode 100644
index ce018ef..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename5.f90
+++ /dev/null

@@ -1,47 +0,0 @@
-!            14                             45     52
-pure integer(selected_int_kind(3)) function thrice(n)
-  intent(in) :: n ! 17    n should be implicitly declared, NOT resolve to the outer n
-  thrice=-999 ! 3
-end function thrice ! 14
-
-  type type ! 8
-    integer :: a ! 16
-  end type type ! 12
-
-! 3      10     17  
-! thrice(n) = 3*n ! Statement function, shadows outer function
-! 3
-  n = 1 ! Different n than statement function parameter
-
-  !        12         23     30  34  38    44
-  print *, thrice(6), thrice(n), n,  f(1), f(3)
-  ! Expect 18.0       3.0        1.0 1.0   3.0
-  stop
-
-contains
-                           ! 30 33
-  recursive integer function f (a)
-    !          16
-    integer :: a ! Different a than derived type component
-    !    10       19
-    type(type) :: x
-    !    10                28   33
-    type(type), pointer :: p => null()
-    
-    target :: x ! 15
-    intent(in) :: a ! 19
-
-!   5 7   11
-    x%a = a ! Assign local a to component
-!   5   9    14
-    x = type(a) ! Structure ctor assigning local a to component a
-!   5    10
-    p => x
-    !p => null() does not parse
-
-!   5
-    f = 1
-!       9      16  20     2729
-    if (a > 1) f = thrice(f(f-1))
-  end function f ! 16
-end

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename6.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename6.f90
deleted file mode 100644
index 5784c10..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename6.f90
+++ /dev/null

@@ -1,29 +0,0 @@
-implicit none; type outer ! outer 21
-  integer :: i
-  type(outer), pointer :: inner ! outer 8
-end type
-integer :: j ! j 12
-integer, parameter :: i = 2   ! i 23
-character(len=i), save :: hi = 'hi', bye = 'bye' ! i 15 hi 27 bye 38
-!type(outer) :: type
-type(outer) :: ty ! outer 6 ty 16
-integer :: array(5) ! array 12
-
-!type%i = type%inner%i - i ! i 25
-
-!2      9            22
- ty%i = ty%inner%i - i
-
-!         11   16  20   25   30   35   40
-namelist /nl1/ hi, bye /nl2/ hi, /nl3/ bye
-read (5, nml=nl1) ! nl1 14
-
-!    6  9   13               30
-data hi,bye,ty%i /'Hi','Bye',i/
-!    6       14
-data array/5*i/
-!    6     12
-data array(i) /3/
-!     7     13  17    23    29
-data (array(j), j=1,5,i) /3*i/
-end

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename7.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename7.f90
deleted file mode 100644
index e8e0b9d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename7.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-!          12
-block data bdn
-
-implicit none
-!          12  16  20  24  28
-integer :: v1, v2, v3, v4, v5
-!       9        18  22    28  32       41  45
-common /common1/ v1, v2/zz/v3,          v4, v5 ! Replacing /zz/ with // causes parse error    Adding /common1/ at 31 causes semantic error
-!     7
-save /common1/
-!    6   10
-data v1, v2 /3, 4/
-!              16
-end block data bdn
-end

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename8.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename8.f90
deleted file mode 100644
index c07b925..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename8.f90
+++ /dev/null

@@ -1,30 +0,0 @@
-end
-! f : (((double -> char(3)), double) -> char(3)) -> char(*)
-!        1012        22
-function f(g) result(q)
-  implicit none
-  !                   23
-  character(len=*) :: q
-  interface
-    ! g : ((double -> char(3)), double) -> char(3)
-    !                         3133 36
-    character(len=3) function g(h, x)
-      interface
-        ! h : double -> char(3)
-        !                         3537
-        character(len=3) function h(x)
-          !                               43
-          double precision, intent(in) :: x
-        end function h !<<< 22
-      end interface
-      !                               39
-      double precision, intent(in) :: x
-    !            18
-    end function g
-  end interface
-! 3
-  q = 'This is terrible'
-!            14
-end function f
-!                18   23                  43
-integer function g(); g = 3; end function g

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename9.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename9.f90
deleted file mode 100644
index 9b5a100..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename9.f90
+++ /dev/null

@@ -1,40 +0,0 @@
-module M1
-  implicit none
-  integer :: i1 !3,14
-  integer, private :: j1 !4,23
-  private :: k1 !5,14
-  interface
-    character(len=3) function k1(z) !7,31
-      real, intent(in) :: z
-    end function
-  end interface
-contains
-  integer function f1(); f1 = 1; end function !12,20 12,26
-end module M1
-
-module M2
-  implicit none
-  integer :: i2 !17,14
-  integer, public :: j2
-  private
-  public :: k2 !20,13
-  interface
-    character(len=3) function k2(i2) !22,31
-      doubleprecision, intent(in) :: i2
-    end function
-  end interface
-contains
-  integer function f2(); f2 = 1; end function !27,20 27,26
-end module M2
-
-program p
-  use M1
-  use M2
-!implicit none ! Uncomment to see compile errors (to determine which are implicits)
-  ! j1 k1 z implicit
-  !        12  16  20  24    30
-  print *, i1, j1, k1, f1(), z
-  ! i2 f2 implicit
-  !        12  16  20       29
-  print *, i2, j2, k2(3d0), f2
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename9a.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename9a.f90
deleted file mode 100644
index a09dbc9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/rename/rename9a.f90
+++ /dev/null

@@ -1,4 +0,0 @@
-character(len=3) function k2(i)
-  real, intent(in) :: i
-  k2 = 'Bye'
-end function

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-character-star/test1/Test1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-character-star/test1/Test1.f90
deleted file mode 100644
index b32705d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-character-star/test1/Test1.f90
+++ /dev/null

@@ -1,21 +0,0 @@
-program main !<<<<< 1, 1, 21, 17, pass

-

-    implicit none

-

-	character*12 cint(12,12)

-	character*1 cnmlp(lon,lat,2),rainp(lon,lat,2)

-

-    character*10  UnOld,lolo*5 ='helios'!This  is a comment

-	CHARACTER*3 CONST,GREEK

-	CHARACTER   CATLOG*10,NAME*20

-	character *10 uno,dos

-    character hname*20

-	Character str*10

-	character hname*20, name*50, lname*50, expdesc*50, hist*65

-!	no change

-	character (len=10)s , str2*36

-	character (len=10)s1 , str1='lola'

-	character(len=10) :: UnNewString10

-	integer i

-

-end program main
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-character-star/test1/Test1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-character-star/test1/Test1.f90.result
deleted file mode 100644
index ea9962f..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-character-star/test1/Test1.f90.result
+++ /dev/null

@@ -1,30 +0,0 @@
-program main !<<<<< 1, 1, 21, 17, pass

-

-    implicit none

-

-	character(len=12)::cint(12,12)

-	character(len=1)::cnmlp(lon,lat,2)

-	character(len=1)::rainp(lon,lat,2)

-

-    character(len=10)::UnOld!This  is a comment

-    character(len=5)::lolo='helios'!This  is a comment

-	character(len=3)::CONST

-	character(len=3)::GREEK

-	character(len=10)::CATLOG

-	character(len=20)::NAME

-	character(len=10)::uno

-	character(len=10)::dos

-    character(len=20)::hname

-	character(len=10)::str

-	character(len=20)::hname

-	character(len=50)::name

-	character(len=50)::lname

-	character(len=50)::expdesc

-	character(len=65)::hist

-!	no change

-	character (len=10)s , str2*36

-	character (len=10)s1 , str1='lola'

-	character(len=10) :: UnNewString10

-	integer i

-

-end program main


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test1/test1.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test1/test1.f90
deleted file mode 100644
index b1a2e66..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test1/test1.f90
+++ /dev/null

@@ -1,4 +0,0 @@
-program Test1 !<<<<< 1, 1, 4, 18, pass

-	do 100 i = 1,10

-	100 j=i

-end program Test1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test1/test1.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test1/test1.f90.result
deleted file mode 100644
index e2098fc..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test1/test1.f90.result
+++ /dev/null

@@ -1,5 +0,0 @@
-program Test1 !<<<<< 1, 1, 4, 18, pass

-    do i = 1,10

-100     j=i

-    END DO

-end program Test1


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test2/test2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test2/test2.f90
deleted file mode 100644
index 75a65c2..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test2/test2.f90
+++ /dev/null

@@ -1,4 +0,0 @@
-program Test2 !<<<<< 1, 1, 4, 18, pass

-    do 100 i = 1,10

-	100 continue

-end program Test2


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test2/test2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test2/test2.f90.result
deleted file mode 100644
index 366715a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test2/test2.f90.result
+++ /dev/null

@@ -1,5 +0,0 @@
-program Test2 !<<<<< 1, 1, 4, 18, pass

-    do i = 1,10

-100 continue

-    END DO

-end program Test2


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test3/test3.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test3/test3.f90
deleted file mode 100644
index fb7fd34..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test3/test3.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-program Test3 !<<<<< 1, 1, 14, 18, pass

-    do 100 i = 1,10

-    do 110 j = 1,10

-    do 120 k = 1,10

-    do 130 l = 1,10

-    do 140 m = 1,10

-    do 150 n = 1,10

-    150 x=i+j+k+l+m+n

-    140 y=j+k+l+m+n

-    130 z=k+l+m+n

-    120 w=l+m+n

-    110 t=m+n

-    100 v=n

-end program Test3
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test3/test3.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test3/test3.f90.result
deleted file mode 100644
index f4ccbe0..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test3/test3.f90.result
+++ /dev/null

@@ -1,20 +0,0 @@
-program Test3 !<<<<< 1, 1, 14, 18, pass

-    do i = 1,10

-        do j = 1,10

-            do k = 1,10

-                do l = 1,10

-                    do m = 1,10

-                        do n = 1,10

-150                         x=i+j+k+l+m+n

-                        END DO

-140                     y=j+k+l+m+n

-                    END DO

-130                 z=k+l+m+n

-                END DO

-120             w=l+m+n

-            END DO

-110         t=m+n

-        END DO

-100     v=n

-    END DO

-end program Test3


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test4/test4.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test4/test4.f90
deleted file mode 100644
index 8a85c20..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test4/test4.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-program Test4 !<<<<< 1, 1, 14, 18, pass

-	do 100 i = 1,10

-    do 110 j = 1,10

-    do 120 k = 1,10

-    do 130 l = 1,10

-    do 140 m = 1,10

-    do 150 n = 1,10

-    150 continue

-    140 continue

-    130 continue

-    120 continue

-    110 continue

-    100 continue

-end program Test4


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test4/test4.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test4/test4.f90.result
deleted file mode 100644
index 35dbf41..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test4/test4.f90.result
+++ /dev/null

@@ -1,20 +0,0 @@
-program Test4 !<<<<< 1, 1, 14, 18, pass

-    do i = 1,10

-        do j = 1,10

-            do k = 1,10

-                do l = 1,10

-                    do m = 1,10

-                        do n = 1,10

-150                     continue

-                        END DO

-140                 continue

-                    END DO

-130             continue

-                END DO

-120         continue

-            END DO

-110     continue

-        END DO

-100 continue

-    END DO

-end program Test4


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test5/test5.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test5/test5.f90
deleted file mode 100644
index f59d2da..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test5/test5.f90
+++ /dev/null

@@ -1,46 +0,0 @@
-program Test5 !<<<<< 1, 1, 46, 18, pass

-! Shared Do Loop Termination

-    do 100 j=1,10

-    do 100 w=1,10

-       100 i=j+1

-! simple Do Loop

-    do 110 i = 1,10

-    110 j=i

-! simple Do Loop with Continue

-    do 120 i = 1,10

-    120 continue

-! simple f90 Do Loop

-    do i =1,100

-        w=i

-    end do

-! More Complex Do Loop

-  DO 140 K=1,KM

-      DO 140 I=1,IMT

-        USAV(I,K)=UCLIN(I,K)

-        VSAV(I,K)=VCLIN(I,K)

-        UCLIN(I,K)=UP(I,K)

-        VCLIN(I,K)=VP(I,K)

- 140  CONTINUE

-! More Complex Do Loop

-     DO 170 K=1,KM

-     DO 170 I=1,IMU

-     IF(KMUP(I).GE.KAR(K)) THEN

-     UBP(I,K)=UBP(I,K)+SFUB(I)

-     VBP(I,K)=VBP(I,K)+SFVB(I)

-     UP (I,K)=UP (I,K)+SFU (I)

-     VP (I,K)=VP (I,K)+SFV (I)

-     ENDIF

- 170 CONTINUE

-! More complex Shared Do Loop Termination

-      DO 270 K=2,KM

-      DO 270 I=1,IMT

-      DPDX(I,K)=RHON(I,K-1)+RHON(I,K)

-      DPDY(I,K)=RHOS(I,K-1)+RHOS(I,K)

- 270  CONTINUE

-! Complex Shared Do Loop Termination

-  DO 150 K=1,KM

-  DO 150 I=1,IMT

-  DO 150 J=1,IMT

-  DO 150 W=1,IMT

-  150 DPDX(I,K)=RHON(I,K-1)+RHON(I,K)

-end program Test5


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test5/test5.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test5/test5.f90.result
deleted file mode 100644
index 088dfde..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/replace-old-style-do-loop/test5/test5.f90.result
+++ /dev/null

@@ -1,60 +0,0 @@
-program Test5 !<<<<< 1, 1, 46, 18, pass

-    ! Shared Do Loop Termination

-    do j=1,10

-        do w=1,10

-100         i=j+1

-        END DO

-    END DO

-       ! simple Do Loop

-       do i = 1,10

-110        j=i

-       END DO

-    ! simple Do Loop with Continue

-    do i = 1,10

-120 continue

-    END DO

-! simple f90 Do Loop

-    do i =1,100

-        w=i

-    end do

-    ! More Complex Do Loop

-    DO K=1,KM

-        DO I=1,IMT

-            USAV(I,K)=UCLIN(I,K)

-            VSAV(I,K)=VCLIN(I,K)

-            UCLIN(I,K)=UP(I,K)

-            VCLIN(I,K)=VP(I,K)

-140     CONTINUE

-        END DO

-    END DO

- ! More Complex Do Loop

- DO K=1,KM

-     DO I=1,IMU

-         IF(KMUP(I).GE.KAR(K)) THEN

-             UBP(I,K)=UBP(I,K)+SFUB(I)

-             VBP(I,K)=VBP(I,K)+SFVB(I)

-             UP (I,K)=UP (I,K)+SFU (I)

-             VP (I,K)=VP (I,K)+SFV (I)

-         ENDIF

-170  CONTINUE

-     END DO

- END DO

- ! More complex Shared Do Loop Termination

- DO K=2,KM

-     DO I=1,IMT

-         DPDX(I,K)=RHON(I,K-1)+RHON(I,K)

-         DPDY(I,K)=RHOS(I,K-1)+RHOS(I,K)

-270  CONTINUE

-     END DO

- END DO

- ! Complex Shared Do Loop Termination

- DO K=1,KM

-     DO I=1,IMT

-         DO J=1,IMT

-             DO W=1,IMT

-150              DPDX(I,K)=RHON(I,K-1)+RHON(I,K)

-             END DO

-         END DO

-     END DO

- END DO

-end program Test5


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-decrement-loop/reverseDecrementedLoop.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-decrement-loop/reverseDecrementedLoop.f90
deleted file mode 100644
index 07670cc..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-decrement-loop/reverseDecrementedLoop.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-program reverseDecremented

-

-    integer i

-

-    !<<<<<5,1,7,1,pass

-    do i=10,1,-1

-

-        print *, i

-    end do

-

-end program reverseDecremented


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-decrement-loop/reverseDecrementedLoop.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-decrement-loop/reverseDecrementedLoop.f90.result
deleted file mode 100644
index ae14adc..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-decrement-loop/reverseDecrementedLoop.f90.result
+++ /dev/null

@@ -1,11 +0,0 @@
-program reverseDecremented

-

-    integer i

-

-    !<<<<<5,1,7,1,pass

-    do i=1,10,-(-1)

-

-        print *, i

-    end do

-

-end program reverseDecremented


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-loop-with-comment/reverseLoopWithComment.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-loop-with-comment/reverseLoopWithComment.f90
deleted file mode 100644
index 2d3c16b..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-loop-with-comment/reverseLoopWithComment.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-program reverseLoopWithComment

-

-    integer i

-

-    !<<<<<5,1,7,1,pass

-    do i=1,10 !This is a comment

-

-        print *, i

-    end do

-

-end program reverseLoopWithComment


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-loop-with-comment/reverseLoopWithComment.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-loop-with-comment/reverseLoopWithComment.f90.result
deleted file mode 100644
index eb10033..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-loop-with-comment/reverseLoopWithComment.f90.result
+++ /dev/null

@@ -1,11 +0,0 @@
-program reverseLoopWithComment

-

-    integer i

-

-    !<<<<<5,1,7,1,pass

-    do i=10,1,-1 !This is a comment

-

-        print *, i

-    end do

-

-end program reverseLoopWithComment


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-nested-loops/reverseNested.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-nested-loops/reverseNested.f90
deleted file mode 100644
index 1c57ded..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-nested-loops/reverseNested.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-program reverseNested

-

-    integer i, j

-

-    !<<<<<5,1,7,1,pass

-    do i=1,10

-

-        do j=2,8,2

-

-            print *, i

-        end do

-    end do

-

-end program reverseNested


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-nested-loops/reverseNested.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-nested-loops/reverseNested.f90.result
deleted file mode 100644
index 58e50c9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-nested-loops/reverseNested.f90.result
+++ /dev/null

@@ -1,14 +0,0 @@
-program reverseNested

-

-    integer i, j

-

-    !<<<<<5,1,7,1,pass

-    do i=10,1,-1

-

-        do j=2,8,2

-

-            print *, i

-        end do

-    end do

-

-end program reverseNested


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-nested-loops2/reverseNested2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-nested-loops2/reverseNested2.f90
deleted file mode 100644
index 0f7128e..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-nested-loops2/reverseNested2.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-program reverseNested2

-

-    integer i, j

-

-    do i=1,10

-

-        !<<<<<8,1,10,1,pass

-        do j=2,8,2

-

-            print *, i

-        end do

-    end do

-

-end program reverseNested2


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-nested-loops2/reverseNested2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-nested-loops2/reverseNested2.f90.result
deleted file mode 100644
index 10572a3..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-nested-loops2/reverseNested2.f90.result
+++ /dev/null

@@ -1,14 +0,0 @@
-program reverseNested2

-

-    integer i, j

-

-    do i=1,10

-

-        !<<<<<8,1,10,1,pass

-        do j=8,2,-(2)

-

-            print *, i

-        end do

-    end do

-

-end program reverseNested2


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-reverse-with-expression/reverseLoopWithExpression.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-reverse-with-expression/reverseLoopWithExpression.f90
deleted file mode 100644
index dd53b23..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-reverse-with-expression/reverseLoopWithExpression.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-program reverseLoopWithExpr

-

-    integer i, j

-    j = 4

-

-    !<<<<<6,1,8,1,pass

-    do i=3,j*j,j

-

-        print *, i

-    end do

-

-end program reverseLoopWithExpr


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-reverse-with-expression/reverseLoopWithExpression.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-reverse-with-expression/reverseLoopWithExpression.f90.result
deleted file mode 100644
index 5720e45..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-reverse-with-expression/reverseLoopWithExpression.f90.result
+++ /dev/null

@@ -1,12 +0,0 @@
-program reverseLoopWithExpr

-

-    integer i, j

-    j = 4

-

-    !<<<<<6,1,8,1,pass

-    do i=j*j,3,-(j)

-

-        print *, i

-    end do

-

-end program reverseLoopWithExpr


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-simple-loop/reverseLoopRefactoring.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-simple-loop/reverseLoopRefactoring.f90
deleted file mode 100644
index 4bba93d..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-simple-loop/reverseLoopRefactoring.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-program reverseLoops

-

-    integer i

-    !<<<<<4,1,6,1,pass

-    do i=1,10

-

-        print *, i

-    end do

-

-end program reverseLoops


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-simple-loop/reverseLoopRefactoring.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-simple-loop/reverseLoopRefactoring.f90.result
deleted file mode 100644
index 03814d7..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/reverse-loop/test-simple-loop/reverseLoopRefactoring.f90.result
+++ /dev/null

@@ -1,10 +0,0 @@
-program reverseLoops

-

-    integer i

-    !<<<<<4,1,6,1,pass

-    do i=10,1,-1

-

-        print *, i

-    end do

-

-end program reverseLoops


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/standardize-stmts/test1/standardize_statements.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/standardize-stmts/test1/standardize_statements.f90
deleted file mode 100644
index b3f3e57..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/standardize-stmts/test1/standardize_statements.f90
+++ /dev/null

@@ -1,8 +0,0 @@
-program standardize_statements !<<<<<1,1,pass

-    implicit none

-    real x,y,z !first declare some reals

-    integer t,q,p,r !then add integer declaration

-    real a,b,c !and declare some more reals

-    !done

-

-end program standardize_statements


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/standardize-stmts/test1/standardize_statements.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/standardize-stmts/test1/standardize_statements.f90.result
deleted file mode 100644
index bcc708e..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/standardize-stmts/test1/standardize_statements.f90.result
+++ /dev/null

@@ -1,15 +0,0 @@
-program standardize_statements !<<<<<1,1,pass

-    implicit none

-    real :: x !first declare some reals

-    real :: y !first declare some reals

-    real :: z !first declare some reals

-    integer :: t !then add integer declaration

-    integer :: q !then add integer declaration

-    integer :: p !then add integer declaration

-    integer :: r !then add integer declaration

-    real :: a !and declare some more reals

-    real :: b !and declare some more reals

-    real :: c !and declare some more reals

-    !done

-

-end program standardize_statements


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/standardize-stmts/test2/standardize_statements_2.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/standardize-stmts/test2/standardize_statements_2.f90
deleted file mode 100644
index 2e43102..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/standardize-stmts/test2/standardize_statements_2.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-program standardize_statements !<<<<<1,1,pass

-    implicit none

-    real, dimension(1:10) :: vector, vector2

-    integer a(4), b(20), c(6), d

-    dimension :: d(10)

-

-    a = (/1,2,3,4/)

-    vector(1:10) = 4.0

-

-end program standardize_statements


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/standardize-stmts/test2/standardize_statements_2.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/standardize-stmts/test2/standardize_statements_2.f90.result
deleted file mode 100644
index e762b04..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/standardize-stmts/test2/standardize_statements_2.f90.result
+++ /dev/null

@@ -1,14 +0,0 @@
-program standardize_statements !<<<<<1,1,pass

-    implicit none

-    real, dimension(1:10) :: vector

-    real, dimension(1:10) :: vector2

-    integer :: a(4)

-    integer :: b(20)

-    integer :: c(6)

-    integer :: d

-    dimension :: d(10)

-

-    a = (/1,2,3,4/)

-    vector(1:10) = 4.0

-

-end program standardize_statements


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/all-identifiers/testAllIdentifiers.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/all-identifiers/testAllIdentifiers.f90
deleted file mode 100644
index 9e116c8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/all-identifiers/testAllIdentifiers.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i

-    integer :: j

-    integer :: n=1, m=20, p=10

-

-    !<<<<<9,1,15,1,20,3,pass

-    do i=n,10

-        do j=n,m

-            print *, i

-        end do

-    end do

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/all-identifiers/testAllIdentifiers.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/all-identifiers/testAllIdentifiers.f90.result
deleted file mode 100644
index b5506b1..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/all-identifiers/testAllIdentifiers.f90.result
+++ /dev/null

@@ -1,19 +0,0 @@
-program test

-

-    implicit none

-    integer :: i1, j1

-

-    integer :: i

-    integer :: j

-    integer :: n=1, m=20, p=10

-    do i1=floor(real(n-20)/3)*3+20,8,3

-        do j1=floor(real(n-20)/3)*3+20,floor(real(m-20)/3)*3+20,3

-            do i=max(n,i1),min(10,i1+2)

-                do j=max(n,j1),min(m,j1+2)

-                    print *, i

-                end do

-            end do

-        end do

-    end do

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/sLoop-lowerBound-dependency/lowerBoundDependency.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/sLoop-lowerBound-dependency/lowerBoundDependency.f90
deleted file mode 100644
index f5d6d97..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/sLoop-lowerBound-dependency/lowerBoundDependency.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i, j

-

-    !<<<<<7,1,13,1,2,10,pass

-    do i=1,40

-        do j=i,50

-            print *, i

-        end do

-    end do

-

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/sLoop-lowerBound-dependency/lowerBoundDependency.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/sLoop-lowerBound-dependency/lowerBoundDependency.f90.result
deleted file mode 100644
index 281e687..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/sLoop-lowerBound-dependency/lowerBoundDependency.f90.result
+++ /dev/null

@@ -1,18 +0,0 @@
-program test

-

-    implicit none

-    integer :: i1, j1

-

-    integer :: i, j

-    do i1=-8,32,10

-        do j1=max(floor(real(1-2)/10)*10+2,floor(real(i1-2)/10)*10+2),42,10

-            do i=max(1,i1),min(40,i1+9)

-                do j=max(i,j1),min(50,j1+9)

-                    print *, i

-                end do

-            end do

-        end do

-    end do

-

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/sLoop-upperBound-dependency/loopUpperBoundDependency.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/sLoop-upperBound-dependency/loopUpperBoundDependency.f90
deleted file mode 100644
index 66ccb9c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/sLoop-upperBound-dependency/loopUpperBoundDependency.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i, j

-

-    !<<<<<7,1,13,1,5,20,pass

-    do i=1,50

-        do j=1,i

-            print *, i

-        end do

-    end do

-

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/sLoop-upperBound-dependency/loopUpperBoundDependency.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/sLoop-upperBound-dependency/loopUpperBoundDependency.f90.result
deleted file mode 100644
index 3bd6ca4..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/sLoop-upperBound-dependency/loopUpperBoundDependency.f90.result
+++ /dev/null

@@ -1,18 +0,0 @@
-program test

-

-    implicit none

-    integer :: i1, j1

-

-    integer :: i, j

-    do i1=-15,45,20

-        do j1=-15,min(floor(real(50-5)/20)*20+5,floor(real(i1-5)/20)*20+5),20

-            do i=max(1,i1),min(50,i1+19)

-                do j=max(1,j1),min(i,j1+19)

-                    print *, i

-                end do

-            end do

-        end do

-    end do

-

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/simple-tiling-test/simpleTilingTest.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/simple-tiling-test/simpleTilingTest.f90
deleted file mode 100644
index 8fb0c7c..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/simple-tiling-test/simpleTilingTest.f90
+++ /dev/null

@@ -1,16 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i, j

-    integer, dimension(50,60) :: A

-

-    !<<<<<8,1,14,1,5,20,pass

-    do i=1,50

-        do j=1,60

-            A(i,j) = i+j

-        end do

-    end do

-

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/simple-tiling-test/simpleTilingTest.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/simple-tiling-test/simpleTilingTest.f90.result
deleted file mode 100644
index 4b269c4..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/tile-loop/simple-tiling-test/simpleTilingTest.f90.result
+++ /dev/null

@@ -1,19 +0,0 @@
-program test

-

-    implicit none

-    integer :: i1, j1

-

-    integer :: i, j

-    integer, dimension(50,60) :: A

-    do i1=-15,45,20

-        do j1=-15,45,20

-            do i=max(1,i1),min(50,i1+19)

-                do j=max(1,j1),min(60,j1+19)

-                    A(i,j) = i+j

-                end do

-            end do

-        end do

-    end do

-

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/before-and-after/beforeAndAfter.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/before-and-after/beforeAndAfter.f90
deleted file mode 100644
index 55df1a2..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/before-and-after/beforeAndAfter.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i, j

-

-    j=1

-    !<<<<<8,1,13,1,1,true,pass

-    do i=1,5

-        print *, i

-        j = i

-    end do

-    j = 1

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/before-and-after/beforeAndAfter.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/before-and-after/beforeAndAfter.f90.result
deleted file mode 100644
index ba5999e..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/before-and-after/beforeAndAfter.f90.result
+++ /dev/null

@@ -1,20 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i, j

-

-    j=1

-    print *, 1

-    j = 1

-    print *, 2

-    j = 2

-    print *, 3

-    j = 3

-    print *, 4

-    j = 4

-    print *, 5

-    j = 5

-    j = 1

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complete-unroll-with-step/completeUnrollWithStep.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complete-unroll-with-step/completeUnrollWithStep.f90
deleted file mode 100644
index 62ee0e5..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complete-unroll-with-step/completeUnrollWithStep.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i

-    !<<<<<6,1,10,1,1,true,pass

-    do i=1,9,2

-        print *, i

-    end do

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complete-unroll-with-step/completeUnrollWithStep.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complete-unroll-with-step/completeUnrollWithStep.f90.result
deleted file mode 100644
index db37fd7..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complete-unroll-with-step/completeUnrollWithStep.f90.result
+++ /dev/null

@@ -1,12 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i

-    print *, 1

-    print *, 3

-    print *, 5

-    print *, 7

-    print *, 9

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complex-body-unroll2/ComplexBodyCompleteUnroll.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complex-body-unroll2/ComplexBodyCompleteUnroll.f90
deleted file mode 100644
index 6d01b83..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complex-body-unroll2/ComplexBodyCompleteUnroll.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i, j=-1

-    !<<<<<6,1,13,1,1,true,pass

-    do i=1,5,2

-        j = j**i

-        j = j+j

-        print *, i

-        print *, j

-    end do

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complex-body-unroll2/ComplexBodyCompleteUnroll.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complex-body-unroll2/ComplexBodyCompleteUnroll.f90.result
deleted file mode 100644
index a04d951..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complex-body-unroll2/ComplexBodyCompleteUnroll.f90.result
+++ /dev/null

@@ -1,19 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i, j=-1

-    j = j**1

-    j = j+j

-    print *, 1

-    print *, j

-    j = j**3

-    j = j+j

-    print *, 3

-    print *, j

-    j = j**5

-    j = j+j

-    print *, 5

-    print *, j

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complexLoopBodyUnroll/complexLoopBodyUnroll.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complexLoopBodyUnroll/complexLoopBodyUnroll.f90
deleted file mode 100644
index a44bab8..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complexLoopBodyUnroll/complexLoopBodyUnroll.f90
+++ /dev/null

@@ -1,15 +0,0 @@
-!Fix this text case after reindenter update

-program test

-

-    implicit none

-

-    integer :: i, j=-1

-    !<<<<<7,1,14,1,4,false,pass

-    do i=1,5

-        j = j**i

-        j = j+j

-        print *, i

-        print *, j

-    end do

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complexLoopBodyUnroll/complexLoopBodyUnroll.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complexLoopBodyUnroll/complexLoopBodyUnroll.f90.result
deleted file mode 100644
index 1382cc6..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/complexLoopBodyUnroll/complexLoopBodyUnroll.f90.result
+++ /dev/null

@@ -1,28 +0,0 @@
-!Fix this text case after reindenter update

-program test

-

-    implicit none

-

-    integer :: i, j=-1

-    !<<<<<7,1,14,1,4,false,pass

-    do i=1,5,4

-        j = j**i

-        j = j+j

-        print *, i

-        print *, j

-        if(i+1>5) exit

-        j = j**(i+1)

-        j = j+j

-        print *, (i+1)

-        print *, j

-        j = j**(i+2)

-        j = j+j

-        print *, (i+2)

-        print *, j

-        j = j**(i+3)

-        j = j+j

-        print *, (i+3)

-        print *, j

-    end do

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/decrement-loop-partial/decrementLoopPartial.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/decrement-loop-partial/decrementLoopPartial.f90
deleted file mode 100644
index 007e91b..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/decrement-loop-partial/decrementLoopPartial.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: k

-    !<<<<<6,1,9,1,2,false,pass

-    do k=9,1,-2

-        print *, k

-    end do

-

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/decrement-loop-partial/decrementLoopPartial.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/decrement-loop-partial/decrementLoopPartial.f90.result
deleted file mode 100644
index 1a2d429..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/decrement-loop-partial/decrementLoopPartial.f90.result
+++ /dev/null

@@ -1,13 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: k

-    !<<<<<6,1,9,1,2,false,pass

-    do k=9,1,-4

-        print *, k

-        print *, (k+-2)

-    end do

-

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/decrement-loop/decrementLoopComplete.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/decrement-loop/decrementLoopComplete.f90
deleted file mode 100644
index da9c3a9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/decrement-loop/decrementLoopComplete.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: k

-    !<<<<<6,1,9,1,1,true,pass

-    do k=5,1,-1

-        print *, k

-    end do

-

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/decrement-loop/decrementLoopComplete.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/decrement-loop/decrementLoopComplete.f90.result
deleted file mode 100644
index 5d60747..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/decrement-loop/decrementLoopComplete.f90.result
+++ /dev/null

@@ -1,13 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: k

-    print *, 5

-    print *, 4

-    print *, 3

-    print *, 2

-    print *, 1

-

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/nested-loop-unroll/nestedLoopUnroll.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/nested-loop-unroll/nestedLoopUnroll.f90
deleted file mode 100644
index 3de1d55..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/nested-loop-unroll/nestedLoopUnroll.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i, j

-    !<<<<<6,1,8,1,2,false,pass

-    do i=1,5

-

-        do j=1,5

-            print *, i+j

-        end do

-    end do

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/nested-loop-unroll/nestedLoopUnroll.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/nested-loop-unroll/nestedLoopUnroll.f90.result
deleted file mode 100644
index 625d332..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/nested-loop-unroll/nestedLoopUnroll.f90.result
+++ /dev/null

@@ -1,19 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i, j

-    !<<<<<6,1,8,1,2,false,pass

-    do i=1,5,2

-

-        do j=1,5

-            print *, i+j

-        end do

-        if(i+1>5) exit

-

-        do j=1,5

-            print *, (i+1)+j

-        end do

-    end do

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/simple-complete-unroll/simpleCompleteUnroll.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/simple-complete-unroll/simpleCompleteUnroll.f90
deleted file mode 100644
index d3c8429..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/simple-complete-unroll/simpleCompleteUnroll.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-program test

-

-    integer :: i

-

-    !<<<<<6,1,10,1,1,true,pass

-

-    do i=1,9

-        print *, i

-    end do

-

-

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/simple-complete-unroll/simpleCompleteUnroll.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/simple-complete-unroll/simpleCompleteUnroll.f90.result
deleted file mode 100644
index c2adcc9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/simple-complete-unroll/simpleCompleteUnroll.f90.result
+++ /dev/null

@@ -1,16 +0,0 @@
-program test

-

-    integer :: i

-    print *, 1

-    print *, 2

-    print *, 3

-    print *, 4

-    print *, 5

-    print *, 6

-    print *, 7

-    print *, 8

-    print *, 9

-

-

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/test-simple-loop/testSimpleLoop.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/test-simple-loop/testSimpleLoop.f90
deleted file mode 100644
index 1173ec1..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/test-simple-loop/testSimpleLoop.f90
+++ /dev/null

@@ -1,9 +0,0 @@
-program test

-

-    implicit none

-    !<<<<<4,1,8,1,2,false,pass

-    DO i=1,9

-        print *, i

-    END DO

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/test-simple-loop/testSimpleLoop.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/test-simple-loop/testSimpleLoop.f90.result
deleted file mode 100644
index 723509e..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/test-simple-loop/testSimpleLoop.f90.result
+++ /dev/null

@@ -1,11 +0,0 @@
-program test

-

-    implicit none

-    !<<<<<4,1,8,1,2,false,pass

-    DO i=1,9,2

-        print *, i

-        if(i+1>9) exit

-        print *, (i+1)

-    END DO

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/testUnrollWithStep/unrollWithStep.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/testUnrollWithStep/unrollWithStep.f90
deleted file mode 100644
index 4f5d98a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/testUnrollWithStep/unrollWithStep.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i

-

-    !<<<<<7,1,11,1,2,false,pass

-    do i=1,9,2

-        print *, i

-    end do

-

-

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/testUnrollWithStep/unrollWithStep.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/testUnrollWithStep/unrollWithStep.f90.result
deleted file mode 100644
index 2979242..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/testUnrollWithStep/unrollWithStep.f90.result
+++ /dev/null

@@ -1,15 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i

-

-    !<<<<<7,1,11,1,2,false,pass

-    do i=1,9,4

-        print *, i

-        if(i+2>9) exit

-        print *, (i+2)

-    end do

-

-

-end program


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/unroll-with-expr-arg/unrollWithExpr.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/unroll-with-expr-arg/unrollWithExpr.f90
deleted file mode 100644
index a60f842..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/unroll-with-expr-arg/unrollWithExpr.f90
+++ /dev/null

@@ -1,11 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i, n=4

-    !<<<<<6,1,8,1,2,false,pass

-    do i=1,n*n

-        print *, i

-    end do

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/unroll-with-expr-arg/unrollWithExpr.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/unroll-with-expr-arg/unrollWithExpr.f90.result
deleted file mode 100644
index 16854f9..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/unroll-with-expr-arg/unrollWithExpr.f90.result
+++ /dev/null

@@ -1,15 +0,0 @@
-program test

-

-    implicit none

-    integer :: loopUpperBound

-

-    integer :: i, n=4

-    loopUpperBound = n*n

-    !<<<<<6,1,8,1,2,false,pass

-    do i=1, loopUpperBound,2

-        print *, i

-        if(i+1>loopUpperBound) exit

-        print *, (i+1)

-    end do

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/upper-bound-int-expr/unrollWithUpperIntExpr.f90 b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/upper-bound-int-expr/unrollWithUpperIntExpr.f90
deleted file mode 100644
index c24313a..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/upper-bound-int-expr/unrollWithUpperIntExpr.f90
+++ /dev/null

@@ -1,12 +0,0 @@
-program test

-

-    implicit none

-

-    integer :: i

-    !<<<<<6,1,10,1,4,false,pass

-    do i=1,3+5,1

-        print *, i

-    end do

-

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/upper-bound-int-expr/unrollWithUpperIntExpr.f90.result b/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/upper-bound-int-expr/unrollWithUpperIntExpr.f90.result
deleted file mode 100644
index 841ce68..0000000
--- a/org.eclipse.photran.core.vpg.tests/refactoring-test-code/unroll-loop/upper-bound-int-expr/unrollWithUpperIntExpr.f90.result
+++ /dev/null

@@ -1,20 +0,0 @@
-program test

-

-    implicit none

-    integer :: loopUpperBound

-

-    integer :: i

-    loopUpperBound = 3+5

-    !<<<<<6,1,10,1,4,false,pass

-    do i=1, loopUpperBound,4

-        print *, i

-        if(i+1>loopUpperBound) exit

-        print *, (i+1)

-        if(i+2>loopUpperBound) exit

-        print *, (i+2)

-        if(i+3>loopUpperBound) exit

-        print *, (i+3)

-    end do

-

-

-end program test


diff --git a/org.eclipse.photran.core.vpg.tests/search-test-code/foo.f90 b/org.eclipse.photran.core.vpg.tests/search-test-code/foo.f90
deleted file mode 100644
index 40cb623..0000000
--- a/org.eclipse.photran.core.vpg.tests/search-test-code/foo.f90
+++ /dev/null

@@ -1,4 +0,0 @@
-program main
-  integer a, b
-  a = 5
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/search-test-code/implicitTest.f90 b/org.eclipse.photran.core.vpg.tests/search-test-code/implicitTest.f90
deleted file mode 100644
index 9b24b0c..0000000
--- a/org.eclipse.photran.core.vpg.tests/search-test-code/implicitTest.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-program ImplicitTest
-	a = 1
-	call s
-	stop
-contains
-	subroutine s
-		b = 3
-		return
-	end subroutine
-end program ImplicitTest

diff --git a/org.eclipse.photran.core.vpg.tests/search-test-code/moduleInclusion.F90 b/org.eclipse.photran.core.vpg.tests/search-test-code/moduleInclusion.F90
deleted file mode 100644
index 55c451c..0000000
--- a/org.eclipse.photran.core.vpg.tests/search-test-code/moduleInclusion.F90
+++ /dev/null

@@ -1,17 +0,0 @@
-PROGRAM hi
-!this should work
-
-
-  USE moduleZiggurat
-  IMPLICIT NONE
-
-  REAL ::  x
-  INTEGER :: i
-
-  DO  i = 1, 10000
-     x = uni( )
-  END DO
-  WRITE(*,*) x
-
-END PROGRAM hi
-

diff --git a/org.eclipse.photran.core.vpg.tests/search-test-code/nameScoping.F90 b/org.eclipse.photran.core.vpg.tests/search-test-code/nameScoping.F90
deleted file mode 100644
index 66fd2c3..0000000
--- a/org.eclipse.photran.core.vpg.tests/search-test-code/nameScoping.F90
+++ /dev/null

@@ -1,25 +0,0 @@
-
-SUBROUTINE pgmName
-	PRINT *,'Hello'
-END SUBROUTINE pgmName
-
-
-
-PROGRAM pgmName
-!this should work
-
-
-  USE pgmName
-  IMPLICIT NONE
-
-  REAL ::  x
-  INTEGER :: i
-
-  DO  i = 1, 10000
-     x = hi( )
-  END DO
-  WRITE(*,*) x
-  
-  CALL pgmName
-
-END PROGRAM pgmName

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/Activator.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/Activator.java
deleted file mode 100644
index a076771..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/Activator.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle.
- * 
- * @author (generated)
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.photran.core.vpg.tests";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	@Override public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	@Override public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/PhotranASTTestCase.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/PhotranASTTestCase.java
deleted file mode 100644
index 1b26ee2..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/PhotranASTTestCase.java
+++ /dev/null

@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests;
-
-import java.io.File;
-import java.io.IOException;
-
-import junit.framework.ComparisonFailure;
-
-import org.eclipse.photran.internal.core.lexer.sourceform.UnpreprocessedFixedSourceForm;
-import org.eclipse.photran.internal.core.lexer.sourceform.UnpreprocessedFreeSourceForm;
-import org.eclipse.photran.internal.core.parser.ASTExecutableProgramNode;
-import org.eclipse.photran.internal.core.sourceform.ISourceForm;
-import org.eclipse.photran.internal.core.sourceform.SourceForm;
-import org.eclipse.photran.internal.core.util.SemanticError;
-import org.eclipse.photran.internal.core.vpg.PhotranVPG;
-
-/**
- * Base class for a test case that takes an AST as input.
- * <p>
- * Test cases based on this will usually be created by a {@link PhotranTestSuiteFromFiles}.
- * 
- * @author Jeff Overbey
- */
-public abstract class PhotranASTTestCase extends PhotranTestCase
-{
-    protected File file = null;
-    protected boolean isFixedForm = false;
-    protected String fileDescription = null;
-
-    /**
-     * Constructor
-     * 
-     * @param filename the file to parse
-     * @param isFixedForm true iff the file is in fixed format
-     */
-    public PhotranASTTestCase(File file, boolean isFixedForm, String testCaseDescription)
-    {
-        super("test"); // name of method to run
-        this.file = file;
-        this.isFixedForm = isFixedForm;
-        this.fileDescription = testCaseDescription;
-    }
-    
-    /**
-     * Method called by JUnit: Parses the given file.
-     * 
-     * @throws Exception
-     */
-    public final void test() throws Exception
-    {
-        if (file == null) return; // for when JUnit invokes the no-arguments constructor and reflectively invokes this method
-        
-        try
-        {
-            ASTExecutableProgramNode ast = parse(file, createSourceForm());
-            assertTrue(ast != null);
-            assertNull(PhotranVPG.findFirstErrorIn(ast));
-            handleAST(ast);
-        }
-        catch (ComparisonFailure f)
-        {
-            throw f;
-        }
-        catch (Throwable t)
-        {
-            System.err.println(file.getName());
-            throw new Exception(fileDescription, t);
-        }
-    }
-
-    protected ISourceForm createSourceForm()
-    {
-        if (isFixedForm)
-            return new UnpreprocessedFixedSourceForm();
-        else if (file.getName().endsWith(".F90"))
-            return SourceForm.of(null, file.getPath()); // delegate to create CPP source form
-        else
-            return new UnpreprocessedFreeSourceForm();
-    }
-
-    /**
-     * Subclasses can override this method to do something interesting with the AST
-     * 
-     * @param ast The abstract syntax tree for the Fortran file that was parsed
-     * @throws IOException 
-     */
-    protected abstract void handleAST(ASTExecutableProgramNode ast) throws IOException, SemanticError;
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/PhotranRefactoringTestSuiteFromMarkers.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/PhotranRefactoringTestSuiteFromMarkers.java
deleted file mode 100644
index 20e9d89..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/PhotranRefactoringTestSuiteFromMarkers.java
+++ /dev/null

@@ -1,313 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009-2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.TreeMap;
-
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.Refactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.photran.core.IFortranAST;
-import org.eclipse.photran.internal.core.lexer.Token;
-import org.eclipse.photran.internal.core.refactoring.infrastructure.FortranEditorRefactoring;
-import org.eclipse.photran.internal.core.refactoring.infrastructure.FortranResourceRefactoring;
-import org.eclipse.photran.internal.core.vpg.PhotranVPG;
-import org.eclipse.rephraserengine.core.vpg.refactoring.VPGResourceRefactoring;
-import org.eclipse.rephraserengine.testing.junit3.GeneralTestSuiteFromMarkers;
-
-/**
- * A test suite constructed by importing files from a directory in the source tree, searching its
- * files for <i>markers</i> (comma-separated lines starting with <tt>!&lt;&lt;&lt;&lt;&lt;</tt>),
- * and adding one test case to the suite for each marker.
- * <p>
- * Markers are expected to have one of the following forms:
- * <ol>
- * <li> <tt>!&lt;&lt;&lt;&lt;&lt; line, col, ...</tt>
- * <li> <tt>!&lt;&lt;&lt;&lt;&lt; fromLine, fromCol, toLine, toCol, ...</tt>
- * </ol>
- * That is, the first two fields in each marker are expected to be a line and column number; the
- * text selection passed to the refactoring will be the offset of that line and column.  The third
- * fourth fields may also be a line and column number; then, the selection passed to the refactoring
- * will extend from the first line/column to the second line/column.
- * <p>
- * The line and column numbers may be followed by an arbitrary number of fields that contain data
- * specific to the refactoring being invoked.  Many refactorings don't require any additional data;
- * the Extract Local Variable test suite uses one field for the new variable declaration; the Add
- * ONLY to USE Statement test suite uses these fields to list the module entities to add; etc.
- * <p>
- * The final field must be either &quot;pass&quot;, &quot;fail-initial&quot;,
- * or &quot;fail-final&quot;, indicating whether the refactoring should succeed,
- * fail its initial precondition check, or fail its final precondition check.
- * <p>
- * If the refactoring is expected to succeed, the Fortran program will be compiled and run before
- * and after the refactoring in order to ensure that the refactoring actually preserved behavior.
- *
- * @author Jeff Overbey
- */
-public abstract class PhotranRefactoringTestSuiteFromMarkers<R extends VPGResourceRefactoring<IFortranAST, Token, PhotranVPG>>
-              extends GeneralTestSuiteFromMarkers
-{
-    /** Text of the last marker field when a refactoring is pass all precondition checks */
-    private static final String PASS = "pass";
-    /** Text of the last marker field when a refactoring is expected to fail initial precondition check */
-    private static final String FAIL_INITIAL = "fail-initial";
-    /** Text of the last marker field when a refactoring is expected to fail final precondition check */
-    private static final String FAIL_FINAL = "fail-final";
-
-    /** The activator class that will be used to load test files from the source tree */
-    protected Plugin activator;
-    
-    /** The refactoring under test */
-    protected Class<R> refactoringClass;
-
-    protected PhotranRefactoringTestSuiteFromMarkers(Plugin activator, String descriptionPrefix, String directory, Class<R> clazz) throws Exception
-    {
-        super(descriptionPrefix, PhotranWorkspaceTestCase.MARKER, new File(directory), PhotranWorkspaceTestCase.FORTRAN_FILE_FILTER,
-              activator, // initializationData[0]
-              clazz);    // initializationData[1]
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override protected void initialize(Object... initializationData)
-    {
-        this.activator = (Plugin)initializationData[0];
-        this.refactoringClass = (Class<R>)initializationData[1];
-    }
-
-    
-    @Override protected Test createTestFor(File fileContainingMarker, int markerOffset, String markerText) throws Exception
-    {
-        return new IndividualRefactoringTestCase(activator, description, fileContainingMarker, markerText);
-    }
-
-    /**
-     * This method is invoked to instantiate the refactoring class.  Override if necessary.
-     */
-    protected R createRefactoring() throws InstantiationException, IllegalAccessException
-    {
-        return refactoringClass.newInstance();
-    }
-
-    /**
-     * This method is invoked after the refactoring is created ({@link #createRefactoring()}) but
-     * before {@link Refactoring#checkInitialConditions(org.eclipse.core.runtime.IProgressMonitor)}
-     * is invoked.  Override if necessary.
-     *
-     * @return true iff the refactoring is expected to pass initial precondition checking
-     */
-    protected boolean initializeRefactoring(R refactoring, IFile file, TextSelection selection, String[] markerText)
-    {
-        if (refactoring instanceof FortranEditorRefactoring)
-            ((FortranEditorRefactoring)refactoring).initialize(file, selection);
-        else if (refactoring instanceof FortranResourceRefactoring)
-            ((FortranResourceRefactoring)refactoring).initialize(Collections.singletonList(file));
-        else
-            throw new IllegalStateException();
-        
-        if (lastMarkerField(markerText).equals(PASS) || lastMarkerField(markerText).equals(FAIL_FINAL))
-            return true;
-        else if (lastMarkerField(markerText).equals(FAIL_INITIAL))
-            return false;
-        else
-            throw new IllegalStateException();
-    }
-
-    /**
-     * This method is invoked after initial preconditions have been checked
-     * ({@link Refactoring#checkInitialConditions(org.eclipse.core.runtime.IProgressMonitor)})
-     * but before final preconditions are checked
-     * ({@link Refactoring#checkFinalConditions(org.eclipse.core.runtime.IProgressMonitor)}).
-     * Override if necessary to supply user input.
-     *
-     * @return true iff the refactoring is expected to pass final precondition checking
-     */
-    protected boolean configureRefactoring(R refactoring, IFile file, TextSelection selection, String[] markerText)
-    {
-        if (lastMarkerField(markerText).equals(PASS))
-            return true;
-        else if (lastMarkerField(markerText).equals(FAIL_FINAL))
-            return false;
-        else
-            throw new IllegalStateException();
-    }
-
-    private String lastMarkerField(String[] markerText)
-    {
-        return markerText[markerText.length-1];
-    }
-
-    public class IndividualRefactoringTestCase extends PhotranWorkspaceTestCase
-    {
-        private Plugin activator;
-        private String description;
-        private File fileContainingMarker;
-        private String markerText;
-
-        private TreeMap<String, IFile> files = new TreeMap<String, IFile>();
-
-        public IndividualRefactoringTestCase(Plugin activator, String description, File fileContainingMarker, String markerText) throws Exception
-        {
-            this.activator = activator;
-            this.description = description;
-            this.fileContainingMarker = fileContainingMarker;
-            this.markerText = markerText;
-            this.setName("test");
-        }
-
-        public void test() throws Exception
-        {
-            IFile fileContainingMarker = importFiles();
-            R refactoring = createRefactoring();
-
-            String[] markerFields = parseMarker(markerText);
-            TextSelection selection = determineSelection(markerFields, fileContainingMarker);
-
-            appendFilenameToDescription(markerFields);
-
-            RefactoringStatus status =
-                checkInitialConditions(refactoring,
-                    initializeRefactoring(refactoring, fileContainingMarker, selection, markerFields));
-
-            if (!status.hasFatalError())
-            {
-                String before = shouldCompile(fileContainingMarker) ? compileAndRunFortranProgram() : "";
-                
-                status = checkFinalConditions(refactoring,
-                    configureRefactoring(refactoring, fileContainingMarker, selection, markerFields));
-    
-                if (!status.hasFatalError())
-                {
-                    performChange(refactoring);
-                    
-                    if (!status.hasError() && shouldCompile(fileContainingMarker))
-                        assertEquals(before, compileAndRunFortranProgram());
-                    compareAgainstResultFile();
-                }
-            }
-        }
-
-        private IFile importFiles() throws Exception
-        {
-            importFiles(fileContainingMarker.getParent());
-            return files.get(fileContainingMarker.getName());
-        }
-
-        private String compileAndRunFortranProgram() throws Exception
-        {
-            project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-
-            System.out.println("Compiling and running Fortran program");
-            return compileAndRunFortranProgram(files.keySet().toArray(new String[files.size()]));
-        }
-
-
-        private void appendFilenameToDescription(String[] markerStrings)
-        {
-            description += " (" + fileContainingMarker.getName() + " " + Arrays.toString(markerStrings) + ")";
-        }
-
-        private RefactoringStatus checkInitialConditions(R refactoring, boolean shouldSucceed)
-        {
-            RefactoringStatus status = refactoring.checkInitialConditions(new NullProgressMonitor());
-            if (shouldSucceed)
-                assertTrue(description + " failed initial precondition check: " + status.toString(), !status.hasError());
-            else
-                assertTrue(description + " should have failed initial precondition check but did not: " + status.toString(), status.hasError());
-            return status;
-        }
-
-        private RefactoringStatus checkFinalConditions(R refactoring, boolean shouldSucceed)
-        {
-            RefactoringStatus status;
-            status = refactoring.checkFinalConditions(new NullProgressMonitor());
-            if (shouldSucceed)
-                assertTrue(description + " failed final precondition check: " + status.toString(), !status.hasError());
-            else
-                assertTrue(description + " should have failed final precondition check but did not: " + status.toString(), status.hasError());
-            return status;
-        }
-
-        private void performChange(R refactoring) throws CoreException
-        {
-            IProgressMonitor pm = new NullProgressMonitor();
-            Change change = refactoring.createChange(pm);
-            assertNotNull(description + " returned null Change object", change);
-            assertTrue(description + " returned invalid Change object", change.isValid(pm).isOK());
-            change.perform(pm);
-        }
-
-        private void compareAgainstResultFile() throws IOException, URISyntaxException, CoreException
-        {
-            for (String filename : files.keySet())
-            {
-                if (resultFileFor(filename).exists())
-                {
-                    String expected = readTestFile(activator, fileContainingMarker.getParent(), filename + ".result").replaceAll("\\r", "");
-                    String actual = readWorkspaceFile(filename).replaceAll("\\r", "");
-                    assertEquals(expected, actual);               // actual refactored file
-                }
-            }
-        }
-
-        private File resultFileFor(String filename)
-        {
-            return new File(fileContainingMarker.getParent()
-                + File.separator
-                + filename
-                +  ".result");
-        }
-
-        private void importFiles(String subdir) throws Exception
-        {
-            PhotranVPG.getInstance().clearDatabase();
-
-            files = new TreeMap<String, IFile>();
-
-            for (File file : new File(subdir).listFiles())
-            {
-                String filename = file.getName();
-                if (!filename.endsWith(".result")
-                    && !filename.equalsIgnoreCase("CVS")
-                    && !filename.equalsIgnoreCase(".svn"))
-                {
-                    IFile thisFile = importFile(activator, subdir, filename);
-                    files.put(filename, thisFile);
-                }
-            }
-
-            IProgressMonitor pm = new NullProgressMonitor();
-            project.refreshLocal(IResource.DEPTH_INFINITE, pm);
-            PhotranVPG.getInstance().ensureVPGIsUpToDate(pm);
-        }
-    }
-
-    /**
-     * @return true iff the Fortran program should be compiled and run
-     */
-    protected boolean shouldCompile(IFile fileContainingMarker)
-    {
-        return true;
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/PhotranTestCase.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/PhotranTestCase.java
deleted file mode 100644
index 44a0eef..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/PhotranTestCase.java
+++ /dev/null

@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.photran.internal.core.FortranCorePlugin;
-import org.eclipse.photran.internal.core.SyntaxException;
-import org.eclipse.photran.internal.core.analysis.loops.LoopReplacer;
-import org.eclipse.photran.internal.core.lexer.ASTLexerFactory;
-import org.eclipse.photran.internal.core.lexer.LexerException;
-import org.eclipse.photran.internal.core.lexer.sourceform.UnpreprocessedFreeSourceForm;
-import org.eclipse.photran.internal.core.parser.ASTAssignmentStmtNode;
-import org.eclipse.photran.internal.core.parser.ASTExecutableProgramNode;
-import org.eclipse.photran.internal.core.parser.ASTMainProgramNode;
-import org.eclipse.photran.internal.core.parser.IBodyConstruct;
-import org.eclipse.photran.internal.core.parser.IExpr;
-import org.eclipse.photran.internal.core.parser.Parser;
-import org.eclipse.photran.internal.core.sourceform.ISourceForm;
-
-/**
- * Base class for all Photran test cases.
- * <p>
- * This class provides methods to parse Fortran code, as well as some general utility methods.
- *
- * @author Jeff Overbey
- */
-public abstract class PhotranTestCase extends TestCase
-{
-    public PhotranTestCase()
-    {
-        this(null);
-    }
-
-    public PhotranTestCase(String name)
-    {
-        super(name);
-        if (!FortranCorePlugin.inTestingMode())
-            fail("PHOTRAN'S UNIT TESTS MUST BE RUN AS A JUNIT PLUG-IN TEST");
-    }
-
-    protected ASTExecutableProgramNode parse(String string) throws IOException, LexerException, SyntaxException
-    {
-        return parse(string, new UnpreprocessedFreeSourceForm());
-    }
-
-    protected ASTExecutableProgramNode parse(String string, ISourceForm sourceForm) throws IOException, LexerException, SyntaxException
-    {
-        ASTExecutableProgramNode ast = new Parser().parse(new ASTLexerFactory().createLexer(new StringReader(string), null, "<stdin>", sourceForm));
-        assertTrue(ast != null);
-        return ast;
-    }
-
-    protected ASTExecutableProgramNode parse(File file) throws IOException, LexerException, SyntaxException, CoreException
-    {
-        return parse(file, new UnpreprocessedFreeSourceForm());
-    }
-
-    protected ASTExecutableProgramNode parse(File file, ISourceForm sourceForm) throws IOException, LexerException, SyntaxException, CoreException
-    {
-        ASTExecutableProgramNode ast = new Parser().parse(new ASTLexerFactory().createLexer(file, sourceForm));
-        assertTrue(ast != null);
-        return ast;
-    }
-
-    @SuppressWarnings("unchecked")
-    protected <T extends IBodyConstruct> T parseStmt(String stmt) throws IOException, LexerException, SyntaxException
-    {
-        String program = stmt + "\nend program\n";
-        ASTExecutableProgramNode ast = new Parser().parse(new ASTLexerFactory().createLexer(new StringReader(program), null, null));
-        assertTrue(ast != null);
-        LoopReplacer.replaceAllLoopsIn(ast);
-        return (T)((ASTMainProgramNode)ast.getProgramUnitList().get(0)).getBody().get(0);
-    }
-
-    protected IExpr parseExpression(String expression) throws IOException, LexerException,
-        SyntaxException
-    {
-        String program = "a = " + expression + "\nend";
-        ASTExecutableProgramNode ast = parse(program);
-        assertNotNull(ast);
-        ASTMainProgramNode mainProg = (ASTMainProgramNode)ast.getProgramUnitList().get(0);
-        ASTAssignmentStmtNode assignmentStmt = (ASTAssignmentStmtNode)mainProg.getBody().get(0);
-        IExpr exprNode = assignmentStmt.getRhs();
-        return exprNode;
-    }
-
-    protected <T> void assertCollectionsEqual(T[] expectedArray, Iterable<T> actualIterable)
-    {
-        assertCollectionsEqual(Arrays.asList(expectedArray), actualIterable);
-    }
-
-    protected <T> void assertCollectionsEqual(List<T> expected, Iterable<T> actualIterable)
-    {
-        List<T> actual = new ArrayList<T>();
-        for (T entry : actualIterable)
-            actual.add(entry);
-
-        assertEquals(expected, actual);
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/PhotranTestSuiteFromFiles.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/PhotranTestSuiteFromFiles.java
deleted file mode 100644
index 1a9d8ac..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/PhotranTestSuiteFromFiles.java
+++ /dev/null

@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FilenameFilter;
-import java.io.IOException;
-
-import junit.framework.Test;
-
-import org.eclipse.rephraserengine.testing.junit3.GeneralTestSuiteFromFiles;
-
-/**
- * Base class for a test suite that contains one test for each file in a directory.
- * <p>
- * This class takes a given directory (usually in the org.eclipse.photran.core.vpg.tests
- * source tree), finds all of the Fortran source files in that directory or a subdirectory,
- * and then creates a test case for each file.
- * <p>
- * The creation of the test case is delegated to {@link #createTestFor(File, boolean, String)},
- * which subclasses must override.
- * 
- * @author Jeff Overbey
- * 
- * @see PhotranASTTestCase
- */
-public abstract class PhotranTestSuiteFromFiles extends GeneralTestSuiteFromFiles
-{
-    public static final String TEST_ROOT = "../org.eclipse.photran.core.vpg.tests/parser-test-code/";
-    
-    protected String directory;
-    protected boolean isFixedForm;
-    
-    public PhotranTestSuiteFromFiles(String description, String directorySuffix, boolean isFixedForm, boolean mustExist) throws FileNotFoundException, IOException
-    {
-        super(description + (isFixedForm ? " fixed form" : " free form"),
-              directorySuffix,
-              isFixedForm ? FIXED_FORM_FILENAME_FILTER : FREE_FORM_FILENAME_FILTER,
-              mustExist,
-              isFixedForm);
-    }
-    
-    @Override protected void initialize(Object... initializationData)
-    {
-        this.isFixedForm = (Boolean)initializationData[0];
-    }
-
-    @Override protected String getRootDirectory()
-    {
-        return TEST_ROOT;
-    }
-
-    @Override protected String nameOfTextFileContainingFilesToSkip()
-    {
-        return "PHOTRAN-PARSER-ERRORS.txt";
-    }
-
-    private static FilenameFilter FREE_FORM_FILENAME_FILTER = new FilenameFilter()
-    {
-        public boolean accept(File dir, String name)
-        {
-            return (name.endsWith(".f90")
-                || name.endsWith(".f03")
-                || name.endsWith(".f08")
-                || name.endsWith(".F90")
-                || name.endsWith(".F03")
-                || name.endsWith(".F08")
-                || name.endsWith(".FRE")) && !name.startsWith("XXX");
-        }
-    };
-
-    private static FilenameFilter FIXED_FORM_FILENAME_FILTER = new FilenameFilter()
-    {
-        public boolean accept(File dir, String name)
-        {
-            return (name.endsWith(".f")
-                || name.endsWith(".FIX")) && !name.startsWith("XXX");
-        }
-    };
-    
-    @Override protected final Test createTestFor(File file)
-    {
-        return createTestFor(file, isFixedForm, describe(file));
-    }
-    
-    protected abstract PhotranASTTestCase createTestFor(File file, boolean isFixedForm, String fileDescription);
-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/PhotranWorkspaceTestCase.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/PhotranWorkspaceTestCase.java
deleted file mode 100644
index 9bc0c12..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/PhotranWorkspaceTestCase.java
+++ /dev/null

@@ -1,383 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Markus Schorn (Wind River Systems)
- *******************************************************************************/
-
-/*
- * Created on Oct 4, 2004
- */
-package org.eclipse.photran.internal.tests;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.eclipse.cdt.core.CCorePlugin;
-import org.eclipse.cdt.core.dom.IPDOMManager;
-import org.eclipse.cdt.core.model.ICProject;
-import org.eclipse.cdt.core.testplugin.CProjectHelper;
-import org.eclipse.cdt.core.testplugin.FileManager;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-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.NullProgressMonitor;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.photran.internal.core.FProjectNature;
-import org.eclipse.photran.internal.core.util.LineCol;
-import org.eclipse.photran.internal.core.vpg.PhotranVPG;
-import org.eclipse.rephraserengine.core.util.Spawner;
-
-/**
- * Base class for a test case that imports files into the runtime workspace and then operates on the
- * runtime workspace.
- * <p>
- * Most refactorings are tested in this way. However, refactoring tests should generally be created
- * by subclassing {@link PhotranRefactoringTestSuiteFromMarkers}, not by subclassing this class
- * directly.
- * <p>
- * This class is based on org.eclipse.cdt.core.tests.BaseTestFramework.
- * 
- * @author aniefer
- * @author Jeff Overbey - Modified so that every test case creates a new project - Added line/column
- *         computation when importing files - Added {@link #compileAndRunFortranProgram(String...)}
- *         Also added marker infrastructure.
- */
-public abstract class PhotranWorkspaceTestCase extends PhotranTestCase {
-
-    /** The marker to search for */
-    public static final String MARKER = "!<<<<<";
-
-    /** Filter that determines which files will be imported into the runtime workspace */
-    public static final FilenameFilter FORTRAN_FILE_FILTER = new FilenameFilter()
-    {
-        public boolean accept(File dir, String filename)
-        {
-            return !filename.endsWith(".result")
-                && !filename.equalsIgnoreCase("CVS")
-                && !filename.equalsIgnoreCase(".svn");
-        }
-    };
-
-    static protected NullProgressMonitor	monitor;
-    static protected IWorkspace 			workspace;
-    static protected IProject 				project;
-    static protected ICProject				cproject;
-    static protected FileManager 			fileManager;
-	static protected boolean				indexDisabled=false;
-	
-	private static int n = 0;
-	
-    private HashMap<String, ArrayList<Integer>> lineMaps = new HashMap<String, ArrayList<Integer>>();
-
-    static void initProject() {
-		if (project != null) {
-			return;
-		}
-        if( CCorePlugin.getDefault() != null && CCorePlugin.getDefault().getCoreModel() != null){
-			//(CCorePlugin.getDefault().getCoreModel().getIndexManager()).reset();
-			monitor = new NullProgressMonitor();
-			
-			workspace = ResourcesPlugin.getWorkspace();
-			
-	        try {
-	            PhotranVPG.getInstance().releaseAllASTs();
-	            PhotranVPG.getInstance().clearDatabase();
-	            
-	            cproject = CProjectHelper.createCCProject("PhotranTestProject" + (++n), "bin", IPDOMManager.ID_NO_INDEXER); //$NON-NLS-1$ //$NON-NLS-2$
-	            CProjectHelper.addNatureToProject(cproject.getProject(), FProjectNature.F_NATURE_ID, null);
-	        
-	            project = cproject.getProject();
-	            
-	            /*project.setSessionProperty(SourceIndexer.activationKey, Boolean.FALSE );
-	        	//Set the id of the source indexer extension point as a session property to allow
-	    		//index manager to instantiate it
-	    		project.setSessionProperty(IndexManager.indexerIDKey, sourceIndexerID);*/
-	    		
-	 
-	    		
-	        } catch ( CoreException e ) {
-	            /*boo*/
-	        }
-			if (project == null)
-				fail("Unable to create project"); //$NON-NLS-1$
-	
-			//Create file manager
-			fileManager = new FileManager();
-        }
-	}
-            
-    public PhotranWorkspaceTestCase()
-    {
-        super();
-    }
-
-    public PhotranWorkspaceTestCase(String name)
-    {
-        super(name);
-    }
-    
-	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		initProject();
-	}
-
-	@Override
-	protected void tearDown() throws Exception {
-        if( project == null || !project.exists() )
-            return;
-        
-//        IResource [] members = project.members();
-//        for( int i = 0; i < members.length; i++ ){
-//            if( members[i].getName().equals( ".project" ) || members[i].getName().equals( ".cproject" ) ) //$NON-NLS-1$ //$NON-NLS-2$
-//                continue;
-//            if (members[i].getName().equals(".settings"))
-//            	continue;
-//            try{
-//                members[i].delete( false, monitor );
-//            } catch( Throwable e ){
-//                /*boo*/
-//            }
-//        }
-        
-        try {
-            project.delete(true, true, new NullProgressMonitor());
-        } catch( Throwable e ){
-            /* boo */
-            project.close(new NullProgressMonitor());
-            // To speed things up a bit and conserve memory...
-            PhotranVPG.getInstance().releaseAllASTs();
-            PhotranVPG.getInstance().clearDatabase();
-        }
-        project = null;
-	}
-
-    protected IFile importFile(String fileName, String contents) throws Exception
-    {
-		//Obtain file handle
-		IFile file = project.getProject().getFile(fileName);
-		
-		InputStream stream = new ByteArrayInputStream( contents.getBytes() );
-		//Create file input stream
-		if( file.exists() )
-		    file.setContents( stream, false, false, monitor );
-		else
-			file.create( stream, false, monitor );
-		
-		fileManager.addFile(file);
-		
-		return file;
-	}
-
-    /**
-     * If the environment variables COMPILER and EXECUTABLE are set during the JUnit run,
-     * compiles and runs the Fortran program being refactored and returns the output of
-     * the compilation and execution.  Otherwise, returns the empty string.
-     * <p>
-     * (This is intended to allow developers creating refactorings to test their refactorings
-     * by actually compiling the code, while not forcing other developers to do so, since
-     * it can be time-consuming.  Tests should NOT assume that a compiler is available.)
-     * <p>
-     * This will compile the file(s) that are currently being refactored (i.e., the files
-     * imported into the test project using {@link #importFile(Plugin, String, String)}) into a
-     * single executable, and then run that executable.  This can be invoked before and
-     * after a refactoring is performed to make sure runtime behavior is actually preserved
-     * for the test program.  If a specific ordering of the filenames is desired, it
-     * must be passed as an argument to this method; otherwise, all *.f* resources in the
-     * test project will be passed to the compiler in no specific order.
-     * <p>
-     * COMPILER must be set to the path of your Fortran compiler, e.g.,
-     * /usr/local/gfortran/bin/gfortran
-     * <p>
-     * EXECUTABLE gives a path for the generated executable, e.g.,
-     * /Users/joverbey/fortran-test-program.exe
-     * <p>
-     * The actual command line that is invoked is printed to standard output.
-     * <p>
-     * NOTE: Occasionally, the last part of the output from the Fortran program may seem to
-     * be missing.  (This may be a gfortran-specific problem.)  You should include a
-     * statement to manually flush the output to ensure that your test cases always pass.
-     * In gfortran, you can "CALL FLUSH" to invoke the (proprietary) flush intrinsic; or
-     * there is also a FLUSH statement in Fortran 2003.
-     *
-     * @return the output from the compiler and executable
-     * @throws Exception
-     */
-    protected String compileAndRunFortranProgram(String... filenamesOpt) throws Exception
-    {
-        String compiler = System.getenv("COMPILER");
-        if (compiler == null) return "";
-
-        String exe = System.getenv("EXECUTABLE");
-        if (exe == null) return "";
-
-        ArrayList<String> args = new ArrayList<String>(8);
-        args.add(compiler);
-
-        args.add("-falign-functions");
-        args.add("-w"); // Suppress all warnings (notably, use of assigned gotos)
-        
-        args.add("-o");
-        args.add(exe);
-        if (filenamesOpt == null || filenamesOpt.length == 0)
-        {
-            for (IResource res : project.members())
-                if (res instanceof IFile && res.getFileExtension().startsWith("f"))
-                    args.add(res.getName());
-        }
-        else
-        {
-            for (String filename : filenamesOpt)
-                args.add(filename);
-        }
-
-        System.out.println(toString(args));
-        String output = Spawner.run(project.getLocation().toFile(), args);
-        //System.out.println(output);
-
-        System.out.println(exe);
-        String output2 = Spawner.run(project.getLocation().toFile(), exe);
-        //System.out.println(output2);
-        
-        // Wait a few milliseconds for the file lock on a.exe to be released
-        // Otherwise Windows 7 + Cygwin may give a "Device or resource busy"
-        // error when we compile to a.exe in the next test case
-        Thread.sleep(250); // 1/4 of a second seems to be sufficient
-
-        return output + "\n" + output2;
-    }
-
-    private String toString(ArrayList<String> args)
-    {
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < args.size(); i++)
-            sb.append((i == 0 ? "" : " ") + args.get(i));
-        return sb.toString();
-    }
-
-    protected IFile importFile(Plugin activator, String srcDir, String filename) throws Exception
-    {
-        //project.getProject().getFile(filename).delete(true, new NullProgressMonitor());
-        IFile result = importFile(filename, readTestFile(activator, srcDir, filename));
-        //project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-        return result;
-    }
-
-    protected String readTestFile(Plugin activator, String srcDir, String filename) throws IOException, URISyntaxException
-    {
-        ArrayList<Integer> lineMap = new ArrayList<Integer>(50);
-        lineMaps.put(filename, lineMap);
-        lineMap.add(0); // Offset of line 1
-        URL resource = activator.getBundle().getResource(srcDir + "/" + filename);
-        assertNotNull(resource);
-        return readStream(lineMap, resource.openStream());
-    }
-
-    protected String readStream(InputStream inputStream) throws IOException
-    {
-        return readStream(null, inputStream);
-    }
-
-    private String readStream(ArrayList<Integer> lineMap, InputStream inputStream) throws IOException
-    {
-        StringBuffer sb = new StringBuffer(4096);
-        BufferedReader in = new BufferedReader(new InputStreamReader(inputStream));
-        for (int offset = 0, ch = in.read(); ch >= 0; ch = in.read())
-        {
-            sb.append((char)ch);
-            offset++;
-
-            if (ch == '\n' && lineMap != null)
-            {
-                //System.out.println("Line " + (lineMap.size()+1) + " starts at offset " + offset);
-                lineMap.add(offset);
-            }
-        }
-        in.close();
-        return sb.toString();
-    }
-
-    protected String readWorkspaceFile(String filename) throws IOException, CoreException
-    {
-        return readStream(project.getFile(filename).getContents(true));
-    }
-
-    /**
-     * @param filename
-     * @param line line number, starting at 1
-     * @param col column number, starting at 1
-     */
-    protected int getLineColOffset(String filename, LineCol lineCol)
-    {
-        return lineMaps.get(filename).get(lineCol.getLine()-1) + (lineCol.getCol()-1);
-    }
-
-    protected String[] parseMarker(String markerText)
-    {
-        String[] markerStrings = markerText.split(",");
-        for (int i = 0; i < markerStrings.length; i++)
-            markerStrings[i] = markerStrings[i].trim();
-        return markerStrings;
-    }
-
-    protected TextSelection determineSelection(String[] markerStrings, IFile fileContainingMarker) throws IOException, CoreException
-    {
-        assertTrue(markerStrings.length >= 2);
-        int fromLine = Integer.parseInt(markerStrings[0]);
-        int fromCol = Integer.parseInt(markerStrings[1]);
-        int fromOffset = getLineColOffset(fileContainingMarker.getName(), new LineCol(fromLine, fromCol));
-        int length = 0;
-        if (markerStrings.length >= 4 && isInteger(markerStrings[2]) && isInteger(markerStrings[3]))
-        {
-            int toLine = Integer.parseInt(markerStrings[2]);
-            int toCol = Integer.parseInt(markerStrings[3]);
-            int toOffset = getLineColOffset(fileContainingMarker.getName(), new LineCol(toLine, toCol));
-            length = toOffset - fromOffset;
-        }
-        TextSelection selection = new TextSelection(createDocument(fileContainingMarker),  fromOffset, length);
-        return selection;
-    }
-
-    /**
-     * @return true iff {@link Integer#parseInt(String)} can successfully parse the given
-     *         string can be parsed as an integer
-     */
-    protected boolean isInteger(String string)
-    {
-        try
-        {
-            Integer.parseInt(string);
-            return true;
-        }
-        catch (NumberFormatException e)
-        {
-            return false;
-        }
-    }
-
-    private IDocument createDocument(IFile fileContainingMarker) throws IOException, CoreException
-    {
-        return new Document(readWorkspaceFile(fileContainingMarker.getName()));
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/dependence/AbstractDependencesTestCase.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/dependence/AbstractDependencesTestCase.java
deleted file mode 100644
index 8dd3098..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/dependence/AbstractDependencesTestCase.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.analysis.dependence;
-
-import java.io.IOException;
-
-import org.eclipse.photran.internal.core.SyntaxException;
-import org.eclipse.photran.internal.core.analysis.dependence.LoopDependences;
-import org.eclipse.photran.internal.core.analysis.loops.ASTProperLoopConstructNode;
-import org.eclipse.photran.internal.core.lexer.LexerException;
-import org.eclipse.photran.internal.core.parser.ASTAssignmentStmtNode;
-import org.eclipse.photran.internal.tests.PhotranTestCase;
-import org.eclipse.rephraserengine.core.analysis.dependence.GCDTest;
-import org.eclipse.rephraserengine.core.analysis.dependence.GeneralizedGCDTest;
-
-/**
- * Base class for unit tests for dependence testing classes.
- *
- * @author Jeff Overbey
- */
-public abstract class AbstractDependencesTestCase extends PhotranTestCase
-{
-    protected LoopDependences dependences(String loop) throws IOException, LexerException, SyntaxException
-    {
-        return LoopDependences.computeFor(loop(loop),
-            new GCDTest(),
-            new GeneralizedGCDTest());
-    }
-
-    protected ASTProperLoopConstructNode loop(String stmt) throws IOException, LexerException, SyntaxException
-    {
-        ASTProperLoopConstructNode result = parseStmt(stmt);
-        assertNotNull(result);
-        return result;
-    }
-
-    protected ASTAssignmentStmtNode assignment(String stmt) throws IOException, LexerException, SyntaxException
-    {
-        ASTAssignmentStmtNode result = parseStmt(stmt);
-        assertNotNull(result);
-        return result;
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/dependence/ArrayReferenceTest.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/dependence/ArrayReferenceTest.java
deleted file mode 100644
index 2501574..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/dependence/ArrayReferenceTest.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.analysis.dependence;
-
-import org.eclipse.photran.internal.core.analysis.dependence.VariableReference;
-
-/**
- * 
- * @author Jeff Overbey
- */
-public class ArrayReferenceTest extends AbstractDependencesTestCase
-{
-    public void test1DLHS() throws Exception
-    {
-        assertEquals("a(2*i+3)", VariableReference.fromLHS(assignment("a(2* i  +3) = 0")).toString());
-        assertEquals("a(2*i+3)", VariableReference.fromLHS(assignment("A(2* i  +3) = 0")).toString());
-        assertEquals("a(1*i+2)", VariableReference.fromLHS(assignment("a(i + 2) = 0")).toString());
-        assertEquals("a(3)",     VariableReference.fromLHS(assignment("a(3) = 0")).toString());
-        assertEquals("a(1*i+0)", VariableReference.fromLHS(assignment("a(i) = 0")).toString());
-        assertEquals("a(2*i+0)", VariableReference.fromLHS(assignment("a(2* i) = 0")).toString());
-        assertEquals("a",        VariableReference.fromLHS(assignment("a(s(n/3)) = 0")).toString());
-        assertEquals("a(2*i+5)", VariableReference.fromLHS(assignment("a(5+2*i) = 0")).toString());
-        assertEquals("a(1*i+5)", VariableReference.fromLHS(assignment("a(5+i) = 0")).toString());
-        assertEquals("a(-1*i+5)", VariableReference.fromLHS(assignment("a(-i+5) = 0")).toString());
-        assertEquals("a(-1*i+0)", VariableReference.fromLHS(assignment("a(-i) = 0")).toString());
-        //assertEquals("a(-1*i+5)", VariableReference.fromLHS(assignment("a(5+-i) = 0")).toString());
-    }
-
-    public void test3DLHS() throws Exception
-    {
-        assertEquals("a(2*i+0, 6, 1*j+10)", VariableReference.fromLHS(assignment("a ( 2*i, 6 , j + 10 ) = 0")).toString());
-    }
-
-    public void testRHS() throws Exception
-    {
-        assertEquals("[b(3), c(6*i+0), i, d, a]",
-            VariableReference.fromRHS(assignment("a ( 2*i, 6 , j + 10 ) = b(3) + c(6*i) + 3 * d * a")).toString());
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/dependence/DependencesTest.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/dependence/DependencesTest.java
deleted file mode 100644
index 23f1426..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/dependence/DependencesTest.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.analysis.dependence;
-
-import org.eclipse.photran.internal.core.analysis.dependence.LoopDependences;
-
-/**
- * Unit tests for the Dependences class, which collects array dependences in a perfect loop nest.
- *
- * @author Jeff Overbey
- */
-public class DependencesTest extends AbstractDependencesTestCase
-{
-    public void testPage38() throws Exception
-    {
-        LoopDependences deps = dependences(
-            "DO I = 1, N\n" +
-            "    A(I + 1) = A(I) + B(I)     ! S1\n" +
-            "ENDDO\n");
-
-        assertEquals("[a(1*i+1)]", deps.getWrites().toString());
-        assertEquals("[a(1*i+0), i, b(1*i+0), i]", deps.getReads().toString());
-
-        assertEquals("[Anti-dependence from a(1*i+0) to a(1*i+1), Flow dependence from a(1*i+1) to a(1*i+0)]",
-            deps.getDependences().toString());
-    }
-
-    public void testPage39() throws Exception
-    {
-        LoopDependences deps = dependences(
-            "DO I = 1, N\n" +
-            "    A(I + 2) = A(I) + B(I)     ! S1\n" +
-            "ENDDO\n");
-
-        assertEquals("[a(1*i+2)]", deps.getWrites().toString());
-        assertEquals("[a(1*i+0), i, b(1*i+0), i]", deps.getReads().toString());
-
-        assertEquals("[Anti-dependence from a(1*i+0) to a(1*i+2), Flow dependence from a(1*i+2) to a(1*i+0)]",
-            deps.getDependences().toString());
-    }
-
-    public void testFalse1() throws Exception
-    {
-        System.out.println("START");
-        LoopDependences deps = dependences(
-            "DO I = 1, N\n" +
-            "    A(2*I) = A(2*I + 1)\n" +
-            "ENDDO\n");
-
-        assertEquals("[a(2*i+0)]", deps.getWrites().toString());
-        assertEquals("[a(2*i+1), i]", deps.getReads().toString());
-
-        assertTrue(deps.getDependences().isEmpty());
-        System.out.println("DONE");
-    }
-
-    public void testPage49() throws Exception
-    {
-        LoopDependences deps = dependences(
-            "DO I = 1, N\n" +
-            "    A(I + 1) = F(I)     ! S1\n" +
-            "    F(I + 1) = A(I)     ! S2\n" +
-            "ENDDO\n");
-
-        assertEquals("[a(1*i+1), f(1*i+1)]", deps.getWrites().toString());
-        assertEquals("[f(1*i+0), i, a(1*i+0), i]", deps.getReads().toString());
-
-        assertEquals("[Anti-dependence from f(1*i+0) to f(1*i+1), " +
-                      "Flow dependence from a(1*i+1) to a(1*i+0), " +
-                      "Anti-dependence from a(1*i+0) to a(1*i+1), " +
-                      "Flow dependence from f(1*i+1) to f(1*i+0)]",
-            deps.getDependences().toString());
-    }
-
-    public void testFalse2() throws Exception
-    {
-        LoopDependences deps = dependences(
-            "DO I = 1, N\n" +
-            "    A(-1*I) = A(I)\n" +
-            "ENDDO\n");
-
-        assertEquals("[a(-1*i+0)]", deps.getWrites().toString());
-        assertEquals("[a(1*i+0), i]", deps.getReads().toString());
-
-        assertTrue(deps.getDependences().isEmpty());
-    }
-
-    public void testSubtract1() throws Exception
-    {
-        LoopDependences deps = dependences(
-            "DO I = 1+3, N\n" +
-            "    A(I-3) = A(I)\n" +
-            "ENDDO\n");
-
-        assertEquals("[a(1*i-3)]", deps.getWrites().toString());
-        assertEquals("[a(1*i+0), i]", deps.getReads().toString());
-
-        System.out.println(deps.getDependences());
-        assertFalse(deps.getDependences().isEmpty());
-        assertEquals("[Anti-dependence from a(1*i+0) to a(1*i-3), Flow dependence from a(1*i-3) to a(1*i+0)]", deps.getDependences().toString());
-    }
-
-    public void testSubtract2() throws Exception
-    {
-        LoopDependences deps = dependences(
-            "DO I = 1+3, N\n" +
-            "    A(I) = A(I-3)\n" +
-            "ENDDO\n");
-
-        assertEquals("[a(1*i+0)]", deps.getWrites().toString());
-        assertEquals("[a(1*i-3), i]", deps.getReads().toString());
-
-        //System.out.println(deps.getDependences());
-        assertFalse(deps.getDependences().isEmpty());
-        assertEquals("[Anti-dependence from a(1*i-3) to a(1*i+0), Flow dependence from a(1*i+0) to a(1*i-3)]", deps.getDependences().toString());
-    }
-
-    public void testEvenOdd1() throws Exception
-    {
-        LoopDependences deps = dependences(
-            "DO I = 1, N\n" +
-            "    A(2*I) = A(2*I+3)\n" +
-            "ENDDO\n");
-
-        assertEquals("[a(2*i+0)]", deps.getWrites().toString());
-        assertEquals("[a(2*i+3), i]", deps.getReads().toString());
-
-        assertTrue(deps.getDependences().isEmpty());
-    }
-
-    public void testEvenOdd2() throws Exception
-    {
-        LoopDependences deps = dependences(
-            "DO I = 1+3, N\n" +
-            "    A(2*I) = A(2*I-3)\n" +
-            "ENDDO\n");
-
-        assertEquals("[a(2*i+0)]", deps.getWrites().toString());
-        assertEquals("[a(2*i-3), i]", deps.getReads().toString());
-
-        assertTrue(deps.getDependences().isEmpty());
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/flow/ControlFlowTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/flow/ControlFlowTestSuite.java
deleted file mode 100644
index 329a85d..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/flow/ControlFlowTestSuite.java
+++ /dev/null

@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Matthew Fotzler, UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.analysis.flow;
-
-import java.io.File;
-
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.photran.core.IFortranAST;
-import org.eclipse.photran.internal.core.lexer.Token;
-import org.eclipse.photran.internal.core.parser.IActionStmt;
-import org.eclipse.photran.internal.core.parser.IExecutableConstruct;
-import org.eclipse.photran.internal.core.vpg.EdgeType;
-import org.eclipse.photran.internal.core.vpg.PhotranTokenRef;
-import org.eclipse.photran.internal.core.vpg.PhotranVPG;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.tests.PhotranWorkspaceTestCase;
-import org.eclipse.rephraserengine.core.analysis.flow.FlowGraphNode;
-import org.eclipse.rephraserengine.core.analysis.flow.VPGFlowGraph;
-import org.eclipse.rephraserengine.testing.junit3.GeneralTestSuiteFromMarkers;
-
-/**
- * Unit tests for the control flow graph constructor.
- * 
- * @author Matthew Fotzler
- */
-public class ControlFlowTestSuite extends GeneralTestSuiteFromMarkers
-{
-    private static final String DIR = "control-flow-test-code";
- 
-    public static Test suite() throws Exception
-    {
-        return new ControlFlowTestSuite();
-    }
-    
-    public ControlFlowTestSuite() throws Exception
-    {
-        super("Constructing control flow graph for",
-            PhotranWorkspaceTestCase.MARKER,
-            new File(DIR),
-            PhotranWorkspaceTestCase.FORTRAN_FILE_FILTER);
-    }
-
-    @Override
-    protected Test createTestFor(File fileContainingMarker, int markerOffset, String markerText)
-        throws Exception
-    {
-        return new ControlFlowTestCase(fileContainingMarker, markerText) {};
-    }
-    
-    public static abstract class ControlFlowTestCase extends PhotranWorkspaceTestCase
-    {
-        private File javaFile;
-        private IFile file;
-        private String markerText;
-
-        public ControlFlowTestCase(File file, String markerText) throws Exception
-        {
-            super("test");
-            this.javaFile = file;
-            this.markerText = markerText;
-        }
-        
-        @Override public void setUp() throws Exception
-        {
-            super.setUp();
-
-            this.file = importFile(Activator.getDefault(), javaFileDirectory(), javaFile.getName());
-            project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-        }
-
-        protected String javaFileDirectory()
-        {
-            return DIR+File.separator+javaFile.getParentFile().getName();
-        }
-
-        public void test() throws Exception
-        {
-            PhotranVPG vpg = PhotranVPG.getInstance();
-            vpg.ensureVPGIsUpToDate(new NullProgressMonitor());
-            
-            IFortranAST ast = vpg.acquireTransientAST(file);
-            assertNotNull(ast);
-            
-            Token programToken = ast.findFirstTokenOnLine(1);
-            Token endToken = ast.findFirstTokenOnLine(Integer.parseInt(markerText));
-            assertNotNull(programToken);
-            assertNotNull(endToken);
-            
-            PhotranTokenRef ctlFlowEntryNode = programToken.getTokenRef();
-            PhotranTokenRef ctlFlowExitNode = endToken.getTokenRef();
-            PhotranVPGFlowGraph flowGraph = new PhotranVPGFlowGraph(ctlFlowEntryNode, ctlFlowExitNode);
-
-            String actual = flowGraph.toString();
-            String expected = this.readTestFile(Activator.getDefault(), javaFileDirectory(), file.getName() + ".result").replace("\r", "");
-            assertEquals(expected.replace("\r", ""), actual.replace("\r", ""));
-        }
-        
-        private static final class PhotranVPGFlowGraph extends VPGFlowGraph<PhotranTokenRef, Token, IExecutableConstruct>
-        {
-            private PhotranVPGFlowGraph(PhotranTokenRef entryNodeRef, PhotranTokenRef exitNodeRef)
-            {
-                super(PhotranVPG.getInstance(), entryNodeRef, exitNodeRef, EdgeType.CONTROL_FLOW_EDGE_TYPE);
-            }
-
-            @Override protected IExecutableConstruct map(PhotranTokenRef tokenRef)
-            {
-                Token token = tokenRef.findToken();
-                IActionStmt actionStmt = token.findNearestAncestor(IActionStmt.class);
-                if (actionStmt != null)
-                    return actionStmt;
-                else
-                    return token.findNearestAncestor(IExecutableConstruct.class);
-            }
-
-            @Override protected String nodeDataAsString(FlowGraphNode<IExecutableConstruct> node)
-            {
-                return String.valueOf(node.getData()).trim();
-            }
-        }
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/types/TypeCheckerTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/types/TypeCheckerTestSuite.java
deleted file mode 100644
index a2f6ff3..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/types/TypeCheckerTestSuite.java
+++ /dev/null

@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Matthew Fotzler, UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.analysis.types;
-
-import java.io.File;
-
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.photran.core.IFortranAST;
-import org.eclipse.photran.internal.core.analysis.loops.ASTVisitorWithLoops;
-import org.eclipse.photran.internal.core.analysis.types.TypeChecker;
-import org.eclipse.photran.internal.core.lexer.Token;
-import org.eclipse.photran.internal.core.parser.IExpr;
-import org.eclipse.photran.internal.core.vpg.PhotranVPG;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.tests.PhotranWorkspaceTestCase;
-import org.eclipse.rephraserengine.testing.junit3.GeneralTestSuiteFromMarkers;
-
-/**
- * Unit tests for the type checker.
- * 
- * @author Abhishek Sharma - Fortran code
- * @author Jeff Overbey - this class
- */
-public class TypeCheckerTestSuite extends GeneralTestSuiteFromMarkers
-{
-    private static final String DIR = "type-checker-test-code";
- 
-    public static Test suite() throws Exception
-    {
-        return new TypeCheckerTestSuite();
-    }
-    
-    public TypeCheckerTestSuite() throws Exception
-    {
-        super("Type checking",
-            PhotranWorkspaceTestCase.MARKER,
-            new File(DIR),
-            PhotranWorkspaceTestCase.FORTRAN_FILE_FILTER);
-    }
-
-    @Override
-    protected Test createTestFor(File fileContainingMarker, int markerOffset, String markerText)
-        throws Exception
-    {
-        return new TypeCheckerTestCase(fileContainingMarker, markerText) {};
-    }
-    
-    public static abstract class TypeCheckerTestCase extends PhotranWorkspaceTestCase
-    {
-        private File javaFile;
-        private IFile file;
-        private String markerText;
-
-        public TypeCheckerTestCase(File file, String markerText) throws Exception
-        {
-            super("test");
-            this.javaFile = file;
-            this.markerText = markerText;
-        }
-        
-        @Override public void setUp() throws Exception
-        {
-            super.setUp();
-
-            this.file = importFile(Activator.getDefault(), javaFileDirectory(), javaFile.getName());
-            project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-        }
-
-        protected String javaFileDirectory()
-        {
-            return DIR+File.separator+javaFile.getParentFile().getName();
-        }
-
-        public void test() throws Exception
-        {
-            PhotranVPG vpg = PhotranVPG.getInstance();
-            vpg.ensureVPGIsUpToDate(new NullProgressMonitor());
-            
-            IFortranAST ast = vpg.acquireTransientAST(file);
-            assertNotNull(ast);
-            
-            String[] markerFields = parseMarker(markerText);
-            TextSelection selection = determineSelection(markerFields, file);
-            
-            IExpr expression = findExpression(ast, selection.getOffset(), selection.getLength());
-            assertNotNull(expression); // If this fails, a marker's line/column information does not correspond to an expression
-            
-            String expectedType = markerFields[4];
-            String actualType = TypeChecker.getTypeOf(expression).toString();
-            assertEquals(expectedType, actualType);
-        }
-
-        private IExpr findExpression(IFortranAST ast, final int offset, final int length)
-        {
-            class V extends ASTVisitorWithLoops
-            {
-                private IExpr result = null;
-                
-                @Override public void visitIExpr(IExpr expr)
-                {
-                    Token firstToken = expr.findFirstToken();
-                    Token lastToken = expr.findLastToken();
-                    
-                    int exprOffset = firstToken.getFileOffset();
-                    int exprLength = lastToken.getFileOffset() + lastToken.getLength() - offset;
-                    
-                    if (exprOffset == offset && exprLength == length)
-                        result = expr;
-                }
-            };
-            
-            V v = new V();
-            ast.getRoot().accept(v);
-            return v.result;
-        }
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/types/TypeCheckerTests.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/types/TypeCheckerTests.java
deleted file mode 100644
index fa48165..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/analysis/types/TypeCheckerTests.java
+++ /dev/null

@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.analysis.types;
-
-import org.eclipse.photran.internal.core.analysis.types.Type;
-import org.eclipse.photran.internal.core.analysis.types.TypeChecker;
-import org.eclipse.photran.internal.core.parser.IExpr;
-import org.eclipse.photran.internal.tests.PhotranTestCase;
-
-/**
- * Unit tests for the Fortran type checker.
- *
- * @author Stoyan Gaydarov
- */
-public class TypeCheckerTests extends PhotranTestCase
-{
-
-    /** Parses a Fortran expression.  Does not bind identifiers, etc. */
-    private Type getType(String expression) throws Exception
-    {
-        // We can only parse entire programs, so we embed the expression in
-        // a parseable program, then extract the expression from the program's AST
-
-        IExpr exprNode = parseExpression(expression);
-        return TypeChecker.getTypeOf(exprNode);
-    }
-
-    private String character = "\"Stoyan\""; // used for character type
-
-    public void testConstantExpressionTypes() throws Exception
-    {
-        assertEquals(Type.INTEGER, getType("3"));
-        assertEquals(Type.REAL, getType("3.0"));
-        assertEquals(Type.CHARACTER, getType(character));
-        assertEquals(Type.DOUBLEPRECISION, getType("3.0D+00"));
-        assertEquals(Type.COMPLEX, getType("(3,3)"));
-        assertEquals(Type.LOGICAL, getType(".true."));
-    }
-
-    public void testUnaryExpressionTypes() throws Exception
-    {
-        assertEquals(Type.INTEGER, getType("-3"));
-        assertEquals(Type.INTEGER, getType("+3"));
-        assertEquals(Type.TYPE_ERROR, getType(".NOT. 3"));
-
-        assertEquals(Type.REAL, getType("-3.0"));
-        assertEquals(Type.REAL, getType("+3.0"));
-        assertEquals(Type.TYPE_ERROR, getType(".NOT. 3.0"));
-
-        assertEquals(Type.DOUBLEPRECISION, getType("-3.0D+00"));
-        assertEquals(Type.DOUBLEPRECISION, getType("+3.0D+00"));
-        assertEquals(Type.TYPE_ERROR, getType(".NOT. 3.0D+00"));
-
-        assertEquals(Type.COMPLEX, getType("-(3,3)"));
-        assertEquals(Type.COMPLEX, getType("+(3,3)"));
-        assertEquals(Type.TYPE_ERROR, getType(".NOT. (3,3)"));
-
-        assertEquals(Type.TYPE_ERROR, getType("-" + character)); //??
-        assertEquals(Type.TYPE_ERROR, getType("+" + character)); //??
-        assertEquals(Type.TYPE_ERROR, getType(".NOT. " + character));
-
-        assertEquals(Type.TYPE_ERROR, getType("-.true."));
-        assertEquals(Type.TYPE_ERROR, getType("+.true."));
-        assertEquals(Type.LOGICAL, getType(".NOT. .true."));
-    }
-
-    public void testConcatOperations() throws Exception
-    {
-        assertEquals(Type.UNKNOWN, getType(character + " // " + "1"));
-        assertEquals(Type.UNKNOWN, getType(character + " // " + "3.2"));
-        assertEquals(Type.UNKNOWN, getType(character + " // " + "43.3D+00"));
-        assertEquals(Type.UNKNOWN, getType(character + " // " + "(6,7)"));
-        assertEquals(Type.UNKNOWN, getType(character + " // " + ".true."));
-        assertEquals(Type.CHARACTER, getType(character + " // " + character));
-    }
-
-    public void testGEOperator() throws Exception
-    {
-        testComparasonOperations(" .GE. ");
-    }
-
-    public void testGTOperator() throws Exception
-    {
-        testComparasonOperations(" .GT. ");
-    }
-
-    public void testLEOperator() throws Exception
-    {
-        testComparasonOperations(" .LE. ");
-    }
-
-    public void testLTOperator() throws Exception
-    {
-        testComparasonOperations(" .LT. ");
-    }
-
-    public void testNEOperator() throws Exception
-    {
-        testComparasonOperations(" .NE. ");
-    }
-
-    public void testEQOperator() throws Exception
-    {
-        testComparasonOperations(" .EQ. ");
-    }
-
-    private void testComparasonOperations(String op) throws Exception
-    {
-        if(op.equals(" .EQ. ") || op.equals(" .NE. "))
-        {
-            assertEquals(Type.LOGICAL, getType("8" + op + "(4,5)"));
-            assertEquals(Type.LOGICAL, getType("3.6" + op + "(3,8)"));
-            assertEquals(Type.LOGICAL, getType("3.2D+00" + op + "(4,9)"));
-            assertEquals(Type.LOGICAL, getType("(4,8)" + op + "7"));
-            assertEquals(Type.LOGICAL, getType("(4,3)" + op + "5.4"));
-            assertEquals(Type.LOGICAL, getType("(4,6)" + op + "(4,9)"));
-            assertEquals(Type.LOGICAL, getType("(3,0)" + op + "3.0D+00"));
-        }
-        else
-        {
-            assertEquals(Type.TYPE_ERROR, getType("8" + op + "(4,5)"));
-            assertEquals(Type.TYPE_ERROR, getType("3.6" + op + "(3,8)"));
-            assertEquals(Type.TYPE_ERROR, getType("3.2D+00" + op + "(4,9)"));
-            assertEquals(Type.TYPE_ERROR, getType("(4,8)" + op + "7"));
-            assertEquals(Type.TYPE_ERROR, getType("(4,3)" + op + "5.4"));
-            assertEquals(Type.TYPE_ERROR, getType("(4,6)" + op + "(4,9)"));
-            assertEquals(Type.TYPE_ERROR, getType("(3,0)" + op + "3.0D+00"));
-        }
-
-        assertEquals(Type.LOGICAL, getType("9" + op + "3"));
-        assertEquals(Type.LOGICAL, getType("5" + op + "3.0"));
-        assertEquals(Type.LOGICAL, getType("4" + op + "2.0D+00"));
-        assertEquals(Type.TYPE_ERROR, getType("3" + op + ".true."));
-        assertEquals(Type.TYPE_ERROR, getType("1" + op + character));
-
-        assertEquals(Type.LOGICAL, getType("3.0" + op + "7"));
-        assertEquals(Type.LOGICAL, getType("3.3" + op + "3.5"));
-        assertEquals(Type.LOGICAL, getType("4.0" + op + "3.0D+00"));
-        assertEquals(Type.TYPE_ERROR, getType("3.2" + op + ".true."));
-        assertEquals(Type.TYPE_ERROR, getType("4.1" + op + character));
-
-        assertEquals(Type.LOGICAL, getType("3.1D+00" + op + "7"));
-        assertEquals(Type.LOGICAL, getType("4.0D+00" + op + "5.4"));
-        assertEquals(Type.LOGICAL, getType("5.0D+00" + op + "3.0D+00"));
-        assertEquals(Type.TYPE_ERROR, getType("3.8D+00" + op + ".true."));
-        assertEquals(Type.TYPE_ERROR, getType("2.1D+00" + op + character));
-
-        assertEquals(Type.TYPE_ERROR, getType("(3,3)" + op + ".true."));
-        assertEquals(Type.TYPE_ERROR, getType("(2,1)" + op + character));
-
-        assertEquals(Type.TYPE_ERROR, getType(".true." + op + "7"));
-        assertEquals(Type.TYPE_ERROR, getType(".true." + op + "5.4"));
-        assertEquals(Type.TYPE_ERROR, getType(".true." + op + "(4,9)"));
-        assertEquals(Type.TYPE_ERROR, getType(".true." + op + "3.0D+00"));
-        assertEquals(Type.TYPE_ERROR, getType(".true." + op + ".true."));
-        assertEquals(Type.TYPE_ERROR, getType(".true." + op + character));
-
-        assertEquals(Type.TYPE_ERROR, getType(character + op + "7"));
-        assertEquals(Type.TYPE_ERROR, getType(character + op + "5.4"));
-        assertEquals(Type.TYPE_ERROR, getType(character + op + "(4,9)"));
-        assertEquals(Type.TYPE_ERROR, getType(character + op + "3.0D+00"));
-        assertEquals(Type.TYPE_ERROR, getType(character + op + ".true."));
-        assertEquals(Type.TYPE_ERROR, getType(character + op + "c"));
-
-    }
-
-    public void testLogicalOperations() throws Exception
-    {
-
-        assertEquals(Type.LOGICAL, getType(".true. .AND. .true."));
-        assertEquals(Type.TYPE_ERROR, getType("1 .AND. .true."));
-        assertEquals(Type.TYPE_ERROR, getType("4.3 .AND. .true."));
-        assertEquals(Type.TYPE_ERROR, getType("4.2D+00 .AND. .true."));
-        assertEquals(Type.TYPE_ERROR, getType("(3,4) .AND. .true."));
-        assertEquals(Type.TYPE_ERROR, getType(character + " .AND. .true."));
-
-        assertEquals(Type.LOGICAL, getType(".true. .OR. .true."));
-        assertEquals(Type.TYPE_ERROR, getType("1 .OR. .true."));
-        assertEquals(Type.TYPE_ERROR, getType("4.3 .OR. .true."));
-        assertEquals(Type.TYPE_ERROR, getType("4.2D+00 .OR. .true."));
-        assertEquals(Type.TYPE_ERROR, getType("(3,4) .OR. .true."));
-        assertEquals(Type.TYPE_ERROR, getType(character + " .OR. .true."));
-
-        assertEquals(Type.LOGICAL, getType(".true. .EQV. .true."));
-        assertEquals(Type.TYPE_ERROR, getType("1 .EQV. .true."));
-        assertEquals(Type.TYPE_ERROR, getType("4.3 .EQV. .true."));
-        assertEquals(Type.TYPE_ERROR, getType("4.2D+00 .EQV. .true."));
-        assertEquals(Type.TYPE_ERROR, getType("(3,4) .EQV. .true."));
-        assertEquals(Type.TYPE_ERROR, getType(character + " .EQV. .true."));
-
-        assertEquals(Type.LOGICAL, getType(".true. .NEQV. .true."));
-        assertEquals(Type.TYPE_ERROR, getType("1 .NEQV. .true."));
-        assertEquals(Type.TYPE_ERROR, getType("4.3 .NEQV. .true."));
-        assertEquals(Type.TYPE_ERROR, getType("4.2D+00 .NEQV. .true."));
-        assertEquals(Type.TYPE_ERROR, getType("(3,4) .NEQV. .true."));
-        assertEquals(Type.TYPE_ERROR, getType(character + " .NEQV. .true."));
-
-    }
-
-    public void testAddExpressionTypes() throws Exception
-    {
-        testOpExpressionTypes("+");
-    }
-
-    public void testSubtractExpressionTypes() throws Exception
-    {
-        testOpExpressionTypes("-");
-    }
-
-    public void testMultiplyExpressionTypes() throws Exception
-    {
-        testOpExpressionTypes("*");
-    }
-
-    public void testDivisionExpressionTypes() throws Exception
-    {
-        testOpExpressionTypes("/");
-    }
-
-    public void testPowerExpressionTypes() throws Exception
-    {
-        testOpExpressionTypes("**");
-    }
-
-    private void testOpExpressionTypes(String op) throws Exception
-    {
-
-        assertEquals(Type.INTEGER, getType("9" + op + "3"));
-        assertEquals(Type.REAL, getType("5" + op + "3.0"));
-        assertEquals(Type.COMPLEX, getType("8" + op + "(4,5)"));
-        assertEquals(Type.DOUBLEPRECISION, getType("4" + op + "2.0D+00"));
-        assertEquals(Type.TYPE_ERROR, getType("3" + op + ".true."));
-        assertEquals(Type.TYPE_ERROR, getType("1" + op + character));
-
-        assertEquals(Type.REAL, getType("3.0" + op + "7"));
-        assertEquals(Type.REAL, getType("3.3" + op + "3.5"));
-        assertEquals(Type.COMPLEX, getType("3.6" + op + "(3,8)"));
-        assertEquals(Type.DOUBLEPRECISION, getType("4.0" + op + "3.0D+00"));
-        assertEquals(Type.TYPE_ERROR, getType("3.2" + op + ".true."));
-        assertEquals(Type.TYPE_ERROR, getType("4.1" + op + character));
-
-        assertEquals(Type.COMPLEX, getType("(4,8)" + op + "7"));
-        assertEquals(Type.COMPLEX, getType("(4,3)" + op + "5.4"));
-        assertEquals(Type.COMPLEX, getType("(4,6)" + op + "(4,9)"));
-        assertEquals(Type.COMPLEX, getType("(3,0)" + op + "3.0D+00"));
-        assertEquals(Type.TYPE_ERROR, getType("(3,3)" + op + ".true."));
-        assertEquals(Type.TYPE_ERROR, getType("(2,1)" + op + character));
-
-        assertEquals(Type.DOUBLEPRECISION, getType("3.1D+00" + op + "7"));
-        assertEquals(Type.DOUBLEPRECISION, getType("4.0D+00" + op + "5.4"));
-        assertEquals(Type.COMPLEX, getType("3.2D+00" + op + "(4,9)"));
-        assertEquals(Type.DOUBLEPRECISION, getType("5.0D+00" + op + "3.0D+00"));
-        assertEquals(Type.TYPE_ERROR, getType("3.8D+00" + op + ".true."));
-        assertEquals(Type.TYPE_ERROR, getType("2.1D+00" + op + character));
-
-        assertEquals(Type.TYPE_ERROR, getType(".true." + op + "7"));
-        assertEquals(Type.TYPE_ERROR, getType(".true." + op + "5.4"));
-        assertEquals(Type.TYPE_ERROR, getType(".true." + op + "(4,9)"));
-        assertEquals(Type.TYPE_ERROR, getType(".true." + op + "3.0D+00"));
-        assertEquals(Type.TYPE_ERROR, getType(".true." + op + ".true."));
-        assertEquals(Type.TYPE_ERROR, getType(".true." + op + character));
-
-        assertEquals(Type.TYPE_ERROR, getType(character + op + "7"));
-        assertEquals(Type.TYPE_ERROR, getType(character + op + "5.4"));
-        assertEquals(Type.TYPE_ERROR, getType(character + op + "(4,9)"));
-        assertEquals(Type.TYPE_ERROR, getType(character + op + "3.0D+00"));
-        assertEquals(Type.TYPE_ERROR, getType(character + op + ".true."));
-        assertEquals(Type.TYPE_ERROR, getType(character + op + "c"));
-
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/MultiTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/MultiTestSuite.java
deleted file mode 100644
index 38596ed..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/MultiTestSuite.java
+++ /dev/null

@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.parser;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.Set;
-
-import junit.framework.Assert;
-import junit.framework.TestSuite;
-
-import org.eclipse.photran.internal.core.analysis.loops.LoopReplacer;
-import org.eclipse.photran.internal.core.lexer.Token;
-import org.eclipse.photran.internal.core.parser.ASTExecutableProgramNode;
-import org.eclipse.photran.internal.core.parser.GenericASTVisitor;
-import org.eclipse.photran.internal.core.parser.IASTNode;
-import org.eclipse.photran.internal.core.refactoring.infrastructure.SourcePrinter;
-import org.eclipse.photran.internal.tests.PhotranASTTestCase;
-import org.eclipse.photran.internal.tests.PhotranTestSuiteFromFiles;
-
-/**
- * An aggregate test suite that tests the parser, source reproduction, and loop replacement.
- * 
- * @author Jeff Overbey
- */
-public abstract class MultiTestSuite extends TestSuite
-{
-    public MultiTestSuite(String directorySuffix, boolean isFixedForm, boolean mustExist) throws FileNotFoundException, IOException
-    {
-        setName("Running multiple tests on " + directorySuffix);
-        
-        if (isFixedForm)
-            addTest(new ParserTestSuite(directorySuffix, isFixedForm, mustExist) {});
-        else
-            //addTest(new SourceReproductionTestSuite(directorySuffix, isFixedForm, mustExist) {});
-            addTest(new LoopReplacerSRTestSuite(directorySuffix, isFixedForm, mustExist) {});
-    }
-    
-    public MultiTestSuite() {;} // to keep JUnit quiet
-    public void test() {} // to keep JUnit quiet
-
-    private static void checkCorrectParenting(final ASTExecutableProgramNode ast)
-    {
-        ast.accept(new GenericASTVisitor()
-        {
-            private IASTNode expectedParent = null;
-            
-            @Override public void visitASTNode(IASTNode node)
-            {
-                if (node != ast && node.getParent() == null)
-                    System.err.println("!"); // Set breakpoint here
-                
-                if (node == ast)
-                    Assert.assertNull(node.getParent());
-                else
-                    Assert.assertNotNull(node.getParent());
-                
-                Assert.assertEquals(expectedParent, node.getParent());
-                IASTNode myParent = expectedParent;
-                
-                expectedParent = node;
-                traverseChildren(node);
-                expectedParent = myParent;
-            }
-            
-            @Override public void visitToken(Token token)
-            {
-                if (token.getParent() == null)
-                    System.err.println("!"); // Set breakpoint here
-                
-                Assert.assertEquals(expectedParent, token.getParent());
-            }
-        });
-    }
-
-    public static abstract class ParserTestSuite extends PhotranTestSuiteFromFiles
-    {
-        public ParserTestSuite(String directorySuffix, boolean isFixedForm, boolean mustExist) throws FileNotFoundException, IOException
-        {
-            super("Parse", directorySuffix, isFixedForm, mustExist);
-        }
-
-        @Override
-        protected PhotranASTTestCase createTestFor(File file, boolean isFixedForm, String fileDescription)
-        {
-            return new ParserTestCase(file, isFixedForm, fileDescription);
-        }
-    }
-    
-    /**
-     * This is a special instance of {@link ParserTestSuite} which attempts to parse only files listed
-     * in a PHOTRAN-PARSER-ERRORS.txt file in the project's directory.
-     * 
-     * @author joverbey
-     */
-    public static abstract class FailingParserTestSuite extends ParserTestSuite
-    {
-        public FailingParserTestSuite(String directorySuffix, boolean isFixedForm, boolean mustExist) throws FileNotFoundException, IOException
-        {
-            super(directorySuffix, isFixedForm, mustExist);
-        }
-
-        @Override protected boolean shouldSkip(File file, Set<String> filenamesToSkip)
-        {
-            return !super.shouldSkip(file, filenamesToSkip);
-        }
-
-    }
-
-    /**
-     * A test case which runs the parser over a file, expecting a successful parse.
-     * Created by {@link ParserTestSuite}.
-     * 
-     * @author joverbey
-     */
-    public static final class ParserTestCase extends PhotranASTTestCase
-    {
-        public ParserTestCase(File file, boolean isFixedForm, String testCaseDescription)
-        {
-            super(file, isFixedForm, testCaseDescription);
-        }
-
-        @Override
-        protected void handleAST(ASTExecutableProgramNode ast)
-        {
-            checkCorrectParenting(ast);
-        }
-        
-        public ParserTestCase() { super(null, false, ""); } // to keep JUnit quiet
-    }
-
-    public static abstract class SourceReproductionTestSuite extends PhotranTestSuiteFromFiles
-    {
-        public SourceReproductionTestSuite(String directorySuffix, boolean isFixedForm, boolean mustExist) throws FileNotFoundException, IOException
-        {
-            super("Reproduce source code for", directorySuffix, isFixedForm, mustExist);
-        }
-
-        @Override
-        protected PhotranASTTestCase createTestFor(File file, boolean isFixedForm, String fileDescription)
-        {
-            return new SourceReproductionTestCase(file, isFixedForm, fileDescription);
-        }
-    }
-    
-    public static class SourceReproductionTestCase extends PhotranASTTestCase
-    {
-        public SourceReproductionTestCase(File file, boolean isFixedForm, String testCaseDescription)
-        {
-            super(file, isFixedForm, testCaseDescription);
-        }
-
-        @Override
-        protected void handleAST(ASTExecutableProgramNode ast) throws IOException
-        {
-            checkCorrectParenting(ast);
-            
-            String originalSourceCode = getSourceCodeFromFile(file).replaceAll("\r", "");
-            transform(ast);
-            String reproducedSourceCode = getSourceCodeFromAST(ast).replaceAll("\r", "");
-            assertEquals(originalSourceCode, reproducedSourceCode);
-        }
-
-        protected void transform(ASTExecutableProgramNode ast)
-        {
-            // Subclass and override to transform AST first
-        }
-
-        private String getSourceCodeFromFile(File file) throws IOException
-        {
-            StringBuffer sb = new StringBuffer(4096);
-            BufferedReader in = new BufferedReader(new FileReader(file));
-            for (int ch = in.read(); ch >= 0; ch = in.read())
-                sb.append((char)ch);
-            in.close();
-            return sb.toString();
-        }
-        
-        private String getSourceCodeFromAST(ASTExecutableProgramNode ast)
-        {
-            return SourcePrinter.getSourceCodeFromAST(ast);
-        }
-
-        public SourceReproductionTestCase() { super(null, false, ""); } // to keep JUnit quiet
-    }
-    
-    public static abstract class LoopReplacerSRTestSuite extends PhotranTestSuiteFromFiles
-    {
-        public LoopReplacerSRTestSuite(String directorySuffix, boolean isFixedForm, boolean mustExist) throws FileNotFoundException, IOException
-        {
-            super("Replace loops and reproduce source for", directorySuffix, isFixedForm, mustExist);
-        }
-
-        @Override
-        protected PhotranASTTestCase createTestFor(File file, boolean isFixedForm, String fileDescription)
-        {
-            return new LoopReplacerSRTestCase(file, isFixedForm, fileDescription);
-        }
-    }
-    
-    public static class LoopReplacerSRTestCase extends SourceReproductionTestCase
-    {
-        private long elapsedTime = 0L;
-        
-        public LoopReplacerSRTestCase(File file, boolean isFixedForm, String testCaseDescription)
-        {
-            super(file, isFixedForm, testCaseDescription);
-        }
-
-        @Override protected void transform(ASTExecutableProgramNode ast)
-        {
-            long start = System.currentTimeMillis();
-            
-            LoopReplacer.replaceAllLoopsIn(ast);
-            
-            elapsedTime = System.currentTimeMillis() - start;
-        }
-        
-        public void testPerformance()
-        {
-            assertTrue("Loop replacer must complete in less than 5 seconds ("
-                + (this.file == null ? "???" : this.file.getName())
-                + " took "
-                + ((elapsedTime/1000) + (elapsedTime%1000 > 500 ? 1 : 0))
-                + " seconds)",
-                elapsedTime < 5000);
-        }
-
-        public LoopReplacerSRTestCase() { super(null, false, ""); } // to keep JUnit quiet
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseArjanVanDijkAtmos.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseArjanVanDijkAtmos.java
deleted file mode 100644
index 703056a..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseArjanVanDijkAtmos.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-

-public class ParseArjanVanDijkAtmos

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("../../org.eclipse.photran-projects.confidential.arjan-van-dijk-atmos", false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseAsteroids.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseAsteroids.java
deleted file mode 100644
index 5dfb615..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseAsteroids.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-

-public class ParseAsteroids

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("../../org.eclipse.photran-projects.confidential.asteroids", false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseBrainerdFortran2003.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseBrainerdFortran2003.java
deleted file mode 100644
index ad09b06..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseBrainerdFortran2003.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-

-public class ParseBrainerdFortran2003

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("../../org.eclipse.photran-projects.confidential.walt-brainerd-fortran2003", false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseBrainerdTestSuiteFixed.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseBrainerdTestSuiteFixed.java
deleted file mode 100644
index 079061a..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseBrainerdTestSuiteFixed.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-

-public class ParseBrainerdTestSuiteFixed

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("../../org.eclipse.photran-projects.confidential.walt-brainerd-test-suite",

-            true, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseBrainerdTestSuiteFree.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseBrainerdTestSuiteFree.java
deleted file mode 100644
index 8652a57..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseBrainerdTestSuiteFree.java
+++ /dev/null

@@ -1,26 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-

-public class ParseBrainerdTestSuiteFree

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("../../org.eclipse.photran-projects.confidential.walt-brainerd-test-suite",

-            false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseCoarraySamples.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseCoarraySamples.java
deleted file mode 100644
index ed1f869..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseCoarraySamples.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-

-public class ParseCoarraySamples

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("../../org.eclipse.photran-projects.confidential.coarray-samples", false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseCollections.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseCollections.java
deleted file mode 100644
index f824153..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseCollections.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-

-public class ParseCollections

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("../../org.eclipse.photran-projects.collections", false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseFMLIB.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseFMLIB.java
deleted file mode 100644
index 3d25517..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseFMLIB.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-

-public class ParseFMLIB

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("../../org.eclipse.photran-projects.confidential.fmlib", false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseFilesFromTheWWW.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseFilesFromTheWWW.java
deleted file mode 100644
index 988b559..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseFilesFromTheWWW.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-

-public class ParseFilesFromTheWWW

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("../../org.eclipse.photran-projects.confidential.from-the-www", false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseFortran2003TestFiles.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseFortran2003TestFiles.java
deleted file mode 100644
index 51213ce..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseFortran2003TestFiles.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-

-public class ParseFortran2003TestFiles

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("fortran2003_tests", false, true) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseHugeFile.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseHugeFile.java
deleted file mode 100644
index ce6516e..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseHugeFile.java
+++ /dev/null

@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.parser;
-
-import junit.framework.TestCase;
-
-/**
- * These are meant to be used as performance tests.  When this one of the test methods in this class is run standalone with
- * JVM arguments such as
- * <pre>-Xmx512M -Xrunhprof:cpu=samples,depth=5,file=/Users/joverbey/Desktop/java.hprof.txt</pre>,
- * the profile can be used to find bottlenecks in the lexer or parser code.
- * 
- * @author Jeff Overbey
- */
-public class ParseHugeFile extends TestCase
-{
-//    private String hugeFile = null;
-    
-    public void test() { /* Uncomment below */ }
-    
-//    public void setUp()
-//    {
-//        long start = System.currentTimeMillis();
-//        StringBuilder sb = new StringBuilder();
-//        sb.append("program p\n");
-//        for (int i = 0; i < 30000; i++)
-//            sb.append("    print *, 3+4*5\n");
-//            //sb.append("    print *, \"----+----|----+----|----+----|----+----|----+----|----+----|----+----|----+----|\"\n");
-//        sb.append("end");
-//        hugeFile = sb.toString();
-//        System.out.println("String building: " + (System.currentTimeMillis() - start));
-//    }
-//
-//    public void testLexHugeFile() throws Exception
-//    {
-//        ByteArrayInputStream in = new ByteArrayInputStream(hugeFile.getBytes());
-//
-//        long start = System.currentTimeMillis();
-//        IAccumulatingLexer lexer = LexerFactory.createLexer(in, "<stdin>", SourceForm.preprocessedFreeForm(new IncludeLoaderCallback(null)), true);
-//        while (lexer.yylex().getTerminal() != Terminal.END_OF_INPUT)
-//            ;
-//        System.out.println("Lexing: " + (System.currentTimeMillis() - start));
-//    }
-//
-//    public void testParseHugeFile() throws Exception
-//    {
-//        ByteArrayInputStream in = new ByteArrayInputStream(hugeFile.getBytes());
-//
-//        long start = System.currentTimeMillis();
-//        IAccumulatingLexer lexer = LexerFactory.createLexer(in, "<stdin>", SourceForm.preprocessedFreeForm(new IncludeLoaderCallback(null)), true);
-//        new Parser().parse(lexer);
-//        System.out.println("Parsing: " + (System.currentTimeMillis() - start));
-//    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseIBEAMCppMod.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseIBEAMCppMod.java
deleted file mode 100644
index 358224a..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseIBEAMCppMod.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-

-public class ParseIBEAMCppMod

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("../../org.eclipse.photran-projects.confidential.ibeam-cpp-mod", false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseLAPACK.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseLAPACK.java
deleted file mode 100644
index 008abdf..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseLAPACK.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-

-public class ParseLAPACK

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("../../org.eclipse.photran-projects.confidential.lapack", true, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseNagleFortran2003.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseNagleFortran2003.java
deleted file mode 100644
index 3b7d199..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseNagleFortran2003.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-

-public class ParseNagleFortran2003

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("../../org.eclipse.photran-projects.confidential.nagle-fortran2003", false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParsePOP.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParsePOP.java
deleted file mode 100644
index 7fd2592..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParsePOP.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-

-public class ParsePOP

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("../../org.eclipse.photran-projects.confidential.pop", false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParsePhotranSamples.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParsePhotranSamples.java
deleted file mode 100644
index a6b21ab..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParsePhotranSamples.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-

-public class ParsePhotranSamples

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("../../org.eclipse.photran-samples", false, true) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseProjectCInterop.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseProjectCInterop.java
deleted file mode 100644
index faa5554..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseProjectCInterop.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-

-public class ParseProjectCInterop

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("../../org.eclipse.photran-projects.c-interop-demo", false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseProjectGTKHello.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseProjectGTKHello.java
deleted file mode 100644
index a9cd17c..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseProjectGTKHello.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-

-public class ParseProjectGTKHello

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("../../org.eclipse.photran-projects.gtk-hello-world", false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseProjectString.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseProjectString.java
deleted file mode 100644
index 3f0babd..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseProjectString.java
+++ /dev/null

@@ -1,24 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-public class ParseProjectString

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("../../org.eclipse.photran-projects.string", false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseRefactoringTestFiles.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseRefactoringTestFiles.java
deleted file mode 100644
index 362dd36..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseRefactoringTestFiles.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-

-public class ParseRefactoringTestFiles

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("refactoring_test_files", false, true) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseRegressionTestFiles.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseRegressionTestFiles.java
deleted file mode 100644
index 5ceb8ee..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseRegressionTestFiles.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-

-public class ParseRegressionTestFiles

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("reg_tests", false, true) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseWRF.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseWRF.java
deleted file mode 100644
index 419db45..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/ParseWRF.java
+++ /dev/null

@@ -1,25 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.parser;

-

-import java.io.FileNotFoundException;

-import java.io.IOException;

-

-import junit.framework.Test;

-

-

-public class ParseWRF

-{

-    public static Test suite() throws FileNotFoundException, IOException

-    {

-        return new MultiTestSuite("../../org.eclipse.photran-projects.confidential.wrf", false, false) {};

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/TestOpenMPComments.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/TestOpenMPComments.java
deleted file mode 100644
index a816d38..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/parser/TestOpenMPComments.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.parser;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.photran.internal.core.lexer.Token;
-import org.eclipse.photran.internal.core.lexer.sourceform.UnpreprocessedFixedSourceForm;
-import org.eclipse.photran.internal.core.lexer.sourceform.UnpreprocessedFreeSourceForm;
-import org.eclipse.photran.internal.core.parser.ASTExecutableProgramNode;
-import org.eclipse.photran.internal.core.parser.GenericASTVisitor;
-import org.eclipse.photran.internal.tests.PhotranTestCase;
-
-/**
- * Unit tests for {@link Token#getOpenMPComments()}.
- * 
- * @author Jeff Overbey
- */
-public class TestOpenMPComments extends PhotranTestCase
-{
-    public void testFreeFormOpenMPComments() throws Exception
-    {
-        ASTExecutableProgramNode ast = parse(//         1    1    2    2    3    3
-        //----5----0----5----0----5----0----5
-        "! This is a sample OpenMP program\n" + // Starts at offset 0
-        "program OpenMP\n" +                                    // 34
-        "    integer :: num_threads, id\n" +                    // 49
-        "    !$omp parallel private(num_threads, id) \n" +      // 80
-        "    id = omp_get_thread_num()\n" +
-        "    print *, 'This is thread ', id\n" +
-        "    if (id == 0) then\n" +
-        "      num_threads = omp_get_num_threads()\n" +
-        "      print *, 'Total threads: ', num_threads\n" +
-        "    end if\n" +
-        "    !$omp end parallel\n" +
-        "end program\n",
-            new UnpreprocessedFreeSourceForm());
-        //System.out.println(ast);
-        
-        List<Token> comments = OpenMPCommentVisitor.getOpenMPCommentsIn(ast);
-        
-        assertEquals(2, comments.size());
-        
-        Token directive = comments.get(0);
-        assertEquals(4, directive.getLine());
-        assertEquals(84, directive.getFileOffset());
-        assertEquals(84, directive.getStreamOffset());
-        assertEquals("!$omp parallel private(num_threads, id)".length(), directive.getLength());
-        assertEquals("!$omp ", directive.getWhiteBefore());
-        assertEquals("parallel private(num_threads, id)", directive.getText());
-        assertEquals(" \n", directive.getWhiteAfter());
-        
-        directive = comments.get(1);
-        assertEquals(11, directive.getLine());
-        assertEquals(315, directive.getFileOffset());
-        assertEquals("end parallel", directive.getText());
-    }
-    
-    public void testFixedFormOpenMPComments() throws Exception
-    {
-        ASTExecutableProgramNode ast = parse(//         1    1    2    2    3    3
-        //----5----0----5----0----5----0----5
-        "! This is a sample OpenMP program\n" + // Starts at offset 0
-        "       program OpenMP\n" +                             // 34
-        "       integer :: num_threads, id\n" +                 // 56
-        "c$omp  parallel private(num_threads, id)\n" +          // 90
-        "       id = omp_get_thread_num()\n" +
-        "       print *, 'This is thread ', id\n" +
-        "       if (id .eq. 0) then\n" +
-        "           num_threads = omp_get_num_threads()\n" +
-        "           print *, 'Total threads: ', num_threads\n" +
-        "       end if\n" +
-        "c$omp  end parallel\n" +
-        "       end program\n",
-            new UnpreprocessedFixedSourceForm());
-        //System.out.println(ast);
-        
-        List<Token> comments = OpenMPCommentVisitor.getOpenMPCommentsIn(ast);
-        
-        assertEquals(2, comments.size());
-        
-        Token directive = comments.get(0);
-        assertEquals(4, directive.getLine());
-        assertEquals(90, directive.getFileOffset());
-        assertEquals(90, directive.getStreamOffset());
-        assertEquals("c$omp  parallel private(num_threads, id)".length(), directive.getLength());
-        assertEquals("c$omp  ", directive.getWhiteBefore());
-        assertEquals("parallel private(num_threads, id)", directive.getText());
-        assertEquals("\n", directive.getWhiteAfter());
-        
-        directive = comments.get(1);
-        assertEquals(11, directive.getLine());
-        assertEquals(341, directive.getFileOffset());
-        assertEquals("end parallel", directive.getText());
-    }
-    
-    public static final class OpenMPCommentVisitor extends GenericASTVisitor
-    {
-        public static List<Token> getOpenMPCommentsIn(ASTExecutableProgramNode ast)
-        {
-            OpenMPCommentVisitor visitor = new OpenMPCommentVisitor();
-            ast.accept(visitor);
-            return visitor.ompComments;
-        }
-        
-        private List<Token> ompComments = new ArrayList<Token>();
-        
-        @Override
-        public void visitToken(Token token)
-        {
-            ompComments.addAll(token.getOpenMPComments());
-        }
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/patternmatching/TestIdentMatch.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/patternmatching/TestIdentMatch.java
deleted file mode 100644
index 7f3d952..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/patternmatching/TestIdentMatch.java
+++ /dev/null

@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.patternmatching;
-
-import junit.framework.TestCase;
-
-/**
- * 
- * @author joverbey
- */
-public class TestIdentMatch extends TestCase
-{
-    public void test() {}
-//    public void setUp()
-//    {
-//        ASTMatcher.patternVariableSuffix = "";
-//        ASTMatcher.doNotMatchTokenText = new HashSet<Terminal>();
-//        ASTMatcher.matchTokenTextCaseInsensitive = new HashSet<Terminal>();
-//        
-//        for (Field f : Terminal.class.getFields())
-//        {
-//            try
-//            {
-//                Terminal t = (Terminal)f.get(null);
-//                if (t == Terminal.T_EOS)
-//                    ASTMatcher.doNotMatchTokenText.add(t);
-//                else
-//                    ASTMatcher.matchTokenTextCaseInsensitive.add(t);
-//            }
-//            catch (IllegalArgumentException e) {}
-//            catch (IllegalAccessException e) {}
-//        }
-//    }
-//
-//    public void testUnification1() throws Exception
-//    {
-//        String pattern = "prOGram @a:T_IDENT\nend program @a:T_IDENT";
-//        String prog1 = "program  jeff  \n    ! Do stuff\n  end progRam jEFf\n";
-//        String prog2 = "program  jeff  \n    ! Do stuff\n  end program\n";
-//        ASTExecutableProgramNode patternAST = parse(pattern);
-//        //System.out.println(match(patternAST, parse(prog1)));
-//        //Match<ASTExecutableProgramNode> result = parse(prog1).match(patternAST);
-//        //System.err.println(result.errorMessage);
-//        assertEquals("  jeff", parse(prog1).match(patternAST).variables.get("@a:T_IDENT").toString());
-//        assertFalse(parse(prog2).match(patternAST).succeeded());
-//    }
-//
-//    public void testUnification2() throws Exception
-//    {
-//        String pattern = "@a:T_IDENT = 3\nend program";
-//        String prog1 = "program jeff\n  ! Do stuff\n  three = 3; eerht = 3\nend program\n";
-//        
-//        ASTAssignmentStmtNode patternAST = parse(pattern).findFirst(ASTAssignmentStmtNode.class);
-//        List<Match<ASTAssignmentStmtNode>> matches = new ASTMatcher(SearchStrategy.BOTTOM_UP).matchAll(patternAST, parse(prog1));
-//        //System.out.println(matches);
-//        assertEquals(2, matches.size());
-//    }
-//
-//    public void testUnification3() throws Exception
-//    {
-//        String pattern = "three = xxxx\nend program";
-//        String prog1 = "program jeff\n  ! Do stuff\n  three = 3; eerht = 3\nthree = three * three + three\nend program\n";
-//        
-//        Token patternAST = parse(pattern).findFirst(ASTAssignmentStmtNode.class).getLhsVariable().getName();
-//
-//        List<Match<Token>> matches = new ASTMatcher(SearchStrategy.TOP_DOWN_NO_NESTED_MATCHES).matchAll(patternAST, parse(prog1));
-//        assertEquals(5, matches.size());
-//
-//        matches = new ASTMatcher(SearchStrategy.BOTTOM_UP).matchAll(patternAST, parse(prog1));
-//        //assertEquals(7, matches.size());
-//
-//        matches = new ASTMatcher(SearchStrategy.TOP_DOWN).matchAll(patternAST, parse(prog1));
-//        //assertEquals(7, matches.size());
-//    }
-//
-//    public void testUnification4() throws Exception
-//    {
-//        String pattern = "xxxx = @var:T_IDENT + 0\nend program";
-//        String prog1 = "n = ((n * (2 + 0)) + 0) + 0; end program\n";
-//        
-//        ASTBinaryExprNode patternAST = (ASTBinaryExprNode)parse(pattern).findFirst(ASTAssignmentStmtNode.class).getRhs();
-//        ASTExecutableProgramNode progAST = parse(prog1);
-//        
-////        List<Match<IExpr>> iexprMatches = new ASTMatcher(SearchStrategy.BOTTOM_UP).matchAll(IExpr.class, patternAST, progAST);
-////        //System.out.println(iexprMatches);
-////        assertEquals(3, iexprMatches.size());
-//        
-//        List<Match<ASTBinaryExprNode>> matches = new ASTMatcher(SearchStrategy.BOTTOM_UP).matchAll(patternAST, progAST);
-//        //System.out.println(matches);
-//        assertEquals(3, matches.size());
-//        
-//        for (Match<ASTBinaryExprNode> match : matches)
-//            match.matchedNode.replaceWith(match.variables.get("@var:T_IDENT"));
-//        //System.out.println(progAST);
-//        assertEquals("n = ((n * (2))); end program", progAST.toString().trim());
-//
-//        progAST = parse(prog1);
-//        pattern = "xxxx = @var:T_IDENT\nend program";
-//        IExpr replacementAST = parse(pattern).findFirst(ASTAssignmentStmtNode.class).getRhs();
-//        new ASTMatcher(SearchStrategy.BOTTOM_UP).replaceAll(patternAST, replacementAST, progAST);
-//        //System.out.println(progAST);
-//        assertEquals("n =  ( (n * ( 2))); end program", progAST.toString().trim());
-//
-//        // FIXME: This causes an error because discardedSymbols don't have parents set
-//        //progAST = parse("a = a + a + (2 * b + b) + (b + b * c) + (d + d) - ((2*q+6) + (2*q+6); end");
-//        progAST = parse("a = a + a + (2 * b + b) + (b + b * c) + (d + d) - ((2*q+6) + (2*q+6)); end");
-//        pattern = "xxxx=@var:T_IDENT + @var:T_IDENT\nend program";
-//        IExpr patternnAST = parse(pattern).findFirst(ASTAssignmentStmtNode.class).getRhs();
-//        String replacement = "xxxx=(2*@var:T_IDENT)\nend program";
-//        replacementAST = parse(replacement).findFirst(ASTAssignmentStmtNode.class).getRhs();
-//        new ASTMatcher(SearchStrategy.BOTTOM_UP).replaceAll(patternnAST, replacementAST, progAST);
-//        //System.out.println(progAST);
-//        assertEquals("a =(2* a) + (2 * b + b) + (b + b * c) + ((2*d)) - ((2*(2*q+6))); end", progAST.toString().trim());
-//
-//        /*
-//        @SuppressWarnings("rawtypes")
-//        class ASTPatternListNode2<T> implements IASTListNode<T>
-//        {
-//            // IASTNode
-//            public void accept(IASTVisitor visitor) { throw new UnsupportedOperationException(); }
-//            public Object clone() { throw new UnsupportedOperationException(); }
-//            public Token findFirstToken() { throw new UnsupportedOperationException(); }
-//            public Token findLastToken() { throw new UnsupportedOperationException(); }
-//            public <T extends IASTNode> T findNearestAncestor(Class<T> targetClass) { throw new UnsupportedOperationException(); }
-//            public IASTNode getParent() { throw new UnsupportedOperationException(); }
-//            public boolean isFirstChildInList() { throw new UnsupportedOperationException(); }
-//            public Iterable<? extends IASTNode> getChildren() { throw new UnsupportedOperationException(); }
-//            //public void printOn(PrintStream out) { throw new UnsupportedOperationException(); }
-//            public IPreprocessorReplacement printOn(PrintStream out, IPreprocessorReplacement lastPreprocessorDirective) { throw new UnsupportedOperationException(); }
-//            public void replaceChild(IASTNode node, IASTNode withNode) { throw new UnsupportedOperationException(); }
-//            public void removeFromTree() { throw new UnsupportedOperationException(); }
-//            public void replaceWith(IASTNode newNode) { throw new UnsupportedOperationException(); }
-//            public void replaceWith(String literalString) { throw new UnsupportedOperationException(); }
-//            public void setParent(IASTNode parent) { throw new UnsupportedOperationException(); }
-//            // IASTListNode
-//            public void insertBefore(Object insertBefore, Object newElement) { throw new UnsupportedOperationException(); }
-//            public void insertAfter(Object insertAfter, Object newElement) { throw new UnsupportedOperationException(); }
-//            // List
-//            public void add(int index, Object element) { throw new UnsupportedOperationException(); }
-//            public boolean addAll(int index, java.util.Collection c) { throw new UnsupportedOperationException(); }
-//            public void clear() { throw new UnsupportedOperationException(); }
-//            public Object get(int index) { throw new UnsupportedOperationException(); }
-//            public int indexOf(Object o) { throw new UnsupportedOperationException(); }
-//            public boolean isEmpty() { throw new UnsupportedOperationException(); }
-//            public Iterator iterator() { throw new UnsupportedOperationException(); }
-//            public int lastIndexOf(Object o) { throw new UnsupportedOperationException(); }
-//            public ListIterator<Object> listIterator() { throw new UnsupportedOperationException(); }
-//            public ListIterator<Object> listIterator(int index) { throw new UnsupportedOperationException(); }
-//            public Object remove(int index) { throw new UnsupportedOperationException(); }
-//            public Object set(int index, Object element) { throw new UnsupportedOperationException(); }
-//            public int size() { throw new UnsupportedOperationException(); }
-//            public List<Object> subList(int fromIndex, int toIndex) { throw new UnsupportedOperationException(); }
-//            // Collection
-//            public boolean add(Object o) { throw new UnsupportedOperationException(); }
-//            public boolean addAll(java.util.Collection c) { throw new UnsupportedOperationException(); }
-//            public boolean contains(Object o) { throw new UnsupportedOperationException(); }
-//            public boolean containsAll(java.util.Collection c) { throw new UnsupportedOperationException(); }
-//            public boolean equals(Object o) { throw new UnsupportedOperationException(); }
-//            public boolean remove(Object o) { throw new UnsupportedOperationException(); }
-//            public boolean removeAll(java.util.Collection c) { throw new UnsupportedOperationException(); }
-//            public boolean retainAll(java.util.Collection c) { throw new UnsupportedOperationException(); }
-//            public Object[] toArray() { throw new UnsupportedOperationException(); }
-//            public Object[] toArray(Object[] a) { throw new UnsupportedOperationException(); }
-//        };
-//    */
-//    }
-//
-//    protected ASTExecutableProgramNode parse(String contents) throws IOException, LexerException, SyntaxException
-//    {
-//        return new Parser().parse(LexerFactory.createLexer(new ByteArrayInputStream(contents.getBytes()), null, "<stdin>", SourceForm.UNPREPROCESSED_FREE_FORM, true));
-//    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/AddIdentifierToEndTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/AddIdentifierToEndTestSuite.java
deleted file mode 100644
index d2d7205..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/AddIdentifierToEndTestSuite.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring;
-
-import junit.framework.Test;
-
-import org.eclipse.photran.internal.core.refactoring.AddIdentifierToEndRefactoring;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;
-
-/**
- * Unit tests for the Add Identifier to END refactoring.
- *
- * @author Matthew Fotzler
- */
-public class AddIdentifierToEndTestSuite
-     extends PhotranRefactoringTestSuiteFromMarkers<AddIdentifierToEndRefactoring>
-{
-    private static final String DIR = "refactoring-test-code/add-identifier-to-end";
-
-    public static Test suite() throws Exception
-    {
-        return new AddIdentifierToEndTestSuite();
-    }
-
-    public AddIdentifierToEndTestSuite() throws Exception
-    {
-        super(Activator.getDefault(),
-              "Running Add identifier to END refactoring in",
-              DIR,
-              AddIdentifierToEndRefactoring.class);
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/AddOnlyToUseTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/AddOnlyToUseTestSuite.java
deleted file mode 100644
index 24b9be3..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/AddOnlyToUseTestSuite.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

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

-import org.eclipse.jface.text.TextSelection;

-import org.eclipse.photran.internal.core.refactoring.AddOnlyToUseStmtRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Unit tests for the Add Only to Use refactoring.

- *

- * @author Jeff Overbey

- * @author Esfar Huq

- * @author Rui Wang - Modified to add support for marker based testing, documentation

- */

-

-public class AddOnlyToUseTestSuite

-     extends PhotranRefactoringTestSuiteFromMarkers<AddOnlyToUseStmtRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/add-only-to-use-stmt";

-

-    public static Test suite() throws Exception

-    {

-        return new AddOnlyToUseTestSuite();

-    }

-

-    public AddOnlyToUseTestSuite() throws Exception

-    {

-        super(Activator.getDefault(),

-              "Running Add only to use refactoring in",

-              DIR,

-              AddOnlyToUseStmtRefactoring.class);

-    }

-

-    /**

-     * Overridden method to allow marker to hold multiple file names

-     * 

-     * MARKER FORMAT: !<<<<< startLine, startCol, endLine, endCol,

-     *                       filename1, filname2, ..., result

-     * Note: result is either pass, fail-initial, or fail-final

-     */

-    

-    @Override

-    protected boolean initializeRefactoring(AddOnlyToUseStmtRefactoring refactoring,

-                                            IFile file,

-                                            TextSelection selection,

-                                            String[] markerText)

-    {

-        boolean result = super.initializeRefactoring(refactoring, file, selection, markerText);

-        

-        //loop to collect multiple files

-        for (int i = 4; i < markerText.length-1; i++)

-        {

-            String fileToAdd = markerText[i]; //file field(s) are just before result

-            if (!fileToAdd.equals(""))

-                refactoring.addToOnlyList(fileToAdd);

-        }

-        

-        return result;

-    }

-    

-    /**

-     * Method that prevents compilation of test files we know aren't supposed to compile

-     */

-    @Override protected boolean shouldCompile(IFile fileContainingMarker)

-    {

-        return !fileContainingMarker.getName().equalsIgnoreCase("test6.f90");

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/AddSubroutineParameterTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/AddSubroutineParameterTestSuite.java
deleted file mode 100644
index 2fabcf9..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/AddSubroutineParameterTestSuite.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 Joe Handzik, Joe Gonzales, Marc Celani, and Jason Patel.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    Joe Handzik, Joe Gonzales, Marc Celani, and Jason Patel - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

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

-import org.eclipse.jface.text.TextSelection;

-import org.eclipse.photran.internal.core.refactoring.AddSubroutineParameterRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Tests for the Add Subroutine Parameter refactoring.

- * 

- * @author Marc Celani, Joe Handzik, Joe Gonzalez, Jason Patel

- * @author Jeff Overbey - added {@link #shouldCompile(IFile)}

- */

-public class AddSubroutineParameterTestSuite extends

-    PhotranRefactoringTestSuiteFromMarkers<AddSubroutineParameterRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/add-subroutine-parameter";

-

-    public static Test suite() throws Exception

-    {

-        return new AddSubroutineParameterTestSuite();

-    }

-

-    public AddSubroutineParameterTestSuite() throws Exception

-    {

-        super(Activator.getDefault(), "Running Add Subroutine Parameter refactoring in", DIR,

-            AddSubroutineParameterRefactoring.class);

-    }

-

-    @Override

-    protected boolean configureRefactoring(AddSubroutineParameterRefactoring refactoring,

-        IFile file, TextSelection selection, String[] markerText)

-    {

-        boolean shouldSucceed = super

-            .configureRefactoring(refactoring, file, selection, markerText);

-        refactoring.setDeclaration(markerText[4].replaceAll(";", ","));

-        refactoring.setPosition(Integer.parseInt(markerText[5]));

-        if (!markerText[6].equals("_dont_call")) refactoring.setDefaultValue(markerText[6]);

-

-        return shouldSucceed;

-    }

-

-    @Override protected boolean shouldCompile(IFile fileContainingMarker)

-    {

-        return !fileContainingMarker.getName().equalsIgnoreCase("add_subroutine_parameter_11.f90");

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/DataToParameterTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/DataToParameterTestSuite.java
deleted file mode 100644
index 76ee689..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/DataToParameterTestSuite.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring;
-
-import junit.framework.Test;
-
-import org.eclipse.photran.internal.core.refactoring.DataToParameterRefactoring;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;
-
-/**
- * Unit tests for the Data to Parameter refactoring.
- *
- * @author Tim Yuvashev
- * @author Jeff Overbey
- */
-public class DataToParameterTestSuite extends PhotranRefactoringTestSuiteFromMarkers<DataToParameterRefactoring>
-{
-    private static final String DIR = "refactoring-test-code/data-to-parameter";
-
-    public static Test suite() throws Exception
-    {
-        return new DataToParameterTestSuite();
-    }
-
-    public DataToParameterTestSuite() throws Exception
-    {
-        super(Activator.getDefault(),
-              "Running Data to Parameter refactoring in",
-              DIR,
-              DataToParameterRefactoring.class);
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/EncapsulateVariableTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/EncapsulateVariableTestSuite.java
deleted file mode 100644
index e652ad3..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/EncapsulateVariableTestSuite.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

-import org.eclipse.photran.internal.core.refactoring.EncapsulateVariableRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Unit tests for the New Encapsulate Variable refactoring.

- *

- * @author Rui Wang

- * @author Esfar Huq - Modified to support marker based testing, documentation

- */

-public class EncapsulateVariableTestSuite extends PhotranRefactoringTestSuiteFromMarkers<EncapsulateVariableRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/encapsulate-variable";

-

-    public static Test suite() throws Exception

-    {

-        return new EncapsulateVariableTestSuite();

-    }

-

-    /**

-     * MARKER FORMAT: !<<<<< startLine, startCol, endLine, endCol, result

-     * 

-     * Note: result is either pass, fail-initial, or fail-final

-     */

-    public EncapsulateVariableTestSuite() throws Exception

-    {

-        super(Activator.getDefault(),

-              "Running Encapsulate variable refactoring in",

-              DIR,

-              EncapsulateVariableRefactoring.class);

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/ExtractLocalVariableTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/ExtractLocalVariableTestSuite.java
deleted file mode 100644
index cf5de93..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/ExtractLocalVariableTestSuite.java
+++ /dev/null

@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring;
-
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.photran.internal.core.refactoring.ExtractLocalVariableRefactoring;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;
-
-/**
- * Unit tests for the Extract Local Variable refactoring.
- *
- * @author Jeff Overbey
- */
-public class ExtractLocalVariableTestSuite
-     extends PhotranRefactoringTestSuiteFromMarkers<ExtractLocalVariableRefactoring>
-{
-    private static final String DIR = "refactoring-test-code/extract-local-variable";
-
-    public static Test suite() throws Exception
-    {
-        return new ExtractLocalVariableTestSuite();
-    }
-
-    public ExtractLocalVariableTestSuite() throws Exception
-    {
-        super(Activator.getDefault(),
-              "Running Extract Local Variable refactoring in",
-              DIR,
-              ExtractLocalVariableRefactoring.class);
-    }
-
-    @Override
-    protected boolean configureRefactoring(ExtractLocalVariableRefactoring refactoring,
-                                           IFile file,
-                                           TextSelection selection,
-                                           String[] markerText)
-    {
-        boolean shouldSucceed = super.configureRefactoring(refactoring, file, selection, markerText);
-
-        String newName = markerText[4];
-        refactoring.setDecl(newName);
-
-        return shouldSucceed;
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/FuseLoopsRefactoringTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/FuseLoopsRefactoringTestSuite.java
deleted file mode 100644
index a96621f..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/FuseLoopsRefactoringTestSuite.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

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

-import org.eclipse.photran.internal.core.refactoring.FuseLoopsRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Unit tests for the Fuse Loops refactoring.

- * 

- * @author Ashley Kasza

- */

-public class FuseLoopsRefactoringTestSuite extends PhotranRefactoringTestSuiteFromMarkers<FuseLoopsRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/fuse-loops";

-    

-    public static Test suite() throws Exception

-    {

-        return new FuseLoopsRefactoringTestSuite();

-    }

-    

-    public FuseLoopsRefactoringTestSuite() throws Exception

-    {

-        super(Activator.getDefault(),

-            "Running Loop Fusion refactoring in",

-            DIR,

-            FuseLoopsRefactoring.class);

-    }

-

-    /** Prevents the compilation and running of tests we know don't preserve behavior */

-    @Override protected boolean shouldCompile(IFile fileContainingMarker)

-    {

-       return false;

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/IfConstructStatementConversionRefactoringTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/IfConstructStatementConversionRefactoringTestSuite.java
deleted file mode 100644
index 6389807..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/IfConstructStatementConversionRefactoringTestSuite.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 Zeeshan Ansari, Mark Chen, Burim Isai, Waseem Sheikh, Mumtaz Vauhkonen.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Zeeshan Ansari

- *     Mark Chen

- *     Burim Isai

- *     Waseem Sheihk

- *     Mumtaz Vauhkonen

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

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

-import org.eclipse.jface.text.TextSelection;

-import org.eclipse.photran.internal.core.refactoring.IfConstructStatementConversionRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Unit tests for the IF Statement/Construct refactoring.

- * 

- * @author Zeeshan Ansari

- * @author Mark Chen

- * @author Mumtaz Vauhkonrn

- * @author Burim Isai

- * @author Waseem Sheikh

- * @author Jeff Overbey - added {@link #shouldCompile(IFile)}

- */

-public class IfConstructStatementConversionRefactoringTestSuite extends

-    PhotranRefactoringTestSuiteFromMarkers<IfConstructStatementConversionRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/if-construct-statement-conversion";

-

-    public static Test suite() throws Exception

-    {

-        return new IfConstructStatementConversionRefactoringTestSuite();

-    }

-

-    public IfConstructStatementConversionRefactoringTestSuite() throws Exception

-    {

-        super(Activator.getDefault(), "Running If Construct Statement Conversion refactoring in",

-            DIR, IfConstructStatementConversionRefactoring.class);

-    }

-

-    @Override

-    protected boolean configureRefactoring(IfConstructStatementConversionRefactoring refactoring,

-        IFile file, TextSelection selection, String[] markerText)

-    {

-        boolean shouldSucceed = super

-            .configureRefactoring(refactoring, file, selection, markerText);

-        String includeOptionalElse;

-        String testType;

-        testType = markerText[4];

-

-        if (testType.equals("IfStmtToIfConstruct"))

-        {

-            includeOptionalElse = markerText[5];

-            if (includeOptionalElse.equals("TRUE")) refactoring.setAddEmptyElseBlock();

-        }

-        

-        return shouldSucceed;

-    }

-

-    @Override protected boolean shouldCompile(IFile fileContainingMarker)

-    {

-        String name = fileContainingMarker.getName();

-        return

-            !name.equalsIgnoreCase("convert_ifConstruct.f90") &&

-            !name.equalsIgnoreCase("ifStmtComplexBoolean_2.f90");

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/InterchangeLoopsTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/InterchangeLoopsTestSuite.java
deleted file mode 100644
index 07ebe1f..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/InterchangeLoopsTestSuite.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

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

-import org.eclipse.photran.internal.core.refactoring.InterchangeLoopsRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Unit tests for the Interchange Loops refactoring.

- *

- * @author Jeff Overbey

- * @author Esfar Huq

- * @author Rui Wang - Modified to allow for marker based testing, documentation

- * 

- * NOTE: Refactoring of loops is incorrect at the moment**

- */

-public class InterchangeLoopsTestSuite

-     extends PhotranRefactoringTestSuiteFromMarkers<InterchangeLoopsRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/interchange-loops";

-

-    public static Test suite() throws Exception

-    {

-        return new InterchangeLoopsTestSuite();

-    }

-

-    /**

-     * MARKER FORMAT: !<<<<< startLine, startCol, endLine, endCol, result

-     * 

-     * Note: result is either pass, fail-initial, or fail-final

-     */

-    public InterchangeLoopsTestSuite() throws Exception

-    {

-        super(Activator.getDefault(),

-              "Running Interchange loop refactoring in",

-              DIR,

-              InterchangeLoopsRefactoring.class);

-    }

-

-    /**

-     * Method that prevents the compilation of any test we know don't compile

-     */

-    @Override protected boolean shouldCompile(IFile fileContainingMarker)

-    {

-       return false;

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/IntroImplicitTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/IntroImplicitTestSuite.java
deleted file mode 100644
index a65a11b..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/IntroImplicitTestSuite.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

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

-import org.eclipse.jface.text.TextSelection;

-import org.eclipse.photran.internal.core.refactoring.IntroImplicitNoneRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Unit tests for the Introduce Implicit None refactoring.

- *

- * @author Jeff Overbey

- * @author Esfar Huq 

- * @author Rui Wang - Modified to allow for marker based testing, documentation

- */

-

-public class IntroImplicitTestSuite

-     extends PhotranRefactoringTestSuiteFromMarkers<IntroImplicitNoneRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/intro-implicit-none";

-

-    public static Test suite() throws Exception

-    {

-        return new IntroImplicitTestSuite();

-    }

-

-    public IntroImplicitTestSuite() throws Exception

-    {

-        super(Activator.getDefault(),

-              "Running Intro implicit refactoring in",

-              DIR,

-              IntroImplicitNoneRefactoring.class);

-    }

-

-    /**

-     * Overridden method to simplify functionality

-     * 

-     * MARKER FORMAT: !<<<<< startLine, startCol, result

-     * 

-     * Note: result is either pass, fail-initial, or fail-final

-     */

-    

-    @Override

-    protected boolean configureRefactoring(IntroImplicitNoneRefactoring refactoring,

-                                           IFile file,

-                                           TextSelection selection,

-                                           String[] markerText)

-    {

-        return super.configureRefactoring(refactoring, file, selection, markerText);

-    }

-    

-    /**

-     * Method that prevents the compilation of any test we know don't compile

-     */

-    @Override protected boolean shouldCompile(IFile fileContainingMarker)

-    {

-       return !fileContainingMarker.getName().equalsIgnoreCase("implicit-subprog.f90");

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/KeywordCaseTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/KeywordCaseTestSuite.java
deleted file mode 100644
index 81f7dab..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/KeywordCaseTestSuite.java
+++ /dev/null

@@ -1,72 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

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

-import org.eclipse.jface.text.TextSelection;

-import org.eclipse.photran.internal.core.refactoring.KeywordCaseRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Unit tests for the Keyword Case refactoring.

- *

- * @author Jeff Overbey

- * @author Esfar Huq

- * @author Rui Wang - Modified to allow for marker based testing, documentation

- */

-

-public class KeywordCaseTestSuite

-     extends PhotranRefactoringTestSuiteFromMarkers<KeywordCaseRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/keyword-case";

-

-    public static Test suite() throws Exception

-    {

-        return new KeywordCaseTestSuite();

-    }

-

-    public KeywordCaseTestSuite() throws Exception

-    {

-        super(Activator.getDefault(),

-              "Running Keyword case refactoring in",

-              DIR,

-              KeywordCaseRefactoring.class);

-    }

-

-    /**

-     * Overridden method to allow refactoring to process the 'isLowerCase' field of the marker

-     * 

-     * MARKER FORMAT: !<<<<< startLine, startCol, endLine, endCol, isLower, result

-     * 

-     * Note: result is either pass, fail-initial, or fail-final

-     */

-    @Override

-    protected boolean configureRefactoring(KeywordCaseRefactoring refactoring,

-                                           IFile file,

-                                           TextSelection selection,

-                                           String[] markerText)

-    {

-        boolean shouldSucceed = super.configureRefactoring(refactoring, file, selection, markerText);

-        

-        //the fifth field of the marker (index 4) should hold current lowercase status

-        if(markerText[4].equals("false"))

-            refactoring.setLowerCase(false);

-        else

-            refactoring.setLowerCase(true);

-        

-        return shouldSucceed;

-    }

-    

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/MakeCommonConsistentTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/MakeCommonConsistentTestSuite.java
deleted file mode 100644
index 7df3c8c..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/MakeCommonConsistentTestSuite.java
+++ /dev/null

@@ -1,75 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

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

-import org.eclipse.jface.text.TextSelection;

-import org.eclipse.photran.internal.core.refactoring.CommonVarNamesRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Unit tests for the Common Variable Name refactoring.

- *

- * @author Jeff Overbey

- * @author Esfar Huq

- * @author Rui Wang - Modified to add support for marker based testing, documentation

- */

-

-public class MakeCommonConsistentTestSuite

-     extends PhotranRefactoringTestSuiteFromMarkers<CommonVarNamesRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/make-common-var-names-consistent";

-

-    public static Test suite() throws Exception

-    {

-        return new MakeCommonConsistentTestSuite();

-    }

-

-    public MakeCommonConsistentTestSuite() throws Exception

-    {

-        super(Activator.getDefault(),

-              "Running Common var names refactoring in",

-              DIR,

-              CommonVarNamesRefactoring.class);

-    }

-

-    /**

-     * Overridden method to allow marker to hold entity names

-     * 

-     * MARKER FORMAT: !<<<<< startLine, startCol, endLine, endCol, entityName1,

-     *                entityName2, ..., result

-     * 

-     * Note: result is either pass, fail-initial, or fail-final

-     */

-    @Override

-    protected boolean initializeRefactoring(CommonVarNamesRefactoring refactoring,

-                                            IFile file,

-                                            TextSelection selection,

-                                            String[] markerText)

-    {   

-        boolean result = super.initializeRefactoring(refactoring, file, selection, markerText);

-        

-        //loop to collect any entity fields from the marker text

-        for (int i = 4; i < markerText.length-1; i++)

-        {

-            String entityToAdd = markerText[i]; //entity field(s) are just before result

-            

-            if (!entityToAdd.equals(""))

-                refactoring.modifyNewName(i - 4, markerText[i]);

-        }

-        

-        return result;

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/MakePrivateEntityPublicTestCase.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/MakePrivateEntityPublicTestCase.java
deleted file mode 100644
index bbf1367..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/MakePrivateEntityPublicTestCase.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

-import org.eclipse.photran.internal.core.refactoring.MakePrivateEntityPublicRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Unit tests for the Private to Public refactoring.

- *

- * @author Jeff Overbey

- * @author Esfar Huq

- * @author Rui Wang - Modified to allow for marker based testing, documentation

- */

-

-public class MakePrivateEntityPublicTestCase

-     extends PhotranRefactoringTestSuiteFromMarkers<MakePrivateEntityPublicRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/make-private-entity-public";

-

-    public static Test suite() throws Exception

-    {

-        return new MakePrivateEntityPublicTestCase();

-    }

-

-    /**

-     * MARKER FORMAT: !<<<<< startLine, startCol, endLine, endCol, result

-     * 

-     * Note: result is of the form pass, fail-initial, or fail-final

-     */

-    public MakePrivateEntityPublicTestCase() throws Exception

-    {

-        super(Activator.getDefault(),

-              "Running Make private entity public refactoring in",

-              DIR,

-              MakePrivateEntityPublicRefactoring.class);

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/MakeSaveExplicitTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/MakeSaveExplicitTestSuite.java
deleted file mode 100644
index 9f09c37..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/MakeSaveExplicitTestSuite.java
+++ /dev/null

@@ -1,58 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 Stephen Downs, Robert Samblanet, Kevin Schilling, Jon 

- * Woolwine, and Chad Zamzow

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *      Stephen Downs, Robert Samblanet, Kevin Schilling, 

- *      Jon Woolwine, and Chad Zamzow

- *******************************************************************************/

-

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

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

-import org.eclipse.photran.internal.core.refactoring.MakeSaveExplicitRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Unit tests for the Make Save Explicit refactoring.

- *

- * @author Stephen Downs

- * @author Robert Samblanet

- * @author Kevin Schilling

- * @author Jon Woolwine

- * @author Chad Zamzow

- * @author Jeff Overbey - added {@link #shouldCompile(IFile)}

- */

-public class MakeSaveExplicitTestSuite

-     extends PhotranRefactoringTestSuiteFromMarkers<MakeSaveExplicitRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/make-save-explicit";

-

-    public static Test suite() throws Exception

-    {

-        return new MakeSaveExplicitTestSuite();

-    }

-

-    public MakeSaveExplicitTestSuite() throws Exception

-    {

-        super(Activator.getDefault(),

-              "Running Make Save Attribute Explicit refactoring in",

-              DIR,

-              MakeSaveExplicitRefactoring.class);

-    }

-

-    @Override protected boolean shouldCompile(IFile fileContainingMarker)

-    {

-        String name = fileContainingMarker.getName();

-        return

-            !name.equalsIgnoreCase("make_save_7_1.f90") &&

-            !name.equalsIgnoreCase("make_save_7_3.f90");

-    }

-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/MinOnlyListTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/MinOnlyListTestSuite.java
deleted file mode 100644
index a939360..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/MinOnlyListTestSuite.java
+++ /dev/null

@@ -1,49 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

-import org.eclipse.photran.internal.core.refactoring.MinOnlyListRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Unit tests for the Min Only List refactoring.

- *

- * @author Jeff Overbey

- * @author Esfar Huq

- * @author Rui Wang - Modified to allow for marker based filtering, documentation

- */

-public class MinOnlyListTestSuite

-     extends PhotranRefactoringTestSuiteFromMarkers<MinOnlyListRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/min-only-list";

-

-    public static Test suite() throws Exception

-    {

-        return new MinOnlyListTestSuite();

-    }

-

-    /**

-     * MARKER FORMAT: !<<<<< startLine, startCol, endLine, endCol, result

-     * 

-     * Note: result is either pass, fail-initial, or fail-final

-     */

-    public MinOnlyListTestSuite() throws Exception

-    {

-        super(Activator.getDefault(),

-              "Running Min only list refactoring in",

-              DIR,

-              MinOnlyListRefactoring.class);

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/MoveSavedToCommonBlockTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/MoveSavedToCommonBlockTestSuite.java
deleted file mode 100644
index 1241a04..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/MoveSavedToCommonBlockTestSuite.java
+++ /dev/null

@@ -1,61 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

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

-import org.eclipse.photran.internal.core.refactoring.MoveSavedToCommonBlockRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Unit tests for the Moved Saved to Common Block refactoring.

- *

- * @author Jeff Overbey

- * @author Esfar Huq

- * @author Rui Wang - Modified to add support for marker based testing, documentation

- */

-public class MoveSavedToCommonBlockTestSuite

-     extends PhotranRefactoringTestSuiteFromMarkers<MoveSavedToCommonBlockRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/move-saved-to-common-block";

-

-    public static Test suite() throws Exception

-    {

-        return new MoveSavedToCommonBlockTestSuite();

-    }

-

-    /**

-     * Overridden method

-     * 

-     * MARKER FORMAT: !<<<<< startLine, startCol, result

-     * 

-     * Note: result is either pass, fail-initial, or fail-final

-     */

-    public MoveSavedToCommonBlockTestSuite() throws Exception

-    {

-        super(Activator.getDefault(),

-              "Running Move saved to common block refactoring in",

-              DIR,

-              MoveSavedToCommonBlockRefactoring.class);

-    }

-    

-    /**

-     * Method that prevents the compilation of tests that we know don't compile

-     */

-    @Override protected boolean shouldCompile(IFile fileContainingMarker)

-    {

-        //don't compile the second test case

-        return !fileContainingMarker.getName().equalsIgnoreCase("test2.f90");

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/PermuteSubroutineArgsTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/PermuteSubroutineArgsTestSuite.java
deleted file mode 100644
index 0584e11..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/PermuteSubroutineArgsTestSuite.java
+++ /dev/null

@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Matthew Fotzler, UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.photran.internal.core.refactoring.PermuteSubroutineArgsRefactoring;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;
-
-/**
- * Test suite for the change subroutine signature refactoring.
- * 
- * @author Matthew Fotzler
- */
-public class PermuteSubroutineArgsTestSuite extends PhotranRefactoringTestSuiteFromMarkers<PermuteSubroutineArgsRefactoring>
-{
-    private static final String DIR = "refactoring-test-code/permute-subroutine-args";
-
-    public PermuteSubroutineArgsTestSuite() throws Exception
-    {
-        super(Activator.getDefault(),
-              "Running Permute Subroutine Arguments refactoring in",
-              DIR,
-              PermuteSubroutineArgsRefactoring.class);
-    }
-
-    public static Test suite() throws Exception
-    {
-        return new PermuteSubroutineArgsTestSuite();
-    }
-    
-    // Marker format is !<<<<< startRow,startCol,endRow,endCol,[sigma],pass/fail-initial/fail-final
-    // where sigma is the desired permutation of the subroutine arguments given by the selection
-    @Override
-    protected boolean initializeRefactoring(PermuteSubroutineArgsRefactoring refactoring,
-                                            IFile file,
-                                            TextSelection selection,
-                                            String[] markerText)
-    {
-        boolean result = super.initializeRefactoring(refactoring, file, selection, markerText);
-        List<Integer> sigma = new ArrayList<Integer>();
-
-        for (int i = 4; i < markerText.length-1; i++)
-        {
-            String nextElement = markerText[i];
-            
-            sigma.add(Integer.parseInt(nextElement));
-        }
-        
-        refactoring.setSigma(sigma);
-        
-        return result;
-    }
-
-    /** Prevents the compilation of tests we know don't compile */
-    @Override protected boolean shouldCompile(IFile fileContainingMarker)
-    {
-       return false;
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveArithmeticIfTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveArithmeticIfTestSuite.java
deleted file mode 100644
index cfe1ee4..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveArithmeticIfTestSuite.java
+++ /dev/null

@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring;
-
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.photran.internal.core.refactoring.RemoveArithmeticIfRefactoring;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;
-
-/**
- * Unit tests for the Remove Arithmetic If Statement refactoring.
- *
- * @author Matthew Fotzler
- * @author Jeff Overbey - added {@link #shouldCompile(IFile)}
- */
-public class RemoveArithmeticIfTestSuite
-     extends PhotranRefactoringTestSuiteFromMarkers<RemoveArithmeticIfRefactoring>
-{
-    private static final String DIR = "refactoring-test-code/remove-arithmetic-if-stmt";
-
-    public static Test suite() throws Exception
-    {
-        return new RemoveArithmeticIfTestSuite();
-    }
-
-    public RemoveArithmeticIfTestSuite() throws Exception
-    {
-        super(Activator.getDefault(),
-              "Running Remove Arithmetic If Statements Refactoring in",
-              DIR,
-              RemoveArithmeticIfRefactoring.class);
-    }
-
-    @Override protected boolean shouldCompile(IFile fileContainingMarker)
-    {
-        return !fileContainingMarker.getName().equalsIgnoreCase("bug335794.f90");
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveAssignedGotoTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveAssignedGotoTestSuite.java
deleted file mode 100644
index f63a7c9..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveAssignedGotoTestSuite.java
+++ /dev/null

@@ -1,85 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 Andrea Dranberg, John Hammonds, Rajashekhar Arasanal, 

- * Balaji Ambresh Rajkumar and Paramvir Singh.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * Andrea Dranberg, John Hammonds, Rajashekhar Arasanal, Balaji Ambresh Rajkumar

- * and Paramvir Singh - Initial API and implementation

- * 

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

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

-import org.eclipse.jface.text.TextSelection;

-import org.eclipse.photran.internal.core.refactoring.RemoveAssignedGotoRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Unit tests for the Remove Assigned Goto refactoring.

- *

- * @author Andrea Dranberg

- * @author John Hammonds

- * @author Rajashekhar Arasanal

- * @author Balaji Ambresh Rajkumar

- * @author Paramvir Singh

- * @author Jeff Overbey - updated {@link #shouldCompile(IFile)}

- */

-public class RemoveAssignedGotoTestSuite

-     extends PhotranRefactoringTestSuiteFromMarkers<RemoveAssignedGotoRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/remove-assign-gotos";

-

-    public static Test suite() throws Exception

-    {

-        return new RemoveAssignedGotoTestSuite();

-    }

-

-    public RemoveAssignedGotoTestSuite() throws Exception

-    {

-        super(Activator.getDefault(),

-              "Running Remove Assigned Goto refactoring in",

-              DIR,

-              RemoveAssignedGotoRefactoring.class);

-    }

-

-    /**

-     * Overridden method to allow refactoring to process the 'isDefaultCaseRequired' 

-     * field of the marker.

-     * 

-     * MARKER FORMAT: !<<<<< startLine, startCol, endLine, endCol, isDefaultCaseRequired, result

-     * 

-     * Note: result is either pass, fail-initial, or fail-final

-     */

-    @Override

-    protected boolean configureRefactoring(RemoveAssignedGotoRefactoring refactoring,

-                                           IFile file,

-                                           TextSelection selection,

-                                           String[] markerText)

-    {

-        boolean shouldSucceed = super.configureRefactoring(refactoring, file, selection, markerText);

-        refactoring.setDefaultSelected(Boolean.parseBoolean(markerText[4]));

-        

-        return shouldSucceed;

-    }

-    

-    /**

-     * Method that prevents compilation of test files we know aren't supposed to compile or run

-     */

-    @Override protected boolean shouldCompile(IFile fileContainingMarker)

-    {

-        String name = fileContainingMarker.getName();

-        return

-            !name.equalsIgnoreCase("one_label_no_goto_no_address.f90") &&

-            !name.equalsIgnoreCase("integer_label_assign_and_assignment.f90") &&

-            !name.equalsIgnoreCase("use_label_in_write.f90") &&

-            !name.equalsIgnoreCase("two_assign_same_label_withgotos.f90") &&

-            !name.equalsIgnoreCase("one_goto_with_statement_label.f90");

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveAssignedGotoWhiteBoxTestCase.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveAssignedGotoWhiteBoxTestCase.java
deleted file mode 100644
index 49117d8..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveAssignedGotoWhiteBoxTestCase.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 Andrea Dranberg, John Hammonds, Rajashekhar Arasanal, 

- * Balaji Ambresh Rajkumar and Paramvir Singh.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- * Andrea Dranberg, John Hammonds, Rajashekhar Arasanal, Balaji Ambresh Rajkumar

- * and Paramvir Singh - Initial API and implementation

- * 

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.refactoring;

-

-import java.util.Collections;

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

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

-import org.eclipse.jface.text.ITextSelection;

-import org.eclipse.photran.internal.core.refactoring.RemoveAssignedGotoRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranWorkspaceTestCase;

-

-/** 

- * White-box test cases for the remove assigned goto refactoring.

- * @author Andrea Dranberg

- * @author John Hammonds

- * @author Rajashekhar Arasanal

- * @author Balaji Ambresh Rajkumar

- * @author Paramvir Singh

- */

-public class RemoveAssignedGotoWhiteBoxTestCase extends PhotranWorkspaceTestCase

-{

-    private static final String DIR = "refactoring-test-code/remove-assign-gotos-white-box";

-

-    private static NullProgressMonitor pm = new NullProgressMonitor();

-

-    protected ITextSelection selectionToExtract = null;

-

-    public RemoveAssignedGotoWhiteBoxTestCase()

-    {

-        this.setName("test");

-    }

-

-    /**

-     * Test case to check if the tool collects correct number of ASSIGN

-     * and assigned GOTOs from the input file one_label_no_goto.f90.

-     */

-    public void test() throws Exception

-    {

-        IFile thisFile = importFile(Activator.getDefault(), DIR, "one_label_no_goto.f90");

-        RemoveAssignedGotoRefactoring tool = new RemoveAssignedGotoRefactoring();

-        tool.initialize(Collections.singletonList(thisFile));

-        tool.checkInitialConditions(pm);

-        RemoveAssignedGotoRefactoring.FileInfo data =

-            RemoveAssignedGotoRefactoring.FileInfoFactory.getInstance(thisFile, tool.getVpg());

-        assertTrue(data.getAssignedGotoStmtList().size() == 0);

-        assertTrue(data.getAssignedStmtList().size() == 1);

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveBranchToEndIfTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveBranchToEndIfTestSuite.java
deleted file mode 100644
index 5915b28..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveBranchToEndIfTestSuite.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Rita Chow, Nicola Hall, Jerry Hsiao, Mark Mozolewski, Chamil Wijenayaka
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Rita Chow - Initial Implementation
- *    Nicola Hall - Initial Implementation
- *    Jerry Hsiao - Initial Implementation
- *    Mark Mozolewski - Initial Implementation
- *    Chamil Wijenayaka - Initial Implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring;
-
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.photran.internal.core.refactoring.RemoveBranchToEndIfRefactoring;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;
-
-/**
- * Unit tests for the Remove Branch To End If Refactoring.
- * 
- * @author Rita Chow (chow15), Jerry Hsiao (jhsiao2), Mark Mozolewski (mozolews), Chamil Wijenayaka
- *         (wijenay2), Nicola Hall (nfhall2)
- * @author Jeff Overbey - added {@link #shouldCompile(IFile)}
- */
-public class RemoveBranchToEndIfTestSuite extends
-    PhotranRefactoringTestSuiteFromMarkers<RemoveBranchToEndIfRefactoring>
-{
-    private static final String DIR = "refactoring-test-code/remove-branch-to-end-if";
-
-    public static Test suite() throws Exception
-    {
-        return new RemoveBranchToEndIfTestSuite();
-    }
-
-    public RemoveBranchToEndIfTestSuite() throws Exception
-    {
-        super(Activator.getDefault(), "Running Remove Branch To End If Refactoring in", DIR,
-            RemoveBranchToEndIfRefactoring.class);
-    }
-
-    @Override protected boolean shouldCompile(IFile fileContainingMarker)
-    {
-        String name = fileContainingMarker.getName();
-        return
-            !name.equalsIgnoreCase("branch_from_inside_and_outside_if_block_no_do_loop.f90") &&
-            !name.equalsIgnoreCase("nested_if_block_basic.f90") &&
-            !name.equalsIgnoreCase("test-branch_end_if_label.f90") &&
-            !name.equalsIgnoreCase("test-end_if_label_between_branch_to_end_if.f90");
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveComputedGoToTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveComputedGoToTestSuite.java
deleted file mode 100644
index ea96ab7..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveComputedGoToTestSuite.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

-import org.eclipse.photran.internal.core.refactoring.RemoveComputedGoToRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Unit tests for the Remove computedGoto refactoring.

- *

- * @author Rui Wang

- */

-public class RemoveComputedGoToTestSuite extends PhotranRefactoringTestSuiteFromMarkers<RemoveComputedGoToRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/remove-computed-goto";

-

-    public static Test suite() throws Exception

-    {

-        return new RemoveComputedGoToTestSuite();

-    }

-

-    /**

-     * MARKER FORMAT: !<<<<< startLine, startCol, endLine, endCol, result

-     * 

-     * Note: result is either pass, fail-initial, or fail-final

-     */

-    public RemoveComputedGoToTestSuite() throws Exception

-    {

-        super(Activator.getDefault(),

-              "Running Remove computed goto refactoring in",

-              DIR,

-              RemoveComputedGoToRefactoring.class);

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemovePauseStmtTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemovePauseStmtTestSuite.java
deleted file mode 100644
index 00f11d1..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemovePauseStmtTestSuite.java
+++ /dev/null

@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Rita Chow, Nicola Hall, Jerry Hsiao, Mark Mozolewski, Chamil Wijenayaka
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Rita Chow - Initial Implementation
- *    Nicola Hall - Initial Implementation
- *    Jerry Hsiao - Initial Implementation
- *    Mark Mozolewski - Initial Implementation
- *    Chamil Wijenayaka - Initial Implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring;
-
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.photran.internal.core.refactoring.RemovePauseStmtRefactoring;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;
-
-/**
- * Unit tests for the Remove Pause Statement Refactoring.
- * 
- * @author Rita Chow (chow15), Jerry Hsiao (jhsiao2), Mark Mozolewski (mozolews), Chamil Wijenayaka
- *         (wijenay2), Nicola Hall (nfhall2)
- * @author Jeff Overbey - added {@link #shouldCompile(IFile)}
- */
-public class RemovePauseStmtTestSuite extends
-    PhotranRefactoringTestSuiteFromMarkers<RemovePauseStmtRefactoring>
-{
-    private static final String DIR = "refactoring-test-code/remove-pause-stmt";
-
-    public static Test suite() throws Exception
-    {
-        return new RemovePauseStmtTestSuite();
-    }
-
-    public RemovePauseStmtTestSuite() throws Exception
-    {
-        super(Activator.getDefault(), "Running Remove Pause Stmt Refactoring in", DIR,
-            RemovePauseStmtRefactoring.class);
-    }
-
-    @Override protected boolean shouldCompile(IFile fileContainingMarker)
-    {
-        return false;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveRealAndDoublePrecisionLoopCountersTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveRealAndDoublePrecisionLoopCountersTestSuite.java
deleted file mode 100644
index 42654f3..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveRealAndDoublePrecisionLoopCountersTestSuite.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 Rita Chow, Nicola Hall, Jerry Hsiao, Mark Mozolewski, Chamil Wijenayaka
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Rita Chow - Initial Implementation
- *    Nicola Hall - Initial Implementation
- *    Jerry Hsiao - Initial Implementation
- *    Mark Mozolewski - Initial Implementation
- *    Chamil Wijenayaka - Initial Implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring;
-
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.photran.internal.core.refactoring.RemoveRealAndDoublePrecisionLoopCountersRefactoring;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;
-
-/**
- * Unit tests for the Remove Branch To End If Refactoring.
- * 
- * @author Rita Chow (chow15), Jerry Hsiao (jhsiao2), Mark Mozolewski (mozolews), Chamil Wijenayaka
- *         (wijenay2), Nicola Hall (nfhall2)
- */
-public class RemoveRealAndDoublePrecisionLoopCountersTestSuite extends
-    PhotranRefactoringTestSuiteFromMarkers<RemoveRealAndDoublePrecisionLoopCountersRefactoring>
-{
-    private static final String DIR = "refactoring-test-code/remove-real-and-double-precision-loop-counters";
-
-    public static Test suite() throws Exception
-    {
-        return new RemoveRealAndDoublePrecisionLoopCountersTestSuite();
-    }
-
-    public RemoveRealAndDoublePrecisionLoopCountersTestSuite() throws Exception
-    {
-        super(Activator.getDefault(),
-            "Running Remove Real and Double Precision Loop Counters Refactoring in", DIR,
-            RemoveRealAndDoublePrecisionLoopCountersRefactoring.class);
-    }
-
-    @Override
-    protected boolean configureRefactoring(
-        RemoveRealAndDoublePrecisionLoopCountersRefactoring refactoring, IFile file,
-        TextSelection selection, String[] markerText)
-    {
-        boolean shouldSucceed = super
-            .configureRefactoring(refactoring, file, selection, markerText);
-
-        boolean shouldReplaceWithDoWhileLoop;
-        if (markerText[4].equals("1"))
-            shouldReplaceWithDoWhileLoop = true;
-        else
-            shouldReplaceWithDoWhileLoop = false;
-        refactoring.setShouldReplaceWithDoWhileLoop(shouldReplaceWithDoWhileLoop);
-
-        return shouldSucceed;
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveUnreferencedLabelsTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveUnreferencedLabelsTestSuite.java
deleted file mode 100644
index f81ba8f..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveUnreferencedLabelsTestSuite.java
+++ /dev/null

@@ -1,45 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Esfar Huq, UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-import org.eclipse.photran.internal.core.refactoring.RemoveUnreferencedLabelsRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Unit tests for the Remove Unreferenced Label refactoring.

- *

- * @author Mariano Mendez (Fortran)

- * @author Esfar Huq (Java)

- */

-public class RemoveUnreferencedLabelsTestSuite extends PhotranRefactoringTestSuiteFromMarkers<RemoveUnreferencedLabelsRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/remove-unreferenced-labels";

-

-    public static Test suite() throws Exception

-    {

-        return new RemoveUnreferencedLabelsTestSuite();

-    }

-

-    /**

-     * MARKER FORMAT: !<<<<< startLine, startCol, endLine, endCol, result

-     * 

-     * Note: result is either pass, fail-initial, or fail-final

-     */

-    public RemoveUnreferencedLabelsTestSuite() throws Exception

-    {

-        super(Activator.getDefault(),

-              "Running Remove unreferenced label refactoring in",

-              DIR,

-              RemoveUnreferencedLabelsRefactoring.class);

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveUnusedTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveUnusedTestSuite.java
deleted file mode 100644
index 96cbcf0..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/RemoveUnusedTestSuite.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring;
-
-import junit.framework.Test;
-
-import org.eclipse.photran.internal.core.refactoring.RemoveUnusedVariablesRefactoring;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;
-
-/**
- * Unit tests for the Remove Unused Local Variables refactoring.
- *
- * @author Tim Yuvashev
- * @author Jeff Overbey
- */
-public class RemoveUnusedTestSuite extends PhotranRefactoringTestSuiteFromMarkers<RemoveUnusedVariablesRefactoring>
-{
-    private static final String DIR = "refactoring-test-code/remove-unused-local-vars";
-
-    public static Test suite() throws Exception
-    {
-        return new RemoveUnusedTestSuite();
-    }
-
-    public RemoveUnusedTestSuite() throws Exception
-    {
-        super(Activator.getDefault(),
-              "Running Remove Unused Variables refactoring in",
-              DIR,
-              RemoveUnusedVariablesRefactoring.class);
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/ReplaceCharacterStarTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/ReplaceCharacterStarTestSuite.java
deleted file mode 100644
index 0472429..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/ReplaceCharacterStarTestSuite.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Esfar Huq, UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

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

-import org.eclipse.photran.internal.core.refactoring.ReplaceCharacterStarRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Unit tests for the Replace Character* with Character(len=) refactoring.

- *

- * @author Mariano Mendez (Fortran)

- * @author Esfar Huq (Java)

- */

-public class ReplaceCharacterStarTestSuite extends PhotranRefactoringTestSuiteFromMarkers<ReplaceCharacterStarRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/replace-character-star";

-

-    public static Test suite() throws Exception

-    {

-        return new ReplaceCharacterStarTestSuite();

-    }

-

-    /**

-     * MARKER FORMAT: !<<<<< startLine, startCol, endLine, endCol, result

-     * 

-     * Note: result is either pass, fail-initial, or fail-final

-     */

-    public ReplaceCharacterStarTestSuite() throws Exception

-    {

-        super(Activator.getDefault(),

-              "Running Replace CHARACTER* refactoring in",

-              DIR,

-              ReplaceCharacterStarRefactoring.class);

-    }

-

-    /**

-     * Prevents compilation of any tests we know don't compile

-     */

-    @Override protected boolean shouldCompile(IFile fileContainingMarker)

-    {

-       return false;

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/ReplaceOldStyleDoLoopTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/ReplaceOldStyleDoLoopTestSuite.java
deleted file mode 100644
index cc929c0..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/ReplaceOldStyleDoLoopTestSuite.java
+++ /dev/null

@@ -1,60 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     Esfar Huq, UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

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

-import org.eclipse.photran.internal.core.refactoring.ReplaceOldStyleDoLoopRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Unit tests for the Replace Old Style Do Loop refactoring.

- *

- * @author Esfar Huq

- */

-public class ReplaceOldStyleDoLoopTestSuite

-     extends PhotranRefactoringTestSuiteFromMarkers<ReplaceOldStyleDoLoopRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/replace-old-style-do-loop";

-

-    public static Test suite() throws Exception

-    {

-        return new ReplaceOldStyleDoLoopTestSuite();

-    }

-

-    /**

-     * Overridden method

-     * 

-     * MARKER FORMAT: !<<<<< startLine, startCol, endLine, endCol, result

-     * 

-     * Note: result is either pass, fail-initial, or fail-final

-     */

-    public ReplaceOldStyleDoLoopTestSuite() throws Exception

-    {

-        super(Activator.getDefault(),

-              "Running Replace old style do loop refactoring in",

-              DIR,

-              ReplaceOldStyleDoLoopRefactoring.class);

-    }

-

-    /**

-     * Prevents compilation of any tests we know don't compile

-     */

-    @Override protected boolean shouldCompile(IFile fileContainingMarker)

-    {

-       if (fileContainingMarker.getName().contains("test5"))

-           return false; // Test 5 does not compile, so don't try

-       else

-           return true; // All others do

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/ReverseLoopRefactoringTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/ReverseLoopRefactoringTestSuite.java
deleted file mode 100644
index 5fd779b..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/ReverseLoopRefactoringTestSuite.java
+++ /dev/null

@@ -1,47 +0,0 @@
-/*******************************************************************************

-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

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

-import org.eclipse.photran.internal.core.refactoring.ReverseLoopRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Unit tests for the Reverse Loop refactoring.

- *

- * @author Ashley Kasza

- */

-public class ReverseLoopRefactoringTestSuite extends PhotranRefactoringTestSuiteFromMarkers<ReverseLoopRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/reverse-loop";

-

-    public static Test suite() throws Exception

-    {

-        return new ReverseLoopRefactoringTestSuite();

-    }

-

-    public ReverseLoopRefactoringTestSuite() throws Exception

-    {

-        super(Activator.getDefault(),

-              "Running Reverse Loop refactoring in",

-              DIR,

-              ReverseLoopRefactoring.class);

-    }

-

-    @Override protected boolean shouldCompile(IFile fileContainingMarker)

-    {

-       return false;

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/SafeDeleteInternalSubprogramRefactoringTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/SafeDeleteInternalSubprogramRefactoringTestSuite.java
deleted file mode 100644
index b179ae9..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/SafeDeleteInternalSubprogramRefactoringTestSuite.java
+++ /dev/null

@@ -1,41 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

-import org.eclipse.photran.internal.core.refactoring.SafeDeleteInternalSubprogramRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Unit tests for the Safe Delete Internal Subprogram refactoring.

- * 

- * @author Abhishek Sharma

- */

-public class SafeDeleteInternalSubprogramRefactoringTestSuite

-    extends PhotranRefactoringTestSuiteFromMarkers<SafeDeleteInternalSubprogramRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/Safe-Delete-Internal-Subprogram" ;

-

-    public static Test suite()throws Exception

-    {

-        return new SafeDeleteInternalSubprogramRefactoringTestSuite() ;

-    }

-

-    protected SafeDeleteInternalSubprogramRefactoringTestSuite() throws Exception

-    {

-        super(Activator.getDefault(),

-              "Running Safe-Delete Internal Subprogram test in",

-              DIR,

-              SafeDeleteInternalSubprogramRefactoring.class);

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/StandardizeStmtsTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/StandardizeStmtsTestSuite.java
deleted file mode 100644
index f230531..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/StandardizeStmtsTestSuite.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring;
-
-import junit.framework.Test;
-
-import org.eclipse.photran.internal.core.refactoring.StandardizeStatementsRefactoring;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;
-
-/**
- * Unit tests for the Standardize Statements refactoring.
- *
- * @author Tim Yuvashev
- * @author Jeff Overbey
- */
-public class StandardizeStmtsTestSuite
-     extends PhotranRefactoringTestSuiteFromMarkers<StandardizeStatementsRefactoring>
-{
-    private static final String DIR = "refactoring-test-code/standardize-stmts";
-
-    public static Test suite() throws Exception
-    {
-        return new StandardizeStmtsTestSuite();
-    }
-
-    public StandardizeStmtsTestSuite() throws Exception
-    {
-        super(Activator.getDefault(),
-              "Running Standardize Statements refactoring in",
-              DIR,
-              StandardizeStatementsRefactoring.class);
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/TileLoopRefactoringTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/TileLoopRefactoringTestSuite.java
deleted file mode 100644
index c1a6f75..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/TileLoopRefactoringTestSuite.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

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

-import org.eclipse.jface.text.TextSelection;

-import org.eclipse.photran.internal.core.refactoring.TileLoopRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- *  Test suite for loop tiling refactoring

- * @author Ashley Kasza

- */

-public class TileLoopRefactoringTestSuite extends PhotranRefactoringTestSuiteFromMarkers<TileLoopRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/tile-loop";

-    

-    public static Test suite() throws Exception

-    {

-        return new TileLoopRefactoringTestSuite();

-    }

-    

-    public TileLoopRefactoringTestSuite() throws Exception

-    {

-        super(Activator.getDefault(),

-            "Running Loop Tiling refactoring in",

-            DIR,

-            TileLoopRefactoring.class);

-    }

-    

-    @Override

-    protected boolean initializeRefactoring(TileLoopRefactoring refactoring,

-                                            IFile file,

-                                            TextSelection selection,

-                                            String[] markerText)

-    {

-        boolean result = super.initializeRefactoring(refactoring, file, selection, markerText);

-

-            String s = markerText[4]; //file field(s) are just before result

-            String s2 = markerText[5];

-            refactoring.setLoopTilingOffsetNumber(s);

-            refactoring.setLoopTilingStepNumber(s2);

-            //}

-        

-        return result;

-    }

-

-    /** Prevents the compilation and running of tests we know don't preserve behavior */

-    @Override protected boolean shouldCompile(IFile fileContainingMarker)

-    {

-       return false;

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/UnrollLoopRefactoringTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/UnrollLoopRefactoringTestSuite.java
deleted file mode 100644
index be244af..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/UnrollLoopRefactoringTestSuite.java
+++ /dev/null

@@ -1,65 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.photran.internal.tests.refactoring;

-

-import junit.framework.Test;

-

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

-import org.eclipse.jface.text.TextSelection;

-import org.eclipse.photran.internal.core.refactoring.UnrollLoopRefactoring;

-import org.eclipse.photran.internal.tests.Activator;

-import org.eclipse.photran.internal.tests.PhotranRefactoringTestSuiteFromMarkers;

-

-/**

- * Test suite for loop unrolling refactoring

- * 

- * @author Ashley Kasza

- */

-public class UnrollLoopRefactoringTestSuite extends PhotranRefactoringTestSuiteFromMarkers<UnrollLoopRefactoring>

-{

-    private static final String DIR = "refactoring-test-code/unroll-loop";

-

-    public static Test suite() throws Exception

-    {

-        return new UnrollLoopRefactoringTestSuite();

-    }

-

-    public UnrollLoopRefactoringTestSuite() throws Exception

-    {

-        super(Activator.getDefault(),

-            "Running Loop Unrolling refactoring in",

-            DIR,

-            UnrollLoopRefactoring.class);

-    }

-

-    @Override

-    protected boolean initializeRefactoring(UnrollLoopRefactoring refactoring, IFile file,

-        TextSelection selection, String[] markerText)

-    {

-        boolean result = super.initializeRefactoring(refactoring, file, selection, markerText);

-

-        String s = markerText[4]; // file field(s) are just before result

-        String s2 = markerText[5];

-        refactoring.setLoopUnrollNumber(s);

-        refactoring.setComplete(s2.equals("true"));

-        // }

-

-        return result;

-    }

-

-    /** Prevents the compilation and running of tests we know don't compile or run */

-    @Override protected boolean shouldCompile(IFile fileContainingMarker)

-    {

-        String filename = fileContainingMarker.getName();

-        return !filename.equalsIgnoreCase("decrementLoopPartial.f90")

-            && !filename.equalsIgnoreCase("testSimpleLoop.f90");

-    }

-}


diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/extractprocedure/ExtractProcTestCase.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/extractprocedure/ExtractProcTestCase.java
deleted file mode 100644
index 40c9f91..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/extractprocedure/ExtractProcTestCase.java
+++ /dev/null

@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring.extractprocedure;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.photran.internal.core.refactoring.ExtractProcedureRefactoring;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.tests.PhotranWorkspaceTestCase;
-
-public class ExtractProcTestCase extends PhotranWorkspaceTestCase
-{
-    private static final String DIR = "refactoring-test-code/extract-procedure";
-
-    private static NullProgressMonitor pm = new NullProgressMonitor();
-
-    protected String filename = null;
-    protected ITextSelection selectionToExtract = null;
-
-    public ExtractProcTestCase() {;}  // when JUnit invokes a subclass outside a test suite
-
-    public ExtractProcTestCase(String filename, Object ignored) // avoid JUnit constructor
-    {
-        this.filename = filename;
-        this.setName("test");
-    }
-
-    protected void doRefactoring() throws Exception
-    {
-        String description = "Attempt to extract procedure from " + filename;
-
-        ExtractProcedureRefactoring refactoring = createRefactoring(filename);
-
-        project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-        String before = compileAndRunFortranProgram();
-
-        RefactoringStatus status = refactoring.checkInitialConditions(pm);
-        assertTrue(description + " failed initial precondition check: " + status.toString(), !status.hasError());
-
-        refactoring.setName("new_procedure");
-
-        status = refactoring.checkFinalConditions(pm);
-        assertTrue(description + " failed final precondition check: " + status.toString(), !status.hasError());
-
-        Change change = refactoring.createChange(pm);
-        assertNotNull(description + " returned null Change object", change);
-        assertTrue(description + " returned invalid Change object", change.isValid(pm).isOK());
-        change.perform(pm);
-
-        project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-
-        String after = compileAndRunFortranProgram();
-        System.out.println(after);
-        assertEquals(before, after);
-    }
-
-    private ExtractProcedureRefactoring createRefactoring(final String filename) throws Exception
-    {
-        final IFile thisFile = importFile(Activator.getDefault(), DIR, filename);
-        ExtractProcedureRefactoring r = new ExtractProcedureRefactoring();
-        r.initialize(thisFile, selectionToExtract);
-        return r;
-    }
-
-    @Override protected String readTestFile(Plugin activator, String srcDir, String filename) throws IOException, URISyntaxException
-    {
-        String result = super.readTestFile(activator, srcDir, filename);
-
-        int startOffset = result.lastIndexOf('\n', result.indexOf("!<<<<<START")) + 1;
-        int endOffset = result.indexOf("!<<<<<END");
-        if (startOffset <= 0 || endOffset < 0 || endOffset <= startOffset)
-            throw new Error("Malformed test case");
-
-        selectionToExtract = new TextSelection(startOffset, endOffset-startOffset);
-
-        return result;
-    }
-
-    protected String readTestFile(String filename) throws IOException, URISyntaxException
-    {
-        return super.readTestFile(Activator.getDefault(), DIR, filename);
-    }
-
-    /**
-     * Given an array with all of the positions of identifiers that should be renamed together, try applying the Rename refactoring to
-     * each, and make sure all the others change with it.
-     */
-    public void test() throws Exception
-    {
-        if (filename == null) return; // when JUnit invokes this outside a test suite
-
-        doRefactoring();
-        assertEquals(
-            readTestFile(filename + ".result").replaceAll("\\r", ""), // expected result
-            readWorkspaceFile(filename).replaceAll("\\r", ""));       // actual refactored file
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/extractprocedure/ExtractProcTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/extractprocedure/ExtractProcTestSuite.java
deleted file mode 100644
index 6c611ae..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/extractprocedure/ExtractProcTestSuite.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring.extractprocedure;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class ExtractProcTestSuite extends TestSuite
-{
-    public static Test suite() throws Exception
-    {
-        TestSuite suite = new TestSuite();
-        suite.addTest(getSuiteFor("test01-simple.f90"));
-        suite.addTest(getSuiteFor("test02-locals.f90"));
-        suite.addTest(getSuiteFor("test03-locals2.f90"));
-        suite.addTest(getSuiteFor("test04-in-loop.f90"));
-        suite.addTest(getSuiteFor("test05-parameter.f90"));
-        suite.addTest(getSuiteFor("test06-parameter.f90"));
-        suite.addTest(getSuiteFor("test07-attribs.f90"));
-        return suite;
-    }
-    
-    private static TestSuite getSuiteFor(String baseFilename)
-    {
-        TestSuite subSuite = new TestSuite("Extracting Procedures from " + baseFilename);
-        subSuite.addTest(new ExtractProcTestCase(baseFilename, null));
-        return subSuite;
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/AbstractSourceEditorTestCase.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/AbstractSourceEditorTestCase.java
deleted file mode 100644
index 5470fee..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/AbstractSourceEditorTestCase.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring.infrastructure;
-
-import java.io.File;
-
-import org.eclipse.photran.internal.core.parser.ASTExecutableProgramNode;
-import org.eclipse.photran.internal.core.refactoring.infrastructure.SourcePrinter;
-import org.eclipse.photran.internal.tests.PhotranTestCase;
-
-public abstract class AbstractSourceEditorTestCase extends PhotranTestCase
-{
-    /**
-     * Parses the given file as free form Fortran source code
-     */
-    public ASTExecutableProgramNode load(String filename) throws Exception
-    {
-        return parse(new File("../org.eclipse.photran.core.vpg.tests/refactoring-test-code/infrastructure/source-editor/" + filename));
-    }
-
-    /**
-     * Checks whether two ASTs produce identical source code
-     */
-    protected void assertEquals(ASTExecutableProgramNode expected, ASTExecutableProgramNode actual)
-    {
-        assertEquals(SourcePrinter.getSourceCodeFromAST(expected),
-                     SourcePrinter.getSourceCodeFromAST(actual));
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/CheckCanAddDeclTests.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/CheckCanAddDeclTests.java
deleted file mode 100644
index af80b4e..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/CheckCanAddDeclTests.java
+++ /dev/null

@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring.infrastructure;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.photran.core.IFortranAST;
-import org.eclipse.photran.internal.core.parser.ASTMainProgramNode;
-import org.eclipse.photran.internal.core.parser.ASTModuleNode;
-import org.eclipse.photran.internal.core.parser.ASTSubroutineSubprogramNode;
-import org.eclipse.photran.internal.core.refactoring.infrastructure.FortranEditorRefactoring;
-import org.eclipse.photran.internal.core.vpg.PhotranVPG;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.tests.PhotranWorkspaceTestCase;
-
-/**
- * Unit tests for {@link PhotranVPG#listAllModules()}
- *
- * @author Jeff Overbey
- */
-public class CheckCanAddDeclTests extends PhotranWorkspaceTestCase
-{
-    private static final String DIR = "refactoring-test-code/infrastructure/check-can-add-decl";
-
-    private ASTMainProgramNode mainProgram;
-    private ASTSubroutineSubprogramNode internalSubroutine;
-    private ASTModuleNode module;
-
-    @Override public void setUp() throws Exception
-    {
-        super.setUp();
-
-        IFile main_f90 = importFile(Activator.getDefault(), DIR, "main.f90");
-        IFile module_f90 = importFile(Activator.getDefault(), DIR, "module.f90");
-        importFile(Activator.getDefault(), DIR, "external.f90");
-        PhotranVPG.getInstance().ensureVPGIsUpToDate(new NullProgressMonitor());
-
-        project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-        compileAndRunFortranProgram("module.f90", "main.f90", "external.f90");
-
-        PhotranVPG vpg = PhotranVPG.getInstance();
-        IFortranAST mainFileAST = vpg.acquireTransientAST(main_f90);
-        IFortranAST moduleFileAST = vpg.acquireTransientAST(module_f90);
-        assertNotNull(mainFileAST);
-        assertNotNull(moduleFileAST);
-
-        mainProgram = mainFileAST.findFirstTokenOnLine(1).findNearestAncestor(ASTMainProgramNode.class);
-        internalSubroutine = mainFileAST.findFirstTokenOnLine(23).findNearestAncestor(ASTSubroutineSubprogramNode.class);
-        module = moduleFileAST.findFirstTokenOnLine(1).findNearestAncestor(ASTModuleNode.class);
-        assertNotNull(mainProgram);
-        assertNotNull(internalSubroutine);
-        assertNotNull(module);
-    }
-
-    public void testAddDeclsToMainProgram() throws Exception
-    {
-        new FauxFortranRefactoring()
-        {
-            protected void runTest()
-            {
-                assertTrue(canAdd("something_new"));
-                assertFalse(canAdd("assigned_local_variable"));
-                assertFalse(canAdd("AsSiGnEd_LoCaL_vArIaBlE"));
-                assertFalse(canAdd("unused_local_variable"));
-                assertFalse(canAdd("local_variable_accessed_from_internal_subroutine"));
-                assertFalse(canAdd("defined_external_subroutine"));
-                assertFalse(canAdd("declared_external_subroutine"));
-                assertFalse(canAdd("undeclared_external_subroutine"));
-                assertFalse(canAdd("internal_subroutine"));
-                assertFalse(canAdd("used_module_subroutine"));
-                assertFalse(canAdd("unused_module_subroutine"));
-                assertTrue(canAdd("private_module_subroutine"));
-            }
-
-            private boolean canAdd(String name)
-            {
-                return checkIfDeclarationCanBeAddedToScope(name, mainProgram, new NullProgressMonitor());
-            }
-        }.runTest();
-    }
-
-    public void testAddDeclsToModule() throws Exception
-    {
-        new FauxFortranRefactoring()
-        {
-            protected void runTest()
-            {
-                assertFalse(canAdd("private_module_subroutine"));
-
-                // These are the same as above, since declaring these in the module
-                // will cause them to be imported into the main program, preventing
-                // the main program from redeclaring them
-
-                assertTrue(canAdd("something_new"));
-                assertFalse(canAdd("assigned_local_variable"));
-                assertFalse(canAdd("AsSiGnEd_LoCaL_vArIaBlE"));
-                assertFalse(canAdd("unused_local_variable"));
-                assertFalse(canAdd("local_variable_accessed_from_internal_subroutine"));
-                // FIXME assertFalse(canAdd("defined_external_subroutine"));
-                assertFalse(canAdd("declared_external_subroutine"));
-                assertFalse(canAdd("undeclared_external_subroutine"));
-                assertFalse(canAdd("internal_subroutine"));
-                assertFalse(canAdd("used_module_subroutine"));
-                assertFalse(canAdd("unused_module_subroutine"));
-            }
-
-            private boolean canAdd(String name)
-            {
-                return checkIfDeclarationCanBeAddedToScope(name, module, new NullProgressMonitor());
-            }
-        }.runTest();
-    }
-
-    public void testAddDeclsToInternalSubprogram() throws Exception
-    {
-        new FauxFortranRefactoring()
-        {
-            protected void runTest()
-            {
-                assertTrue(canAdd("something_new"));
-                assertFalse(canAdd("internal_subroutine"));
-                assertFalse(canAdd("local_variable_accessed_from_internal_subroutine"));
-                assertTrue(canAdd("private_module_subroutine"));
-
-                // These will shadow declarations in an outer scope, but since they're not
-                // referenced, that is OK
-                assertTrue(canAdd("assigned_local_variable"));
-                assertTrue(canAdd("AsSiGnEd_LoCaL_vArIaBlE"));
-                assertTrue(canAdd("unused_local_variable"));
-                assertTrue(canAdd("defined_external_subroutine"));
-                assertTrue(canAdd("declared_external_subroutine"));
-                assertTrue(canAdd("undeclared_external_subroutine"));
-                assertTrue(canAdd("used_module_subroutine"));
-                assertTrue(canAdd("unused_module_subroutine"));
-            }
-
-            private boolean canAdd(String name)
-            {
-                return checkIfDeclarationCanBeAddedToScope(name, internalSubroutine, new NullProgressMonitor());
-            }
-        }.runTest();
-    }
-
-    /**
-     * This is intended to be subclassed in order to gain access to the protected methods of
-     * {@link FortranEditorRefactoring} to test those methods.
-     *
-     * @author Jeff Overbey
-     */
-    private class FauxFortranRefactoring extends FortranEditorRefactoring
-    {
-        public FauxFortranRefactoring()
-        {
-            this.vpg = PhotranVPG.getInstance();
-        }
-
-        @Override
-        protected void doCheckInitialConditions(RefactoringStatus status, IProgressMonitor pm)
-            throws PreconditionFailure
-        {
-        }
-
-        @Override
-        protected void doCheckFinalConditions(RefactoringStatus status, IProgressMonitor pm)
-            throws PreconditionFailure
-        {
-        }
-
-        @Override
-        protected void doCreateChange(IProgressMonitor pm) throws CoreException, OperationCanceledException
-        {
-        }
-
-        @Override
-        public String getName()
-        {
-            return null;
-        }
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/ReindenterTestCase.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/ReindenterTestCase.java
deleted file mode 100644
index d104a82..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/ReindenterTestCase.java
+++ /dev/null

@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring.infrastructure;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.net.URISyntaxException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.photran.core.IFortranAST;
-import org.eclipse.photran.internal.core.refactoring.infrastructure.SourcePrinter;
-import org.eclipse.photran.internal.core.reindenter.Reindenter;
-import org.eclipse.photran.internal.core.reindenter.Reindenter.Strategy;
-import org.eclipse.photran.internal.core.vpg.PhotranVPG;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.tests.PhotranWorkspaceTestCase;
-
-public class ReindenterTestCase extends PhotranWorkspaceTestCase
-{
-    private static final String DIR = "refactoring-test-code/infrastructure/reindenter";
-
-    protected String filename = null;
-    protected Strategy strategy;
-    private int fromLine;
-    private int thruLine;
-
-    public ReindenterTestCase() {;}  // when JUnit invokes a subclass outside a test suite
-
-    public ReindenterTestCase(String filename, Strategy strategy)
-    {
-        this.filename = filename;
-        this.strategy = strategy;
-        this.setName("test");
-    }
-
-    public void test() throws Exception
-    {
-        if (filename == null) return; // when JUnit invokes this outside a test suite
-
-        final IFile thisFile = importFile(Activator.getDefault(), DIR, filename);
-
-        IFortranAST ast = PhotranVPG.getInstance().acquireTransientAST(thisFile);
-        assertNotNull(ast);
-
-        Reindenter.reindent(fromLine, thruLine, ast, strategy);
-
-        thisFile.setContents(
-            new ByteArrayInputStream(SourcePrinter.getSourceCodeFromAST(ast).getBytes()),
-            true,
-            false,
-            new NullProgressMonitor());
-
-        project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-
-        assertEquals(
-            readTestFile(filename + ".result"), // expected result
-            readWorkspaceFile(filename));       // actual refactored file
-    }
-
-    @Override protected String readTestFile(Plugin activator, String srcDir, String filename) throws IOException, URISyntaxException
-    {
-        String result = super.readTestFile(activator, srcDir, filename);
-
-        int startOffset = result.lastIndexOf('\n', result.indexOf("!<<<<<START")) + 1;
-        int endOffset = result.indexOf("!<<<<<END");
-        if (startOffset < 0 || endOffset < 0 || endOffset <= startOffset)
-            throw new Error("Malformed test case");
-
-        determineLinesFromOffsets(result, startOffset, endOffset);
-
-        return result;
-    }
-
-    private void determineLinesFromOffsets(String result, int startOffset, int endOffset)
-    {
-        int line = 1;
-
-        for (int i = 0; i < result.length(); i++)
-        {
-            if (i == startOffset)
-                this.fromLine = line;
-
-            if (i == endOffset)
-                this.thruLine = line;
-
-            if (result.charAt(i) == '\n')
-                line++;
-        }
-    }
-
-    protected String readTestFile(String filename) throws IOException, URISyntaxException
-    {
-        return super.readTestFile(Activator.getDefault(), DIR, filename);
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/ReindenterTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/ReindenterTestSuite.java
deleted file mode 100644
index a3d23d5..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/ReindenterTestSuite.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-
-/**
- * @author Esfar Huq
- * @author Rui Wang - Added additional test cases for reindent by line
- */
-package org.eclipse.photran.internal.tests.refactoring.infrastructure;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.photran.internal.core.reindenter.Reindenter.Strategy;
-
-public class ReindenterTestSuite extends TestSuite
-{
-    public static Test suite() throws Exception
-    {
-        TestSuite suite = new TestSuite();
-        suite.addTest(getSuiteFor("01-simple.f90", Strategy.REINDENT_EACH_LINE));
-        suite.addTest(getSuiteFor("02-end-after.f90", Strategy.SHIFT_ENTIRE_BLOCK));
-        suite.addTest(getSuiteFor("03-blank-after.f90", Strategy.SHIFT_ENTIRE_BLOCK));
-        suite.addTest(getSuiteFor("04-guess-indent.f90", Strategy.SHIFT_ENTIRE_BLOCK));
-        suite.addTest(getSuiteFor("05-eachline-test.f90", Strategy.REINDENT_EACH_LINE));
-        suite.addTest(getSuiteFor("06-continuation-test.f90",Strategy.REINDENT_EACH_LINE));
-        suite.addTest(getSuiteFor("07-singleLineIf-test.f90",Strategy.REINDENT_EACH_LINE));
-        suite.addTest(getSuiteFor("08-labelAndComments-test.f90",Strategy.REINDENT_EACH_LINE));
-        suite.addTest(getSuiteFor("09-bug331904.f90",Strategy.REINDENT_EACH_LINE));
-        suite.addTest(getSuiteFor("10-continue.f90",Strategy.REINDENT_EACH_LINE));
-        suite.addTest(getSuiteFor("11-select-case.f90",Strategy.REINDENT_EACH_LINE));
-        suite.addTest(getSuiteFor("12-line-continuations.f90",Strategy.REINDENT_EACH_LINE));
-
-        return suite;
-    }
-    
-    private static TestSuite getSuiteFor(String baseFilename, Strategy strategy)
-    {
-        TestSuite subSuite = new TestSuite("Reindenting " + baseFilename);
-        subSuite.addTest(new ReindenterTestCase(baseFilename, strategy));
-        return subSuite;
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/TestChangeText.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/TestChangeText.java
deleted file mode 100644
index a7d4a7d..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/TestChangeText.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring.infrastructure;
-
-import org.eclipse.photran.internal.core.lexer.Token;
-import org.eclipse.photran.internal.core.parser.ASTExecutableProgramNode;
-import org.eclipse.photran.internal.core.parser.ASTMainProgramNode;
-import org.eclipse.photran.internal.core.parser.ASTProgramNameNode;
-import org.eclipse.photran.internal.core.parser.ASTProgramStmtNode;
-import org.eclipse.photran.internal.core.parser.IProgramUnit;
-
-public class TestChangeText extends AbstractSourceEditorTestCase
-{
-    public void testChangeProggie() throws Exception
-    {
-        ASTExecutableProgramNode ast = load("hello-1-initial.f90");
-        IProgramUnit programUnit1 = ast.getProgramUnitList().get(0);
-        ASTMainProgramNode mainProgram = (ASTMainProgramNode)programUnit1;
-        ASTProgramStmtNode programStmt = mainProgram.getProgramStmt();
-        ASTProgramNameNode programName = programStmt.getProgramName();
-        Token proggie = programName.getProgramName();
-        
-        proggie.setText("p");
-        assertEquals(load("hello-2-proggie-shorter.f90"), ast);
-        
-        proggie.setText("proggiedoggie");
-        assertEquals(load("hello-3-proggie-longer.f90"), ast);
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/TestRemove.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/TestRemove.java
deleted file mode 100644
index 5823707..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/TestRemove.java
+++ /dev/null

@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring.infrastructure;
-
-import org.eclipse.photran.internal.core.parser.ASTExecutableProgramNode;
-import org.eclipse.photran.internal.core.parser.ASTMainProgramNode;
-import org.eclipse.photran.internal.core.parser.IASTListNode;
-import org.eclipse.photran.internal.core.parser.IInternalSubprogram;
-
-public class TestRemove extends AbstractSourceEditorTestCase
-{
-    public void testRemoveQ() throws Exception
-    {
-        ASTExecutableProgramNode ast = load("hello-1-initial.f90");
-        IASTListNode<IInternalSubprogram> subprograms = ((ASTMainProgramNode)ast.getProgramUnitList().get(0)).getInternalSubprograms();
-        subprograms.remove(0);
-        assertEquals(load("hello-4-q-cut.f90"), ast);
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/TestSeparatedListRemoval.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/TestSeparatedListRemoval.java
deleted file mode 100644
index fd08b70..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/infrastructure/TestSeparatedListRemoval.java
+++ /dev/null

@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring.infrastructure;
-
-import java.io.IOException;
-
-import org.eclipse.photran.internal.core.SyntaxException;
-import org.eclipse.photran.internal.core.lexer.LexerException;
-import org.eclipse.photran.internal.core.parser.ASTEntityDeclNode;
-import org.eclipse.photran.internal.core.parser.ASTTypeDeclarationStmtNode;
-import org.eclipse.photran.internal.core.parser.IASTListNode;
-import org.eclipse.photran.internal.tests.PhotranTestCase;
-
-/**
- * Test to verify that ASTSeparatedListNode#remove correctly removes commas
- * 
- * @author Jeff Overbey
- */
-public class TestSeparatedListRemoval extends PhotranTestCase
-{
-    public void testSeparatedListRemoval() throws IOException, LexerException, SyntaxException
-    {
-        ASTTypeDeclarationStmtNode stmt = parseStmt("integer a, b, c, d, e");
-        IASTListNode<ASTEntityDeclNode> decls = stmt.getEntityDeclList();
-        decls.remove(0);
-        assertEquals("integer b, c, d, e", stmt.toString().trim());
-        ASTEntityDeclNode b = decls.get(0);
-        decls.remove(b);
-        assertEquals("integer c, d, e", stmt.toString().trim());
-        decls.remove(1);
-        assertEquals("integer c, e", stmt.toString().trim());
-        decls.remove(1);
-        assertEquals("integer c", stmt.toString().trim());
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename1.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename1.java
deleted file mode 100644
index 6f3f7c5..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename1.java
+++ /dev/null

@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring.rename;
-
-import junit.framework.Test;
-
-import org.eclipse.photran.internal.core.util.LineCol;
-
-public class Rename1 extends RenameTestSuite
-{
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // RECORD POSITIONS OF ALL IDENTIFIERS IN RENAME1.F90, AND
-    // GROUP THEM ACCORDING TO WHICH ONES SHOULD BE RENAMED TOGETHER
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    private String filename = "rename1.f90";
-    
-    private Ident intInMain = var(filename, "int", new LineCol[] { lc(11,10), lc(17,16), lc(23,20) });
-    private Ident subInMain = var(filename, "sub", new LineCol[] { lc(24,16), lc(25,20) });
-    
-    private Ident[] mainVars = new Ident[] {
-        var(filename, "two", new LineCol[] { lc(2,27), lc(7,40), lc(9,23) }),
-        var(filename, "three", new LineCol[] { lc(3,27), lc(4,23), lc(5,13), lc(6,15), lc(7,33), lc(7,66), lc(9,28) }),
-        var(filename, "a", new LineCol[] { lc(4,16), lc(9,14) }),
-        var(filename, "b", new LineCol[] { lc(4,19), lc(9,17) }),
-        var(filename, "not_shadowed", new LineCol[] { lc(5,23), lc(9,35), lc(21,16) }),
-        var(filename, "c", new LineCol[] { lc(6,25), lc(9,20) }),
-        var(filename, "shadow_this_1", new LineCol[] { lc(7,16), lc(9,49) }),
-        var(filename, "shadow_this_2", new LineCol[] { lc(7,46), lc(9,64) }),
-        var(filename, "implicit", new LineCol[] { lc(8,5), lc(9,79), lc(21,64) }),
-        intInMain
-    };
-    
-    private Ident shadowThis1IntShadow = var(filename, "shadow_this_1", new LineCol[] { lc(18,18), lc(21,30) });
-    private Ident shadowThis2IntShadow = var(filename, "shadow_this_2", new LineCol[] { lc(19,18), lc(21,45) });
-    
-    private Ident main = var(filename, "Main", new LineCol[] { lc(1,9), lc(26,13) });
-    private Ident ext = var(filename, "ext", new LineCol[] { lc(12,10), lc(22,12), lc(27,12), lc(33,16) });
-    
-    private Ident twoInExt = var(filename, "two", new LineCol[] { lc(28,14), lc(31,18) });
-    
-    private Ident intContained = var(filename, "int", new LineCol[] { lc(30,16), lc(32,20) });
-    
-    private Ident[] otherVars = new Ident[] { shadowThis1IntShadow, shadowThis2IntShadow, main, ext, twoInExt, intContained };
-    
-    private Ident intrinsic = var(filename, "selected_real_kind", new LineCol[] { lc(3,35) });
-    
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // TEST CASES
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    public static Test suite() throws Exception
-    {
-        return new Rename1();
-    }
-    
-    public Rename1() throws Exception
-    {
-        addSuccessTests();
-        addFailNotAnIdentifier();
-        addFailIntrinsicProcedure();
-        addFailConflictInSameScope();
-        addFailConflictInReference();
-    }
-    
-    public void addSuccessTests()
-    {
-        startTests("Renaming local variables in main program");
-        for (Ident v : mainVars)
-        {
-            addSuccessTests(v, v.getName() + v.getName());
-            addSuccessTests(v, "z");
-            addSuccessTests(v, "if");
-        }
-        endTests();
-        
-        startTests("Renaming variables outside main program");
-        for (Ident v : otherVars)
-        {
-            addSuccessTests(v, v.getName() + v.getName());
-            addSuccessTests(v, "z");
-            addSuccessTests(v, "if");
-        }
-        endTests();
-    }
-
-    public void addFailNotAnIdentifier() throws Exception
-    {
-        startTests("Check: Not an identifier");
-        for (Ident v : mainVars)
-        {
-            addPreconditionTests(v, "");
-            addPreconditionTests(v, "\u0080"); // Euro symbol
-            addPreconditionTests(v, "3");
-            addPreconditionTests(v, "hello world");
-            addPreconditionTests(v, "\"hello world\"");
-        }
-        endTests();
-    }
-    
-    public void addFailIntrinsicProcedure() throws Exception
-    {
-        startTests("Check: Cannot rename intrinsic procedures");
-        addPreconditionTests(intrinsic, "new_name");
-        endTests();
-    }
-    
-    public void addFailConflictInSameScope() throws Exception
-    {
-        startTests("Check: Local variable name conflicts in local scope (main program)");
-        for (int i = 0; i < mainVars.length; i++)
-            addPreconditionTests(mainVars[i], mainVars[Math.max(i-1, 0)].getName());
-        endTests();
-
-        startTests("Check: Local variable name conflicts with capitalization changed");
-        for (int i = 0; i < mainVars.length; i++)
-            if (!mainVars[i].getName().equalsIgnoreCase(mainVars[Math.max(i-1, 0)].getName())) // FIXME AltRename differs
-                addPreconditionTests(mainVars[i], mainVars[Math.max(i-1, 0)].getName().toUpperCase());
-        endTests();
-    }
-    
-    public void addFailConflictInReference() throws Exception
-    {
-        startTests("Check: Conflicts outside local scope");
-        addPreconditionTests(main, "int"); // FIXME: Bug -- should be addPreconditionTests
-        addPreconditionTests(main, "ext");
-        addPreconditionTests(intInMain, "Main");
-        addPreconditionTests(intInMain, "ext");
-        addPreconditionTests(subInMain, "int");
-        addPreconditionTests(subInMain, "ext");
-        addPreconditionTests(ext, "int"); // conflict due to reference in Main
-        addPreconditionTests(ext, "sub"); // will change interpretation of ext call in Main
-        addPreconditionTests(ext, "Main");
-        addSuccessTests(intContained, "sub");
-        addSuccessTests(intContained, "Main");
-        endTests();
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename2.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename2.java
deleted file mode 100644
index 9159e4a..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename2.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring.rename;
-
-import junit.framework.Test;
-
-import org.eclipse.photran.internal.core.util.LineCol;
-
-public class Rename2 extends RenameTestSuite
-{
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // RECORD POSITIONS OF ALL IDENTIFIERS IN RENAME2.F90, AND
-    // GROUP THEM ACCORDING TO WHICH ONES SHOULD BE RENAMED TOGETHER
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    private String filename = "rename2.f90";
-    
-    private Ident[] vars = new Ident[]
-    {
-        var(filename, "Main", new LineCol[] { lc(2,9), lc(27,13) }),
-        var(filename, "one", new LineCol[] { lc(4,16), lc(12,14), lc(16,11), lc(20,11) }),
-        var(filename, "two", new LineCol[] { lc(5,27), lc(10,13), lc(13,14), lc(17,14) }),
-        var(filename, "three", new LineCol[] { lc(6,16), lc(14,9), lc(18,9) }),
-        var(filename, "four", new LineCol[] { lc(10,21), lc(15,14), lc(19,14) })
-    };
-    
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // TEST CASES
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    public static Test suite() throws Exception
-    {
-        return new Rename2();
-    }
-    
-    public Rename2() throws Exception
-    {
-        startTests("Renaming program with comments and line continuations");
-        for (String name : new String[] { "z", "a_really_really_long_name" })
-            for (Ident var : vars)
-                addSuccessTests(var, name);
-        endTests();
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename3.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename3.java
deleted file mode 100644
index 3bdbed6..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename3.java
+++ /dev/null

@@ -1,166 +0,0 @@
-package org.eclipse.photran.internal.tests.refactoring.rename;
-
-import junit.framework.Test;
-
-import org.eclipse.photran.internal.core.util.LineCol;
-
-public class Rename3 extends RenameTestSuite
-{
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // RECORD POSITIONS OF ALL IDENTIFIERS IN RENAME3*.F90
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    private String file = "rename3.f90";
-    private String filea = "rename3a.f90";
-    private String fileb = "rename3b.f90";
-    private String filec = "rename3c.f90";
-
-    private Ident myProgram = var("MyProgram");
-    private Ident aRenamed3 = var("a_renamed3");
-    private Ident bRenamed3 = var("b_renamed3");
-    private Ident contained = var("contained");
-    private Ident external = var("external");
-    
-    private Ident moduleA = var("module_a");
-    private Ident aSub1of3 = var("a_sub1of3");
-    private Ident aSub2of3 = var("a_sub2of3");
-    private Ident aSub3of3 = var("a_sub3of3");
-    
-    private Ident moduleB = var("module_b");
-    private Ident bSub1of3 = var("b_sub1of3");
-    private Ident bSub2of3 = var("b_sub2of3");
-    private Ident bSub3of3 = var("b_sub3of3");
-    
-    private Ident moduleC = var("module_c");
-    private Ident cSub = var("c_sub");
-    
-    // Note that the order here determines the order in the expectSuccess matrix below
-    private Ident[] allVars = new Ident[]
-    {
-        myProgram, aRenamed3, bRenamed3, contained, external,
-        moduleA, aSub1of3, aSub2of3, aSub3of3,
-        moduleB, bSub1of3, bSub2of3, bSub3of3,
-        moduleC, cSub
-    };
-    
-    private boolean[][] expectSuccess = new boolean[][]
-    {
-        // IMPORTANT:
-        // * Modules can't be renamed, hence the rows of "false" for moduleA, moduleB, and moduleC
-        // * The rename refactoring requires that the new name not be identical to the old name, hence "false" along the diagonal
-        
-        /* vvv can be renamed to >>>    myProgram, aRenamed3, bRenamed3, contained, external, moduleA, aSub1of3, aSub2of3, aSub3of3, moduleB, bSub1of3, bSub2of3, bSub3of3, moduleC, cSub
-        /* myProgram */ new boolean[] { false,     false,     false,     false,     false,    true,    false,    false,    true,     true,    true,     false,    true,     true,    true  },
-        /* aRenamed3 */ new boolean[] { false,     false,     false,     false,     false,    true,    false,    false,    true,     true,    true,     false,    true,     true,    true  },
-        /* bRenamed3 */ new boolean[] { false,     false,     false,     false,     false,    true,    false,    false,    true,     true,    true,     false,    true,     true,    true  },
-        /* contained */ new boolean[] { false,     false,     false,     false,     false,    true,    false,    false,    true,     true,    true,     false,    true,     true,    true  },
-        /* external  */ new boolean[] { false,     false,     false,     false,     false,    true,    false,    false,    true,     true,    true,     false,    true,     true,    true  },
-        /* moduleA   */ new boolean[] { false,     false,     false,     false,     false,    false,   false,    false,    false,    false,   false,    false,    false,    false,   false },
-        /* aSub1of3  */ new boolean[] { false,     false,     false,     false,     false,    false,   false,    false,    false,    true,    true,     false,    true,     true,    true  },
-        /* aSub2of3  */ new boolean[] { false,     false,     false,     false,     false,    false,   false,    false,    false,    true,    true,     false,    true,     true,    true  },
-        /* aSub3of3  */ new boolean[] { true,      true,      true,      true,      true,     false,   false,    false,    false,    true,    true,     true,     true,     true,    true  },
-        /* moduleB   */ new boolean[] { false,     false,     false,     false,     false,    false,   false,    false,    false,    false,   false,    false,    false,    false,   false },
-        /* bSub1of3  */ new boolean[] { true,      true,      true,      true,      true,     true,    true,     true,     true,     false,   false,    false,    false,    true,    false },
-        /* bSub2of3  */ new boolean[] { false,     false,     false,     false,     false,    true,    false,    false,    true,     false,   false,    false,    false,    true,    false,},
-        /* bSub3of3  */ new boolean[] { true,      true,      true,      true,      true,     true,    true,     true,     true,     false,   false,    false,    false,    true,    false },
-        /* moduleC   */ new boolean[] { false,     false,     false,     false,     false,    false,   false,    false,    false,    false,   false,    false,    false,    false,   false },
-        /* cSub      */ new boolean[] { true,      true,      true,      true,      true,     true,    true,     true,     true,     false,   false,    false,    false,    false,   false },
-    };
-    
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // TEST CASES
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    public static Test suite() throws Exception
-    {
-        return new Rename3();
-    }
-    
-    public Rename3() throws Exception
-    {
-        myProgram.addReferences(file, new LineCol[] { lc(1,9) });
-        aRenamed3.addReferences(file, new LineCol[] { lc(2,17), lc(9,8) });
-        bRenamed3.addReferences(file, new LineCol[] { lc(3,34), lc(11,8) });
-        contained.addReferences(file, new LineCol[] { lc(15,14), lc(12,8) });
-        external.addReferences(file, new LineCol[] { lc(18,12), lc(13,8) });
-        moduleA.addReferences(file, new LineCol[] { lc(2,7) });
-        aSub1of3.addReferences(file, new LineCol[] { lc(7,8) });
-        aSub2of3.addReferences(file, new LineCol[] { lc(8,8) });
-        aSub3of3.addReferences(file, new LineCol[] { lc(2,31) });
-        moduleB.addReferences(file, new LineCol[] { lc(3,7) });
-        bSub1of3.addReferences(file, new LineCol[] {});
-        bSub2of3.addReferences(file, new LineCol[] { lc(3, 23), lc(10,8) });
-        bSub3of3.addReferences(file, new LineCol[] { lc(3,48) });
-        moduleC.addReferences(file, new LineCol[] {});
-        cSub.addReferences(file, new LineCol[] {});
-        
-        myProgram.addReferences(filea, new LineCol[] {});
-        aRenamed3.addReferences(filea, new LineCol[] {});
-        bRenamed3.addReferences(filea, new LineCol[] {});
-        contained.addReferences(filea, new LineCol[] {});
-        external.addReferences(filea, new LineCol[] {});
-        moduleA.addReferences(filea, new LineCol[] { lc(1,8) });
-        aSub1of3.addReferences(filea, new LineCol[] { lc(3,16) });
-        aSub2of3.addReferences(filea, new LineCol[] { lc(4,16) });
-        aSub3of3.addReferences(filea, new LineCol[] { lc(5,16) });
-        moduleB.addReferences(filea, new LineCol[] {});
-        bSub1of3.addReferences(filea, new LineCol[] {});
-        bSub2of3.addReferences(filea, new LineCol[] {});
-        bSub3of3.addReferences(filea, new LineCol[] {});
-        moduleC.addReferences(filea, new LineCol[] {});
-        cSub.addReferences(filea, new LineCol[] {});
-        
-        myProgram.addReferences(fileb, new LineCol[] {});
-        aRenamed3.addReferences(fileb, new LineCol[] {});
-        bRenamed3.addReferences(fileb, new LineCol[] {});
-        contained.addReferences(fileb, new LineCol[] {});
-        external.addReferences(fileb, new LineCol[] {});
-        moduleA.addReferences(fileb, new LineCol[] {});
-        aSub1of3.addReferences(fileb, new LineCol[] {});
-        aSub2of3.addReferences(fileb, new LineCol[] {});
-        aSub3of3.addReferences(fileb, new LineCol[] {});
-        moduleB.addReferences(fileb, new LineCol[] { lc(1,8) });
-        bSub1of3.addReferences(fileb, new LineCol[] { lc(4,16) });
-        bSub2of3.addReferences(fileb, new LineCol[] { lc(5,16) });
-        bSub3of3.addReferences(fileb, new LineCol[] { lc(6,16) });
-        moduleC.addReferences(fileb, new LineCol[] { lc(2,9) });
-        cSub.addReferences(fileb, new LineCol[] { lc(7,12) });
-        
-        myProgram.addReferences(filec, new LineCol[] {});
-        aRenamed3.addReferences(filec, new LineCol[] {});
-        bRenamed3.addReferences(filec, new LineCol[] {});
-        contained.addReferences(filec, new LineCol[] {});
-        external.addReferences(filec, new LineCol[] {});
-        moduleA.addReferences(filec, new LineCol[] {});
-        aSub1of3.addReferences(filec, new LineCol[] {});
-        aSub2of3.addReferences(filec, new LineCol[] {});
-        aSub3of3.addReferences(filec, new LineCol[] {});
-        moduleB.addReferences(filec, new LineCol[] {});
-        bSub1of3.addReferences(filec, new LineCol[] {});
-        bSub2of3.addReferences(filec, new LineCol[] {});
-        bSub3of3.addReferences(filec, new LineCol[] {});
-        moduleC.addReferences(filec, new LineCol[] { lc(1,8) });
-        cSub.addReferences(filec, new LineCol[] { lc(3,16) });
-
-        startTests("Renaming subroutines imported from modules");
-        for (int i = 0; i < allVars.length; i++)
-        {
-            for (int j = 0; j < allVars.length; j++)
-            {
-//        for (int i = 6; i == 6; i++)
-//        {
-//            for (int j = 1; j == 1; j++)
-//            {
-                if (expectSuccess[i][j])
-                    addSuccessTests(allVars[i], allVars[j].getName());
-                else
-                    addPreconditionTests(allVars[i], allVars[j].getName());
-            }
-        }
-        endTests();
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename4.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename4.java
deleted file mode 100644
index b8a5b71..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename4.java
+++ /dev/null

@@ -1,56 +0,0 @@
-package org.eclipse.photran.internal.tests.refactoring.rename;
-
-import junit.framework.Test;
-
-import org.eclipse.photran.internal.core.util.LineCol;
-
-public class Rename4 extends RenameTestSuite
-{
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // RECORD POSITIONS OF ALL IDENTIFIERS IN RENAME4*.F90
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    private String file = "rename4.f90";
-    private String filea = "rename4a.fh";
-    private String fileb = "rename4b.fh";
-
-    private Ident myProgram = var("MyProgram");
-    private Ident hello = var("hello");
-    private Ident goodbye = var("goodbye");
-    
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // TEST CASES
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    public static Test suite() throws Exception
-    {
-        return new Rename4();
-    }
-    
-    public Rename4() throws Exception
-    {
-        myProgram.addReferences(file, new LineCol[] { lc(1,9) });
-        hello.addReferences(file, new LineCol[] { lc(3,12) });
-        goodbye.addReferences(file, new LineCol[] {});
-        
-        myProgram.addReferences(filea, new LineCol[] {});
-        hello.addReferences(filea, new LineCol[] { lc(1,12) });
-        goodbye.addReferences(filea, new LineCol[] { lc(2,12) });
-        
-        myProgram.addReferences(fileb, new LineCol[] {});
-        hello.addReferences(fileb, new LineCol[] { lc(1,10) });
-        goodbye.addReferences(fileb, new LineCol[] {});
-
-        startTests("Renaming file with Fortran INCLUDE lines");
-        addSuccessTests(myProgram, "ziggySockyZiggySockyHoyHoyHoy");
-        addPreconditionTests(myProgram, "hello");
-        addPreconditionTests(hello, "Goodbye");
-        addPreconditionTests(hello, "MyProgram");
-        addPreconditionTests(hello, "ziggySockyZiggySockyHoyHoyHoy");
-        endTests();
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename5.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename5.java
deleted file mode 100644
index d0646d3..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename5.java
+++ /dev/null

@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring.rename;
-
-import junit.framework.Test;
-
-import org.eclipse.photran.internal.core.util.LineCol;
-
-public class Rename5 extends RenameTestSuite
-{
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // RECORD POSITIONS OF ALL IDENTIFIERS IN RENAME3.F90, AND
-    // GROUP THEM ACCORDING TO WHICH ONES SHOULD BE RENAMED TOGETHER
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    private String filename = "rename5.f90";
-    
-    private Ident intrinsic1 = var(filename, "selected_int_kind", new LineCol[] { lc(2,14) });
-    private Ident intrinsic2 = var(filename, "null", new LineCol[] { lc(29,33) });
-    
-    //private Ident outerThrice = var(filename, "thrice", new LineCol[] { lc(2,45) });
-    //private Ident outerThriceImpliedResult = var(filename, "thrice", new LineCol[] { lc(4,3) });
-    private Ident outerThriceFunctionAndResult = var(filename, "thrice", new LineCol[] { lc(2,45), lc(4,3), lc(5,14),
-        lc(17,12), lc(17,23), lc(45,20)}); // If statement function removed
-    private Ident outerThriceParam = var(filename, "n", new LineCol[] { lc(2,52), lc(3,17) });
-    
-    private Ident typeType = var(filename, "type", new LineCol[] { lc(7,8), lc(9,12), lc(27,10), lc(29,10), lc(37,9) });
-    private Ident typeComponent = var(filename, "a", new LineCol[] { lc(8,16), lc(35,7), lc(45,9) });
-    
-    //private Ident innerThrice = var(filename, "thrice", new LineCol[] { lc(12,3), lc(17,12), lc(17,23), lc(45,20) });
-    //private Ident innerThriceParam = var(filename, "n", new LineCol[] { lc(12,10), lc(12,17) });
-    
-    private Ident localN = var(filename, "n", new LineCol[] { lc(14,3), lc(17,30), lc(17,34) });
-    
-    //private Ident fFunction = var(filename, "f", new LineCol[] { lc(17,38), lc(17,44), lc(23,30), lc(45,27), lc(46,16) });
-    //private Ident fResult = var(filename, "f", new LineCol[] { lc(47,5), lc(45,16), lc(45,29) });
-    private Ident fFunctionAndResult = var(filename, "f", new LineCol[] { lc(17,38), lc(17,44), lc(23,30), lc(45,27), lc(46,16), lc(43,5), lc(45,16), lc(45,29) });
-    private Ident fParam = var(filename, "a", new LineCol[] { lc(23,33), lc(25,16), lc(32,19), lc(35,11), lc(37,14) });
-    private Ident fx = var(filename, "x", new LineCol[] { lc(27,19), lc(31,15), lc(35,5), lc(37,5), lc(39,10) });
-    private Ident fp = var(filename, "p", new LineCol[] { lc(29,28), lc(39,5) });
-    
-    private Ident[] notRenameable = new Ident[]
-    {
-        intrinsic1, intrinsic2,
-        outerThriceParam, /*innerThriceParam,*/ fParam,
-        typeComponent,
-    };
-    
-    private Ident[] renameable = new Ident[]
-    {
-        outerThriceFunctionAndResult,
-        typeType,
-        /*innerThrice,*/
-        localN,
-        fFunctionAndResult,
-        fx,
-        fp,
-    };
-    
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // TEST CASES
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    public static Test suite() throws Exception
-    {
-        return new Rename5();
-    }
-    
-    public Rename5() throws Exception
-    {
-        //startTests("Renaming program with a shadowing statement function, implied results, and pointers");
-        startTests("Renaming program with implied results and pointers");
-        for (Ident var : notRenameable)
-            addPreconditionTests(var, "z");
-        for (Ident var : renameable)
-            addSuccessTests(var, "z");
-        endTests();
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename6.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename6.java
deleted file mode 100644
index aa903d9..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename6.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring.rename;
-
-import junit.framework.Test;
-
-import org.eclipse.photran.internal.core.util.LineCol;
-
-public class Rename6 extends RenameTestSuite
-{
-    private String filename = "rename6.f90";
-    
-    private Ident[] vars = new Ident[] {
-        var(filename, "outer", new LineCol[] { lc(1,21), lc(3,8), lc(9,6) }),
-        var(filename, "i", new LineCol[] { lc(6,23), lc(7,15), lc(15,22), lc(22,30), lc(24,14), lc(26,12), lc(28,23), lc(28,29) }),
-        var(filename, "hi", new LineCol[] { lc(7,27), lc(18,16), lc(18,30), lc(22,6) }),
-        var(filename, "bye", new LineCol[] { lc(7,38), lc(18,20), lc(18,40), lc(22,9) }),
-        var(filename, "ty", new LineCol[] { lc(15,2), lc(15,2), lc(15,9), lc(22,13) }),
-        var(filename, "array", new LineCol[] { lc(10,12), lc(24,6), lc(26,6), lc(28,7) }),
-        var(filename, "nl1", new LineCol[] { lc(18,11), lc(19,14) }),
-        var(filename, "nl2", new LineCol[] { lc(18,25) }),
-        var(filename, "nl3", new LineCol[] { lc(18,35) }),
-        var(filename, "j", new LineCol[] { lc(5,12), lc(28,13), lc(28,17) }),
-    };
-    
-    public static Test suite() throws Exception
-    {
-        return new Rename6();
-    }
-    
-    public Rename6() throws Exception
-    {
-        startTests("Renaming local variables: nested derived type and namelists");
-        for (Ident v : vars)
-            addSuccessTests(v, "zzzzz");
-        endTests();
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename7.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename7.java
deleted file mode 100644
index 20f5bb1..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename7.java
+++ /dev/null

@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring.rename;
-
-import junit.framework.Test;
-
-import org.eclipse.photran.internal.core.util.LineCol;
-
-public class Rename7 extends RenameTestSuite
-{
-    private String filename = "rename7.f90";
-    
-    private Ident[] vars = new Ident[] {
-        var(filename, "v1", new LineCol[] { lc(6,12), lc(8,18), lc(12,6) }),
-        var(filename, "v2", new LineCol[] { lc(6,16), lc(8,22), lc(12,10) }),
-        var(filename, "v3", new LineCol[] { lc(6,20), lc(8,28) }),
-        var(filename, "v4", new LineCol[] { lc(6,24), lc(8,41) }),
-        var(filename, "v5", new LineCol[] { lc(6,28), lc(8,45) }),
-        var(filename, "common1", new LineCol[] { lc(8,9), /*lc(8,32),*/ lc(10,7) }),
-    };
-    
-    private Ident bdn = var(filename, "bdn", new LineCol[] { lc(2,12), lc(14,16) });
-    
-    public static Test suite() throws Exception
-    {
-        return new Rename7();
-    }
-    
-    public Rename7() throws Exception
-    {
-        startTests("Renaming local variables: common blocks and block data");
-        
-        addSuccessTests(bdn, "zzzzz");
-        for (Ident v : vars)
-        	addSuccessTests(bdn, v.getName());
-
-        for (Ident v1 : vars)
-        {
-            addSuccessTests(v1, "zzzzz");
-            
-            for (Ident v2 : vars)
-            	addPreconditionTests(v1, v2.getName());
-        }
-
-        endTests();
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename8.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename8.java
deleted file mode 100644
index 154c53f..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename8.java
+++ /dev/null

@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring.rename;
-
-import junit.framework.Test;
-
-import org.eclipse.photran.internal.core.util.LineCol;
-
-public class Rename8 extends RenameTestSuite
-{
-    private String filename = "rename8.f90";
-    
-    private Ident f = var(filename, "f", new LineCol[] { lc(4,10), lc(28,14) });
-    private Ident g_paramOfF = var(filename, "g", new LineCol[] { lc(4,12), lc(11,31), lc(23,18) });
-    private Ident q = var(filename, "q", new LineCol[] { lc(4,22), lc(7,23), lc(26,3) });
-    private Ident h = var(filename, "h", new LineCol[] { lc(11,33), lc(15,35), lc(18,22) });
-    private Ident x_paramOfG = var(filename, "x", new LineCol[] { lc(11,36), lc(21,39) });
-    private Ident x_paramOfH = var(filename, "x", new LineCol[] { lc(15,37), lc(17,43) });
-    private Ident g_function = var(filename, "g", new LineCol[] { lc(30,18), lc(30,23), lc(30,43) });
-    
-    // Note that the order here determines the order in the expectSuccess matrix below
-    private Ident[] allVars = new Ident[]
-    {
-        f, g_paramOfF, q, h, x_paramOfG, x_paramOfH, g_function
-    };
-
-    private boolean[][] expectSuccess = new boolean[][]
-      {
-          // IMPORTANT:
-          // * Subprogram arguments cannot be renamed
-          // * x cannot be renamed to x
-          
-          /* vvv can be renamed to >>>     f      g_paramOfF q      h      x_paramOfG x_paramOfH g_function   
-          /* f          */ new boolean[] { false, false,     false, true,  true,      true,      false },
-          /* g_paramOfF */ new boolean[] { false, false,     false, false, false,     false,     false },
-          /* q          */ new boolean[] { false, false,     false, true,  true,      true,      false },
-          /* h          */ new boolean[] { false, false,     false, false, false,     false,     false },
-          /* x_paramOfG */ new boolean[] { false, false,     false, false, false,     false,     false },
-          /* x_paramOfH */ new boolean[] { false, false,     false, false, false,     false,     false },
-          /* g_function */ new boolean[] { false, false,     true,  true,  true,      true,      false },
-      };
-
-    public static Test suite() throws Exception
-    {
-        return new Rename8();
-    }
-    
-    public Rename8() throws Exception
-    {
-        startTests("Renaming subroutine arguments");
-        for (int i = 0; i < allVars.length; i++)
-        {
-            for (int j = 0; j < allVars.length; j++)
-            {
-                if (expectSuccess[i][j])
-                    addSuccessTests(allVars[i], allVars[j].getName());
-                else
-                    addPreconditionTests(allVars[i], allVars[j].getName());
-            }
-        }
-        endTests();
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename9.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename9.java
deleted file mode 100644
index 5506717..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/Rename9.java
+++ /dev/null

@@ -1,75 +0,0 @@
-package org.eclipse.photran.internal.tests.refactoring.rename;
-
-import junit.framework.Test;
-
-import org.eclipse.photran.internal.core.util.LineCol;
-
-public class Rename9 extends RenameTestSuite
-{
-    private String filename = "rename9.f90";
-    
-    private Ident i1 = var(filename, "i1", new LineCol[] { lc(3,14), lc(36,12) });
-    private Ident j1 = var(filename, "j1", new LineCol[] { lc(4,23) });
-    private Ident k1 = var(filename, "k1", new LineCol[] { lc(5,14), lc(7,31) });
-    private Ident f1 = var(filename, "f1", new LineCol[] { lc(12,20), lc(12,26), lc(36,24) });
-    private Ident i2 = var(filename, "i2", new LineCol[] { lc(17,14) });
-    private Ident j2 = var(filename, "j2", new LineCol[] { lc(18,22), lc(39,16) });
-    private Ident k2 = var(filename, "k2", new LineCol[] { lc(20,13), lc(22,31), lc(39,20) });
-    private Ident f2 = var(filename, "f2", new LineCol[] { lc(27,20), lc(27,26) });
-    private Ident j1implicit = var(filename, "j1", new LineCol[] { lc(36,16) });
-    private Ident k1implicit = var(filename, "k1", new LineCol[] { lc(36,20) });
-    private Ident zimplicit = var(filename, "z", new LineCol[] { lc(36,30) });
-    private Ident i2implicit = var(filename, "i2", new LineCol[] { lc(39,12) });
-    private Ident f2implicit = var(filename, "f2", new LineCol[] { lc(39,29) });
-    
-    // Note that the order here determines the order in the expectSuccess matrix below
-    private Ident[] allVars = new Ident[]
-    {
-        i1, j1, k1, f1, i2, j2, k2, f2, j1implicit, k1implicit, zimplicit, i2implicit, f2implicit
-    };
-
-    private boolean[][] expectSuccess = new boolean[][]
-      {
-          // IMPORTANT:
-          // * Subprogram arguments cannot be renamed
-          // * x cannot be renamed to x
-          // * j1 and j1implicit have the SAME NAME, so their columns should be identical (same for k1, etc.)
-          
-          /* vvv can be renamed to >>>     i1     j1     k1     f1     i2     j2     k2     f2     j1implicit k1implicit zimplicit i2implicit f2implicit   
-          /* i1         */ new boolean[] { false, false, false, false, false, false, false, false, false,     false,     false,    false,     false },
-          /* j1         */ new boolean[] { false, false, false, false, true,  true,  true,  true,  false,     false,     true,     true,      true  },
-          /* k1         */ new boolean[] { false, false, false, false, true,  true,  true,  true,  false,     false,     false,    true,      true  },
-          /* f1         */ new boolean[] { false, false, false, false, false, false, false, false, false,     false,     false,    false,     false },
-          /* i2         */ new boolean[] { true,  true,  true,  true,  false, false, false, false, true,      true,      true,     false,     false },
-          /* j2         */ new boolean[] { false, false, false, false, false, false, false, false, false,     false,     false,    false,     false },
-          /* k2         */ new boolean[] { false, false, false, false, false, false, false, false, false,     false,     false,    false,     false },
-          /* f2         */ new boolean[] { true,  true,  true,  true,  false, false, false, false, true,      true,      true,     false,     false },
-          /* j1implicit */ new boolean[] { false, false, false, false, false, false, false, false, false,     false,     false,    false,     false },
-          /* k1implicit */ new boolean[] { false, false, false, false, false, false, false, false, false,     false,     false,    false,     false },
-          /* zimplicit  */ new boolean[] { false, false, false, false, false, false, false, false, false,     false,     false,    false,     false },
-          /* i2implicit */ new boolean[] { false, false, false, false, false, false, false, false, false,     false,     false,    false,     false },
-          /* f2implicit */ new boolean[] { false, false, false, false, false, false, false, false, false,     false,     false,    false,     false },
-      };
-
-    public static Test suite() throws Exception
-    {
-        return new Rename9();
-    }
-    
-    public Rename9() throws Exception
-    {
-        startTests("Renaming in module with interfaces and visibilities");
-        for (int i = 0; i < allVars.length; i++)
-        {
-            addSuccessTests(allVars[i], "something_different");
-            for (int j = 0; j < allVars.length; j++)
-            {
-                if (expectSuccess[i][j])
-                    addSuccessTests(allVars[i], allVars[j].getName());
-                else
-                    addPreconditionTests(allVars[i], allVars[j].getName());
-            }
-        }
-        endTests();
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameBug278103.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameBug278103.java
deleted file mode 100644
index 925a098..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameBug278103.java
+++ /dev/null

@@ -1,42 +0,0 @@
-package org.eclipse.photran.internal.tests.refactoring.rename;
-
-import junit.framework.Test;
-
-import org.eclipse.photran.internal.core.util.LineCol;
-
-public class RenameBug278103 extends RenameTestSuite
-{
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // RECORD POSITIONS OF ALL IDENTIFIERS IN BUG278103-*.F90
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    private String filem = "bug278103-mod.f90";
-    private String filep = "bug278103-prog.f90";
-    private String files = "bug278103-subs.f90";
-
-    private Ident dim = var("DIM");
-    
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // TEST CASES
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    public static Test suite() throws Exception
-    {
-        return new RenameBug278103();
-    }
-    
-    public RenameBug278103() throws Exception
-    {
-        dim.addReferences(filem, new LineCol[] { lc(3,27), lc(11,22) });
-        dim.addReferences(filep, new LineCol[] { lc(14,24), lc(16,22) });
-        dim.addReferences(files, new LineCol[] { lc(5,22), lc(9,14), lc(11,23) });
-
-        startTests("Renaming file exercising Bug 278103");
-        addSuccessTests(dim, "something_else");
-        endTests();
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameBug278106_Visibility.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameBug278106_Visibility.java
deleted file mode 100644
index 34383cc..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameBug278106_Visibility.java
+++ /dev/null

@@ -1,59 +0,0 @@
-package org.eclipse.photran.internal.tests.refactoring.rename;
-
-import junit.framework.Test;
-
-import org.eclipse.photran.internal.core.util.LineCol;
-
-public class RenameBug278106_Visibility extends RenameTestSuite
-{
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // RECORD POSITIONS OF ALL IDENTIFIERS IN BUG278106.F90
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    private String file = "bug278106-visibility.f90";
-
-    private Ident m1_m1a = var("m1a");
-    private Ident m1_m1b = var("m1b");
-    
-    private Ident s1_m1b = var("m1b");
-
-    private Ident s2_m1a = var("m1a");
-    private Ident s2_m1b = var("m1b");
-    
-    private Ident s3_m1b = var("m1b");
-
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // TEST CASES
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    public static Test suite() throws Exception
-    {
-        return new RenameBug278106_Visibility();
-    }
-    
-    public RenameBug278106_Visibility() throws Exception
-    {
-        m1_m1a.addReferences(file, new LineCol[] { lc(2,14), lc(14,12), lc(32,13), lc(39,12) });
-        m1_m1b.addReferences(file, new LineCol[] { lc(2,19), lc(7,14) });
-        
-        s1_m1b.addReferences(file, new LineCol[] { lc(13,14), lc(14,17) });
-
-        s2_m1a.addReferences(file, new LineCol[] { lc(24,14), lc(26,12) });
-        s2_m1b.addReferences(file, new LineCol[] { lc(25,14), lc(26,17) });
-        
-        s3_m1b.addReferences(file, new LineCol[] { lc(38,14), lc(39,17) });
-
-        startTests("Renaming file exercising Bug 278324");
-        addSuccessTests(m1_m1a, "something_else");
-        addSuccessTests(m1_m1b, "something_else");
-        addSuccessTests(s1_m1b, "something_else");
-        addSuccessTests(s2_m1a, "something_else");
-        addSuccessTests(s2_m1b, "something_else");
-        addSuccessTests(s3_m1b, "something_else");
-        endTests();
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameBug278320.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameBug278320.java
deleted file mode 100644
index ef631ac..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameBug278320.java
+++ /dev/null

@@ -1,40 +0,0 @@
-package org.eclipse.photran.internal.tests.refactoring.rename;
-
-import junit.framework.Test;
-
-import org.eclipse.photran.internal.core.util.LineCol;
-
-public class RenameBug278320 extends RenameTestSuite
-{
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // RECORD POSITION OF MODULE_ARRAY IN BUG278320-*.F90
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    private String prog_file = "bug278320-prog.f90";
-    private String mod_file = "bug278320-mod.f90";
-
-    private Ident module_array = var("module_array");
-    
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // TEST CASES
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    public static Test suite() throws Exception
-    {
-        return new RenameBug278320();
-    }
-    
-    public RenameBug278320() throws Exception
-    {
-        module_array.addReferences(prog_file, new LineCol[] { lc(5,5), lc(6,17) });
-        module_array.addReferences(mod_file, new LineCol[] { lc(3,28) });
-
-        startTests("Renaming file exercising Bug 278320");
-        addSuccessTests(module_array, "something_else");
-        endTests();
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameBug278324.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameBug278324.java
deleted file mode 100644
index d887730..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameBug278324.java
+++ /dev/null

@@ -1,38 +0,0 @@
-package org.eclipse.photran.internal.tests.refactoring.rename;
-
-import junit.framework.Test;
-
-import org.eclipse.photran.internal.core.util.LineCol;
-
-public class RenameBug278324 extends RenameTestSuite
-{
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // RECORD POSITIONS OF ALL IDENTIFIERS IN BUG278324.F90
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    private String file = "bug278324.f90";
-
-    private Ident parmValFormat = var("parmValFormat");
-    
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // TEST CASES
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    public static Test suite() throws Exception
-    {
-        return new RenameBug278324();
-    }
-    
-    public RenameBug278324() throws Exception
-    {
-        parmValFormat.addReferences(file, new LineCol[] { lc(3,25), lc(5,11), lc(6,15) });
-
-        startTests("Renaming file exercising Bug 278324");
-        addSuccessTests(parmValFormat, "something_else");
-        endTests();
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameExtSub1.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameExtSub1.java
deleted file mode 100644
index 8cf3723..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameExtSub1.java
+++ /dev/null

@@ -1,55 +0,0 @@
-package org.eclipse.photran.internal.tests.refactoring.rename;
-
-import junit.framework.Test;
-
-import org.eclipse.photran.internal.core.util.LineCol;
-
-/**
- * Rename refactoring tests ensuring that renaming external subprograms also
- * updates references in other files and in INTERFACE blocks
- * 
- * @author Jeff Overbey
- */
-public class RenameExtSub1 extends RenameTestSuite
-{
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // RECORD POSITIONS OF SUBPROGRAM IDENTIFIERS IN RENAME-EXTSUB1-*.F90
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    private String file1 = "rename-extsub1-a.f90";
-    private String file2 = "rename-extsub1-b.f90";
-
-    private Ident ext1 = var("ext1");
-    private Ident ext2 = var("ext2");
-    private Ident ext3 = var("ext3");
-    
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // TEST CASES
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    public static Test suite() throws Exception
-    {
-        return new RenameExtSub1();
-    }
-    
-    public RenameExtSub1() throws Exception
-    {
-        ext1.addReferences(file1, new LineCol[] { lc(1,12), lc(2,16), lc(6,16), lc(7,20), lc(17,8) });
-        
-        ext2.addReferences(file1, new LineCol[] { lc(9,31), lc(11,18), lc(18,12) });
-        ext2.addReferences(file2, new LineCol[] { lc(1,27), lc(6,3), lc(7,14) });
-        
-        ext3.addReferences(file1, new LineCol[] { lc(13,22), lc(14,18), lc(19,12), lc(23,10), lc(25,14) });
-        ext3.addReferences(file2, new LineCol[] { lc(3,12), lc(5,7) });
-
-        startTests("Renaming file testing aggressive external subprogram binding resolution");
-        addSuccessTests(ext1, "something_else");
-        addSuccessTests(ext2, "something_else");
-        addSuccessTests(ext3, "something_else");
-        endTests();
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameFnResult.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameFnResult.java
deleted file mode 100644
index 15eb17a..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameFnResult.java
+++ /dev/null

@@ -1,38 +0,0 @@
-package org.eclipse.photran.internal.tests.refactoring.rename;
-
-import junit.framework.Test;
-
-import org.eclipse.photran.internal.core.util.LineCol;
-
-public class RenameFnResult extends RenameTestSuite
-{
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // RECORD POSITIONS OF ALL IDENTIFIERS IN RENAME-FN-RESULT.F90
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    private String file = "rename-fn-result.f90";
-
-    private Ident f = var("f");
-    
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // TEST CASES
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    public static Test suite() throws Exception
-    {
-        return new RenameFnResult();
-    }
-    
-    public RenameFnResult() throws Exception
-    {
-        f.addReferences(file, new LineCol[] { lc(1,12), lc(3,12), lc(4,16), lc(5,5), lc(6,16) });
-
-        startTests("Renaming function and implied result variable simultaneously");
-        addSuccessTests(f, "something_else");
-        endTests();
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameOverloads.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameOverloads.java
deleted file mode 100644
index 7abb61b..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameOverloads.java
+++ /dev/null

@@ -1,53 +0,0 @@
-package org.eclipse.photran.internal.tests.refactoring.rename;
-
-import junit.framework.Test;
-
-import org.eclipse.photran.internal.core.util.LineCol;
-
-/**
- * Rename refactoring tests ensuring that renaming external subprograms also
- * updates references in other files and in INTERFACE blocks
- * 
- * @author Jeff Overbey
- */
-public class RenameOverloads extends RenameTestSuite
-{
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // RECORD POSITIONS OF SUBPROGRAM IDENTIFIERS IN RENAME-EXTSUB1-*.F90
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    private String file = "rename-overloads.f90";
-
-    private Ident module_overload = var("module_overload");
-    private Ident overload_int = var("overload_int");
-    private Ident mp_overload_char = var("overload_char");
-    private Ident ext_overload_char = var("overload_char");
-
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // TEST CASES
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    public static Test suite() throws Exception
-    {
-        return new RenameOverloads();
-    }
-    
-    public RenameOverloads() throws Exception
-    {
-        module_overload.addReferences(file, new LineCol[] { lc(2,13), lc(7,17), lc(39,10), lc(40,10) });
-        overload_int.addReferences(file, new LineCol[] { lc(3,16), lc(5,20), lc(15,12), lc(18,16), lc(22,16), lc(24,20), lc(33,8), lc(41,10) });
-        mp_overload_char.addReferences(file, new LineCol[] { lc(6,22), lc(9,14), lc(12,18), lc(42,10) });
-        ext_overload_char.addReferences(file, new LineCol[] { lc(26,16), lc(28,20), lc(34,8), lc(46,12), lc(49,16) });
-
-        startTests("Renaming file testing bindings in overload declarations");
-        addSuccessTests(module_overload, "something_else");
-        addSuccessTests(overload_int, "something_else");
-        addSuccessTests(mp_overload_char, "something_else");
-        addSuccessTests(ext_overload_char, "something_else");
-        endTests();
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameTestCase.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameTestCase.java
deleted file mode 100644
index cd530cb..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameTestCase.java
+++ /dev/null

@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring.rename;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.photran.internal.core.refactoring.RenameRefactoring;
-import org.eclipse.photran.internal.core.refactoring.interfaces.IRenameRefactoring;
-import org.eclipse.photran.internal.core.util.LineCol;
-import org.eclipse.photran.internal.core.vpg.PhotranVPG;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.tests.PhotranWorkspaceTestCase;
-import org.eclipse.photran.internal.tests.refactoring.rename.RenameTestSuite.Ident;
-
-public abstract class RenameTestCase extends PhotranWorkspaceTestCase
-{
-    private static final String DIR = "refactoring-test-code/rename";
-
-    private static NullProgressMonitor pm = new NullProgressMonitor();
-
-    protected String filename;
-    protected Ident variable;
-    protected LineCol position;
-    protected String newName;
-
-    public RenameTestCase() {;}  // when JUnit invokes a subclass outside a test suite
-
-    public RenameTestCase(String filename, Ident variable, LineCol position, String newName)
-    {
-        this.filename = filename;
-        this.variable = variable;
-        this.newName = newName;
-        this.position = position;
-        this.setName("test");
-    }
-    
-//    public void testLevenshtein()
-//    {
-//        assertEquals(0, levenshteinDistance("", ""));
-//        assertEquals(0, levenshteinDistance("kitten", "kitten"));
-//        assertEquals(6, levenshteinDistance("", "kitten"));
-//        assertEquals(6, levenshteinDistance("kitten", ""));
-//        assertEquals(3, levenshteinDistance("kitten", "sitting"));
-//        assertEquals(3, levenshteinDistance("kitten", "kit"));
-//        assertEquals(1, levenshteinDistance("kitten", "kittten"));
-//        assertEquals(2, levenshteinDistance("kitten", "kien"));
-//    }
-
-    /**
-     * Computes the Levenshtein distance between two strings.
-     *
-     * @return the Levenshtein distance between <code>s</code> and <code>t</code>
-     */
-    /*
-     * This is a well-known algorithm; see, for example,
-     * http://en.wikipedia.org/wiki/Levenshtein_distance
-     */
-    protected int levenshteinDistance(String s, String t)
-    {
-        int m = s.length(), n = t.length();
-
-        int[][] d = new int[m+1][n+1];
-
-        for (int i = 1; i <= m; i++)
-            d[i][0] = i;
-        for (int j = 1; j <= n; j++)
-            d[0][j] = j;
-
-        for (int i = 1; i <= m; i++)
-        {
-            for (int j = 1; j <= n; j++)
-            {
-                int cost = s.charAt(i-1) == t.charAt(j-1) ? 0 : 1;
-                d[i][j] = min(d[i-1][j] + 1,       // deletion
-                              d[i][j-1] + 1,       // insertion
-                              d[i-1][j-1] + cost); // substitution
-            }
-        }
-
-        return d[m][n];
-    }
-
-    private int min(int a, int b, int c)
-    {
-        return Math.min(Math.min(a, b), c);
-    }
-
-    protected void assertLevDist(String errorMessage, int expected, String s, String t)
-    {
-        int actual = levenshteinDistance(s, t);
-
-        if (actual != expected)
-        {
-            // Use assertEquals so that JUnit will pop up a comparison viewer
-            assertEquals("Unexpected Levenshtein distance " + actual + " (expected " + expected + ") " + errorMessage,
-                         s,
-                         t);
-        }
-    }
-
-    /**
-     * Renames the identifier at the given position in the given workspace file to the given new name.  Files in the workspace
-     * are updated accordingly.
-     */
-    protected void doRename(String filename, LineCol lineCol, String newName, Set<String> allFiles) throws Exception
-    {
-        String description = "Attempt to rename identifier at " + lineCol;
-
-        IRenameRefactoring refactoring = createRefactoring(filename, lineCol, allFiles);
-
-        RefactoringStatus status = refactoring.checkInitialConditions(pm);
-        assertTrue(description + " failed initial precondition check: " + status.toString(), !status.hasError());
-
-        refactoring.setNewNameForIdentifier(newName);
-
-        status = refactoring.checkFinalConditions(pm);
-        assertTrue(description + " failed final precondition check: " + status.toString(), !status.hasError());
-
-        Change change = refactoring.createChange(pm);
-        assertNotNull(description + " returned null Change object", change);
-        assertTrue(description + " returned invalid Change object", change.isValid(pm).isOK());
-        change.perform(pm);
-
-        project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-    }
-
-    /**
-     * Attempts to renames the identifier at the given position in the given workspace file to the given new name, with
-     * the expectation that at least one precondition will fail.  Returns the first failing status.  Does not actually
-     * perform the refactoring.
-     */
-    protected RefactoringStatus attemptRename(String filename, LineCol lineCol, String newName, Set<String> allFiles) throws Exception
-    {
-        IRenameRefactoring refactoring = createRefactoring(filename, lineCol, allFiles);
-
-        RefactoringStatus status = refactoring.checkInitialConditions(pm);
-        if (status.hasError()) return status;
-
-        refactoring.setNewNameForIdentifier(newName);
-
-        status = refactoring.checkFinalConditions(pm);
-        return status;
-    }
-
-    private IRenameRefactoring createRefactoring(final String filename, final LineCol lineCol, final Set<String> allFiles) throws Exception
-    {
-    	PhotranVPG.getInstance().clearDatabase();
-
-        final IFile thisFile = importFile(Activator.getDefault(), DIR, filename);
-        for (String f : allFiles)
-            importFile(Activator.getDefault(), DIR, f);
-
-        // Originally, we called acquireTransientAST on each IFile
-        PhotranVPG.getInstance().ensureVPGIsUpToDate(new NullProgressMonitor());
-        //project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); // Runs in separate thread... grrr...
-
-//        System.out.println(filename);
-//        for (String f : allFiles)
-//            System.out.println(f);
-//        PhotranVPG.getInstance().db.printOn(System.out);
-
-        IRenameRefactoring r = createRefactoring();
-        r.initialize(thisFile, new TextSelection(getLineColOffset(filename, lineCol), 0));
-        return r;
-    }
-
-    protected abstract IRenameRefactoring createRefactoring();
-
-    protected String readTestFile(String filename) throws IOException, URISyntaxException
-    {
-        return super.readTestFile(Activator.getDefault(), DIR, filename);
-    }
-
-    public static class ExpectSuccess extends RenameTestCase
-    {
-        public ExpectSuccess() {;}  // when JUnit invokes this outside a test suite
-
-        public ExpectSuccess(String filename, Ident variable, LineCol position, String newName)
-        {
-            super(filename, variable, position, newName);
-        }
-
-        /**
-         * Given an array with all of the positions of identifiers that should be renamed together, try applying the Rename refactoring to
-         * each, and make sure all the others change with it.
-         */
-        public void test() throws Exception
-        {
-            if (filename == null || variable == null || newName == null) return; // when JUnit invokes this outside a test suite
-            //System.out.println("***** " + variable.getName() + " ==> " + newName + " *****");
-
-            doRename(filename, position, newName, variable.getFiles());
-            for (String filename : variable.getFiles())
-            {
-                int totalLevDist = variable.getReferences(filename).length * levenshteinDistance(variable.getName(), newName);
-                assertLevDist("renaming " + variable.getName() + " to " + newName + " (" + position + " - " + variable.getReferences(filename).length + " occurrences)",
-                              totalLevDist,
-                              readTestFile(filename), // original file
-                              readWorkspaceFile(filename)); // refactored file
-            }
-        }
-
-        @Override protected IRenameRefactoring createRefactoring()
-        {
-            return new RenameRefactoring();
-        }
-    }
-
-    public static class ExpectFailure extends RenameTestCase
-    {
-        public ExpectFailure() {;}  // when JUnit invokes this outside a test suite
-
-        public ExpectFailure(String filename, Ident variable, LineCol position, String newName)
-        {
-            super(filename, variable, position, newName);
-        }
-
-        /**
-         * Given an array with all of the positions of identifiers that should be renamed together, try applying the Rename refactoring to
-         * each, and make sure a precondition failure is raised.
-         * @throws Exception
-         */
-        public void test() throws Exception
-        {
-            if (filename == null || variable == null || newName == null) return; // when JUnit invokes this outside a test suite
-            //System.out.println("***** " + variable.getName() + " ==> " + newName + " *****");
-
-            RefactoringStatus status = attemptRename(filename, position, newName, variable.getFiles());
-            assertTrue("Attempting to rename " + variable.getName() + " to " + newName + " in " + filename
-                           + " (" + position + " - " + variable.getReferences(filename).length + " occurrences) "
-                           + "should have failed precondition checking.",
-                       status.hasError());
-        }
-
-        @Override protected IRenameRefactoring createRefactoring()
-        {
-            return new RenameRefactoring();
-        }
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameTestSuite.java
deleted file mode 100644
index b165687..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/refactoring/rename/RenameTestSuite.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.refactoring.rename;
-
-import java.util.HashMap;
-import java.util.Set;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.photran.internal.core.util.LineCol;
-
-public abstract class RenameTestSuite extends TestSuite
-{
-    /**
-     * If this is set to <code>true</code>, a test case will be added where the refactoring is
-     * initiated from every occurrence of the variable name.  If it is <code>false</code>, the
-     * refactoring will only be initiated once for each identifier, and the selection will be
-     * the first occurrence of that identifier in the file.
-     */
-    private static boolean TEST_ALL_REFERENCES = false;
-    
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // RECORD POSITIONS OF ALL IDENTIFIERS IN RENAME1.F90, AND
-    // GROUP THEM ACCORDING TO WHICH ONES SHOULD BE RENAMED TOGETHER
-    //
-    ///////////////////////////////////////////////////////////////////////////
-    
-    public static class Ident
-    {
-        private String name;
-        private HashMap<String, LineCol[]> references;
-        
-        public Ident(String name)
-        {
-            this.name = name;
-            this.references = new HashMap<String, LineCol[]>();
-        }
-        
-        public Ident(String filename, String name, LineCol[] referencesInFile)
-        {
-            this(name);
-            addReferences(filename, referencesInFile);
-        }
-        
-        public void addReferences(String filename, LineCol[] referencesInFile)
-        {
-            this.references.put(filename, referencesInFile);
-        }
-
-        public String getName()
-        {
-            return this.name;
-        }
-
-        public Set<String> getFiles()
-        {
-            return this.references.keySet();
-        }
-        
-        public LineCol[] getReferences(String filename)
-        {
-            return this.references.get(filename);
-        }
-    }
-
-    protected Ident var(String name) { return new Ident(name); }
-    protected Ident var(String filename, String name, LineCol[] refs) { return new Ident(filename, name, refs); }
-    protected LineCol lc(int line, int col) { return new LineCol(line, col); }
-    
-    ///////////////////////////////////////////////////////////////////////////
-    //
-    // SUITE BUILDING
-    //
-    ///////////////////////////////////////////////////////////////////////////
-
-    private TestSuite currentSubSuite = null;
-    
-    protected void startTests(String description)
-    {
-        currentSubSuite = new TestSuite();
-        currentSubSuite.setName(description);
-    }
-    
-    protected void addSuccessTests(Ident ident, String newName)
-    {
-        TestSuite subSubSuite = new TestSuite();
-        subSubSuite.setName("Renaming " + describe(ident, newName));
-        
-        for (String filename : ident.getFiles())
-            for (LineCol position : referencesTo(ident, filename))
-                subSubSuite.addTest(createSuccessTestCase(ident, newName, filename, position));
-        
-        currentSubSuite.addTest(subSubSuite);
-    }
-
-
-    protected void addPreconditionTests(Ident ident, String newName)
-    {
-        TestSuite subSubSuite = new TestSuite();
-        subSubSuite.setName("Attempting to rename " + describe(ident, newName));
-        
-        for (String filename : ident.getFiles())
-            for (LineCol position : referencesTo(ident, filename))
-                subSubSuite.addTest(createFailureTestCase(ident, newName, filename, position));
-        
-        currentSubSuite.addTest(subSubSuite);
-    }
-
-    private LineCol[] referencesTo(Ident ident, String filename)
-    {
-        LineCol[] allReferences = ident.getReferences(filename);
-        
-        if (TEST_ALL_REFERENCES)
-            return allReferences;
-        else if (allReferences.length == 0)
-            return new LineCol[] { };
-        else
-            return new LineCol[] { allReferences[0] };
-    }
-
-    protected TestCase createSuccessTestCase(Ident ident, String newName, String filename, LineCol position)
-    {
-        return new RenameTestCase.ExpectSuccess(filename, ident, position, newName);
-    }
-    
-    protected TestCase createFailureTestCase(Ident ident, String newName, String filename, LineCol position)
-    {
-        return new RenameTestCase.ExpectFailure(filename, ident, position, newName);
-    }
-    
-    private String describe(Ident ident, String newName)
-    {
-        return ident.name + " to " + newName;
-    }
-    
-    protected void endTests()
-    {
-        addTest(currentSubSuite);
-        currentSubSuite = null;
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/search/ManualSearchPageTests.txt b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/search/ManualSearchPageTests.txt
deleted file mode 100644
index 81cf5a8..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/search/ManualSearchPageTests.txt
+++ /dev/null

@@ -1,77 +0,0 @@
-Fortran Search is displayed in the Fortran perspective:
-1: Launch eclipse with the Photran plugin.
-2: Ensure that the workspace is in the Fortran Perspective 
-   (Window->Open Perspective-> Other-> Fortran)
-3: Select Search from the menu bar
-4: "Fortran Search" should be in the dropdown menu.
-
-
-Fortran Search is among the choices in the Search Page
-1: Launch eclipse with the Photran plugin.
-2: Ensure that the workspace is in the Fortran Perspective 
-   (Window->Open Perspective-> Other-> Fortran)
-3: Select Search from the menu bar
-4: Select Search from the dropdown menu
-5: "Fortran Search" should be one of the tabs listed in the Search dialog
-
-
-Search Button is disallowed for empty strings
-1: Launch eclipse with the Photran plugin.
-2: Ensure that the workspace is in the Fortran Perspective 
-   (Window->Open Perspective-> Other-> Fortran)
-3: Select Search-> Fortran Search
-4: Delete any text in the "Search pattern" text box
-5: The search button should be disabled
-
-
-Search Button is disallowed if no types are specified
-1: Launch eclipse with the Photran plugin.
-2: Ensure that the workspace is in the Fortran Perspective 
-   (Window->Open Perspective-> Other-> Fortran)
-3: Select Search-> Fortran Search
-4: Enter any characters into the "Search Pattern" text box
-5: Uncheck all check boxes in the "Search for" area 
-   (Common block, Function, Subroutine, Module, Variable, Program)
-6: The "Search" button should be disabled
-
-
-Checked Regular Expression checkbox hides glob string instructions
-1: Launch eclipse with the Photran plugin.
-2: Ensure that the workspace is in the Fortran Perspective 
-   (Window->Open Perspective-> Other-> Fortran)
-3: Select Search-> Fortran Search
-4: Check the Regular Expression checkbox
-5: The "glob string instructions" (* = any string, ? = any character) should be hidden
-
-
-Unchecked Regular Expression checkbox shows glob string instructions
-1: Launch eclipse with the Photran plugin.
-2: Ensure that the workspace is in the Fortran Perspective 
-   (Window->Open Perspective-> Other-> Fortran)
-3: Select Search-> Fortran Search
-4: Uncheck the Regular Expression checkbox
-5: The "glob string instructions" (* = any string, ? = any character) 
-   should be visible under the search box
-
-
-Search box saves last search settings
-1: Launch eclipse with the Photran plugin.
-2: Ensure that the workspace is in the Fortran Perspective 
-   (Window->Open Perspective-> Other-> Fortran)
-3: Select Search-> Fortran Search
-4: Select any desired search criteria which will allow for a search
-5: Perform the search (it does not matter if the search fails)
-6: Select Search-> Fortran Search
-7: The settings from the previous search should be enabled, and the string used in 
-   the last search should be in the drop-down menu for the text box
-   
-
-Search button activates a search
-1: Launch eclipse with the Photran plugin.
-2: Ensure that the workspace is in the Fortran Perspective 
-   (Window->Open Perspective-> Other-> Fortran)
-3: Select Search-> Fortran Search
-4: Select any desired search criteria which will allow for a search
-5: Click the Search button
-6: Ensure that the Search tab becomes active, indicating that the search command 
-   was executed

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/search/VPGSearchTestCase.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/search/VPGSearchTestCase.java
deleted file mode 100644
index 8df56bf..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/search/VPGSearchTestCase.java
+++ /dev/null

@@ -1,145 +0,0 @@
-package org.eclipse.photran.internal.tests.search;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Scanner;
-
-import org.eclipse.cdt.core.tests.BaseTestFramework;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.ui.search.FortranSearchQuery;
-import org.eclipse.rephraserengine.ui.search.SearchMatch;
-import org.eclipse.rephraserengine.ui.search.SearchPage;
-import org.eclipse.rephraserengine.ui.search.SearchResult;
-import org.eclipse.search.ui.IQueryListener;
-import org.eclipse.search.ui.ISearchQuery;
-import org.eclipse.search.ui.ISearchResult;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.search.ui.text.Match;
-
-/**
- * A single test case for the Prototype Fortran Search
- * Parameters include filenames, scope, and the string to search for
- *
- * @author Jeff Dammeyer, Andrew Deason, Joe Digiovanna, Nick Sexmith
- */
-public class VPGSearchTestCase extends BaseTestFramework
-{
-    private static final String DIR = "search-test-code";
-
-    private static NullProgressMonitor pm = new NullProgressMonitor();
-
-    protected String searchString;
-    protected int searchFlags;
-    protected ArrayList<SearchMatch> matches;
-    protected ArrayList<Match> initMatches;
-    protected boolean isRegex;
-    protected ArrayList<IResource> scope;
-
-    public VPGSearchTestCase() {;}  // when JUnit invokes a subclass outside a test suite
-
-    public VPGSearchTestCase(String searchString, int searchFlags,
-        ArrayList<Match> matches, boolean isRegex)
-    {
-        this.setName("test");
-        this.searchString = searchString;
-        this.searchFlags = searchFlags;
-        this.isRegex = isRegex;
-        this.matches = new ArrayList<SearchMatch>(matches.size());
-        scope = new ArrayList<IResource>();
-        initMatches = matches;
-    }
-
-
-    private IFile getFile(String filename) throws Exception
-    {
-        Scanner sc = new Scanner(Activator.getDefault().getBundle().getResource(DIR + "/" + filename).openStream());
-        sc.useDelimiter("\\A");
-        String contents = sc.next();
-        sc.close();
-        return super.importFile(filename, contents);
-    }
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        if (searchString == null) return; // when JUnit invokes this outside a test suite
-        super.setUp();
-
-        convertMatches();
-        createProject();
-    }
-
-    private void convertMatches() throws Exception
-    {
-        for (Match m : initMatches)
-        {
-            IFile file = getFile((String)(m.getElement()));
-            matches.add(new SearchMatch(file, m.getOffset(), m.getLength()));
-        }
-    }
-
-    private void createProject()
-    {
-        try
-        {
-            scope.add(getFile("foo.f90"));
-            scope.add(getFile("implicitTest.f90"));
-        } catch (Exception e){
-            System.out.println("Error in createProject(): "+e);
-        }
-    }
-
-    private SearchResult runQuery(FortranSearchQuery job)
-    {
-        final ISearchResult result[]= new ISearchResult[1];
-
-        IQueryListener listener= new IQueryListener()
-        {
-            public void queryAdded(ISearchQuery query) {}
-            public void queryFinished(ISearchQuery query) { result[0]= query.getSearchResult(); }
-            public void queryRemoved(ISearchQuery query) {}
-            public void queryStarting(ISearchQuery query) {}
-        };
-
-        NewSearchUI.addQueryListener(listener);
-        NewSearchUI.runQueryInForeground(new IRunnableContext()
-        {
-            public void run(boolean fork, boolean cancelable, IRunnableWithProgress runnable)
-                throws InvocationTargetException, InterruptedException
-            {
-                runnable.run(pm);
-            }
-        }, job);
-
-        assertTrue(result[0] instanceof SearchResult);
-        return (SearchResult)result[0];
-    }
-
-    public void test() throws Exception
-    {
-        if (searchString == null) return; // when JUnit invokes this outside a test suite
-
-        String patternDesc = searchString.trim();
-        String patternRegex = isRegex ? patternDesc : SearchPage.convertGlobToRegex(patternDesc);
-        FortranSearchQuery job = new FortranSearchQuery(scope, "Scope description", patternDesc, patternRegex, searchFlags);
-
-        SearchResult res = runQuery(job);
-        int count = 0;
-        for (Object obj : res.getElements())
-        {
-            for (Match m : res.getMatches(obj))
-            {
-                if (matches.contains((SearchMatch)m))
-                {
-                    count++;
-                }
-            }
-        }
-        assertEquals(matches.size(),count);
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/search/VPGSearchTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/search/VPGSearchTestSuite.java
deleted file mode 100644
index a5f3542..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/search/VPGSearchTestSuite.java
+++ /dev/null

@@ -1,98 +0,0 @@
-package org.eclipse.photran.internal.tests.search;
-
-import java.util.ArrayList;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.photran.internal.ui.search.FortranSearchQuery;
-import org.eclipse.search.ui.text.Match;
-
-/**
- * The suite of tests for testing search functionality
- * 
- * @author Jeff Dammeyer, Andrew Deason, Joe Digiovanna, Nick Sexmith
- */
-public class VPGSearchTestSuite extends TestSuite
-{   
-    /**
-     * Adds all the tests to the suite for searching tests
-     */
-    public static Test suite() throws Exception
-    {
-        TestSuite suite = new TestSuite();
-        ArrayList<Match> matches = new ArrayList<Match>();
-        
-        
-        //test 1
-        //Does a basic test across two different files
-        matches.add(new Match("foo.f90",23,1));
-        matches.add(new Match("foo.f90",30,1));
-        matches.add(new Match("implicitTest.f90",22,1));
-        suite.addTest(getSuiteFor("testOne", new VPGSearchTestCase("a",
-            FortranSearchQuery.FIND_ALL_OCCURANCES | FortranSearchQuery.FIND_ALL_TYPES, matches, false)));
-        
-        //test 2
-        //Same as 2 except different search string
-        matches = new ArrayList<Match>();
-        matches.add(new Match("foo.f90",26,1));
-        matches.add(new Match("implicitTest.f90",67,1));
-        suite.addTest(getSuiteFor("testTwo", new VPGSearchTestCase("b",
-            FortranSearchQuery.FIND_ALL_OCCURANCES | FortranSearchQuery.FIND_ALL_TYPES, matches, false)));
-
-        //test 3
-        //Tests FIND_DECLARATIONS to make sure it is different from FIND_ALL_OCCURANCES
-        matches = new ArrayList<Match>();
-        matches.add(new Match("foo.f90",23,1));
-        suite.addTest(getSuiteFor("testThree", new VPGSearchTestCase("a",
-            FortranSearchQuery.FIND_DECLARATIONS | FortranSearchQuery.FIND_ALL_TYPES, matches, false)));
-        
-//        //test 4
-//        //Tests FIND_REFERENCES
-//        matches = new ArrayList<Match>();
-//        matches.add(new Match("foo.f90",30,1));
-//        matches.add(new Match("implicitTest.f90",22,1));
-//        suite.addTest(getSuiteFor("testFour", new VPGSearchTestCase("a",
-//            VPGSearchQuery.FIND_REFERENCES | VPGSearchQuery.FIND_ALL_TYPES, matches, false)));
-        
-        //test 5
-        //Tests FIND_FUNCTION to make sure it is different from test 6
-        matches = new ArrayList<Match>();
-        suite.addTest(getSuiteFor("testFive", new VPGSearchTestCase("main",
-            FortranSearchQuery.FIND_ALL_OCCURANCES | FortranSearchQuery.FIND_FUNCTION, matches, false)));
-        
-        
-        //test 6
-        //Tests FIND_PROGRAM so it's not the same as FIND_FUNCTION
-        matches = new ArrayList<Match>();
-        matches.add(new Match("foo.f90",8,4));
-        suite.addTest(getSuiteFor("testSix", new VPGSearchTestCase("main",
-            FortranSearchQuery.FIND_ALL_OCCURANCES | FortranSearchQuery.FIND_PROGRAM, matches, false)));
-        
-        //test 7
-        //Tests the glob '?'
-        suite.addTest(getSuiteFor("testSeven", new VPGSearchTestCase("ma?n",
-            FortranSearchQuery.FIND_ALL_OCCURANCES | FortranSearchQuery.FIND_PROGRAM, matches, false)));
-        
-        //test 8
-        //Tests the glob '*'
-        suite.addTest(getSuiteFor("testEight", new VPGSearchTestCase("m*n",
-            FortranSearchQuery.FIND_ALL_OCCURANCES | FortranSearchQuery.FIND_PROGRAM, matches, false)));
-
-        //test 9
-        //Tests regex
-        suite.addTest(getSuiteFor("testNine", new VPGSearchTestCase("m.*",
-            FortranSearchQuery.FIND_ALL_OCCURANCES | FortranSearchQuery.FIND_PROGRAM, matches, true)));
-        
-               
-        return suite;
-    }
-    
-    
-    private static TestSuite getSuiteFor(String baseFilename, VPGSearchTestCase testCase)
-    {
-        TestSuite subSuite = new TestSuite(baseFilename);
-        subSuite.addTest(testCase);
-        return subSuite;
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/vpg/InterfaceLinkTests.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/vpg/InterfaceLinkTests.java
deleted file mode 100644
index 45e5852..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/vpg/InterfaceLinkTests.java
+++ /dev/null

@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.vpg;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.photran.core.IFortranAST;
-import org.eclipse.photran.internal.core.analysis.binding.Definition;
-import org.eclipse.photran.internal.core.lexer.Token;
-import org.eclipse.photran.internal.core.vpg.PhotranVPG;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.tests.PhotranWorkspaceTestCase;
-
-/**
- * Unit tests for {@link Definition#resolveInterfaceBinding()}
- * and {@link Definition#findMatchingDeclarationsInInterfaces()}
- *
- * @author Jeff Overbey
- */
-public class InterfaceLinkTests extends PhotranWorkspaceTestCase
-{
-    private static final String DIR = "vpg-test-code/interface-links";
-
-    private IFile interface1;
-    private IFile definition1;
-    private IFile definition2;
-    private IFile interface2;
-
-    private Definition if1;
-    private Definition if2;
-    private Definition if3;
-    private Definition if4;
-    private Definition def1;
-    private Definition def2;
-    private Definition def3;
-
-    @Override public void setUp() throws Exception
-    {
-        super.setUp();
-
-        /* The four files are imported in this order so that
-         * the INTERFACE block in the first file is seen /before/
-         * all of the corresponding subprogram declarations,
-         * while the INTERFACE block in the last file is seen
-         * /after/ all of the corresponding subprograms.
-         */
-
-        interface1 = importFile(Activator.getDefault(), DIR, "interface1.f90");
-        definition1 = importFile(Activator.getDefault(), DIR, "definition1.f90");
-        definition2 = importFile(Activator.getDefault(), DIR, "definition2.f90");
-        interface2 = importFile(Activator.getDefault(), DIR, "interface2.f90");
-        //                    File      Line  Column
-        if1  = findDefinition(interface1,  2, 20); // Ordinary INTERFACE block
-        if2  = findDefinition(interface1, 10, 24); // INTERFACE block for a subprogram parameter
-        if3  = findDefinition(interface1, 17, 24); // Ordinary INTERFACE block
-        if4  = findDefinition(interface2,  2, 20); // Ordinary INTERFACE block
-        def1 = findDefinition(interface1, 24, 18);
-        def2 = findDefinition(definition1, 1, 18);
-        def3 = findDefinition(definition2, 1, 18);
-    }
-
-    public void testResolveInterfaceBinding() throws Exception
-    {
-        checkContainsAllDefinitions(if1.resolveInterfaceBinding());
-        assertTrue(if2.resolveInterfaceBinding().isEmpty()); // Interface for subprogram parameter
-        checkContainsAllDefinitions(if3.resolveInterfaceBinding());
-        checkContainsAllDefinitions(if4.resolveInterfaceBinding());
-    }
-
-    public void testFindMatchingDeclarationsInInterfaces() throws Exception
-    {
-        checkContainsAllInterfaces(def1.findMatchingDeclarationsInInterfaces());
-        checkContainsAllInterfaces(def2.findMatchingDeclarationsInInterfaces());
-        checkContainsAllInterfaces(def3.findMatchingDeclarationsInInterfaces());
-    }
-
-    private void checkContainsAllDefinitions(Collection<Definition> defs)
-    {
-        assertEquals(3, defs.size());
-        assertTrue(defs.contains(def1));
-        assertTrue(defs.contains(def2));
-        assertTrue(defs.contains(def3));
-    }
-
-    private void checkContainsAllInterfaces(Collection<Definition> defs)
-    {
-        assertEquals(3, defs.size());
-        assertTrue(defs.contains(if1));
-        assertFalse(defs.contains(if2)); // Interface for subprogram parameter
-        assertTrue(defs.contains(if3));
-        assertTrue(defs.contains(if4));
-    }
-
-    private Definition findDefinition(IFile file, int line, int col)
-    {
-        IFortranAST ast = PhotranVPG.getInstance().acquireTransientAST(file); assertNotNull(ast);
-        Token token = findTokenByLineCol(ast, line, col); assertNotNull(token);
-        List<Definition> defs = token.resolveBinding(); assertEquals(1, defs.size());
-        Definition def = defs.get(0);
-        assertEquals(file, def.getTokenRef().getFile());
-        assertEquals(token.getFileOffset(), def.getTokenRef().getOffset());
-        return def;
-    }
-
-    private Token findTokenByLineCol(IFortranAST ast, int line, int col)
-    {
-        for (Token token : ast)
-            if (token.getLine() == line && token.getCol() == col)
-                return token;
-
-        return null;
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/vpg/ListAllModulesTests.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/vpg/ListAllModulesTests.java
deleted file mode 100644
index c6fb180..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/vpg/ListAllModulesTests.java
+++ /dev/null

@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.vpg;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.photran.internal.core.vpg.PhotranVPG;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.tests.PhotranWorkspaceTestCase;
-
-/**
- * Unit tests for {@link PhotranVPG#listAllModules()}
- *
- * @author Jeff Overbey
- */
-public class ListAllModulesTests extends PhotranWorkspaceTestCase
-{
-    private static final String DIR = "vpg-test-code/list-modules";
-
-    @Override public void setUp() throws Exception
-    {
-        super.setUp();
-
-        /* The files are imported in this order so that the USE
-         * statement in use-module1.f90 is seen /before/
-         * the module declaration, while the USE statement for
-         * module 4 is seen after it.  Module2 and module3
-         * are not used.
-         */
-
-        importFile(Activator.getDefault(), DIR, "use-module1.f90");
-        importFile(Activator.getDefault(), DIR, "module1.f90");
-        importFile(Activator.getDefault(), DIR, "module2-module3.f90");
-        importFile(Activator.getDefault(), DIR, "module4.f90");
-        importFile(Activator.getDefault(), DIR, "use-module4.f90");
-        PhotranVPG.getInstance().ensureVPGIsUpToDate(new NullProgressMonitor());
-        //PhotranVPG.getDatabase().printOn(System.out);
-    }
-
-    public void testListAllModules() throws Exception
-    {
-        assertCollectionsEqual(
-            new String[] { "module1", "module2", "module3", "module4" },
-            PhotranVPG.getInstance().listAllModules());
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/vpg/TokenOffsetTests.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/vpg/TokenOffsetTests.java
deleted file mode 100644
index f296e29..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/vpg/TokenOffsetTests.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.vpg;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.photran.core.IFortranAST;
-import org.eclipse.photran.internal.core.lexer.Token;
-import org.eclipse.photran.internal.core.vpg.PhotranVPG;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.tests.PhotranWorkspaceTestCase;
-
-/**
- * Unit tests for checking token offsets
- *
- * @author Jeff Overbey
- */
-public class TokenOffsetTests extends PhotranWorkspaceTestCase
-{
-    private static final String DIR = "refactoring-test-code/encapsulate-variable/test-basic-integer";
-    private static final String FILE = "test-encap-01a-basic-integer.f90";
-    
-    private IFile file;
-
-    @Override public void setUp() throws Exception
-    {
-        super.setUp();
-
-        file = importFile(Activator.getDefault(), DIR, FILE);
-        PhotranVPG.getInstance().ensureVPGIsUpToDate(new NullProgressMonitor());
-        //PhotranVPG.getDatabase().printOn(System.out);
-    }
-
-    public void testListAllModules() throws Exception
-    {
-        PhotranVPG vpg = PhotranVPG.getInstance();
-        IFortranAST ast = vpg.acquirePermanentAST(file);
-        
-        // No preprocessing in this file
-        for (Token t : ast)
-        {
-            assertEquals(t.getLogicalFile(), t.getPhysicalFile().getIFile());
-            assertEquals(t.getFileOffset(), t.getStreamOffset());
-        }
-        
-        vpg.releaseAST(file);
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/vpg/VPGSerializerTests.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/vpg/VPGSerializerTests.java
deleted file mode 100644
index 7c645c6..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/vpg/VPGSerializerTests.java
+++ /dev/null

@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.vpg;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.Serializable;
-
-import junit.framework.TestCase;
-
-import org.eclipse.photran.internal.core.analysis.binding.Definition;
-import org.eclipse.photran.internal.core.analysis.binding.Definition.Classification;
-import org.eclipse.photran.internal.core.analysis.types.DerivedType;
-import org.eclipse.photran.internal.core.analysis.types.FunctionType;
-import org.eclipse.photran.internal.core.analysis.types.Type;
-import org.eclipse.photran.internal.core.vpg.PhotranTokenRef;
-import org.eclipse.photran.internal.core.vpg.PhotranVPGSerializer;
-
-/**
- * Tests serialization and deserialization using the {@link PhotranVPGSerializer}
- * 
- * @author Jeff Overbey
- */
-public class VPGSerializerTests extends TestCase
-{
-    public void test() throws IOException
-    {
-        check(null);
-
-        check("Hello");
-        check("");
-        
-        check(3);
-        check(100);
-        check(-999);
-        check(Integer.MAX_VALUE);
-        check(Integer.MIN_VALUE);
-        
-        check(Type.INTEGER);
-        check(Type.REAL);
-        check(Type.DOUBLEPRECISION);
-        check(Type.COMPLEX);
-        check(Type.LOGICAL);
-        check(Type.CHARACTER);
-        check(Type.UNKNOWN);
-        check(Type.VOID);
-        check(Type.TYPE_ERROR);
-        check(new PhotranTokenRef("/your/place/a.f90", -1, 0));
-        check(new PhotranTokenRef("Test", 3, 5));
-        check(new Definition("declaredName", new PhotranTokenRef("", -1, 0), Classification.ENUMERATOR, Type.INTEGER));
-        check(new DerivedType("my_type"));
-        check(new DerivedType("AnotherType"));
-        check(new FunctionType("a_function"));
-        check(new FunctionType("f"));
-    }
-    
-    private void check(Serializable object) throws IOException
-    {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-        PhotranVPGSerializer.serialize(object, out);
-        
-        ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-        Serializable deserializedObject = PhotranVPGSerializer.deserialize(in);
-        
-        assertEquals(object, deserializedObject);
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/vpg/VariableAccessTestSuite.java b/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/vpg/VariableAccessTestSuite.java
deleted file mode 100644
index 1bb229a..0000000
--- a/org.eclipse.photran.core.vpg.tests/src/org/eclipse/photran/internal/tests/vpg/VariableAccessTestSuite.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.photran.internal.tests.vpg;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.photran.core.IFortranAST;
-import org.eclipse.photran.internal.core.analysis.loops.ASTVisitorWithLoops;
-import org.eclipse.photran.internal.core.lexer.Token;
-import org.eclipse.photran.internal.core.vpg.PhotranVPG;
-import org.eclipse.photran.internal.tests.Activator;
-import org.eclipse.photran.internal.tests.PhotranWorkspaceTestCase;
-import org.eclipse.rephraserengine.testing.junit3.GeneralTestSuiteFromMarkers;
-
-/**
- * Test Suite for variable access marking (performed by the <code>ReferenceCollector</code>).
- * 
- * @author Matthew Fotzler
- */
-public class VariableAccessTestSuite extends GeneralTestSuiteFromMarkers
-{
-    private static final String DIR = "var-access-test-code";
-    
-    public static Test suite() throws Exception
-    {
-        return new VariableAccessTestSuite();
-    }
-    
-    public VariableAccessTestSuite() throws Exception
-    {
-        super("Constructing variable access marking for",
-            PhotranWorkspaceTestCase.MARKER,
-            new File(DIR),
-            PhotranWorkspaceTestCase.FORTRAN_FILE_FILTER);
-    }
-    
-    @Override
-    protected Test createTestFor(File fileContainingMarker, int markerOffset, String markerText)
-        throws Exception
-    {
-        return new ReferenceCollectorTestCase(fileContainingMarker, markerText) {};
-    }
-    
-    public static abstract class ReferenceCollectorTestCase extends PhotranWorkspaceTestCase
-    {
-        private File javaFile;
-        private IFile file;
-        private String[] markerText;
-        
-        public ReferenceCollectorTestCase(File file, String markerText) throws Exception
-        {
-            super("test");
-            this.javaFile = file;
-            this.markerText = parseMarker(markerText);
-        }
-        
-        @Override public void setUp() throws Exception
-        {
-            super.setUp();
-            
-            this.file = importFile(Activator.getDefault(), javaFileDirectory(), javaFile.getName());
-            project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-        }
-        
-        protected String javaFileDirectory()
-        {
-            return DIR+File.separator+javaFile.getParentFile().getName();
-        }
-        
-        public void test() throws Exception
-        {
-            PhotranVPG vpg = PhotranVPG.getInstance();
-            vpg.ensureVPGIsUpToDate(new NullProgressMonitor());
-            
-            IFortranAST ast = PhotranVPG.getInstance().acquireTransientAST(file);
-            assertNotNull(ast);
-            
-            String lineNumber = markerText[0];
-            String column = markerText[1];
-            Token token = findTokenByLineCol(ast, Integer.parseInt(lineNumber), Integer.parseInt(column));
-            assertNotNull(token);
-
-            String line = getLine(ast, Integer.parseInt(lineNumber));
-            String actual = line + token.getText() + " - " + token.getVariableAccessType().toString();
-            String expected = line + token.getText() + " - " + markerText[2];
-            if (!expected.equals(actual))
-                System.err.println(file.getFullPath());
-            assertEquals(expected, actual);
-        }
-
-        private String getLine(IFortranAST ast, int lineNumber)
-        {
-            final ArrayList<Token> lineTokens = new ArrayList<Token>();
-            final int lineNum = lineNumber;
-            String line = "";
-            
-            ast.accept(new ASTVisitorWithLoops(){
-                @Override public void visitToken(Token token)
-                {
-                    if(token.getLine() == lineNum)
-                        lineTokens.add(token);
-                }
-            });
-            
-            for(Token token : lineTokens)
-            {
-                line += token.getWhiteBefore() + token.getText() + token.getWhiteAfter();
-            }
-            
-            line += "\n";
-            
-            return line;
-        }
-        
-        private Token findTokenByLineCol(IFortranAST ast, int line, int col)
-        {
-            for (Token token : ast)
-                if (token.getLine() == line && token.getCol() == col)
-                    return token;
-
-            return null;
-        }
-    }
-}

diff --git a/org.eclipse.photran.core.vpg.tests/type-checker-test-code/test-constants/test.f90 b/org.eclipse.photran.core.vpg.tests/type-checker-test-code/test-constants/test.f90
deleted file mode 100644
index 3376f60..0000000
--- a/org.eclipse.photran.core.vpg.tests/type-checker-test-code/test-constants/test.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-type point
-  integer x, y
-end type
-
-type(point) :: pt
-
-
-
-
-print *, 3   !<<<<< 10, 10, 10, 11, integer
-print *, 3.4 !<<<<< 11, 10, 11, 13, real
-!print *, point(3, 4)  ! 12, 10, 12, 21, type(point)
-end

diff --git a/org.eclipse.photran.core.vpg.tests/var-access-test-code/array-test/array-test.f90 b/org.eclipse.photran.core.vpg.tests/var-access-test-code/array-test/array-test.f90
deleted file mode 100644
index 3653eb4..0000000
--- a/org.eclipse.photran.core.vpg.tests/var-access-test-code/array-test/array-test.f90
+++ /dev/null

@@ -1,10 +0,0 @@
-program arraytest
-    character(len=5), dimension(10) :: array
-    integer :: i
-    
-    do i=1,5
-        array(i)(3:4) = "OK";
-        !<<<<< 6,9,WRITE
-        !<<<<< 6,15,READ
-    end do
-end program
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/var-access-test-code/assignment-test/assignment-test.f90 b/org.eclipse.photran.core.vpg.tests/var-access-test-code/assignment-test/assignment-test.f90
deleted file mode 100644
index f7c0d49..0000000
--- a/org.eclipse.photran.core.vpg.tests/var-access-test-code/assignment-test/assignment-test.f90
+++ /dev/null

@@ -1,7 +0,0 @@
-program test1
-    integer :: x = 3
-
-    x = 2 !<<<<< 4,5,WRITE
-
-    print *, x !<<<<< 6,14,READ
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/var-access-test-code/call-test/call-test.f90 b/org.eclipse.photran.core.vpg.tests/var-access-test-code/call-test/call-test.f90
deleted file mode 100644
index 86978d5..0000000
--- a/org.eclipse.photran.core.vpg.tests/var-access-test-code/call-test/call-test.f90
+++ /dev/null

@@ -1,77 +0,0 @@
-program call
-    implicit none
-    integer :: i
-    integer, dimension(5) :: array
-
-!    interface
-!        integer function external_fn(n)
-!          integer, intent(in) :: n
-!        end function
-!        subroutine external_sub(n)
-!          integer, intent(out) :: n
-!        end subroutine
-!    end interface
-
-    call s(i, i, i) 
-    !<<<<< 15,12,READ
-    !<<<<< 15,15,WRITE
-    !<<<<< 15,18,RW
-    i = f(i, i, i)
-    !<<<<< 19,5,WRITE
-    !<<<<< 19,11,READ
-    !<<<<< 19,14,WRITE
-    !<<<<< 19,17,RW
-    i = g(i)
-    !<<<<< 24,5,WRITE
-    !<<<<< 24,11,WRITE
-    array(i) = array(i) * f(i, i, i)
-    !<<<<< 27,5,WRITE
-    !<<<<< 27,11,READ
-    !<<<<< 27,16,READ
-    !<<<<< 27,22,READ
-    !<<<<< 27,29,READ
-    !<<<<< 27,32,WRITE
-    !<<<<< 27,35,RW
-
-    call s(q=i, p=i, r=i)
-    !<<<<< 36,14,WRITE
-    !<<<<< 36,19,READ
-    !<<<<< 36,24,RW
-    i = f(q=i, p=i, r=i)
-    !<<<<< 40,5,WRITE
-    !<<<<< 40,13,WRITE
-    !<<<<< 40,18,READ
-    !<<<<< 40,23,RW
-
-!    call external_sub(i)
-!    i = external_fn(i)
-
-    call unknown_subroutine(i, (i), i+i)
-    !<<<<< 49,29,RW
-    !<<<<< 49,33,READ
-    !<<<<< 49,37,READ
-    !<<<<< 49,39,READ
-    i = unknown_function(i, (i), i+i)
-    !<<<<< 54,5,WRITE
-    !<<<<< 54,26,RW
-    !<<<<< 54,30,READ
-    !<<<<< 54,34,READ
-    !<<<<< 54,36,READ
-contains
-    subroutine s(p, q, r)
-      integer, intent(in) :: p
-      integer, intent(out) :: q
-      integer, intent(inout) :: r
-    end subroutine s
-    integer function f(p, q, r)
-      integer, intent(in) :: p
-      integer, intent(out) :: q
-      integer, intent(inout) :: r
-      f = p
-      !<<<<< 70,7,WRITE
-      !<<<<< 70,11,READ
-    end function
-    integer function g(i)
-      integer, intent(out) :: i
-    end function
-end program call

diff --git a/org.eclipse.photran.core.vpg.tests/var-access-test-code/forall-test/forall-test.f90 b/org.eclipse.photran.core.vpg.tests/var-access-test-code/forall-test/forall-test.f90
deleted file mode 100644
index 397f24b..0000000
--- a/org.eclipse.photran.core.vpg.tests/var-access-test-code/forall-test/forall-test.f90
+++ /dev/null

@@ -1,13 +0,0 @@
-program forall
-    implicit none
-    integer :: i, arr(100)
-    forall (i = 1:10)
-    !<<<<< 4,13,FORALL
-        arr(i) = i
-        !<<<<< 6,9,WRITE
-        !<<<<< 6,13,READ
-        !<<<<< 6,18,READ
-    end forall
-    print *, arr
-    !<<<<< 11,14,READ
-end program forall
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/var-access-test-code/test-assigned-goto/test-assigned-goto.f90 b/org.eclipse.photran.core.vpg.tests/var-access-test-code/test-assigned-goto/test-assigned-goto.f90
deleted file mode 100644
index 1ee544c..0000000
--- a/org.eclipse.photran.core.vpg.tests/var-access-test-code/test-assigned-goto/test-assigned-goto.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-program testassignedgoto
-    integer :: return_label
-
-    assign 200 to return_label
-    !<<<<< 4,19,WRITE
-
-    goto return_label
-    !<<<<< 7,10,READ
-
-    print *, "I will never be printed..."
-
-200 print *, "but I will!"
-
-end program testassignedgoto

diff --git a/org.eclipse.photran.core.vpg.tests/var-access-test-code/test-data-reference/test-data-reference.f90 b/org.eclipse.photran.core.vpg.tests/var-access-test-code/test-data-reference/test-data-reference.f90
deleted file mode 100644
index a9163e5..0000000
--- a/org.eclipse.photran.core.vpg.tests/var-access-test-code/test-data-reference/test-data-reference.f90
+++ /dev/null

@@ -1,14 +0,0 @@
-program testdataref
-    type myType
-        integer :: var1
-    end type
-    
-    type(myType) :: instance
-    
-    integer :: array(5)
-
-    array(instance%var1) = 5
-    !<<<<< 10,5,WRITE
-    !<<<<< 10,11,READ
-
-end program testdataref
\ No newline at end of file

diff --git a/org.eclipse.photran.core.vpg.tests/var-access-test-code/test-implied-do/test-implied-do.f90 b/org.eclipse.photran.core.vpg.tests/var-access-test-code/test-implied-do/test-implied-do.f90
deleted file mode 100644
index 4746906..0000000
--- a/org.eclipse.photran.core.vpg.tests/var-access-test-code/test-implied-do/test-implied-do.f90
+++ /dev/null

@@ -1,19 +0,0 @@
-program testimplieddo
-    integer :: i,j
-    integer, parameter :: sizeY = 10
-    integer, dimension(10) :: y
-    integer, dimension(12) :: x = (/ ((i,i=1,4),j=1,3) /)
-    !<<<<< 5,40,READ
-    !<<<<< 5,42,IMPLIED_DO
-    !<<<<< 5,49,IMPLIED_DO
-    
-    print *, (i,i=1,10)
-    !<<<<< 10,15,READ
-    !<<<<< 10,17,IMPLIED_DO
-
-    data (y(i),i=1,10)/sizeY * 7/
-    !<<<<< 14,11,READ
-    !<<<<< 14,13,READ
-    !<<<<< 14,16,IMPLIED_DO
-    !<<<<< 14,24,READ
-end program testimplieddo

diff --git a/org.eclipse.photran.core.vpg.tests/var-access-test-code/test-where-construct/test-where-construct.f90 b/org.eclipse.photran.core.vpg.tests/var-access-test-code/test-where-construct/test-where-construct.f90
deleted file mode 100644
index 2b07fb9..0000000
--- a/org.eclipse.photran.core.vpg.tests/var-access-test-code/test-where-construct/test-where-construct.f90
+++ /dev/null

@@ -1,29 +0,0 @@
-program testwhereconstruct
-    integer, dimension(10) :: array
-
-    do i=1,10
-    !<<<<< 4,8,WRITE
-        array(i) = i
-        !<<<<< 6,9,WRITE
-        !<<<<< 6,15,READ
-        !<<<<< 6,20,READ
-    end do
-
-    where (array > 5)
-    !<<<<< 12,12,READ
-        array = 2
-        !<<<<< 14,9,WRITE
-        array = 3
-    elsewhere (array < 2)
-    !<<<<< 17,16,READ
-        array = 10
-        !<<<<< 19,9,WRITE
-    elsewhere (array < 5)
-    !<<<<< 21,16,READ
-        array = 400
-    elsewhere
-        array = 1
-        !<<<<< 25,9,WRITE
-    end where
-
-end program testwhereconstruct

diff --git a/org.eclipse.photran.core.vpg.tests/vpg-test-code/interface-links/definition1.f90 b/org.eclipse.photran.core.vpg.tests/vpg-test-code/interface-links/definition1.f90
deleted file mode 100644
index 26fbfbf..0000000
--- a/org.eclipse.photran.core.vpg.tests/vpg-test-code/interface-links/definition1.f90
+++ /dev/null

@@ -1,3 +0,0 @@
-integer function f() ! 1,18
-  f = 1
-end function

diff --git a/org.eclipse.photran.core.vpg.tests/vpg-test-code/interface-links/definition2.f90 b/org.eclipse.photran.core.vpg.tests/vpg-test-code/interface-links/definition2.f90
deleted file mode 100644
index 4fd6bcd..0000000
--- a/org.eclipse.photran.core.vpg.tests/vpg-test-code/interface-links/definition2.f90
+++ /dev/null

@@ -1,3 +0,0 @@
-integer function f() ! 1,18
-  f = 2
-end function

diff --git a/org.eclipse.photran.core.vpg.tests/vpg-test-code/interface-links/interface1.f90 b/org.eclipse.photran.core.vpg.tests/vpg-test-code/interface-links/interface1.f90
deleted file mode 100644
index 4eb5aeb..0000000
--- a/org.eclipse.photran.core.vpg.tests/vpg-test-code/interface-links/interface1.f90
+++ /dev/null

@@ -1,26 +0,0 @@
-interface
-  integer function f() ! 2,20
-  end function
-end interface
-
-contains
-
-  subroutine s1(f)
-    interface
-      integer function f() ! 10,14 Subroutine parameter -- should not bind
-      end function
-    end interface
-  end subroutine
-
-  subroutine s2
-    interface
-      integer function f() ! 17,24
-      end function
-    end interface
-  end subroutine
-
-end program
-
-integer function f() ! 24,18
-  f = 0
-end function

diff --git a/org.eclipse.photran.core.vpg.tests/vpg-test-code/interface-links/interface2.f90 b/org.eclipse.photran.core.vpg.tests/vpg-test-code/interface-links/interface2.f90
deleted file mode 100644
index 039ce2e..0000000
--- a/org.eclipse.photran.core.vpg.tests/vpg-test-code/interface-links/interface2.f90
+++ /dev/null

@@ -1,6 +0,0 @@
-interface
-  integer function f() ! 2,20
-  end function
-end interface
-
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/vpg-test-code/list-modules/module1.f90 b/org.eclipse.photran.core.vpg.tests/vpg-test-code/list-modules/module1.f90
deleted file mode 100644
index 596ca54..0000000
--- a/org.eclipse.photran.core.vpg.tests/vpg-test-code/list-modules/module1.f90
+++ /dev/null

@@ -1,2 +0,0 @@
-module module1
-end module

diff --git a/org.eclipse.photran.core.vpg.tests/vpg-test-code/list-modules/module2-module3.f90 b/org.eclipse.photran.core.vpg.tests/vpg-test-code/list-modules/module2-module3.f90
deleted file mode 100644
index 72fc5c3..0000000
--- a/org.eclipse.photran.core.vpg.tests/vpg-test-code/list-modules/module2-module3.f90
+++ /dev/null

@@ -1,5 +0,0 @@
-module module2
-end module
-
-module module3
-end module

diff --git a/org.eclipse.photran.core.vpg.tests/vpg-test-code/list-modules/module4.f90 b/org.eclipse.photran.core.vpg.tests/vpg-test-code/list-modules/module4.f90
deleted file mode 100644
index 63ee352..0000000
--- a/org.eclipse.photran.core.vpg.tests/vpg-test-code/list-modules/module4.f90
+++ /dev/null

@@ -1,2 +0,0 @@
-module module4
-end module

diff --git a/org.eclipse.photran.core.vpg.tests/vpg-test-code/list-modules/use-module1.f90 b/org.eclipse.photran.core.vpg.tests/vpg-test-code/list-modules/use-module1.f90
deleted file mode 100644
index dd423e9..0000000
--- a/org.eclipse.photran.core.vpg.tests/vpg-test-code/list-modules/use-module1.f90
+++ /dev/null

@@ -1,2 +0,0 @@
-use module1
-end program

diff --git a/org.eclipse.photran.core.vpg.tests/vpg-test-code/list-modules/use-module4.f90 b/org.eclipse.photran.core.vpg.tests/vpg-test-code/list-modules/use-module4.f90
deleted file mode 100644
index 993d263..0000000
--- a/org.eclipse.photran.core.vpg.tests/vpg-test-code/list-modules/use-module4.f90
+++ /dev/null

@@ -1,2 +0,0 @@
-use module4
-end program

diff --git a/org.eclipse.rephraserengine-support/.classpath b/org.eclipse.rephraserengine-support/.classpath
deleted file mode 100644
index 6fe660e..0000000
--- a/org.eclipse.rephraserengine-support/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src-cdtdb-4.0.3"/>
-	<classpathentry kind="src" path="src-cdtdb-mock-objects"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.rephraserengine-support/.project b/org.eclipse.rephraserengine-support/.project
deleted file mode 100644
index 5618f5d..0000000
--- a/org.eclipse.rephraserengine-support/.project
+++ /dev/null

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rephraserengine-support</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.rephraserengine-support/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.rephraserengine-support/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c2167ff..0000000
--- a/org.eclipse.rephraserengine-support/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,332 +0,0 @@
-#Wed Oct 14 16:23:02 CDT 2009
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=ignore
-org.eclipse.jdt.core.compiler.problem.deadCode=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=ignore
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=ignore
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=ignore
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=ignore
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=ignore
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=ignore
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=ignore
-org.eclipse.jdt.core.compiler.problem.unusedLabel=ignore
-org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=18
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=18
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=100
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=100
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

diff --git a/org.eclipse.rephraserengine-support/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.rephraserengine-support/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 131108c..0000000
--- a/org.eclipse.rephraserengine-support/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,6 +0,0 @@
-#Wed Oct 14 14:50:42 CDT 2009
-eclipse.preferences.version=1
-formatter_profile=_Photran
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} University of Illinois at Urbana-Champaign and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *    UIUC - Initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * \n * @author ${user}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

diff --git a/org.eclipse.rephraserengine-support/README.txt b/org.eclipse.rephraserengine-support/README.txt
deleted file mode 100644
index 72ca300..0000000
--- a/org.eclipse.rephraserengine-support/README.txt
+++ /dev/null

@@ -1,41 +0,0 @@
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-REPHRASER ENGINE SUPPORT CODE
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
-This project is used to build JARs containing the database infrastructure used
-in CDT's indexer.  These JARs are:
-
-cdtdb-4.0.3-eclipse.jar
-    Copied into org.eclipse.rephraserengine.core; used by the Rephraser engine
-    Depends on the Eclipse Platform to provide CoreException and similar classes
-
-cdtdb-4.0.3-cmdline.jar
-    Currently unused
-    Uses mock objects to provide CoreException and similar classes
-
-To build the JAR files:
-1. Make sure the code has compiled successfully within the Eclipse IDE.  (The build script simply JARs the .class files
-   from the project's bin directory; it does not recompile them.)
-2. Right-click build/cdtdb-4.0.3.xml in the Package Explorer, and choose Run As > Ant Build
-3. Right click the org.eclipse.rephraserengine-support project, and click Refresh.
-4. Right-click distrib/cdtdb-4.0.3-eclipse.jar, and click Copy.
-5. Right-click on the org.eclipse.rephraserengine.core.vpg project, and click Paste to paste it into the project root,
-   overwriting the existing JAR.
-
-
-
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-Version information:
-
-JO 10/4/07:
-
-  CDT files copied from CDT 4.0.1 (:pserver:anonymous@dev.eclipse.org:/cvsroot/tools/org.eclipse.cdt/org.eclipse.cdt.core
-  Eclipse files copied from Eclipse 3.3.0 (Build id: I20070621-1340) for Mac OS X
-  Only the necessary fields/methods from CCorePlugin were copied; all other files were copied verbatim in their entirety.
-
-JO 06/09/08:
-  Classes in internal.core.pdom.db updated to CDT 4.0.3 (from cdt_4_0 branch).  Changes to Database class (and file
-  format?) in CDT 5.0 are causing problems.
-
-JO 0628/10:
-  Modified the Database class to fix Bug 318197.  (The modified block is labeled JO.)
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine-support/about.html b/org.eclipse.rephraserengine-support/about.html
deleted file mode 100644
index 9c7ba0a..0000000
--- a/org.eclipse.rephraserengine-support/about.html
+++ /dev/null

@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>About</title></head>
-
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine-support/build/cdtdb-4.0.3.xml b/org.eclipse.rephraserengine-support/build/cdtdb-4.0.3.xml
deleted file mode 100644
index 9aa7073..0000000
--- a/org.eclipse.rephraserengine-support/build/cdtdb-4.0.3.xml
+++ /dev/null

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="jar">
-<target name="jar">
-
-      <jar destfile="../distrib/cdtdb-4.0.3-cmdline.jar">
-        <fileset dir="../distrib"
-          includes="license.html"
-        />
-        <fileset dir="../bin"
-          includes="**/*"
-        />
-        <fileset dir="../src-cdtdb-4.0.3"
-          includes="**/*.java"
-        />
-        <fileset dir="../src-cdtdb-mock-objects"
-          includes="**/*.java"
-        />
-      </jar>
-
-      <jar destfile="../distrib/cdtdb-4.0.3-eclipse.jar">
-        <fileset dir="../distrib"
-          includes="license.html"
-        />
-        <fileset dir="../bin"
-          includes="org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/**/*"
-        />
-        <fileset dir="../src-cdtdb-4.0.3"
-          includes="org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/**/*.java"
-        />
-      </jar>
-
-</target>
-</project>
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine-support/distrib/cdtdb-4.0.3-cmdline.jar b/org.eclipse.rephraserengine-support/distrib/cdtdb-4.0.3-cmdline.jar
deleted file mode 100644
index b30ace3..0000000
--- a/org.eclipse.rephraserengine-support/distrib/cdtdb-4.0.3-cmdline.jar
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.rephraserengine-support/distrib/cdtdb-4.0.3-eclipse.jar b/org.eclipse.rephraserengine-support/distrib/cdtdb-4.0.3-eclipse.jar
deleted file mode 100644
index c1f28cf..0000000
--- a/org.eclipse.rephraserengine-support/distrib/cdtdb-4.0.3-eclipse.jar
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.rephraserengine-support/distrib/license.html b/org.eclipse.rephraserengine-support/distrib/license.html
deleted file mode 100644
index ed4b196..0000000
--- a/org.eclipse.rephraserengine-support/distrib/license.html
+++ /dev/null

@@ -1,328 +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="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* 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
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	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;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/core/CCorePlugin.java b/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/core/CCorePlugin.java
deleted file mode 100644
index efd5bac..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/core/CCorePlugin.java
+++ /dev/null

@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Markus Schorn (Wind River Systems)
- *     Andrew Ferguson (Symbian)
- *     Anton Leherbauer (Wind River Systems)
- *     oyvind.harboe@zylin.com - http://bugs.eclipse.org/250638
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.core;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class CCorePlugin
-{
-    public static final String PLUGIN_ID = "bz.over.vpg.cdtdb"; //$NON-NLS-1$
-
-    private static ResourceBundle fgResourceBundle;
-
-    // -------- static methods --------
-
-    static {
-        try {
-            fgResourceBundle = ResourceBundle.getBundle("org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.internal.core.CCorePluginResources"); //$NON-NLS-1$
-        } catch (MissingResourceException x) {
-            fgResourceBundle = null;
-        }
-    }
-
-    public static String getResourceString(String key) {
-        try {
-            return fgResourceBundle.getString(key);
-        } catch (MissingResourceException e) {
-            return "!" + key + "!"; //$NON-NLS-1$ //$NON-NLS-2$
-        } catch (NullPointerException e) {
-            return "#" + key + "#"; //$NON-NLS-1$ //$NON-NLS-2$
-        }
-    }
-
-    public static void log(Throwable e)
-    {
-        e.printStackTrace();
-    }
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/CCorePluginResources.properties b/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/CCorePluginResources.properties
deleted file mode 100644
index 36862fb..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/CCorePluginResources.properties
+++ /dev/null

@@ -1,87 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2007 QNX Software Systems and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     QNX Software Systems - Initial API and implementation
-#     Markus Schorn (Wind River Systems)
-###############################################################################
-CBuilder.build_error= Build Error	
-CoreModel.BinaryRunner.Binary_Search_Thread=Searching for Binaries
-CoreModel.CModelBuilder.Parser_Construction_Failure=Parser/Scanner construction failure.
-CoreModel.CModelBuilder.Parse_Failure=Parse failure
-CoreModel.ArchiveContainer.Archives=Archives
-CoreModel.BinaryContainer.Binaries=Binaries
-CoreModel.CModelStatus.Error_in_CPlugin=Error in C Plugin
-CoreModel.NullBinaryParser.Not_binary_file=not a binary file
-CoreModel.NullBinaryParser.Null_Format=Null Format
-
-CoreModel.PathEntry.IllegalContainerPath= Illegal container entry
-CoreModel.PathEntry.DuplicateEntry= Duplicate path entries
-CoreModel.PathEntry.NestedEntry= Nested path entries
-CoreModel.PathEntry.InvalidPathEntry= Invalid path
-
-CommandLauncher.error.commandCanceled=Command canceled
-
-CCProjectNature.exception.noNature=Project must have a cnature
-
-CCorePlugin.exception.noBinaryFormat=No Binary Format
-
-CDescriptorManager.exception.invalid_ownerID=Invalid CDT Project owner ID
-CDescriptorManager.exception.alreadyConfigured=CDT Project already configured
-CDescriptorManager.exception.listenerError=An exception occurred during descriptor notification
-CDescriptorManager.internal_owner=No CDT Project owner
-CDescriptorManager.async_updater=CDT Project async save
-CDescriptorManager.owner_not_Installed=CDT Project owner not installed
-
-CDescriptor.exception.projectAlreadyExists=CDTProject already exists
-CDescriptor.exception.unmatchedOwnerId=CDTProject already exists but does not match owner ID
-CDescriptor.exception.fileNotFound=CDTProject file not found
-CDescriptor.exception.missingOwnerId=Missing owner id
-CDescriptor.exception.missingElement=Missing cdtproject element
-CDescriptor.exception.providerNotFound=Extension not found.
-CDescriptor.extension.internalError=Internal Error
-
-ResolverModel.exception.listenerError=An exception occurred during resolver model change notification
-
-Util.exception.invalidArchive=Not a valid archive file.
-Util.exception.arrayToSmall=Array to small
-Util.exception.notPE=Not a PE format
-Util.exception.notELF=Not ELF format
-Util.exception.notDOSFormat=Not DOS EXE format
-Util.exception.notXCOFF32=Not XCOFF32 format
-Util.exception.unknownFormat=Unknow machine/format
-Util.exception.nullPath=Path is null
-Util.exception.noFileAssociation=No file associated with Binary
-Util.exception.missingBytes=missing bytes
-Util.exception.noData=no more data
-Util.exception.cannotCreatePty=Can not create pty
-Util.exception.closeError=close error
-Util.error.cannotRun=Cannot run 
-Util.unknownName=unknown C++ encoded name
-Util.unknownFormat=Unknown debug format
-
-PathEntryVariableResolver.0=CDT PathEntry variable not specified
-
-CTagsIndexMarker.fileMissing=CTags output file missing
-CTagsIndexMarker.CTagsMissing=CTags not installed or not in path
-DOMIndexerMarker.EmptyScannerInfo=File not indexed because it was not built
-
-dom.languageError=Language not found
-indexer.notFound = Indexer not found
-
-pdom.requestTooLarge=Request too large
-pdom.indexer.name=C/C++ Indexer
-pdom.indexer.task=Indexing
-PDOMIndexerJob.updateMonitorJob=Update Monitor
-CCoreInternals.savePreferencesJob=Save preferences
-CConfigBasedDescriptorManager.0=the project is not a CDT project
-CConfigBasedDescriptorManager.1=description based descriptor operation can not be nested
-CConfigBasedDescriptorManager.2=can not perform descriptor operation based on the read only description
-CConfigBasedDescriptorManager.3=Failed to create descriptor
-CConfigBasedDescriptorManager.4=error: read-only configuration can not be used for CDescriptor
-CConfigBasedDescriptorManager.5=the project does not contain valid configurations
-CCorePlugin.startupJob=CDT Startup

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/BTree.java b/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/BTree.java
deleted file mode 100644
index c958f96..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/BTree.java
+++ /dev/null

@@ -1,703 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     QNX - Initial API and implementation
- *     Andrew Ferguson (Symbian) - Provide B-tree deletion routine
- *     Markus Schorn (Wind River Systems)
- *******************************************************************************/
-
-package org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.internal.core.pdom.db;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.core.CCorePlugin;
-
-
-/**
- * @author Doug Schaefer
- *
- */
-public class BTree {
-	// Constants for internal deletion routine (see deleteImp doc)
-	private static final int DELMODE_NORMAL = 0;
-	private static final int DELMODE_DELETE_MINIMUM = 1;
-	private static final int DELMODE_DELETE_MAXIMUM = 2;
-
-	protected final Database db;
-	protected final int rootPointer;
-
-	protected final int DEGREE;
-	protected final int MAX_RECORDS;
-	protected final int MAX_CHILDREN;
-	protected final int MIN_RECORDS; 
-	protected final int OFFSET_CHILDREN;
-	protected final int MEDIAN_RECORD;
-
-	protected final IBTreeComparator cmp;
-	
-	public BTree(Database db, int rootPointer, IBTreeComparator cmp) {
-		this(db, rootPointer, 8, cmp);
-	}
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param db the database containing the btree
-	 * @param root offset into database of the pointer to the root node
-	 */
-	public BTree(Database db, int rootPointer, int degree, IBTreeComparator cmp) {
-		if(degree<2)
-			throw new IllegalArgumentException(Messages.getString("BTree.IllegalDegree")); //$NON-NLS-1$
-
-		this.db = db;
-		this.rootPointer = rootPointer;
-		this.cmp = cmp;
-		
-		this.DEGREE = degree;
-		this.MIN_RECORDS = DEGREE - 1;
-		this.MAX_RECORDS = 2*DEGREE - 1;
-		this.MAX_CHILDREN = 2*DEGREE;
-		this.OFFSET_CHILDREN = MAX_RECORDS * Database.INT_SIZE;
-		this.MEDIAN_RECORD = DEGREE - 1;
-	}
-
-	protected int getRoot() throws CoreException {
-		return db.getInt(rootPointer);
-	}
-
-	protected final void putRecord(Chunk chunk, int node, int index, int record) {
-		chunk.putInt(node + index * Database.INT_SIZE, record);
-	}
-
-	protected final int getRecord(Chunk chunk, int node, int index) {
-		return chunk.getInt(node + index * Database.INT_SIZE);
-	}
-
-	protected final void putChild(Chunk chunk, int node, int index, int child) {
-		chunk.putInt(node + OFFSET_CHILDREN + index * Database.INT_SIZE, child);
-	}
-
-	protected final int getChild(Chunk chunk, int node, int index) {
-		return chunk.getInt(node + OFFSET_CHILDREN + index * Database.INT_SIZE);
-	}
-
-	/**
-	 * Inserts the record into the b-tree. We don't insert if the
-	 * key was already there, in which case we return the record
-	 * that matched. In other cases, we just return the record back.
-	 * 
-	 * @param offset of the record
-	 * @return 
-	 */
-	public int insert(int record) throws CoreException {
-		int root = getRoot();
-
-		// is this our first time in
-		if (root == 0) {
-			firstInsert(record);
-			return record;
-		}
-
-		return insert(null, 0, 0, root, record);
-	}
-
-	private int insert(Chunk pChunk, int parent, int iParent, int node, int record) throws CoreException {
-		Chunk chunk = db.getChunk(node);
-
-		// if this node is full (last record isn't null), split it
-		if (getRecord(chunk, node, MAX_RECORDS - 1) != 0) {
-			int median = getRecord(chunk, node, MEDIAN_RECORD); 
-			if (median == record)
-				// found it, never mind
-				return median;
-			else {
-				// split it
-				// create the new node and move the larger records over
-				int newnode = allocateNode();
-				Chunk newchunk = db.getChunk(newnode);
-				for (int i = 0; i < MEDIAN_RECORD; ++i) {
-					putRecord(newchunk, newnode, i, getRecord(chunk, node, MEDIAN_RECORD + 1 + i));
-					putRecord(chunk, node, MEDIAN_RECORD + 1 + i, 0);
-					putChild(newchunk, newnode, i, getChild(chunk, node, MEDIAN_RECORD + 1 + i));
-					putChild(chunk, node, MEDIAN_RECORD + 1 + i, 0);
-				}
-				putChild(newchunk, newnode, MEDIAN_RECORD, getChild(chunk, node, MAX_RECORDS));
-				putChild(chunk, node, MAX_RECORDS, 0);
-
-				if (parent == 0) {
-					// create a new root
-					parent = allocateNode();
-					pChunk = db.getChunk(parent);
-					db.putInt(rootPointer, parent);
-					putChild(pChunk, parent, 0, node);
-				} else {
-					// insert the median into the parent
-					for (int i = MAX_RECORDS - 2; i >= iParent; --i) {
-						int r = getRecord(pChunk, parent, i);
-						if (r != 0) {
-							putRecord(pChunk, parent, i + 1, r);
-							putChild(pChunk, parent, i + 2, getChild(pChunk, parent, i + 1));
-						}
-					}
-				}
-				putRecord(pChunk, parent, iParent, median);
-				putChild(pChunk, parent, iParent + 1, newnode);
-
-				putRecord(chunk, node, MEDIAN_RECORD, 0);
-
-				// set the node to the correct one to follow
-				if (cmp.compare(record, median) > 0) {
-					node = newnode;
-					chunk = newchunk;
-				}
-			}
-		}
-
-		// binary search to find the insert point
-		int lower= 0; 
-		int upper= MAX_RECORDS-1;
-		while (lower < upper && getRecord(chunk, node, upper-1) == 0) {
-			upper--;
-		}
-
-		while (lower < upper) {
-			int middle= (lower+upper)/2;
-			int checkRec= getRecord(chunk, node, middle);
-			if (checkRec == 0) {
-				upper= middle;
-			}
-			else {
-				int compare= cmp.compare(checkRec, record);
-				if (compare > 0) {
-					upper= middle;
-				}
-				else if (compare < 0) {
-					lower= middle+1;
-				}
-				else {
-					// found it, no insert, just return the record
-					return record;
-				}
-			}
-		}
-		final int i= lower;
-		int	child = getChild(chunk, node, i);
-		if (child != 0) {
-			// visit the children
-			return insert(chunk, node, i, child, record);
-		} else {
-			// were at the leaf, add us in.
-			// first copy everything after over one
-			for (int j = MAX_RECORDS - 2; j >= i; --j) {
-				int r = getRecord(chunk, node, j);
-				if (r != 0)
-					putRecord(chunk, node, j + 1, r);
-			}
-			putRecord(chunk, node, i, record);
-			return record;
-		}
-	}
-
-	private void firstInsert(int record) throws CoreException {
-		// create the node and save it as root
-		int root = allocateNode();
-		db.putInt(rootPointer, root);
-		// put the record in the first slot of the node
-		putRecord(db.getChunk(root), root, 0, record); 
-	}
-
-	private int allocateNode() throws CoreException {
-		return db.malloc((2 * MAX_RECORDS + 1) * Database.INT_SIZE);
-	}
-
-	/**
-	 * Deletes the specified record from the B-tree.
-	 * <p>
-	 * If the specified record is not present then this routine has no effect.
-	 * <p>
-	 * Specifying a record r for which there is another record q existing in the B-tree
-	 * where cmp.compare(r,q)==0 && r!=q will also have no effect   
-	 * <p>
-	 * N.B. The record is not deleted itself - its storage is not deallocated.
-	 * The reference to the record in the btree is deleted.
-	 *  
-	 * @param record the record to delete
-	 * @param cmp the comparator for locating the record
-	 * @throws CoreException
-	 */
-	public void delete(int record) throws CoreException {
-		try {
-			deleteImp(record, getRoot(), DELMODE_NORMAL);
-		} catch(BTreeKeyNotFoundException e) {
-			// contract of this method is to NO-OP upon this event
-		}
-	}
-
-	private class BTreeKeyNotFoundException extends Exception {
-		private static final long serialVersionUID = 9065438266175091670L;
-		public BTreeKeyNotFoundException(String msg) {
-			super(msg);
-		}
-	}
-
-	/**
-	 * Used in implementation of delete routines
-	 */
-	private class BTNode {
-		final int node;
-		final int keyCount;
-		final Chunk chunk;
-
-		BTNode(int node) throws CoreException {
-			this.node = node;
-			this.chunk = db.getChunk(node);
-			int i=0;
-			while(i<MAX_RECORDS && getRecord(chunk, node, i)!=0)
-				i++;
-			keyCount = i;
-		}
-
-		private BTNode getChild(int index) throws CoreException {
-			if(0<=index && index<MAX_CHILDREN) {
-				int child = BTree.this.getChild(chunk, node, index);
-				if(child!=0)
-					return new BTNode(child);
-			}
-			return null;
-		}
-	}
-
-	/**
-	 * Implementation for deleting a key/record from the B-tree.
-	 * <p>
-	 * There is no distinction between keys and records.
-	 * <p>
-	 * This implements a single downward pass (with minor exceptions) deletion
-	 * <p>
-	 * @param key the address of the record to delete
-	 * @param nodeRecord a node that (directly or indirectly) contains the specified key/record
-	 * @param mode one of DELMODE_NORMAL, DELMODE_DELETE_MINIMUM, DELMODE_DELETE_MAXIMUM
-	 * 	where DELMODE_NORMAL: locates the specified key/record using the comparator provided
-	 *        DELMODE_DELETE_MINIMUM: locates and deletes the minimum element in the subtree rooted at nodeRecord
-	 *        DELMODE_DELETE_MAXIMUM: locates and deletes the maximum element in the subtree rooted at nodeRecord
-	 * @param cmp the comparator used to locate the record in the tree
-	 * @return the address of the record removed from the B-tree
-	 * @throws CoreException
-	 */
-	private int deleteImp(int key, int nodeRecord, int mode)
-	throws CoreException, BTreeKeyNotFoundException {
-		BTNode node = new BTNode(nodeRecord);
-
-		// Determine index of key in current node, or -1 if its not in this node
-		int keyIndexInNode = -1;
-		if(mode==DELMODE_NORMAL)
-			for(int i=0; i<node.keyCount; i++)
-				if(getRecord(node.chunk, node.node, i) == key) {
-					keyIndexInNode = i;
-					break;
-				}
-
-		if(getChild(node.chunk, node.node, 0)==0) {
-			/* Case 1: leaf node containing the key (by method precondition) */
-			if(keyIndexInNode!=-1) {
-				nodeContentDelete(node, keyIndexInNode, 1);
-				return key;
-			} else {
-				if(mode==DELMODE_DELETE_MINIMUM) {
-					int subst = getRecord(node.chunk, node.node, 0);
-					nodeContentDelete(node, 0, 1);
-					return subst;
-				} else if(mode==DELMODE_DELETE_MAXIMUM) {
-					int subst = getRecord(node.chunk, node.node, node.keyCount-1);
-					nodeContentDelete(node, node.keyCount-1, 1);
-					return subst;
-				}
-				throw new BTreeKeyNotFoundException(
-						MessageFormat.format(Messages.getString("BTree.DeletionOnAbsentKey"), //$NON-NLS-1$
-								new Object[]{new Integer(key), new Integer(mode)}));
-			}
-		} else {
-			if(keyIndexInNode != -1) {
-				/* Case 2: non-leaf node which contains the key itself */
-
-				BTNode succ = node.getChild(keyIndexInNode+1);
-				if(succ!=null && succ.keyCount > MIN_RECORDS) {
-					/* Case 2a: Delete key by overwriting it with its successor (which occurs in a leaf node) */
-					int subst = deleteImp(-1, succ.node, DELMODE_DELETE_MINIMUM);
-					putRecord(node.chunk, node.node, keyIndexInNode, subst);
-					return key;
-				}
-
-				BTNode pred = node.getChild(keyIndexInNode); 
-				if(pred!=null && pred.keyCount > MIN_RECORDS) {
-					/* Case 2b: Delete key by overwriting it with its predecessor (which occurs in a leaf node) */
-					int subst = deleteImp(-1, pred.node, DELMODE_DELETE_MAXIMUM);
-					putRecord(node.chunk, node.node, keyIndexInNode, subst);
-					return key;
-				}
-
-				/* Case 2c: Merge successor and predecessor */
-				// assert(pred!=null && succ!=null);
-				mergeNodes(succ, node, keyIndexInNode, pred);
-				return deleteImp(key, pred.node, mode);
-			} else {
-				/* Case 3: non-leaf node which does not itself contain the key */
-
-				/* Determine root of subtree that should contain the key */
-				int subtreeIndex;
-				switch(mode) {
-				case DELMODE_NORMAL:
-					subtreeIndex = node.keyCount; 
-					for(int i=0; i<node.keyCount; i++)
-						if(cmp.compare(getRecord(node.chunk, node.node, i), key)>0) {
-							subtreeIndex = i;
-							break;
-						}
-					break;
-				case DELMODE_DELETE_MINIMUM: subtreeIndex = 0; break;
-				case DELMODE_DELETE_MAXIMUM: subtreeIndex = node.keyCount; break;
-				default: throw new CoreException(new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, IStatus.OK, Messages.getString("BTree.UnknownMode"), null)); //$NON-NLS-1$
-				}
-
-				BTNode child = node.getChild(subtreeIndex);
-				if(child==null) {
-					throw new CoreException(new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, IStatus.OK, Messages.getString("BTree.IntegrityError"), null)); //$NON-NLS-1$
-				}
-
-				if(child.keyCount > MIN_RECORDS) {
-					return deleteImp(key, child.node, mode);
-				} else {
-					BTNode sibR = node.getChild(subtreeIndex+1);
-					if(sibR!=null && sibR.keyCount > MIN_RECORDS) {
-						/* Case 3a (i): child will underflow upon deletion, take a key from rightSibling */
-						int rightKey = getRecord(node.chunk, node.node, subtreeIndex);
-						int leftmostRightSiblingKey = getRecord(sibR.chunk, sibR.node, 0);
-						append(child, rightKey, getChild(sibR.chunk, sibR.node, 0));
-						nodeContentDelete(sibR, 0, 1);
-						putRecord(node.chunk, node.node, subtreeIndex, leftmostRightSiblingKey);
-						return deleteImp(key, child.node, mode);
-					}
-
-					BTNode sibL = node.getChild(subtreeIndex-1);
-					if(sibL!=null && sibL.keyCount > MIN_RECORDS) {
-						/* Case 3a (ii): child will underflow upon deletion, take a key from leftSibling */
-						int leftKey = getRecord(node.chunk, node.node, subtreeIndex-1);
-						prepend(child, leftKey, getChild(sibL.chunk, sibL.node, sibL.keyCount));
-						int rightmostLeftSiblingKey = getRecord(sibL.chunk, sibL.node, sibL.keyCount-1);
-						putRecord(sibL.chunk, sibL.node, sibL.keyCount-1, 0);
-						putChild(sibL.chunk, sibL.node, sibL.keyCount, 0);
-						putRecord(node.chunk, node.node, subtreeIndex-1, rightmostLeftSiblingKey);
-						return deleteImp(key, child.node, mode);
-					}
-
-					/* Case 3b (i,ii): leftSibling, child, rightSibling all have minimum number of keys */
-
-					if(sibL!=null) { // merge child into leftSibling
-						mergeNodes(child, node, subtreeIndex-1, sibL);
-						return deleteImp(key, sibL.node, mode);
-					}
-
-					if(sibR!=null) { // merge rightSibling into child
-						mergeNodes(sibR, node, subtreeIndex, child);
-						return deleteImp(key, child.node, mode);
-					}
-
-					throw new BTreeKeyNotFoundException(
-							MessageFormat.format(Messages.getString("BTree.DeletionOnAbsentKey"), //$NON-NLS-1$
-									new Object[]{new Integer(key), new Integer(mode)}));
-				}
-			}
-		}
-	}
-
-	/**
-	 * Merge node 'src' onto the right side of node 'dst' using node
-	 * 'keyProvider' as the source of the median key. Bounds checking is not
-	 * performed.
-	 * @param src the key to merge into dst
-	 * @param mid the node that provides the median key for the new node
-	 * @param kIndex the index of the key in the node <i>mid</i> which is to become the new node's median key
-	 * @param dst the node which is the basis and result of the merge
-	 */
-	public void mergeNodes(BTNode src, BTNode keyProvider, int kIndex, BTNode dst) 
-	throws CoreException {
-		nodeContentCopy(src, 0, dst, dst.keyCount+1, src.keyCount+1);
-		int midKey = getRecord(keyProvider.chunk, keyProvider.node, kIndex);
-		putRecord(dst.chunk, dst.node, dst.keyCount, midKey);
-		int keySucc = kIndex+1 == MAX_RECORDS ? 0 : getRecord(keyProvider.chunk, keyProvider.node, kIndex+1);
-		db.free(getChild(keyProvider.chunk, keyProvider.node,  kIndex+1));
-		nodeContentDelete(keyProvider, kIndex+1, 1);
-		putRecord(keyProvider.chunk, keyProvider.node, kIndex, keySucc);
-		if(kIndex == 0 && keySucc == 0) {
-			/*
-			 * The root node is excused from the property that a node must have a least MIN keys
-			 * This means we must special case it at the point when its had all of its keys deleted
-			 * entirely during merge operations (which push one of its keys down as a pivot)
-			 */
-			int rootNode = getRoot();
-			if(rootNode == keyProvider.node) {
-				db.putInt(rootPointer, dst.node);
-				db.free(rootNode);
-			}
-		}
-	}
-
-	/**
-	 * Insert the key and (its predecessor) child at the left side of the specified node. Bounds checking
-	 * is not performed.
-	 * @param node the node to prepend to
-	 * @param key the new leftmost (least) key
-	 * @param child the new leftmost (least) subtree root
-	 */
-	private void prepend(BTNode node, int key, int child) {
-		nodeContentCopy(node, 0, node, 1, node.keyCount+1);
-		putRecord(node.chunk, node.node, 0, key);
-		putChild(node.chunk, node.node, 0, child);
-	}
-
-	/**
-	 * Insert the key and (its successor) child at the right side of the specified node. Bounds checking
-	 * is not performed.
-	 * @param node
-	 * @param key
-	 * @param child
-	 */
-	private void append(BTNode node, int key, int child) {
-		putRecord(node.chunk, node.node, node.keyCount, key);
-		putChild(node.chunk, node.node, node.keyCount + 1, child);
-	}
-
-	/**
-	 * Overwrite a section of the specified node (dst) with the specified section of the source node. Bounds checking
-	 * is not performed. To allow just copying of the final child (which has no corresponding key) the routine
-	 * behaves as though there were a corresponding key existing with value zero.<p>
-	 * Copying from a node to itself is permitted.
-	 * @param src the node to read from
-	 * @param srcPos the initial index to read from (inclusive)
-	 * @param dst the node to write to
-	 * @param dstPos the initial index to write to (inclusive)
-	 * @param length the number of (key,(predecessor)child) nodes to write
-	 */
-	private void nodeContentCopy(BTNode src, int srcPos, BTNode dst, int dstPos, int length) {
-		for(int i=length-1; i>=0; i--) { // this order is important when src==dst!
-			int srcIndex = srcPos + i;
-			int dstIndex = dstPos + i;
-
-			if(srcIndex<src.keyCount+1) {
-				int srcChild = getChild(src.chunk, src.node, srcIndex);
-				putChild(dst.chunk, dst.node, dstIndex, srcChild);
-
-				if(srcIndex<src.keyCount) {
-					int srcKey = getRecord(src.chunk, src.node, srcIndex);
-					putRecord(dst.chunk, dst.node, dstIndex, srcKey);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Delete a section of node content - (key, (predecessor)child) pairs. Bounds checking
-	 * is not performed. To allow deletion of the final child (which has no corresponding key) the routine
-	 * behaves as though there were a corresponding key existing with value zero.<p>
-	 * Content is deleted and remaining content is moved leftward the appropriate amount.
-	 * @param node the node to delete content from
-	 * @param i the start index (inclusive) to delete from
-	 * @param length the length of the sequence to delete
-	 */
-	private void nodeContentDelete(BTNode node, int i, int length) {
-		for(int index=i; index<=MAX_RECORDS; index++) {
-			int newKey = (index+length) < node.keyCount ? getRecord(node.chunk, node.node, index+length) : 0;
-			int newChild = (index+length) < node.keyCount+1 ? getChild(node.chunk, node.node, index+length) : 0;
-			if(index<MAX_RECORDS) {
-				putRecord(node.chunk, node.node, index, newKey);
-			}
-			if(index<MAX_CHILDREN) {
-				putChild(node.chunk, node.node, index, newChild);
-			}
-		}
-	}
-
-	/**
-	 * Visit all nodes beginning when the visitor comparator
-	 * returns >= 0 until the visitor visit returns falls.
-	 * 
-	 * @param visitor
-	 */
-	public void accept(IBTreeVisitor visitor) throws CoreException {
-		accept(db.getInt(rootPointer), visitor);
-	}
-
-	private boolean accept(int node, IBTreeVisitor visitor) throws CoreException {
-		// if found is false, we are still in search mode
-		// once found is true visit everything
-		// return false when ready to quit
-
-		if (node == 0) {
-			return true;
-		}
-		if(visitor instanceof IBTreeVisitor2) {
-			((IBTreeVisitor2)visitor).preNode(node);
-		}
-
-		try {
-			Chunk chunk = db.getChunk(node);
-			
-			// binary search to find first record greater or equal
-			int lower= 0; 
-			int upper= MAX_RECORDS-1;
-			while (lower < upper && getRecord(chunk, node, upper-1) == 0) {
-				upper--;
-			}
-			while (lower < upper) {
-				int middle= (lower+upper)/2;
-				int checkRec= getRecord(chunk, node, middle);
-				if (checkRec == 0) {
-					upper= middle;
-				}
-				else {
-					int compare= visitor.compare(checkRec);
-					if (compare >= 0) {
-						upper= middle;
-					}
-					else {
-						lower= middle+1;
-					}
-				}
-			}
-			
-			// start with first record greater or equal, reuse comparison results.
-			int i= lower;
-			for (; i < MAX_RECORDS; ++i) {
-				int record = getRecord(chunk, node, i);
-				if (record == 0) 
-					break;
-
-				int compare= visitor.compare(record);
-				if (compare > 0) {
-					// 	start point is to the left
-					return accept(getChild(chunk, node, i), visitor);
-				} 
-				else if (compare == 0) {
-					if (!accept(getChild(chunk, node, i), visitor)) 
-						return false;
-					if (!visitor.visit(record))
-						return false;
-				}
-			}
-			return accept(getChild(chunk, node, i), visitor);
-		} finally {
-			if(visitor instanceof IBTreeVisitor2) {
-				((IBTreeVisitor2)visitor).postNode(node);
-			}
-		}
-	}
-
-	/*
-	 * TODO: It would be good to move these into IBTreeVisitor and eliminate
-	 * IBTreeVisitor2 if this is acceptable.
-	 */
-	private interface IBTreeVisitor2 extends IBTreeVisitor {
-		void preNode(int node) throws CoreException;
-		void postNode(int node) throws CoreException;
-	}
-
-	/**
-	 * Debugging method for checking B-tree invariants
-	 * @return the empty String if B-tree invariants hold, otherwise
-	 * a human readable report
-	 * @throws CoreException
-	 */
-	public String getInvariantsErrorReport() throws CoreException {
-		InvariantsChecker checker = new InvariantsChecker();
-		accept(checker);
-		return checker.isValid() ? "" : checker.getMsg(); //$NON-NLS-1$
-	}
-
-	/**
-	 * A B-tree visitor for checking some B-tree invariants.
-	 * Note ordering invariants are not checked here.
-	 */
-	private class InvariantsChecker implements IBTreeVisitor2 {
-		boolean valid = true;
-		String msg = ""; //$NON-NLS-1$
-		Integer leafDepth;
-		int depth;
-
-		public String getMsg() { return msg; }
-		public boolean isValid() { return valid; }
-		public void postNode(int node) throws CoreException { depth--; }
-		public int compare(int record) throws CoreException { return 0; }
-		public boolean visit(int record) throws CoreException { return true; }
-
-		public void preNode(int node) throws CoreException {
-			depth++;
-
-			// collect information for checking
-			int keyCount = 0;
-			int indexFirstBlankKey = MAX_RECORDS;
-			int indexLastNonBlankKey = 0; 
-			for(int i=0; i<MAX_RECORDS; i++) {
-				if(getRecord(db.getChunk(node), node, i)!=0) {
-					keyCount++;
-					indexLastNonBlankKey = i;
-				} else if(indexFirstBlankKey== MAX_RECORDS){
-					indexFirstBlankKey = i;
-				}
-			}
-
-			int childCount = 0;
-			for(int i=0; i<MAX_CHILDREN; i++) {
-				if(getChild(db.getChunk(node), node, i)!=0) {
-					childCount++;
-				}
-			}
-
-			// check that non-blank keys are contiguous and blank key terminated
-			if(indexFirstBlankKey != indexLastNonBlankKey+1) {
-				boolean full = indexFirstBlankKey == MAX_RECORDS && indexLastNonBlankKey == MAX_RECORDS-1;
-				boolean empty = indexFirstBlankKey == 0 && indexLastNonBlankKey == 0;
-				if(!full && !empty){ 
-					valid = false;
-					msg += MessageFormat.format(Messages.getString("BTree.IntegrityErrorA"), //$NON-NLS-1$
-							new Object[]{new Integer(node), new Integer(indexFirstBlankKey), new Integer(indexLastNonBlankKey)});
-				}
-			}
-
-			// Check: Key number constrains child numbers
-			if(childCount!=0 && childCount!=keyCount+1) {
-				valid = false;
-				msg += MessageFormat.format(Messages.getString("BTree.IntegrityErrorB"), new Object[]{new Integer(node)}); //$NON-NLS-1$
-			}
-
-			// the root node is excused from the remaining node constraints
-			if(node == db.getInt(rootPointer)) {
-				return; 
-			}
-
-			// Check: Non-root nodes must have a keyCount within a certain range
-			if(keyCount < MIN_RECORDS || keyCount > MAX_RECORDS) {
-				valid = false;
-				msg += MessageFormat.format(Messages.getString("BTree.IntegrityErrorC"), new Object[]{new Integer(node)}); //$NON-NLS-1$
-			}
-
-			// Check: All leaf nodes are at the same depth
-			if(childCount==0) {
-				if(leafDepth==null) {
-					leafDepth = new Integer(depth);
-				}
-				if(depth!=leafDepth.intValue()) {
-					valid = false;
-					msg += Messages.getString("BTree.IntegrityErrorD"); //$NON-NLS-1$
-				}
-			}
-		}
-	}
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/Chunk.java b/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/Chunk.java
deleted file mode 100644
index 554c369..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/Chunk.java
+++ /dev/null

@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * QNX - Initial API and implementation
- * Markus Schorn (Wind River Systems)
- * IBM Corporation
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.internal.core.pdom.db;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * Caches the content of a piece of the database.
- */
-final class Chunk {
-	final private byte[] fBuffer= new byte[Database.CHUNK_SIZE];
-
-	final Database fDatabase;
-	final int fSequenceNumber;
-	
-	boolean fCacheHitFlag= false;
-	boolean fDirty= false;
-	boolean fLocked= false;	// locked chunks must not be released from cache.
-	int fCacheIndex= -1;
-		
-	Chunk(Database db, int sequenceNumber) {
-		fDatabase= db;
-		fSequenceNumber= sequenceNumber;
-	}
-
-	void read() throws CoreException {
-		try {
-			final ByteBuffer buf= ByteBuffer.wrap(fBuffer);
-			fDatabase.read(buf, fSequenceNumber*Database.CHUNK_SIZE);
-		} catch (IOException e) {
-			throw new CoreException(new DBStatus(e));
-		}
-	}
-
-	void flush() throws CoreException {
-		try {
-			final ByteBuffer buf= ByteBuffer.wrap(fBuffer);
-			fDatabase.write(buf, fSequenceNumber*Database.CHUNK_SIZE);
-		} catch (IOException e) {
-			throw new CoreException(new DBStatus(e));
-		}
-		fDirty= false;
-	}
-
-	public void putByte(final int offset, final byte value) {
-		assert fLocked;
-		fDirty= true;
-		fBuffer[offset % Database.CHUNK_SIZE]= value;
-	}
-	
-	public byte getByte(final int offset) {
-		return fBuffer[offset % Database.CHUNK_SIZE];
-	}
-	
-	public byte[] getBytes(final int offset, final int length) {
-		final byte[] bytes = new byte[length];
-		System.arraycopy(fBuffer, offset % Database.CHUNK_SIZE, bytes, 0, length);
-		return bytes;
-	}
-	
-	public void putBytes(final int offset, final byte[] bytes) {
-		assert fLocked;
-		fDirty= true;
-		System.arraycopy(bytes, 0, fBuffer, offset % Database.CHUNK_SIZE, bytes.length);
-	}
-	
-	public void putInt(final int offset, final int value) {
-		assert fLocked;
-		fDirty= true;
-		int idx= offset % Database.CHUNK_SIZE;
-		fBuffer[idx]=   (byte)(value >> 24);
-		fBuffer[++idx]= (byte)(value >> 16);
-		fBuffer[++idx]= (byte)(value >> 8);
-		fBuffer[++idx]= (byte)(value);
-	}
-	
-	public int getInt(final int offset) {
-		int idx= offset % Database.CHUNK_SIZE;
-		return ((fBuffer[idx] & 0xff) << 24) |
-			((fBuffer[++idx] & 0xff) << 16) |
-			((fBuffer[++idx] & 0xff) <<  8) |
-			((fBuffer[++idx] & 0xff) <<  0);
-	}
-
-	public void putShort(final int offset, final short value) {
-		assert fLocked;
-		fDirty= true;
-		int idx= offset % Database.CHUNK_SIZE;
-		fBuffer[idx]= (byte)(value >> 8);
-		fBuffer[++idx]= (byte)(value);
-	}
-	
-	public short getShort(final int offset) {
-		int idx= offset % Database.CHUNK_SIZE;
-		return (short) (((fBuffer[idx] << 8) | (fBuffer[++idx] & 0xff)));
-	}
-
-	public long getLong(final int offset) {
-		int idx= offset % Database.CHUNK_SIZE;
-		return ((((long)fBuffer[idx] & 0xff) << 56) |
-				(((long)fBuffer[++idx] & 0xff) << 48) |
-				(((long)fBuffer[++idx] & 0xff) << 40) |
-				(((long)fBuffer[++idx] & 0xff) << 32) |
-				(((long)fBuffer[++idx] & 0xff) << 24) |
-				(((long)fBuffer[++idx] & 0xff) << 16) |
-				(((long)fBuffer[++idx] & 0xff) <<  8) |
-				(((long)fBuffer[++idx] & 0xff) <<  0));
-	}
-
-	public void putLong(final int offset, final long value) {
-		assert fLocked;
-		fDirty= true;
-		int idx= offset % Database.CHUNK_SIZE;
-
-		fBuffer[idx]=   (byte)(value >> 56);
-		fBuffer[++idx]= (byte)(value >> 48);
-		fBuffer[++idx]= (byte)(value >> 40);
-		fBuffer[++idx]= (byte)(value >> 32);
-		fBuffer[++idx]= (byte)(value >> 24);
-		fBuffer[++idx]= (byte)(value >> 16);
-		fBuffer[++idx]= (byte)(value >> 8);
-		fBuffer[++idx]= (byte)(value);
-	}
-	
-	public void putChar(final int offset, final char value) {
-		assert fLocked;
-		fDirty= true;
-		int idx= offset % Database.CHUNK_SIZE;
-		fBuffer[idx]= (byte)(value >> 8);
-		fBuffer[++idx]= (byte)(value);
-	}
-	
-	public char getChar(final int offset) {
-		int idx= offset % Database.CHUNK_SIZE;
-		return (char) (((fBuffer[idx] << 8) | (fBuffer[++idx] & 0xff)));
-	}
-
-	public void getCharArray(final int offset, final char[] result) {
-		final ByteBuffer buf= ByteBuffer.wrap(fBuffer);
-		buf.position(offset % Database.CHUNK_SIZE);
-		buf.asCharBuffer().get(result);
-	}
-	
-	void clear(final int offset, final int length) {
-		assert fLocked;
-		fDirty= true;
-		int idx= (offset % Database.CHUNK_SIZE);
-		final int end= idx + length;
-		for (; idx < end; idx++) {
-			fBuffer[idx]= 0;
-		}
-	}
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/ChunkCache.java b/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/ChunkCache.java
deleted file mode 100644
index 455060a..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/ChunkCache.java
+++ /dev/null

@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Wind River Systems, Inc. and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Markus Schorn - initial API and implementation
- *******************************************************************************/ 
-
-package org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.internal.core.pdom.db;
-
-public final class ChunkCache {
-	private static ChunkCache sSharedInstance= new ChunkCache();
-	
-	private Chunk[] fPageTable;
-	private boolean fTableIsFull= false;
-	private int fPointer= 0;
-	
-	public static ChunkCache getSharedInstance() {
-		return sSharedInstance;
-	}
-
-	public ChunkCache() {
-		this(5*1024*1024);
-	}
-	
-	public ChunkCache(long maxSize) {
-		fPageTable= new Chunk[computeLength(maxSize)];
-	}
-	
-	public synchronized void add(Chunk chunk, boolean locked) {
-		if (locked) {
-			chunk.fLocked= true;
-		}
-		if (chunk.fCacheIndex >= 0) {
-			chunk.fCacheHitFlag= true;
-			return;
-		}
-		if (fTableIsFull) {
-			evictChunk();
-			chunk.fCacheIndex= fPointer;
-			fPageTable[fPointer]= chunk;
-		}
-		else {
-			chunk.fCacheIndex= fPointer;
-			fPageTable[fPointer]= chunk;
-
-			fPointer++;
-			if (fPointer == fPageTable.length) {
-				fPointer= 0;
-				fTableIsFull= true;
-			}
-		}
-	}
-	
-	/**                                                                   
-	 * Evicts a chunk from the page table and the chunk table.            
-	 * After this method returns, {@link #fPointer}  will contain
-	 * the index of the evicted chunk within the page table.              
-	 */                                                                   
-	private void evictChunk() {
-		/*
-		 * Use the CLOCK algorithm to determine which chunk to evict.
-		 * i.e., if the chunk in the current slot of the page table has been
-		 * recently referenced (i.e. the reference flag is set), unset the
-		 * reference flag and move to the next slot.  Otherwise, evict the
-		 * chunk in the current slot.
-		 */
-		while (true) {
-			Chunk chunk = fPageTable[fPointer];
-			if (chunk.fCacheHitFlag) {
-				chunk.fCacheHitFlag= false;
-				fPointer= (fPointer + 1) % fPageTable.length;
-			} else {
-				chunk.fDatabase.releaseChunk(chunk);
-				chunk.fCacheIndex= -1;
-				fPageTable[fPointer] = null;
-				return;
-			}
-		}
-	}
-
-	public synchronized void remove(Chunk chunk) {
-		final int idx= chunk.fCacheIndex;
-		if (idx >= 0) {
-			if (fTableIsFull) {
-				fPointer= fPageTable.length-1;
-				fTableIsFull= false;
-			}
-			else {
-				fPointer--;
-			}
-			chunk.fCacheIndex= -1;
-			final Chunk move= fPageTable[fPointer];
-			fPageTable[idx]= move;
-			move.fCacheIndex= idx;
-			fPageTable[fPointer]= null;
-		}	
-	}
-
-	/**                                                                           
-	 * Returns the maximum size of the chunk cache in bytes.
-	 */                                                                           
-	public synchronized long getMaxSize() {
-		return (long) fPageTable.length * Database.CHUNK_SIZE;
-	}
-
-	/**                                                                           
-	 * Clears the page table and changes it to hold chunks with
-	 * maximum total memory of <code>maxSize</code>.       
-	 * @param maxSize the total size of the chunks in bytes.                
-	 */                                                                           
-	public synchronized void setMaxSize(long maxSize) {
-		final int newLength= computeLength(maxSize);
-		final int oldLength= fTableIsFull ? fPageTable.length : fPointer;
-		if (newLength > oldLength) {
-			Chunk[] newTable= new Chunk[newLength];
-			System.arraycopy(fPageTable, 0, newTable, 0, oldLength);
-			fTableIsFull= false;
-			fPointer= oldLength;
-			fPageTable= newTable;
-		}
-		else {
-			for (int i=newLength; i<oldLength; i++) {
-				final Chunk chunk= fPageTable[i];
-				chunk.fDatabase.releaseChunk(chunk);
-				chunk.fCacheIndex= -1;
-			}
-			Chunk[] newTable= new Chunk[newLength];
-			System.arraycopy(fPageTable, 0, newTable, 0, newLength);
-			fTableIsFull= true;
-			fPointer= 0;
-			fPageTable= newTable;
-		}       
-	}                                                                             
-
-	private int computeLength(long maxSize) {
-		long maxLength= Math.min(maxSize/Database.CHUNK_SIZE, Integer.MAX_VALUE);
-		return Math.max(1, (int)maxLength);
-	}
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/DBProperties.java b/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/DBProperties.java
deleted file mode 100644
index 7d2c1c9..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/DBProperties.java
+++ /dev/null

@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Symbian Software Systems and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Andrew Ferguson (Symbian) - Initial implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.internal.core.pdom.db;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * DBProperties is a bare-bones implementation of a String->String mapping. It is neither
- * a Map or a Properties subclass, because of their more general applications.
- */
-public class DBProperties {
-	static final int PROP_INDEX = 0;
-	static final int RECORD_SIZE = 4;
-	
-	protected BTree index;
-	protected Database db;
-	protected int record;
-	
-	/**
-	 * Allocate storage for a new DBProperties record in the specified database
-	 * @param db
-	 * @throws CoreException
-	 */
-	public DBProperties(Database db) throws CoreException {
-		this.record= db.malloc(RECORD_SIZE);
-		this.index= new BTree(db, record + PROP_INDEX, DBProperty.getComparator(db));
-		this.db= db;
-	}
-	
-	/**
-	 * Creates an object for accessing an existing DBProperties record at the specified location of the specified database
-	 * @param db
-	 * @param record
-	 * @throws CoreException
-	 */
-	public DBProperties(Database db, int record) throws CoreException {
-		this.record= record;
-		this.index= new BTree(db, record + PROP_INDEX, DBProperty.getComparator(db));
-		this.db= db;
-	}
-	
-	/**
-	 * Read the named property from this properties storage
-	 * @param key a case-sensitive identifier for a property, or null
-	 * @return the value associated with the key, or null if either no such property is set, or the specified key was null
-	 * @throws CoreException
-	 */
-	public String getProperty(String key) throws CoreException {
-		if(key!=null) {
-			DBProperty existing= DBProperty.search(db, index, key);
-			if(existing!=null) {
-				return existing.getValue().getString();
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Read the named property from this properties storage, returning the default value if there is no such property
-	 * @param key a case-sensitive identifier for a property, or null
-	 * @param defaultValue a value to return in case the specified key was null
-	 * @return the value associated with the key, or the specified default value if either no such property is set, or
-	 * the specified key was null
-	 * @throws CoreException
-	 */
-	public String getProperty(String key, String defaultValue) throws CoreException {
-		String val= getProperty(key);
-		return (val == null) ? defaultValue : val;
-	}
-
-	/**
-	 * Returns a Set of property names (Strings) stored in this object
-	 * @return a Set of property names (Strings) stored in this object
-	 * @throws CoreException
-	 */
-	public Set getKeySet() throws CoreException {
-		return DBProperty.getKeySet(db, index);
-	}
-
-	/**
-	 * Write the key, value mapping to the properties. If a mapping for the
-	 * same key already exists, it is overwritten.
-	 * @param key a non-null property name
-	 * @param value a value to associate with the key. may not be null.
-	 * @throws CoreException
-	 * @throws NullPointerException if key is null
-	 */
-	public void setProperty(String key, String value) throws CoreException {
-		removeProperty(key);
-		DBProperty newProperty= new DBProperty(db, key, value);
-		index.insert(newProperty.getRecord());
-	}
-
-	/**
-	 * Deletes a property from this DBProperties object
-	 * @param key
-	 * @return whether a property with matching key existed and was removed, or false if the key was null
-	 * @throws CoreException
-	 */
-	public boolean removeProperty(String key) throws CoreException {
-		if(key!=null) {
-			DBProperty existing= DBProperty.search(db, index, key);
-			if(existing != null) {
-				index.delete(existing.getRecord());
-				existing.delete();
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Deletes all properties, does not delete the record associated with the object itself - that is
-	 * it can be repopulated.
-	 * @throws CoreException
-	 */
-	public void clear() throws CoreException {
-		index.accept(new IBTreeVisitor(){
-			public int compare(int record) throws CoreException {
-				return 0;
-			}
-			public boolean visit(int record) throws CoreException {
-				new DBProperty(db, record).delete();
-				return false; // there should never be duplicates
-			}
-		});
-	}
-	
-	/**
-	 * Deletes all properties stored in this object and the record associated with this object itself.
-	 * <br><br>
-	 * <b>The behaviour of objects of this class after calling this method is undefined</b>
-	 * @throws CoreException
-	 */
-	public void delete() throws CoreException {
-		clear();
-		db.free(record);
-	}
-
-	public int getRecord() {
-		return record;
-	}
-	
-	private static class DBProperty {
-		static final int KEY = 0;
-		static final int VALUE = 4;
-		static final int RECORD_SIZE = 8;
-		
-		Database db;
-		int record;
-		
-		public int getRecord() {
-			return record;
-		}
-		
-		/**
-		 * Allocates and initializes a record in the specified database for a DBProperty record
-		 * @param db
-		 * @param key a non-null property name
-		 * @param value a non-null property value
-		 * @throws CoreException
-		 */
-		DBProperty(Database db, String key, String value) throws CoreException {
-			assert key!=null;
-			assert value!=null;
-			IString dbkey= db.newString(key);
-			IString dbvalue= db.newString(value);
-			this.record= db.malloc(RECORD_SIZE);
-			db.putInt(record + KEY, dbkey.getRecord());
-			db.putInt(record + VALUE, dbvalue.getRecord());
-			this.db= db;
-		}
-		
-		/**
-		 * Returns an object for accessing an existing DBProperty record at the specified location in the
-		 * specified database
-		 * @param db
-		 * @param record
-		 */
-		DBProperty(Database db, int record) {
-			this.record= record;
-			this.db= db;
-		}
-		
-		public IString getKey() throws CoreException {
-			return db.getString(db.getInt(record + KEY));
-		}
-		
-		public IString getValue() throws CoreException {
-			return db.getString(db.getInt(record + VALUE));
-		}
-		
-		public static IBTreeComparator getComparator(final Database db) {
-			return new IBTreeComparator() {
-				public int compare(int record1, int record2) throws CoreException {
-					IString left= db.getString(db.getInt(record1 + KEY));
-					IString right= db.getString(db.getInt(record2 + KEY));
-					return left.compare(right, true);
-				}
-			};
-		}
-		
-		public static DBProperty search(final Database db, final BTree index, final String key) throws CoreException {
-			final DBProperty[] result= new DBProperty[1];
-			index.accept(new IBTreeVisitor(){
-				public int compare(int record) throws CoreException {
-					return db.getString(db.getInt(record + KEY)).compare(key, true);
-				}
-				public boolean visit(int record) throws CoreException {
-					result[0] = new DBProperty(db, record);
-					return false; // there should never be duplicates
-				}
-			});
-			return result[0];
-		}
-		
-		public static Set getKeySet(final Database db, final BTree index) throws CoreException {
-			final Set result= new HashSet();
-			index.accept(new IBTreeVisitor(){
-				public int compare(int record) throws CoreException {
-					return 0;
-				}
-				public boolean visit(int record) throws CoreException {
-					result.add(new DBProperty(db, record).getKey().getString());
-					return true; // there should never be duplicates
-				}
-			});
-			return result;
-		}
-		
-		public void delete() throws CoreException {
-			db.getString(db.getInt(record + KEY)).delete();
-			db.getString(db.getInt(record + VALUE)).delete();
-			db.free(record);
-		}
-	}
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/DBStatus.java b/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/DBStatus.java
deleted file mode 100644
index 962a811..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/DBStatus.java
+++ /dev/null

@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * QNX - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.internal.core.pdom.db;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.core.CCorePlugin;
-
-
-/**
- * @author Doug Schaefer
- *
- */
-public class DBStatus extends Status {
-
-	/**
-	 * @param exception
-	 */
-	public DBStatus(IOException exception) {
-		super(IStatus.ERROR, CCorePlugin.PLUGIN_ID, 0, "IOException", exception); //$NON-NLS-1$
-	}
-
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/Database.java b/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/Database.java
deleted file mode 100644
index b94427e..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/Database.java
+++ /dev/null

@@ -1,660 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     QNX - Initial API and implementation
- *     Symbian - Add some non-javadoc implementation notes
- *     Markus Schorn (Wind River Systems)
- *     IBM Corporation
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.internal.core.pdom.db;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
-import java.nio.channels.ClosedByInterruptException;
-import java.nio.channels.ClosedChannelException;
-import java.nio.channels.FileChannel;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.core.CCorePlugin;
-
-
-/**
- * Database encapsulates access to a flat binary format file with a memory-manager-like API for
- * obtaining and releasing areas of storage (memory).
- *
- * @author Doug Schaefer
- */
-/* 
- * The file encapsulated is divided into Chunks of size CHUNK_SIZE, and a table of contents
- * mapping chunk index to chunk address is maintained. Chunk structure exists only conceptually -
- * its not a structure that appears in the file.
- * 
- * ===== The first chunk is used by Database itself for house-keeping purposes and has structure
- * 
- * offset            content
- * 	                 _____________________________
- * 0                | version number
- * INT_SIZE         | pointer to head of linked list of blocks of size MIN_SIZE
- * ..               | ...
- * INT_SIZE * m (1) | pointer to head of linked list of blocks of size MIN_SIZE * m
- * DATA_AREA        | undefined (PDOM stores its own house-keeping data in this area) 
- * 
- * (1) where m <= (CHUNK_SIZE / MIN_SIZE)
- * 
- * ===== block structure
- * 
- * offset            content
- * 	                 _____________________________
- * 0                | size of block (negative indicates in use, positive unused)
- * PREV_OFFSET      | pointer to prev block (of same size)
- * NEXT_OFFSET      | pointer to next block (of same size)
- * 
- */
-public class Database {
-
-	private final File fLocation;
-	private final boolean fReadOnly;
-	private RandomAccessFile fFile;
-	private boolean fExclusiveLock= false;	// necessary for any write operation
-	private boolean fLocked;				// necessary for any operation.
-	private boolean fIsMarkedIncomplete= false;
-
-	private int fVersion;
-	private final Chunk fHeaderChunk;
-	private Chunk[] fChunks;
-	private ChunkCache fCache;
-	
-	private long malloced;
-	private long freed;
-	private long cacheHits;
-	private long cacheMisses;
-	
-	// public for tests only, you shouldn't need these
-	public static final int VERSION_OFFSET = 0;
-	public static final int CHUNK_SIZE = 1024 * 4;
-	public static final int MIN_SIZE = 16;
-	public static final int INT_SIZE = 4;
-	public static final int CHAR_SIZE = 2;
-	public static final int PREV_OFFSET = INT_SIZE;
-	public static final int NEXT_OFFSET = INT_SIZE * 2;
-	public static final int DATA_AREA = CHUNK_SIZE / MIN_SIZE * INT_SIZE + INT_SIZE;
-	
-	public static final int MAX_SIZE = CHUNK_SIZE - 4; // Room for overhead
-	
-	/**
-	 * Construct a new Database object, creating a backing file if necessary.
-	 * @param location the local file path for the database 
-	 * @param cache the cache to be used optimization
-	 * @param version the version number to store in the database (only applicable for new databases)
-	 * @param permanentReadOnly whether this Database object will ever need writing to
-	 * @throws CoreException
-	 */
-	public Database(File location, ChunkCache cache, int version, boolean openReadOnly) throws CoreException {
-		try {
-			fLocation = location;
-			fReadOnly= openReadOnly;
-			fCache= cache;
-			openFile();
-			
-			int nChunksOnDisk = (int) (fFile.length() / CHUNK_SIZE);
-			fHeaderChunk= new Chunk(this, 0);
-			fHeaderChunk.fLocked= true;		// never makes it into the cache, needed to satisfy assertions
-			if (nChunksOnDisk <= 0) {
-				fVersion= version;
-				fChunks= new Chunk[1];
-			}
-			else {
-				fHeaderChunk.read();
-				fVersion= fHeaderChunk.getInt(VERSION_OFFSET);
-				fChunks = new Chunk[nChunksOnDisk];	// chunk[0] is unused.
-			}
-		} catch (IOException e) {
-			throw new CoreException(new DBStatus(e));
-		}
-	}
-		
-	private void openFile() throws FileNotFoundException {
-		fFile = new RandomAccessFile(fLocation, fReadOnly ? "r" : "rw"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	void read(ByteBuffer buf, int i) throws IOException {
-		int retries= 0;
-		do {
-			try {
-				fFile.getChannel().read(buf, i);
-				return;
-			}
-			catch (ClosedChannelException e) {
-				// bug 219834 file may have be closed by interrupting a thread during an I/O operation.
-				reopen(e, ++retries);
-			} 
-		} while (true);
-	}
-
-	void write(ByteBuffer buf, int i) throws IOException {
-		int retries= 0;
-		do {
-			try {
-				fFile.getChannel().write(buf, i);
-				return;
-			}
-			catch (ClosedChannelException e) {
-				// bug 219834 file may have be closed by interrupting a thread during an I/O operation.
-				reopen(e, ++retries);
-			} 
-		} while(true);
-	}
-
-	private void reopen(ClosedChannelException e, int attempt) throws ClosedChannelException, FileNotFoundException {
-		// only if the current thread was not interrupted we try to reopen the file.
-		if (!(e instanceof ClosedByInterruptException) || attempt >= 20) { // JO negated first part
-			throw e;
-		}
-		openFile();
-	}
-
-
-	public void transferTo(FileChannel target) throws IOException {
-		assert fLocked;
-		final FileChannel from= fFile.getChannel();
-		from.transferTo(0, from.size(), target);
-	}
-	
-	public int getVersion() throws CoreException {
-		return fVersion;
-	}
-	
-	public void setVersion(int version) throws CoreException {
-		assert fExclusiveLock;
-		fHeaderChunk.putInt(VERSION_OFFSET, version);
-		fVersion= version;
-	}
-
-	/**
-	 * Empty the contents of the Database, make it ready to start again
-	 * @throws CoreException
-	 */
-	public void clear(int version) throws CoreException {
-		assert fExclusiveLock;
-		removeChunksFromCache();
-		
-		fVersion= version;
-		// clear the first chunk.
-		fHeaderChunk.clear(0, CHUNK_SIZE);
-		// chunks have been removed from the cache, so we may just reset the array of chunks.
-		fChunks = new Chunk[] {null};
-		try {
-			fHeaderChunk.flush();	// zero out header chunk
-			fFile.getChannel().truncate(CHUNK_SIZE);	// truncate database
-		}
-		catch (IOException e) {
-			CCorePlugin.log(e);
-		}
-		malloced = freed = 0;
-	}
-
-	private void removeChunksFromCache() {
-		synchronized (fCache) {
-			for (int i=1; i < fChunks.length; i++) {
-				Chunk chunk= fChunks[i];
-				if (chunk != null) {
-					fCache.remove(chunk);
-					fChunks[i]= null;
-				}
-			}
-		}
-	}
-	
-	
-	/**
-	 * Return the Chunk that contains the given offset.
-	 * @throws CoreException 
-	 */
-	public Chunk getChunk(int offset) throws CoreException {
-		if (offset < CHUNK_SIZE) {
-			return fHeaderChunk;
-		}
-		synchronized(fCache) {
-			assert fLocked;
-			final int index = offset / CHUNK_SIZE;
-			Chunk chunk= fChunks[index];
-			if (chunk == null) {
-				cacheMisses++;
-				chunk = fChunks[index] = new Chunk(this, index);
-				chunk.read();
-			}
-			else {
-				cacheHits++;
-			}
-			fCache.add(chunk, fExclusiveLock);
-			return chunk;
-		}
-	}
-
-	/**
-	 * Allocate a block out of the database.
-	 * 
-	 * @param size
-	 * @return
-	 */ 
-	public int malloc(int size) throws CoreException {
-		assert fExclusiveLock;
-		if (size > MAX_SIZE)
-			// Too Big
-			throw new CoreException(new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, 0,
-					CCorePlugin.getResourceString("pdom.requestTooLarge"), new IllegalArgumentException())); //$NON-NLS-1$
-		
-		// Which block size
-		int freeblock = 0;
-		int blocksize;
-		int matchsize = 0;
-		for (blocksize = MIN_SIZE; blocksize <= CHUNK_SIZE; blocksize += MIN_SIZE) {
-			if (blocksize - INT_SIZE >= size) {
-				if (matchsize == 0) // our real size
-					matchsize = blocksize;
-				freeblock = getFirstBlock(blocksize);
-				if (freeblock != 0)
-					break;
-			}
-		}
-		
-		// get the block
-		Chunk chunk;
-		if (freeblock == 0) {
-			// allocate a new chunk
-			freeblock= createNewChunk();
-			blocksize = CHUNK_SIZE;
-			chunk = getChunk(freeblock);
-		} else {
-			chunk = getChunk(freeblock);
-			removeBlock(chunk, blocksize, freeblock);
-		}
- 
-		if (blocksize != matchsize) {
-			// Add in the unused part of our block
-			addBlock(chunk, blocksize - matchsize, freeblock + matchsize);
-		}
-		
-		// Make our size negative to show in use
-		chunk.putInt(freeblock, - matchsize);
-
-		// Clear out the block, lots of people are expecting this
-		chunk.clear(freeblock + 4, size);
-
-		malloced += matchsize;
-		return freeblock + 4;
-	}
-	
-	private int createNewChunk() throws CoreException {
-		assert fExclusiveLock;
-		synchronized (fCache) {
-			final int oldLen= fChunks.length;
-			final Chunk chunk= new Chunk(this, oldLen);
-			chunk.fDirty= true;
-
-			Chunk[] newchunks = new Chunk[oldLen+1];
-			System.arraycopy(fChunks, 0, newchunks, 0, oldLen);
-			newchunks[oldLen]= chunk;
-			fChunks= newchunks;
-			fCache.add(chunk, true);
-			return oldLen * CHUNK_SIZE;
-		}
-	}
-	
-	private int getFirstBlock(int blocksize) throws CoreException {
-		assert fLocked;
-		return fHeaderChunk.getInt((blocksize / MIN_SIZE) * INT_SIZE);
-	}
-	
-	private void setFirstBlock(int blocksize, int block) throws CoreException {
-		assert fExclusiveLock;
-		fHeaderChunk.putInt((blocksize / MIN_SIZE) * INT_SIZE, block);
-	}
-	
-	private void removeBlock(Chunk chunk, int blocksize, int block) throws CoreException {
-		assert fExclusiveLock;
-		int prevblock = chunk.getInt(block + PREV_OFFSET);
-		int nextblock = chunk.getInt(block + NEXT_OFFSET);
-		if (prevblock != 0)
-			putInt(prevblock + NEXT_OFFSET, nextblock);
-		else // we were the head
-			setFirstBlock(blocksize, nextblock);
-			
-		if (nextblock != 0)
-			putInt(nextblock + PREV_OFFSET, prevblock);
-	}
-	
-	private void addBlock(Chunk chunk, int blocksize, int block) throws CoreException {
-		assert fExclusiveLock;
-		// Mark our size
-		chunk.putInt(block, blocksize);
-
-		// Add us to the head of the list
-		int prevfirst = getFirstBlock(blocksize);
-		chunk.putInt(block + PREV_OFFSET, 0);
-		chunk.putInt(block + NEXT_OFFSET, prevfirst);
-		if (prevfirst != 0)
-			putInt(prevfirst + PREV_OFFSET, block);
-		setFirstBlock(blocksize, block);
-	}
-	
-	/**
-	 * Free an allocate block.
-	 * 
-	 * @param offset
-	 */
-	public void free(int offset) throws CoreException {
-		assert fExclusiveLock;
-		// TODO - look for opportunities to merge blocks
-		int block = offset - 4;
-		Chunk chunk = getChunk(block);
-		int blocksize = - chunk.getInt(block);
-		if (blocksize < 0)
-			// already freed
-			throw new CoreException(new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, 0, "Already Freed", new Exception())); //$NON-NLS-1$
-		addBlock(chunk, blocksize, block);
-		freed += blocksize;
-	}
-
-	public void putByte(int offset, byte value) throws CoreException {
-		getChunk(offset).putByte(offset, value);
-	}
-	
-	public byte getByte(int offset) throws CoreException {
-		return getChunk(offset).getByte(offset);
-	}
-	
-	public void putInt(int offset, int value) throws CoreException {
-		getChunk(offset).putInt(offset, value);
-	}
-	
-	public int getInt(int offset) throws CoreException {
-		return getChunk(offset).getInt(offset);
-	}
-
-	public void putShort(int offset, short value) throws CoreException {
-		getChunk(offset).putShort(offset, value);
-	}
-	
-	public short getShort(int offset) throws CoreException {
-		return getChunk(offset).getShort(offset);
-	}
-
-	public void putLong(int offset, long value) throws CoreException {
-		getChunk(offset).putLong(offset, value);
-	}
-	
-	public long getLong(int offset) throws CoreException {
-		return getChunk(offset).getLong(offset);
-	}
-
-	public void putChar(int offset, char value) throws CoreException {
-		getChunk(offset).putChar(offset, value);
-	}
-
-	public char getChar(int offset) throws CoreException {
-		return getChunk(offset).getChar(offset);
-	}
-	
-	public IString newString(String string) throws CoreException {
-		if (string.length() > ShortString.MAX_LENGTH)
-			return new LongString(this, string);
-		else
-			return new ShortString(this, string);
-	}
-
-	public IString newString(char[] chars) throws CoreException {
-		if (chars.length > ShortString.MAX_LENGTH)
-			return new LongString(this, chars);
-		else
-			return new ShortString(this, chars);
-	}
-
-	public IString getString(int offset) throws CoreException {
-		int length = getInt(offset);
-		if (length > ShortString.MAX_LENGTH)
-			return new LongString(this, offset);
-		else
-			return new ShortString(this, offset);
-	}
-	
-	/**
-	 * For debugging purposes, only.
-	 */
-	public void reportFreeBlocks() throws CoreException {
-		System.out.println("Allocated size: " + fChunks.length * CHUNK_SIZE); //$NON-NLS-1$
-		System.out.println("malloc'ed: " + malloced); //$NON-NLS-1$
-		System.out.println("free'd: " + freed); //$NON-NLS-1$
-		System.out.println("wasted: " + (fChunks.length * CHUNK_SIZE - (malloced - freed))); //$NON-NLS-1$
-		System.out.println("Free blocks"); //$NON-NLS-1$
-		for (int bs = MIN_SIZE; bs <= CHUNK_SIZE; bs += MIN_SIZE) {
-			int count = 0;
-			int block = getFirstBlock(bs);
-			while (block != 0) {
-				++count;
-				block = getInt(block + NEXT_OFFSET);
-			}
-			if (count != 0)
-				System.out.println("Block size: " + bs + "=" + count); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-		
-	/**
-	 * Closes the database. 
-	 * <p>
-	 * The behavior of any further calls to the Database is undefined
-	 * @throws IOException
-	 * @throws CoreException 
-	 */
-	public void close() throws CoreException {
-		assert fExclusiveLock;
-		flush();
-		removeChunksFromCache();
-		
-		// chunks have been removed from the cache, so we are fine
-		fHeaderChunk.clear(0, CHUNK_SIZE);
-		fHeaderChunk.fDirty= false;
-		fChunks= new Chunk[] {null};
-		try {
-			fFile.close();
-		} catch (IOException e) {
-			throw new CoreException(new DBStatus(e));
-		}
-	}
-	
-	/**
-     * This method is public for testing purposes only.
-     */
-	public File getLocation() {
-		return fLocation;
-	}
-
-	/**
-	 * Called from any thread via the cache, protected by {@link #fCache}.
-	 */
-	void releaseChunk(final Chunk chunk) {
-		if (!chunk.fLocked) {
-			fChunks[chunk.fSequenceNumber]= null;
-		}			
-	}
-
-	/**
-	 * Returns the cache used for this database.
-	 * @since 4.0
-	 */
-	public ChunkCache getChunkCache() {
-		return fCache;
-	}
-
-	/**
-	 * Asserts that database is used by one thread exclusively. This is necessary when doing
-	 * write operations.
-	 */
-	public void setExclusiveLock() {
-		fExclusiveLock= true;
-		fLocked= true;
-	}
-
-	public void setLocked(boolean val) {
-		fLocked= val;
-	}
-	
-	public void giveUpExclusiveLock(final boolean flush) throws CoreException {
-		if (fExclusiveLock) {
-			try {
-				ArrayList dirtyChunks= new ArrayList();
-				synchronized (fCache) {
-					for (int i= 1; i < fChunks.length; i++) {
-						Chunk chunk= fChunks[i];
-						if (chunk != null) {
-							if (chunk.fCacheIndex < 0) { 	
-								// locked chunk that has been removed from cache.
-								if (chunk.fDirty) {
-									dirtyChunks.add(chunk); // keep in fChunks until it is flushed.
-								}
-								else {
-									chunk.fLocked= false;
-									fChunks[i]= null;
-								}
-							}
-							else if (chunk.fLocked) {
-								// locked chunk, still in cache.
-								if (chunk.fDirty) {
-									if (flush) {
-										dirtyChunks.add(chunk);
-									}
-								}
-								else {
-									chunk.fLocked= false;
-								}
-							}
-							else {
-								assert !chunk.fDirty; // dirty chunks must be locked.
-							}
-						}
-					}
-				}
-				// also handles header chunk
-				flushAndUnlockChunks(dirtyChunks, flush);
-			}
-			finally {
-				fExclusiveLock= false;
-			}
-		}
-	}
-	
-	public void flush() throws CoreException {
-		assert fLocked;
-		if (fExclusiveLock) {
-			try {
-				giveUpExclusiveLock(true);
-			}
-			finally {
-				setExclusiveLock();
-			}
-			return;
-		}
-
-		// be careful as other readers may access chunks concurrently
-		ArrayList dirtyChunks= new ArrayList();
-		synchronized (fCache) {
-			for (int i= 1; i < fChunks.length ; i++) {
-				Chunk chunk= fChunks[i];
-				if (chunk != null && chunk.fDirty) {
-					dirtyChunks.add(chunk);
-				}
-			}
-		}
-
-		// also handles header chunk
-		flushAndUnlockChunks(dirtyChunks, true);
-	}
-
-	private void flushAndUnlockChunks(final ArrayList dirtyChunks, boolean isComplete) throws CoreException {
-		assert !Thread.holdsLock(fCache);
-		synchronized(fHeaderChunk) {
-			if (!fHeaderChunk.fDirty) {
-				if (!(isComplete && fIsMarkedIncomplete)) {
-					return;
-				}
-			}
-			if (!dirtyChunks.isEmpty()) {
-				markFileIncomplete();
-				for (Iterator it = dirtyChunks.iterator(); it.hasNext();) {
-					Chunk chunk = (Chunk) it.next();
-					if (chunk.fDirty) {
-						chunk.flush();
-					}
-				}
-
-				// only after the chunks are flushed we may unlock and release them.
-				synchronized (fCache) {
-					for (Iterator it = dirtyChunks.iterator(); it.hasNext();) {
-						Chunk chunk = (Chunk) it.next();
-						chunk.fLocked= false;
-						if (chunk.fCacheIndex < 0) {
-							fChunks[chunk.fSequenceNumber]= null;
-						}
-					}
-				}
-			}
-
-			if (isComplete) {
-				if (fHeaderChunk.fDirty || fIsMarkedIncomplete) {
-					fHeaderChunk.putInt(VERSION_OFFSET, fVersion);
-					fHeaderChunk.flush();
-					fIsMarkedIncomplete= false;
-				}
-			}
-		}
-	}
-		
-	private void markFileIncomplete() throws CoreException {
-		if (!fIsMarkedIncomplete) {
-			fIsMarkedIncomplete= true;
-			try {
-				final ByteBuffer buf= ByteBuffer.wrap(new byte[4]);
-
-//              fFile.getChannel().write(buf, 0);
-		        int retries= 0; // JO -- Copied code from above to handle bug 318197
-		        do {
-		            try {
-		                fFile.getChannel().write(buf, 0);
-		                return;
-		            }
-		            catch (ClosedChannelException e) {
-		                // bug 219834 file may have be closed by interrupting a thread during an I/O operation.
-		                reopen(e, ++retries);
-		            }
-		        } while(true);
-
-			} catch (IOException e) {
-				throw new CoreException(new DBStatus(e));
-			}
-		}
-	}
-
-	public void resetCacheCounters() {
-		cacheHits= cacheMisses= 0;
-	}
-	
-	public long getCacheHits() {
-		return cacheHits;
-	}
-	
-	public long getCacheMisses() {
-		return cacheMisses;
-	}
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/IBTreeComparator.java b/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/IBTreeComparator.java
deleted file mode 100644
index 46b24dd..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/IBTreeComparator.java
+++ /dev/null

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * QNX - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.internal.core.pdom.db;
-
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * @author Doug Schaefer
- *
- */
-public interface IBTreeComparator {
-
-	/**
-	 * Compare two records. Used for insert.
-	 * 
-	 * @param record1
-	 * @param record2
-	 * @return
-	 * @throws IOException
-	 */
-	public abstract int compare(int record1, int record2) throws CoreException;
-	
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/IBTreeVisitor.java b/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/IBTreeVisitor.java
deleted file mode 100644
index 1dff590..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/IBTreeVisitor.java
+++ /dev/null

@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * QNX - Initial API and implementation
- * Markus Schorn (Wind River Systems)
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.internal.core.pdom.db;
-
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * @author Doug Schaefer
- * 
- * The visitor visits all records where compare returns 0. 
- */
-public interface IBTreeVisitor {
-
-	/**
-	 * Compare the record against an internally held key. The comparison must be
-	 * compatible with the one used for the btree.
-	 * Used for visiting.
-	 * 
-	 * @param record
-	 * @return -1 if record < key, 0 if record == key, 1 if record > key
-	 * @throws IOException
-	 */
-	public abstract int compare(int record) throws CoreException;
-
-	/**
-	 * Visit a given record and return whether to continue or not.
-
-	 * @return <code>true</code> to continue the visit, <code>false</code> to abort it.
-	 * @throws IOException
-	 */
-	public abstract boolean visit(int record) throws CoreException;
-	
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/IString.java b/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/IString.java
deleted file mode 100644
index 6e42b9c..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/IString.java
+++ /dev/null

@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     QNX - Initial API and implementation
- *     Andrew Ferguson (Symbian)
- *     Markus Schorn (Wind River Systems)
- *******************************************************************************/
-
-package org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.internal.core.pdom.db;
-
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * Interface for strings stored in the database. There is more than one string
- * format. This interface hides that fact. 
- * 
- * @author Doug Schaefer
- */
-public interface IString {
-	/**
-	 * Get the offset of this IString record in the PDOM
-	 * @return
-	 */
-	public int getRecord();
-	
-	// strcmp equivalents
-	/**
-	 * Compare this IString record and the specified IString record
-	 * @param string
-	 * @param caseSensitive whether to compare in a case-sensitive way
-	 * @return <ul><li> -1 if this &lt; string
-	 * <li> 0 if this == string
-	 * <li> 1 if this &gt; string
-	 * </ul>
-	 * @throws CoreException
-	 */
-	public int compare(IString string, boolean caseSensitive) throws CoreException;
-	
-	/**
-	 * Compare this IString record and the specified String object
-	 * @param string
-	 * @param caseSensitive whether to compare in a case-sensitive way
-	 * @return <ul><li> -1 if this &lt; string
-	 * <li> 0 if this == string
-	 * <li> 1 if this &gt; string
-	 * </ul>
-	 * @throws CoreException
-	 */
-	public int compare(String string, boolean caseSensitive) throws CoreException;
-	
-	/**
-	 * Compare this IString record and the specified character array
-	 * @param chars
-	 * @param caseSensitive whether to compare in a case-sensitive way
-	 * @return <ul><li> -1 if this &lt; chars
-	 * <li> 0 if this == chars
-	 * <li> 1 if this &gt; chars
-	 * </ul>
-	 * @throws CoreException
-	 */
-	public int compare(char[] chars, boolean caseSensitive) throws CoreException;
-
-	/**
-	 * Compare this IString record and the specified IString record in a case sensitive manner
-	 * such that it is compatible with case insensitive comparison.
-	 * @param string
-	 * @return <ul><li> -1 if this &lt; string
-	 * <li> 0 if this == string
-	 * <li> 1 if this &gt; string
-	 * </ul>
-	 * @throws CoreException
-	 */
-	public int compareCompatibleWithIgnoreCase(IString string) throws CoreException;
-
-	/**
-	 * Compare this IString record and the specified char array in a case sensitive manner
-	 * such that it is compatible with case insensitive comparison.
-	 * @param chars
-	 * @return <ul><li> -1 if this &lt; string
-	 * <li> 0 if this == string
-	 * <li> 1 if this &gt; string
-	 * </ul>
-	 * @throws CoreException
-	 */
-	public int compareCompatibleWithIgnoreCase(char[] chars) throws CoreException;
-	
-	/**
-	 * Compare this IString record and the specified character array
-	 * @param chars
-	 * @param caseSensitive whether to compare in a case-sensitive way
-	 * @return <ul><li> -1 if this &lt; chars
-	 * <li> 0 if this has a prefix chars
-	 * <li> 1 if this &gt; chars and does not have the prefix
-	 * </ul>
-	 * @throws CoreException
-	 */
-	public int comparePrefix(char[] name, boolean caseSensitive) throws CoreException;
-
-	/**
-	 * Get an equivalent character array to this IString record<p>
-	 * <b>N.B. This method can be expensive: compare and equals can be used for
-	 * efficient comparisons</b>
-	 * @return an equivalent character array to this IString record
-	 * @throws CoreException
-	 */
-	public char[] getChars() throws CoreException;
-	
-	/**
-	 * Get an equivalent String object to this IString record<p>
-	 * <b>N.B. This method can be expensive: compare and equals can be used for
-	 * efficient comparisons</b>
-	 * @return an equivalent String object to this IString record
-	 * @throws CoreException
-	 */
-	public String getString() throws CoreException;
-	
-	/**
-	 * Free the associated record in the PDOM
-	 * @throws CoreException
-	 */
-	public void delete() throws CoreException;
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/ListItem.java b/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/ListItem.java
deleted file mode 100644
index 1624102..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/ListItem.java
+++ /dev/null

@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    QNX - Initial API and implementation
- *    Markus Schorn (Wind River Systems)
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.internal.core.pdom.db;
-
-import org.eclipse.core.runtime.CoreException;
-
-/**
- * This is a list item. It contains a next and prev pointer
- * as well as a pointer to the item.
- * block.
- * 
- * @author Doug Schaefer
- */
-public class ListItem {
-	
-	protected final Database db;
-	protected final int record;
-	
-	protected static final int NEXT = 0;
-	protected static final int PREV = 4;
-	protected static final int ITEM = 8;
-
-	protected static final int RECORD_SIZE = 12;
-	
-	public ListItem(Database db, int record) {
-		this.db = db;
-		this.record = record;
-	}
-	
-	public ListItem(Database db) throws CoreException {
-		this.db = db;
-		this.record = db.malloc(RECORD_SIZE);
-	}
-	
-	public int getRecord() {
-		return record;
-	}
-	
-	public boolean equals(Object obj) {
-		if (obj == this)
-			return true;
-		else if (obj instanceof ListItem)
-			return record == ((ListItem)obj).record;
-		else
-			return false;
-	}
-	
-	public void setItem(int item) throws CoreException {
-		db.putInt(record + ITEM, item);
-	}
-	
-	public int getItem() throws CoreException {
-		return db.getInt(record + ITEM);
-	}
-	
-	public void setNext(ListItem next) throws CoreException {
-		db.putInt(record + NEXT, next.getRecord());
-	}
-	
-	public ListItem getNext() throws CoreException {
-		int next = db.getInt(record + NEXT);
-		return next != 0 ? new ListItem(db, next) : null;
-	}
-	
-	public void setPrev(ListItem prev) throws CoreException {
-		db.putInt(record + PREV, prev.getRecord());
-	}
-	
-	public ListItem getPrev() throws CoreException {
-		int prev = db.getInt(record + PREV);
-		return prev != 0 ? new ListItem(db, prev) : null;
-	}
-
-	public void delete() throws CoreException {
-		db.free(record);
-	}
-	
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/LongString.java b/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/LongString.java
deleted file mode 100644
index f382908..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/LongString.java
+++ /dev/null

@@ -1,343 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     QNX - Initial API and implementation
- *     Andrew Ferguson (Symbian)
- *     Markus Schorn (Wind River Systems)
- *******************************************************************************/
-
-package org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.internal.core.pdom.db;
-
-import java.util.NoSuchElementException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.internal.core.pdom.dom.PDOMNotImplementedError;
-
-
-/**
- * This is for strings that take up more than on chunk.
- * The string will need to be broken up into sections and then
- * reassembled when necessary.
- * 
- * @author Doug Schaefer
- */
-public class LongString implements IString {
-
-	private final Database db;
-	private final int record1;
-
-	// Additional fields of first record
-	private static final int LENGTH = 0; // must be first to match ShortString
-	private static final int NEXT1 = 4;
-	private static final int CHARS1 = 8;
-	
-	private static final int NUM_CHARS1 = (Database.MAX_SIZE - CHARS1) / 2;
-	
-	// Additional fields of subsequent records
-	private static final int NEXTN = 0;
-	private static final int CHARSN = 4;
-	
-	private static final int NUM_CHARSN = (Database.MAX_SIZE - CHARSN) / 2;
-	
-	public LongString(Database db, int record1) {
-		this.db = db;
-		this.record1 = record1;
-	}
-	
-	private interface IWriter {
-		public void writeChars(int start, int length, int p) throws CoreException;
-	}
-
-	private int createString(int length, IWriter writer) throws CoreException {
-		// write the first record
-		int firstRecord = db.malloc(Database.MAX_SIZE);
-		int start = 0;
-		db.putInt(firstRecord, length);
-		writer.writeChars(start, NUM_CHARS1, firstRecord + CHARS1);
-		
-		// write the subsequent records
-		int lastNext = firstRecord + NEXT1;
-		start += NUM_CHARS1;
-		while (length - start > NUM_CHARSN) {
-			int nextRecord = db.malloc(Database.MAX_SIZE);
-			db.putInt(lastNext, nextRecord);
-			writer.writeChars(start, NUM_CHARSN, nextRecord + CHARSN);
-			start += NUM_CHARSN;
-			lastNext = nextRecord + NEXTN;
-		}
-		
-		// Write the final record
-		length -= start;
-		int finalRecord = db.malloc(CHARSN + (length) * 2);
-		db.putInt(lastNext, finalRecord);
-		writer.writeChars(start, length, finalRecord + CHARSN);
-		
-		return firstRecord;
-	}
-	
-	public LongString(Database db, final String string) throws CoreException {
-		this.db = db;
-		this.record1 = createString(string.length(), new IWriter() {
-			public void writeChars(int start, int length, int p) throws CoreException {
-				for (int i = start; i < start + length; ++i) {
-					LongString.this.db.putChar(p, string.charAt(i));
-					p += 2;
-				}
-			}
-		});
-	}
-	
-	public LongString(Database db, final char[] chars) throws CoreException {
-		this.db = db;
-		this.record1 = createString(chars.length, new IWriter() {
-			public void writeChars(int start, int length, int p) throws CoreException {
-				for (int i = start; i < start + length; ++i) {
-					LongString.this.db.putChar(p, chars[i]);
-					p += 2;
-				}
-			}
-		});
-	}
-	
-	public int getRecord() {
-		return record1;
-	}
-
-	public void delete() throws CoreException {
-		int length = db.getInt(record1 + LENGTH) - NUM_CHARS1;
-		int nextRecord = db.getInt(record1 + NEXT1);
-		db.free(record1);
-		
-		// Middle records
-		while (length > NUM_CHARSN) {
-			length -= NUM_CHARSN;
-			int nextnext = db.getInt(nextRecord + NEXTN);
-			db.free(nextRecord);
-			nextRecord = nextnext;
-		}
-		
-		// Last record
-		db.free(nextRecord);
-	}
-	
-	public boolean equals(Object obj) {
-		throw new PDOMNotImplementedError();
-	}
-	
-	public int hashCode() {
-		return record1;
-	}
-	
-	public int compare(IString string, boolean caseSensitive) throws CoreException {
-		if (string instanceof LongString)
-			return compare((LongString)string, caseSensitive);
-		else if (string instanceof ShortString)
-			return compare((ShortString)string, caseSensitive);
-		else
-			throw new IllegalArgumentException();
-	}
-
-	public int compare(char[] other, boolean caseSensitive) throws CoreException {
-		CharIterator i1 = new CharIterator();
-		int i2 = 0;
-		int n2 = other.length;
-		
-		while (i1.hasNext() && i2 < n2) {
-			int cmp= ShortString.compareChars(i1.next(), other[i2], caseSensitive);
-			if(cmp!=0)
-				return cmp;
-			
-			++i2;
-		}
-
-		if (!i1.hasNext() && i2 != n2)
-			return -1;
-		else if (i2 == n2 && i1.hasNext())
-			return 1;
-		else
-			return 0;
-	}
-	
-	public int compare(ShortString other, boolean caseSensitive) throws CoreException {
-		CharIterator i1 = new CharIterator();
-		int index2 = 0;
-		int length2 = other.getLength();
-		
-		while (i1.hasNext() && index2<length2) {
-			int cmp= ShortString.compareChars(i1.next(), other.charAt(index2), caseSensitive);
-			if(cmp!=0)
-				return cmp;
-			index2++;
-		}
-
-		if (!i1.hasNext() && index2 != length2)
-			return -1;
-		else if (index2 == length2 && i1.hasNext())
-			return 1;
-		else
-			return 0;
-	}
-	
-	public int compare(LongString other, boolean caseSensitive) throws CoreException {
-		CharIterator i1 = new CharIterator();
-		CharIterator i2 = other.new CharIterator();
-		
-		while (i1.hasNext() && i2.hasNext()) {
-			int cmp= ShortString.compareChars(i1.next(), i2.next(), caseSensitive);
-			if(cmp!=0)
-				return cmp;
-		}
-
-		if (!i1.hasNext() && i2.hasNext())
-			return -1;
-		else if (!i2.hasNext() && i1.hasNext())
-			return 1;
-		else
-			return 0;
-	}
-	
-	public int compare(String other, boolean caseSensitive) throws CoreException {
-		CharIterator i1 = new CharIterator();
-		int i2 = 0;
-		int n2 = other.length();
-		
-		while (i1.hasNext() && i2 < n2) {
-			int cmp= ShortString.compareChars(i1.next(), other.charAt(i2), caseSensitive);
-			if(cmp!=0)
-				return cmp;
-			
-			++i2;
-		}
-
-		if (!i1.hasNext() && i2 != n2)
-			return -1;
-		else if (i2 == n2 && i1.hasNext())
-			return 1;
-		else
-			return 0;
-	}
-
-	public int comparePrefix(char[] other, boolean caseSensitive) throws CoreException {
-		CharIterator i1 = new CharIterator();
-		int i2 = 0;
-		int n2 = other.length;
-		
-		while (i1.hasNext() && i2 < n2) {
-			int cmp= ShortString.compareChars(i1.next(), other[i2], caseSensitive);
-			if(cmp!=0)
-				return cmp;
-			
-			++i2;
-		}
-
-		if (!i1.hasNext() && i2 != n2)
-			return -1;
-		else
-			return 0;
-	}
-
-	private interface IReader {
-		public void appendChar(char c);
-	}
-	
-	private void readChars(int length, IReader reader) throws CoreException {
-		// First record
-		int p = record1 + CHARS1;
-		for (int i = 0; i < NUM_CHARS1; ++i) {
-			reader.appendChar(db.getChar(p));
-			p += 2;
-		}
-		length -= NUM_CHARS1;
-		int nextRecord = db.getInt(record1 + NEXT1);
-		
-		// Middle records
-		while (length > NUM_CHARSN) {
-			p = nextRecord + CHARSN;
-			for (int i = 0; i < NUM_CHARSN; ++i) {
-				reader.appendChar(db.getChar(p));
-				p += 2;
-			}
-			length -= NUM_CHARSN;
-			nextRecord = db.getInt(nextRecord + NEXTN);
-		}
-		
-		// Last record
-		p = nextRecord + CHARSN;
-		for (int i = 0; i < length; ++i) {
-			reader.appendChar(db.getChar(p));
-			p += 2;
-		}
-	}
-	
-	/**
-     * Convenience class for sequential access to LongString characters
-     */
-	private class CharIterator {
-		int p;
-		int count;
-		int length;
-		
-		public CharIterator() throws CoreException {
-			p = record1 + CHARS1;
-			length =  db.getInt(record1 + LENGTH);
-		}
-		
-		public char next() throws CoreException {
-			char result = db.getChar(p);
-			p += 2;
-			count++;
-			if(count>length) {
-				throw new NoSuchElementException();
-			}
-			if(count == NUM_CHARS1) {
-				p = db.getInt(record1 + NEXT1) + CHARSN;
-			}
-			if(count > NUM_CHARS1 && ((count-NUM_CHARS1) % NUM_CHARSN)==0) {
-				p = db.getInt(record1 + NEXTN) + CHARSN;
-			}
-			return result;
-		}
-		
-		public boolean hasNext() {
-			return count<length;
-		}
-	}
-	
-	public char[] getChars() throws CoreException {
-		int length = db.getInt(record1 + LENGTH);
-		final char[] chars = new char[length];
-		readChars(length, new IReader() {
-			int cp = 0;
-			public void appendChar(char c) {
-				chars[cp++] = c;
-			}
-		});
-		return chars;
-	}
-
-	public String getString() throws CoreException {
-		int length = db.getInt(record1 + LENGTH);
-		final StringBuffer buffer = new StringBuffer(length);
-		readChars(length, new IReader() {
-			public void appendChar(char c) {
-				buffer.append(c);
-			}
-		});
-		return buffer.toString();
-	}
-
-	public int compareCompatibleWithIgnoreCase(IString string) throws CoreException {
-		int cmp= compare(string, false);
-		return cmp==0 ? compare(string, true) : cmp;	
-	}
-
-	public int compareCompatibleWithIgnoreCase(char[] chars) throws CoreException {
-		int cmp= compare(chars, false);
-		return cmp==0 ? compare(chars, true) : cmp;	
-	}
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/Messages.java b/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/Messages.java
deleted file mode 100644
index 921bddc..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/Messages.java
+++ /dev/null

@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 Symbian Software Limited
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Symbian Software Limited - initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.internal.core.pdom.db;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.internal.core.pdom.db.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
-			.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		} catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/ShortString.java b/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/ShortString.java
deleted file mode 100644
index 3480da1..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/ShortString.java
+++ /dev/null

@@ -1,428 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     QNX - Initial API and implementation
- *     Andrew Ferguson (Symbian)
- *     Markus Schorn (Wind River Systems)
- *******************************************************************************/
-
-package org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.internal.core.pdom.db;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.core.CCorePlugin;
-
-
-/**
- * This is for strings that fit inside a single chunk.
- * 
- * @author Doug Schaefer
- */
-public class ShortString implements IString {
-	
-	private final Database db;
-	private final int record;
-	
-	private static final int LENGTH = 0;
-	private static final int CHARS = 4;
-	
-	public static final int MAX_LENGTH = (Database.MAX_SIZE - CHARS) / 2;
-	
-	public ShortString(Database db, int offset) {
-		this.db = db;
-		this.record = offset;
-	}
-
-	public ShortString(Database db, char[] chars) throws CoreException {
-		this.db = db;
-		this.record = db.malloc(CHARS + chars.length * 2);
-		
-		Chunk chunk = db.getChunk(record);
-		chunk.putInt(record + LENGTH, (char)chars.length);
-		int n = chars.length;
-		int p = record + CHARS;
-		for (int i = 0; i < n; ++i) {
-			chunk.putChar(p, chars[i]);
-			p += 2;
-		}
-	}
-	
-	public ShortString(Database db, String string) throws CoreException {
-		this.db = db;
-		this.record = db.malloc(CHARS + string.length() * 2);
-		
-		Chunk chunk = db.getChunk(record);
-		chunk.putInt(record + LENGTH, string.length());
-		int n = string.length();
-		int p = record + CHARS;
-		for (int i = 0; i < n; ++i) {
-			chunk.putChar(p, string.charAt(i));
-			p += 2;
-		}
-	}
-	
-	public int getRecord() {
-		return record;
-	}
-	
-	public void delete() throws CoreException {
-		db.free(record);
-	}
-	
-	public char[] getChars() throws CoreException {
-		Chunk chunk = db.getChunk(record);
-		int length = chunk.getInt(record + LENGTH);
-		char[] chars = new char[length];
-		chunk.getCharArray(record+CHARS, chars);
-		return chars;
-	}
-	
-	public String getString() throws CoreException {
-		return new String(getChars());
-	}
-	
-	public boolean equals(Object obj) {
-		if (obj == this)
-			return true;
-		
-		try {
-			if (obj instanceof ShortString) {
-				ShortString string = (ShortString)obj;
-				if (db == string.db && record == string.record)
-					return true;
-				
-				Chunk chunk1 = db.getChunk(record);
-				Chunk chunk2 = string.db.getChunk(string.record);
-				
-				int n1 = chunk1.getInt(record);
-				int n2 = chunk2.getInt(string.record);
-				if (n1 != n2)
-					return false;
-				
-				int p1 = record + CHARS;
-				int p2 = string.record + CHARS;
-				for (int i = 0; i < n1; ++i) {
-					if (chunk1.getChar(p1) != chunk2.getChar(p2))
-						return false;
-					p1 += 2;
-					p2 += 2;
-				}
-				return true;
-			} else if (obj instanceof char[]) {
-				char[] chars = (char[])obj;
-				Chunk chunk = db.getChunk(record);
-
-				// Make sure size is the same
-				int n = chunk.getInt(record);
-				if (n != chars.length)
-					return false;
-				
-				// Check each character
-				int p = record + CHARS;
-				for (int i = 0; i < n; ++i) {
-					if (chunk.getChar(p) != chars[i])
-						return false;
-					p += 2;
-				}
-				return true;
-			} else if (obj instanceof String) {
-				String string = (String)obj;
-				Chunk chunk = db.getChunk(record);
-
-				// Make sure size is the same
-				int n = chunk.getInt(record);
-				if (n != string.length())
-					return false;
-				
-				// Check each character
-				int p = record + CHARS;
-				for (int i = 0; i < n; ++i) {
-					if (chunk.getChar(p) != string.charAt(i))
-						return false;
-					p += 2;
-				}
-				return true;
-			}
-		} catch (CoreException e) {
-			CCorePlugin.log(e);
-		}
-		return false;
-	}
-	
-	public int hashCode() {
-		// Custom hash code function to allow DBStrings in hashmaps.
-		return record;
-	}
-	
-	public int compare(char[] other, boolean caseSensitive) throws CoreException {
-		Chunk chunk = db.getChunk(record);
-		
-		int i1 = record + CHARS;
-		int i2 = 0;
-		int n1 = i1 + chunk.getInt(record + LENGTH) * 2;
-		int n2 = other.length;
-		
-		while (i1 < n1 && i2 < n2) {
-			int cmp= compareChars(chunk.getChar(i1), other[i2], caseSensitive);
-			if(cmp!=0)
-				return cmp;
-			
-			i1 += 2;
-			++i2;
-		}
-
-		if (i1 == n1 && i2 != n2)
-			return -1;
-		else if (i2 == n2 && i1 != n1)
-			return 1;
-		else
-			return 0;
-	}
-	
-	public int compare(IString string, boolean caseSensitive) throws CoreException {
-		if (string instanceof ShortString)
-			return compare((ShortString)string, caseSensitive);
-		else if (string instanceof LongString)
-			return - ((LongString)string).compare(this, caseSensitive);
-		else
-			throw new IllegalArgumentException();
-	}
-	
-	public int compare(ShortString other, boolean caseSensitive) throws CoreException {
-		Chunk chunk1 = db.getChunk(record);
-		Chunk chunk2 = other.db.getChunk(other.record);
-
-		int i1 = record + CHARS;
-		int i2 = other.record + CHARS;
-		int n1 = i1 + chunk1.getInt(record + LENGTH) * 2;
-		int n2 = i2 + chunk2.getInt(other.record + LENGTH) * 2;
-		
-		while (i1 < n1 && i2 < n2) {
-			int cmp= compareChars(chunk1.getChar(i1), chunk2.getChar(i2), caseSensitive);
-			if(cmp!=0)
-				return cmp;
-			
-			i1 += 2;
-			i2 += 2;
-		}
-
-		if (i1 == n1 && i2 != n2)
-			return -1;
-		else if (i2 == n2 && i1 != n1)
-			return 1;
-		else
-			return 0;
-	}
-	
-	public int compare(String other, boolean caseSensitive) throws CoreException {
-		Chunk chunk = db.getChunk(record);
-		
-		int i1 = record + CHARS;
-		int i2 = 0;
-		int n1 = i1 + chunk.getInt(record + LENGTH) * 2;
-		int n2 = other.length();
-		
-		while (i1 < n1 && i2 < n2) {
-			int cmp= compareChars(chunk.getChar(i1), other.charAt(i2), caseSensitive);
-			if(cmp!=0)
-				return cmp;
-			
-			i1 += 2;
-			++i2;
-		}
-
-		if (i1 == n1 && i2 != n2)
-			return -1;
-		else if (i2 == n2 && i1 != n1)
-			return 1;
-		else
-			return 0;
-	}
-	
-
-	public int compareCompatibleWithIgnoreCase(IString string) throws CoreException {
-		if (string instanceof ShortString)
-			return compareCompatibleWithIgnoreCase((ShortString)string);
-		else if (string instanceof LongString)
-			return - ((LongString)string).compareCompatibleWithIgnoreCase(this);
-		else
-			throw new IllegalArgumentException();
-	}
-
-	
-	public int compareCompatibleWithIgnoreCase(ShortString other) throws CoreException {
-		Chunk chunk1 = db.getChunk(record);
-		Chunk chunk2 = other.db.getChunk(other.record);
-
-		int i1 = record + CHARS;
-		int i2 = other.record + CHARS;
-		int n1 = i1 + chunk1.getInt(record + LENGTH) * 2;
-		int n2 = i2 + chunk2.getInt(other.record + LENGTH) * 2;
-		int sensitiveCmp= 0;
-		while (i1 < n1 && i2 < n2) {
-			final char c1= chunk1.getChar(i1);
-			final char c2= chunk2.getChar(i2);
-			if (c1 != c2) {
-				int cmp= compareChars(c1, c2, false); // insensitive
-				if(cmp!=0)
-					return cmp;
-				
-				if (sensitiveCmp == 0) {
-					if (c1 < c2) {
-						sensitiveCmp= -1;
-					}
-					else {
-						sensitiveCmp= 1;
-					}
-				}
-			}
-			
-			i1 += 2;
-			i2 += 2;
-		}
-		
-		if (i1 == n1 && i2 != n2)
-			return -1;
-		else if (i2 == n2 && i1 != n1)
-			return 1;
-
-		return sensitiveCmp;
-	}
-
-	public int compareCompatibleWithIgnoreCase(char[] chars) throws CoreException {
-		Chunk chunk1 = db.getChunk(record);
-
-		int i1 = record + CHARS;
-		int i2 = 0;
-		int n1 = i1 + chunk1.getInt(record + LENGTH) * 2;
-		int n2 = chars.length;
-		int sensitiveCmp= 0;
-		while (i1 < n1 && i2 < n2) {
-			final char c1= chunk1.getChar(i1);
-			final char c2= chars[i2];
-			if (c1 != c2) {
-				int cmp= compareChars(c1, c2, false); // insensitive
-				if(cmp!=0)
-					return cmp;
-				
-				if (sensitiveCmp == 0) {
-					if (c1 < c2) {
-						sensitiveCmp= -1;
-					}
-					else {
-						sensitiveCmp= 1;
-					}
-				}
-			}
-			
-			i1 += 2;
-			i2++;
-		}
-		
-		if (i1 == n1 && i2 != n2)
-			return -1;
-		else if (i2 == n2 && i1 != n1)
-			return 1;
-
-		return sensitiveCmp;
-	}
-	
-	public int comparePrefix(char[] other, boolean caseSensitive) throws CoreException {
-		Chunk chunk = db.getChunk(record);
-		
-		int i1 = record + CHARS;
-		int i2 = 0;
-		int n1 = i1 + chunk.getInt(record + LENGTH) * 2;
-		int n2 = other.length;
-		
-		while (i1 < n1 && i2 < n2) {
-			int cmp= compareChars(chunk.getChar(i1), other[i2], caseSensitive);
-			if(cmp!=0)
-				return cmp;
-			
-			i1 += 2;
-			++i2;
-		}
-
-		if (i1 == n1 && i2 != n2)
-			return -1;
-		else
-			return 0;
-	}
-	
-	public char charAt(int i) throws CoreException {
-		int ptr = record + CHARS + (i*2);
-		return db.getChar(ptr);
-	}
-	
-	public int getLength() throws CoreException {
-		return db.getInt(record + LENGTH);
-	}
-	
-	/**
-	 * Compare characters case-sensitively, or case-insensitively.
-	 * 
-	 * <b>Limitation</b> This only maps the range a-z,A-Z onto each other
-	 * @param a a character
-	 * @param b a character
-	 * @param caseSensitive whether to compare case-sensitively
-	 * @return 
-	 * <ul>
-	 * <li>-1 if a < b
-	 * <li>0 if a == b
-	 * <li>1 if a > b
-	 * </ul>
-	 */
-	public static int compareChars(char a, char b, boolean caseSensitive) {
-		if(caseSensitive) {
-			if (a < b)
-				return -1;
-			if (a > b)
-				return 1;
-		} else {
-			if (a != b) {
-				a= a >= 'a' && a <='z' ? (char) (a - 32) : a;
-				b= b >= 'a' && b <='z' ? (char) (b - 32) : b;
-				if (a < b)
-					return -1;
-				if (a > b)
-					return 1;
-			}
-		}
-		return 0;
-	}
-	
-/* TODO - this is more correct than the above implementation, but we need to
- * benchmark first.
- * 
- * public static int compareChars(char a, char b, boolean caseSensitive) {
-		if(caseSensitive) {
-			if (a < b)
-				return -1;
-			if (a > b)
-				return 1;
-		} else {
-			if (a != b) {
-				a = Character.toUpperCase(a);
-				b = Character.toUpperCase(b);
-				if (a != b) {
-					a = Character.toLowerCase(a);
-					b = Character.toLowerCase(b);
-					if (a != b) {
-						if (a < b)
-							return -1;
-						if (a > b)
-							return 1;
-					}
-				}
-			}
-		}
-		return 0;
-	}
-*/
-
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/messages.properties b/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/messages.properties
deleted file mode 100644
index b342cac..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/db/messages.properties
+++ /dev/null

@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 Symbian Software Limited
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     Symbian Software Limited - initial API and implementation
-###############################################################################
-BTree.IllegalDegree=BTree degree must be >=2
-BTree.DeletionOnAbsentKey=Deletion of key not in btree: {0} mode={1}
-BTree.UnknownMode=BTree unknown deletion mode error
-BTree.IntegrityError=BTree integrity error
-BTree.IntegrityErrorA=[{0} blanks inconsistent b={1} nb={2}]
-BTree.IntegrityErrorB=[{0} wrong number of children with respect to key count]
-BTree.IntegrityErrorC=[{0} key count out of range]
-BTree.IntegrityErrorD=Leaf nodes at differing depths

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/dom/PDOMNotImplementedError.java b/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/dom/PDOMNotImplementedError.java
deleted file mode 100644
index ea78658..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-4.0.3/org/eclipse/rephraserengine/internal/db/org/eclipse/cdt/internal/core/pdom/dom/PDOMNotImplementedError.java
+++ /dev/null

@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * QNX - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.db.org.eclipse.cdt.internal.core.pdom.dom;
-
-/**
- * @author Doug Schaefer
- *
- */
-public class PDOMNotImplementedError extends Error {
-
-    public static final long serialVersionUID = 0;
-
-    public PDOMNotImplementedError() {
-        super();
-    }
-    
-    public PDOMNotImplementedError(String message) {
-        super(message);
-    }
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/internal/runtime/IRuntimeConstants.java b/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/internal/runtime/IRuntimeConstants.java
deleted file mode 100644
index b5164ee..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/internal/runtime/IRuntimeConstants.java
+++ /dev/null

@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.internal.runtime;
-
-public interface IRuntimeConstants {
-
-    /**
-     * The unique identifier constant (value "<code>org.eclipse.core.runtime</code>")
-     * of the Core Runtime (pseudo-) plug-in.
-     */
-    public static final String PI_RUNTIME = "org.eclipse.core.runtime"; //$NON-NLS-1$
-
-    /**
-     * Name of this bundle.
-     */
-    public static final String PI_COMMON = "org.eclipse.equinox.common"; //$NON-NLS-1$
-
-    /**
-     * Status code constant (value 2) indicating an error occurred while running a plug-in.
-     */
-    public static final int PLUGIN_ERROR = 2;
-
-    /**
-     * Status code constant (value 5) indicating the platform could not write
-     * some of its metadata.
-     */
-    public static final int FAILED_WRITE_METADATA = 5;
-
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/internal/runtime/LocalizationUtils.java b/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/internal/runtime/LocalizationUtils.java
deleted file mode 100644
index 26be432..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/internal/runtime/LocalizationUtils.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.internal.runtime;
-
-import java.lang.reflect.Field;
-
-/**
- * Helper methods related to string localization.
- * 
- * @since org.eclipse.equinox.common 3.3
- */
-public class LocalizationUtils {
-    /**
-     * This method can be used in the absence of NLS class. The method tries to 
-     * use the NLS-based translation routine. If it falls, the method returns the original
-     * non-translated key.
-     * 
-     * @param key case-sensetive name of the filed in the translation file representing 
-     * the string to be translated
-     * @return
-     */
-    static public String safeLocalize(String key) {
-        try {
-            Class messageClass = Class.forName("org.eclipse.core.internal.runtime.CommonMessages"); //$NON-NLS-1$
-            if (messageClass == null)
-                return key;
-            Field field = messageClass.getDeclaredField(key);
-            if (field == null)
-                return key;
-            Object value = field.get(null);
-            if (value instanceof String)
-                return (String) value;
-        } catch (ClassNotFoundException e) {
-            // eat exception and fall through
-        } catch (NoClassDefFoundError e) {
-            // eat exception and fall through
-        } catch (SecurityException e) {
-            // eat exception and fall through
-        } catch (NoSuchFieldException e) {
-            // eat exception and fall through
-        } catch (IllegalArgumentException e) {
-            // eat exception and fall through
-        } catch (IllegalAccessException e) {
-            // eat exception and fall through
-        }
-        return key;
-    }
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/internal/runtime/commonMessages.properties b/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/internal/runtime/commonMessages.properties
deleted file mode 100644
index 5faef93..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/internal/runtime/commonMessages.properties
+++ /dev/null

@@ -1,46 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-### Common runtime plugin messages
-
-ok = OK
-
-### metadata
-meta_couldNotCreate = Error trying to create the platform metadata area: {0}.
-meta_instanceDataUnspecified = The instance data location has not been specified yet.
-meta_noDataModeSpecified = No instance data can be specified.
-meta_notDir = Specified platform location \"{0}\" is not a directory.
-meta_readonly = The platform metadata area could not be written: {0}.  By default the platform writes its content\nunder the current working directory when the platform is launched.  Use the -data parameter to\nspecify a different content area for the platform.
-meta_pluginProblems = Problems occurred when invoking code from plug-in: \"{0}\".
-
-### parsing/resolve
-parse_doubleSeparatorVersion=Plug-in version identifier, \"{0}\", must not contain two consecutive separator characters.
-parse_emptyPluginVersion=A plug-in version identifier must be non-empty.
-parse_fourElementPluginVersion=Plug-in version identifier, \"{0}\", can contain a maximum of four components.
-parse_numericMajorComponent=The major (1st) component of plug-in version identifier, \"{0}\", must be numeric.
-parse_numericMinorComponent=The minor (2nd) component of plug-in version identifier, \"{0}\", must be numeric.
-parse_numericServiceComponent=The service (3rd) component of plug-in version identifier, \"{0}\", must be numeric.
-parse_oneElementPluginVersion=Plug-in version identifier, \"{0}\", must contain at least one component.
-parse_postiveMajor=Plug-in version identifier, \"{0}\", must have a positive major (1st) component.
-parse_postiveMinor=Plug-in version identifier, \"{0}\", must have a positive minor (2nd) component.
-parse_postiveService=Plug-in version identifier, \"{0}\", must have a positive service (3rd) component.
-parse_separatorEndVersion=Plug-in version identifier, \"{0}\", must not end with a separator character.
-parse_separatorStartVersion=Plug-in version identifier, \"{0}\", must not start with a separator character.
-
-### URL
-url_badVariant = Unsupported \"platform:\" protocol variation \"{0}\".
-url_createConnection = Unable to create connection on \"{0}\".
-url_invalidURL = Invalid URL \"{0}\".
-url_noOutput = Output is not supported for \"{0}\", location is read-only.
-url_noaccess = Unhandled URL protocol \"{0}\".
-url_resolveFragment = Unable to resolve fragment \"{0}\".
-url_resolvePlugin = Unable to resolve plug-in \"{0}\".
-
-activator_not_available = The bundle activator for the org.eclipse.equinox.common bundle is not available.

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/runtime/Assert.java b/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/runtime/Assert.java
deleted file mode 100644
index a1674e4..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/runtime/Assert.java
+++ /dev/null

@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.runtime;
-
-/**
- * <code>Assert</code> is useful for for embedding runtime sanity checks
- * in code. The predicate methods all test a condition and throw some
- * type of unchecked exception if the condition does not hold.
- * <p>
- * Assertion failure exceptions, like most runtime exceptions, are
- * thrown when something is misbehaving. Assertion failures are invariably
- * unspecified behavior; consequently, clients should never rely on
- * these being thrown (and certainly should not being catching them
- * specifically).
- * </p><p>
- * This class can be used without OSGi running.
- * </p><p>
- * This class is not intended to be instantiated or sub-classed by clients.
- * </p>
- * @since org.eclipse.equinox.common 3.2
- */
-public final class Assert {
-    /* This class is not intended to be instantiated. */
-    private Assert() {
-        // not allowed
-    }
-
-    /** Asserts that an argument is legal. If the given boolean is
-     * not <code>true</code>, an <code>IllegalArgumentException</code>
-     * is thrown.
-     *
-     * @param expression the outcode of the check
-     * @return <code>true</code> if the check passes (does not return
-     *    if the check fails)
-     * @exception IllegalArgumentException if the legality test failed
-     */
-    public static boolean isLegal(boolean expression) {
-        return isLegal(expression, ""); //$NON-NLS-1$
-    }
-
-    /** Asserts that an argument is legal. If the given boolean is
-     * not <code>true</code>, an <code>IllegalArgumentException</code>
-     * is thrown.
-     * The given message is included in that exception, to aid debugging.
-     *
-     * @param expression the outcode of the check
-     * @param message the message to include in the exception
-     * @return <code>true</code> if the check passes (does not return
-     *    if the check fails)
-     * @exception IllegalArgumentException if the legality test failed
-     */
-    public static boolean isLegal(boolean expression, String message) {
-        if (!expression)
-            throw new IllegalArgumentException(message);
-        return expression;
-    }
-
-    /** Asserts that the given object is not <code>null</code>. If this
-     * is not the case, some kind of unchecked exception is thrown.
-     * 
-     * @param object the value to test
-     */
-    public static void isNotNull(Object object) {
-        isNotNull(object, ""); //$NON-NLS-1$
-    }
-
-    /** Asserts that the given object is not <code>null</code>. If this
-     * is not the case, some kind of unchecked exception is thrown.
-     * The given message is included in that exception, to aid debugging.
-     *
-     * @param object the value to test
-     * @param message the message to include in the exception
-     */
-    public static void isNotNull(Object object, String message) {
-        if (object == null)
-            throw new AssertionFailedException("null argument:" + message); //$NON-NLS-1$
-    }
-
-    /** Asserts that the given boolean is <code>true</code>. If this
-     * is not the case, some kind of unchecked exception is thrown.
-     *
-     * @param expression the outcode of the check
-     * @return <code>true</code> if the check passes (does not return
-     *    if the check fails)
-     */
-    public static boolean isTrue(boolean expression) {
-        return isTrue(expression, ""); //$NON-NLS-1$
-    }
-
-    /** Asserts that the given boolean is <code>true</code>. If this
-     * is not the case, some kind of unchecked exception is thrown.
-     * The given message is included in that exception, to aid debugging.
-     *
-     * @param expression the outcode of the check
-     * @param message the message to include in the exception
-     * @return <code>true</code> if the check passes (does not return
-     *    if the check fails)
-     */
-    public static boolean isTrue(boolean expression, String message) {
-        if (!expression)
-            throw new AssertionFailedException("assertion failed: " + message); //$NON-NLS-1$
-        return expression;
-    }
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/runtime/AssertionFailedException.java b/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/runtime/AssertionFailedException.java
deleted file mode 100644
index f3e371d..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/runtime/AssertionFailedException.java
+++ /dev/null

@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.runtime;
-
-/**
- * <code>AssertionFailedException</code> is a runtime exception thrown
- * by some of the methods in <code>Assert</code>.
- * <p>
- * This class can be used without OSGi running.
- * </p><p>
- * This class is not intended to be instantiated or sub-classed by clients.
- * </p>
- * @see Assert
- * @since org.eclipse.equinox.common 3.2
- */
-public class AssertionFailedException extends RuntimeException {
-
-    /**
-     * All serializable objects should have a stable serialVersionUID
-     */
-    private static final long serialVersionUID = 1L;
-
-    /** 
-     * Constructs a new exception with the given message.
-     * 
-     * @param detail the message
-     */
-    public AssertionFailedException(String detail) {
-        super(detail);
-    }
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/runtime/CoreException.java b/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/runtime/CoreException.java
deleted file mode 100644
index a2a94cb..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/runtime/CoreException.java
+++ /dev/null

@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.runtime;
-
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
-/**
- * A checked exception representing a failure.
- * <p>
- * Core exceptions contain a status object describing the 
- * cause of the exception.
- * </p><p>
- * This class can be used without OSGi running.
- * </p>
- * @see IStatus
- */
-public class CoreException extends Exception {
-
-    /**
-     * All serializable objects should have a stable serialVersionUID
-     */
-    private static final long serialVersionUID = 1L;
-
-    /** Status object. */
-    private IStatus status;
-
-    /**
-     * Creates a new exception with the given status object.  The message
-     * of the given status is used as the exception message.
-     *
-     * @param status the status object to be associated with this exception
-     */
-    public CoreException(IStatus status) {
-        super(status.getMessage());
-        this.status = status;
-    }
-
-    /**
-     * Returns the status object for this exception.
-     *
-     * @return a status object
-     */
-    public final IStatus getStatus() {
-        return status;
-    }
-
-    /**
-     * Prints a stack trace out for the exception, and
-     * any nested exception that it may have embedded in
-     * its Status object.
-     */
-    public void printStackTrace() {
-        printStackTrace(System.err);
-    }
-
-    /**
-     * Prints a stack trace out for the exception, and
-     * any nested exception that it may have embedded in
-     * its Status object.
-     * 
-     * @param output the stream to write to
-     */
-    public void printStackTrace(PrintStream output) {
-        synchronized (output) {
-            super.printStackTrace(output);
-            if (status.getException() != null) {
-                output.print(getClass().getName() + "[" + status.getCode() + "]: "); //$NON-NLS-1$ //$NON-NLS-2$
-                status.getException().printStackTrace(output);
-            }
-        }
-    }
-
-    /**
-     * Prints a stack trace out for the exception, and
-     * any nested exception that it may have embedded in
-     * its Status object.
-     * 
-     * @param output the stream to write to
-     */
-    public void printStackTrace(PrintWriter output) {
-        synchronized (output) {
-            super.printStackTrace(output);
-            if (status.getException() != null) {
-                output.print(getClass().getName() + "[" + status.getCode() + "]: "); //$NON-NLS-1$ //$NON-NLS-2$
-                status.getException().printStackTrace(output);
-            }
-        }
-    }
-
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/runtime/IStatus.java b/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/runtime/IStatus.java
deleted file mode 100644
index 9ddac2b..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/runtime/IStatus.java
+++ /dev/null

@@ -1,186 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.runtime;
-
-/**
- * A status object represents the outcome of an operation.
- * All <code>CoreException</code>s carry a status object to indicate 
- * what went wrong. Status objects are also returned by methods needing 
- * to provide details of failures (e.g., validation methods).
- * <p>
- * A status carries the following information:
- * <ul>
- * <li> plug-in identifier (required)</li>
- * <li> severity (required)</li>
- * <li> status code (required)</li>
- * <li> message (required) - localized to current locale</li>
- * <li> exception (optional) - for problems stemming from a failure at
- *    a lower level</li>
- * </ul>
- * Some status objects, known as multi-statuses, have other status objects 
- * as children.
- * </p>
- * <p>
- * The class <code>Status</code> is the standard public implementation
- * of status objects; the subclass <code>MultiStatus</code> is the
- * implements multi-status objects.
- * </p><p>
- * This interface can be used without OSGi running.
- * </p>
- * @see MultiStatus
- * @see Status
- */
-public interface IStatus {
-
-    /** Status severity constant (value 0) indicating this status represents the nominal case.
-     * This constant is also used as the status code representing the nominal case.
-     * @see #getSeverity()
-     * @see #isOK()
-     */
-    public static final int OK = 0;
-
-    /** Status type severity (bit mask, value 1) indicating this status is informational only.
-     * @see #getSeverity()
-     * @see #matches(int)
-     */
-    public static final int INFO = 0x01;
-
-    /** Status type severity (bit mask, value 2) indicating this status represents a warning.
-     * @see #getSeverity()
-     * @see #matches(int)
-     */
-    public static final int WARNING = 0x02;
-
-    /** Status type severity (bit mask, value 4) indicating this status represents an error.
-     * @see #getSeverity()
-     * @see #matches(int)
-     */
-    public static final int ERROR = 0x04;
-
-    /** Status type severity (bit mask, value 8) indicating this status represents a
-     * cancelation
-     * @see #getSeverity()
-     * @see #matches(int)
-     * @since 3.0
-     */
-    public static final int CANCEL = 0x08;
-
-    /**
-     * Returns a list of status object immediately contained in this
-     * multi-status, or an empty list if this is not a multi-status.
-     *
-     * @return an array of status objects
-     * @see #isMultiStatus()
-     */
-    public IStatus[] getChildren();
-
-    /**
-     * Returns the plug-in-specific status code describing the outcome.
-     *
-     * @return plug-in-specific status code
-     */
-    public int getCode();
-
-    /**
-     * Returns the relevant low-level exception, or <code>null</code> if none. 
-     * For example, when an operation fails because of a network communications
-     * failure, this might return the <code>java.io.IOException</code>
-     * describing the exact nature of that failure.
-     *
-     * @return the relevant low-level exception, or <code>null</code> if none
-     */
-    public Throwable getException();
-
-    /**
-     * Returns the message describing the outcome.
-     * The message is localized to the current locale.
-     *
-     * @return a localized message
-     */
-    public String getMessage();
-
-    /**
-     * Returns the unique identifier of the plug-in associated with this status
-     * (this is the plug-in that defines the meaning of the status code).
-     *
-     * @return the unique identifier of the relevant plug-in
-     */
-    public String getPlugin();
-
-    /**
-     * Returns the severity. The severities are as follows (in
-     * descending order):
-     * <ul>
-     * <li><code>CANCEL</code> - cancelation occurred</li>
-     * <li><code>ERROR</code> - a serious error (most severe)</li>
-     * <li><code>WARNING</code> - a warning (less severe)</li>
-     * <li><code>INFO</code> - an informational ("fyi") message (least severe)</li>
-     * <li><code>OK</code> - everything is just fine</li>
-     * </ul>
-     * <p>
-     * The severity of a multi-status is defined to be the maximum
-     * severity of any of its children, or <code>OK</code> if it has
-     * no children.
-     * </p>
-     *
-     * @return the severity: one of <code>OK</code>, <code>ERROR</code>, 
-     * <code>INFO</code>, <code>WARNING</code>,  or <code>CANCEL</code>
-     * @see #matches(int)
-     */
-    public int getSeverity();
-
-    /**
-     * Returns whether this status is a multi-status.
-     * A multi-status describes the outcome of an operation
-     * involving multiple operands.
-     * <p>
-     * The severity of a multi-status is derived from the severities
-     * of its children; a multi-status with no children is
-     * <code>OK</code> by definition.
-     * A multi-status carries a plug-in identifier, a status code,
-     * a message, and an optional exception. Clients may treat
-     * multi-status objects in a multi-status unaware way.
-     * </p>
-     *
-     * @return <code>true</code> for a multi-status, 
-     *    <code>false</code> otherwise
-     * @see #getChildren()
-     */
-    public boolean isMultiStatus();
-
-    /**
-     * Returns whether this status indicates everything is okay
-     * (neither info, warning, nor error).
-     *
-     * @return <code>true</code> if this status has severity
-     *    <code>OK</code>, and <code>false</code> otherwise
-     */
-    public boolean isOK();
-
-    /**
-     * Returns whether the severity of this status matches the given
-     * severity mask. Note that a status with severity <code>OK</code>
-     * will never match; use <code>isOK</code> instead to detect
-     * a status with a severity of <code>OK</code>.
-     *
-     * @param severityMask a mask formed by bitwise or'ing severity mask
-     *    constants (<code>ERROR</code>, <code>WARNING</code>,
-     *    <code>INFO</code>, <code>CANCEL</code>)
-     * @return <code>true</code> if there is at least one match, 
-     *    <code>false</code> if there are no matches
-     * @see #getSeverity()
-     * @see #CANCEL
-     * @see #ERROR
-     * @see #WARNING
-     * @see #INFO
-     */
-    public boolean matches(int severityMask);
-}

diff --git a/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/runtime/Status.java b/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/runtime/Status.java
deleted file mode 100644
index 091ff0b..0000000
--- a/org.eclipse.rephraserengine-support/src-cdtdb-mock-objects/org/eclipse/core/runtime/Status.java
+++ /dev/null

@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.core.runtime;
-
-import org.eclipse.core.internal.runtime.IRuntimeConstants;
-import org.eclipse.core.internal.runtime.LocalizationUtils;
-
-/**
- * A concrete status implementation, suitable either for 
- * instantiating or subclassing.
- * <p>
- * This class can be used without OSGi running.
- * </p>
- */
-public class Status implements IStatus {
-
-    /**
-     * A standard OK status with an "ok"  message.
-     *
-     * @since 3.0
-     */
-    public static final IStatus OK_STATUS = new Status(OK, IRuntimeConstants.PI_RUNTIME, OK, LocalizationUtils.safeLocalize("ok"), null); //$NON-NLS-1$
-    /**
-     * A standard CANCEL status with no message.
-     * 
-     * @since 3.0
-     */
-    public static final IStatus CANCEL_STATUS = new Status(CANCEL, IRuntimeConstants.PI_RUNTIME, 1, "", null); //$NON-NLS-1$
-    /**
-     * The severity. One of
-     * <ul>
-     * <li><code>CANCEL</code></li>
-     * <li><code>ERROR</code></li>
-     * <li><code>WARNING</code></li>
-     * <li><code>INFO</code></li>
-     * <li>or <code>OK</code> (0)</li>
-     * </ul>
-     */
-    private int severity = OK;
-
-    /** Unique identifier of plug-in.
-     */
-    private String pluginId;
-
-    /** Plug-in-specific status code.
-     */
-    private int code;
-
-    /** Message, localized to the current locale.
-     */
-    private String message;
-
-    /** Wrapped exception, or <code>null</code> if none.
-     */
-    private Throwable exception = null;
-
-    /** Constant to avoid generating garbage.
-     */
-    private static final IStatus[] theEmptyStatusArray = new IStatus[0];
-
-    /**
-     * Creates a new status object.  The created status has no children.
-     *
-     * @param severity the severity; one of <code>OK</code>, <code>ERROR</code>, 
-     * <code>INFO</code>, <code>WARNING</code>,  or <code>CANCEL</code>
-     * @param pluginId the unique identifier of the relevant plug-in
-     * @param code the plug-in-specific status code, or <code>OK</code>
-     * @param message a human-readable message, localized to the
-     *    current locale
-     * @param exception a low-level exception, or <code>null</code> if not
-     *    applicable 
-     */
-    public Status(int severity, String pluginId, int code, String message, Throwable exception) {
-        setSeverity(severity);
-        setPlugin(pluginId);
-        setCode(code);
-        setMessage(message);
-        setException(exception);
-    }
-
-    /**
-     * Simplified constructor of a new status object; assumes that code is <code>OK</code>.
-     * The created status has no children.
-     *
-     * @param severity the severity; one of <code>OK</code>, <code>ERROR</code>, 
-     * <code>INFO</code>, <code>WARNING</code>,  or <code>CANCEL</code>
-     * @param pluginId the unique identifier of the relevant plug-in
-     * @param message a human-readable message, localized to the
-     *    current locale
-     * @param exception a low-level exception, or <code>null</code> if not
-     *    applicable
-     *     
-     * @since org.eclipse.equinox.common 3.3
-     */
-    public Status(int severity, String pluginId, String message, Throwable exception) {
-        setSeverity(severity);
-        setPlugin(pluginId);
-        setMessage(message);
-        setException(exception);
-        setCode(OK);
-    }
-
-    /**
-     * Simplified constructor of a new status object; assumes that code is <code>OK</code> and
-     * exception is <code>null</code>. The created status has no children.
-     *
-     * @param severity the severity; one of <code>OK</code>, <code>ERROR</code>, 
-     * <code>INFO</code>, <code>WARNING</code>,  or <code>CANCEL</code>
-     * @param pluginId the unique identifier of the relevant plug-in
-     * @param message a human-readable message, localized to the
-     *    current locale
-     *    
-     * @since org.eclipse.equinox.common 3.3
-     */
-    public Status(int severity, String pluginId, String message) {
-        setSeverity(severity);
-        setPlugin(pluginId);
-        setMessage(message);
-        setCode(OK);
-        setException(null);
-    }
-
-    /* (Intentionally not javadoc'd)
-     * Implements the corresponding method on <code>IStatus</code>.
-     */
-    public IStatus[] getChildren() {
-        return theEmptyStatusArray;
-    }
-
-    /* (Intentionally not javadoc'd)
-     * Implements the corresponding method on <code>IStatus</code>.
-     */
-    public int getCode() {
-        return code;
-    }
-
-    /* (Intentionally not javadoc'd)
-     * Implements the corresponding method on <code>IStatus</code>.
-     */
-    public Throwable getException() {
-        return exception;
-    }
-
-    /* (Intentionally not javadoc'd)
-     * Implements the corresponding method on <code>IStatus</code>.
-     */
-    public String getMessage() {
-        return message;
-    }
-
-    /* (Intentionally not javadoc'd)
-     * Implements the corresponding method on <code>IStatus</code>.
-     */
-    public String getPlugin() {
-        return pluginId;
-    }
-
-    /* (Intentionally not javadoc'd)
-     * Implements the corresponding method on <code>IStatus</code>.
-     */
-    public int getSeverity() {
-        return severity;
-    }
-
-    /* (Intentionally not javadoc'd)
-     * Implements the corresponding method on <code>IStatus</code>.
-     */
-    public boolean isMultiStatus() {
-        return false;
-    }
-
-    /* (Intentionally not javadoc'd)
-     * Implements the corresponding method on <code>IStatus</code>.
-     */
-    public boolean isOK() {
-        return severity == OK;
-    }
-
-    /* (Intentionally not javadoc'd)
-     * Implements the corresponding method on <code>IStatus</code>.
-     */
-    public boolean matches(int severityMask) {
-        return (severity & severityMask) != 0;
-    }
-
-    /**
-     * Sets the status code.
-     *
-     * @param code the plug-in-specific status code, or <code>OK</code>
-     */
-    protected void setCode(int code) {
-        this.code = code;
-    }
-
-    /**
-     * Sets the exception.
-     *
-     * @param exception a low-level exception, or <code>null</code> if not
-     *    applicable 
-     */
-    protected void setException(Throwable exception) {
-        this.exception = exception;
-    }
-
-    /**
-     * Sets the message. If null is passed, message is set to an empty
-     * string.
-     *
-     * @param message a human-readable message, localized to the
-     *    current locale
-     */
-    protected void setMessage(String message) {
-        if (message == null)
-            this.message = ""; //$NON-NLS-1$
-        else
-            this.message = message;
-    }
-
-    /**
-     * Sets the plug-in id.
-     *
-     * @param pluginId the unique identifier of the relevant plug-in
-     */
-    protected void setPlugin(String pluginId) {
-        Assert.isLegal(pluginId != null && pluginId.length() > 0);
-        this.pluginId = pluginId;
-    }
-
-    /**
-     * Sets the severity.
-     *
-     * @param severity the severity; one of <code>OK</code>, <code>ERROR</code>, 
-     * <code>INFO</code>, <code>WARNING</code>,  or <code>CANCEL</code>
-     */
-    protected void setSeverity(int severity) {
-        Assert.isLegal(severity == OK || severity == ERROR || severity == WARNING || severity == INFO || severity == CANCEL);
-        this.severity = severity;
-    }
-
-    /**
-     * Returns a string representation of the status, suitable 
-     * for debugging purposes only.
-     */
-    public String toString() {
-        StringBuffer buf = new StringBuffer();
-        buf.append("Status "); //$NON-NLS-1$
-        if (severity == OK) {
-            buf.append("OK"); //$NON-NLS-1$
-        } else if (severity == ERROR) {
-            buf.append("ERROR"); //$NON-NLS-1$
-        } else if (severity == WARNING) {
-            buf.append("WARNING"); //$NON-NLS-1$
-        } else if (severity == INFO) {
-            buf.append("INFO"); //$NON-NLS-1$
-        } else if (severity == CANCEL) {
-            buf.append("CANCEL"); //$NON-NLS-1$
-        } else {
-            buf.append("severity="); //$NON-NLS-1$
-            buf.append(severity);
-        }
-        buf.append(": "); //$NON-NLS-1$
-        buf.append(pluginId);
-        buf.append(" code="); //$NON-NLS-1$
-        buf.append(code);
-        buf.append(' ');
-        buf.append(message);
-        buf.append(' ');
-        buf.append(exception);
-        return buf.toString();
-    }
-}

diff --git a/org.eclipse.rephraserengine.core.vpg.tests/.classpath b/org.eclipse.rephraserengine.core.vpg.tests/.classpath
deleted file mode 100644
index 472ee29..0000000
--- a/org.eclipse.rephraserengine.core.vpg.tests/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.rephraserengine.core.vpg.tests/.project b/org.eclipse.rephraserengine.core.vpg.tests/.project
deleted file mode 100644
index 8cbd84b..0000000
--- a/org.eclipse.rephraserengine.core.vpg.tests/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rephraserengine.core.vpg.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>net.sourceforge.metrics.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>net.sourceforge.metrics.nature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.rephraserengine.core.vpg.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.rephraserengine.core.vpg.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 84920e5..0000000
--- a/org.eclipse.rephraserengine.core.vpg.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,335 +0,0 @@
-#Thu May 27 09:50:11 CDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=disabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=18
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=18
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=100
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=100
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

diff --git a/org.eclipse.rephraserengine.core.vpg.tests/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.rephraserengine.core.vpg.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 03cc119..0000000
--- a/org.eclipse.rephraserengine.core.vpg.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,6 +0,0 @@
-#Fri Oct 09 01:04:06 CDT 2009
-eclipse.preferences.version=1
-formatter_profile=_Photran
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} University of Illinois at Urbana-Champaign and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *    UIUC - Initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * \n * @author ${user}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

diff --git a/org.eclipse.rephraserengine.core.vpg.tests/META-INF/MANIFEST.MF b/org.eclipse.rephraserengine.core.vpg.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 6d4f2e7..0000000
--- a/org.eclipse.rephraserengine.core.vpg.tests/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Rephraser Engine Unit Tests
-Bundle-SymbolicName: org.eclipse.rephraserengine.core.vpg.tests
-Bundle-Version: 3.0.0.qualifier
-Bundle-Vendor: Eclipse.org - Photran
-Require-Bundle: org.junit,
- org.eclipse.rephraserengine.core.vpg,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.rephraserengine.core
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.rephraserengine.internal.core.tests.dependence,
- org.eclipse.rephraserengine.internal.core.tests.flow,
- org.eclipse.rephraserengine.internal.core.tests.vpg

diff --git a/org.eclipse.rephraserengine.core.vpg.tests/about.html b/org.eclipse.rephraserengine.core.vpg.tests/about.html
deleted file mode 100644
index 9c7ba0a..0000000
--- a/org.eclipse.rephraserengine.core.vpg.tests/about.html
+++ /dev/null

@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>About</title></head>
-
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine.core.vpg.tests/build.properties b/org.eclipse.rephraserengine.core.vpg.tests/build.properties
deleted file mode 100644
index 9cbab3c..0000000
--- a/org.eclipse.rephraserengine.core.vpg.tests/build.properties
+++ /dev/null

@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html
-src.includes = about.html

diff --git a/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/dependence/GCDTestTest.java b/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/dependence/GCDTestTest.java
deleted file mode 100644
index 55befbb..0000000
--- a/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/dependence/GCDTestTest.java
+++ /dev/null

@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.core.tests.dependence;
-
-import junit.framework.TestCase;
-
-import org.eclipse.rephraserengine.core.analysis.dependence.GCDTest;
-
-/**
- *
- * @author Jeff Overbey
- */
-public class GCDTestTest extends TestCase
-{
-    /**
-     * DO I = 1, N
-     *     A(I + 1) = A(I) + B(I)     ! S1
-     * ENDDO
-     */
-    public void testPage38()
-    {
-        assertTrue(test(
-            1,
-            //          Constant term
-            //          |  Coefficient of I
-            //          |  |
-            //          V  V
-            new int[] { 1, 1 },
-            new int[] { 0, 1 }));
-    }
-
-    /**
-     * DO I = 1, N
-     *     A(I + 2) = A(I) + B(I)     ! S1
-     * ENDDO
-     */
-    public void testPage39()
-    {
-        assertTrue(test(
-            1,
-            //          Constant term
-            //          |  Coefficient of I
-            //          |  |
-            //          V  V
-            new int[] { 2, 1 },
-            new int[] { 0, 1 }));
-    }
-
-    /**
-     * DO I = 1, N
-     *     A(2*I) = A(2*I + 1)
-     * ENDDO
-     */
-    public void testFalse()
-    {
-        assertFalse(test(
-            1,
-            //          Constant term
-            //          |  Coefficient of I
-            //          |  |
-            //          V  V
-            new int[] { 0, 2 },
-            new int[] { 1, 2 }));
-    }
-
-    private boolean test(int n, int[] a, int[] b)
-    {
-        return new GCDTest().test(n, null, null, a, b, null).dependenceMightExist();
-    }
-}

diff --git a/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/dependence/IntMatrixTests.java b/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/dependence/IntMatrixTests.java
deleted file mode 100644
index 8cd14e2..0000000
--- a/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/dependence/IntMatrixTests.java
+++ /dev/null

@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.core.tests.dependence;
-
-import junit.framework.TestCase;
-
-import org.eclipse.rephraserengine.core.analysis.dependence.GeneralizedGCDTest.IntMatrix;
-import org.eclipse.rephraserengine.core.analysis.dependence.GeneralizedGCDTest.IntVector;
-import org.eclipse.rephraserengine.core.analysis.dependence.GeneralizedGCDTest.IntMatrix.Reduce;
-
-/**
- *
- * @author Jeff Overbey
- */
-public class IntMatrixTests extends TestCase
-{
-    public void testToString()
-    {
-        int rows = 3;
-        int cols = 5;
-        IntMatrix m = IntMatrix.zero(rows, cols);
-        for (int row = 1; row <= rows; row++)
-            for (int col = 1; col <= cols; col++)
-                m.set(row, col, 10*row + col);
-        String actual = m.toString();
-        String expected =
-                "   11   12   13   14   15\n" +
-                "   21   22   23   24   25\n" +
-                "   31   32   33   34   35\n";
-        assertEquals(expected, actual);
-
-        IntMatrix copy = IntMatrix.copyFrom(m);
-
-        m.swapColumns(2, 3);
-        String actual2 = m.toString();
-        String expected2 =
-                "   11   13   12   14   15\n" +
-                "   21   23   22   24   25\n" +
-                "   31   33   32   34   35\n";
-        assertEquals(expected2, actual2);
-
-        m.set(1, 2, 77777);
-        m.set(2, 3, 88888);
-        m.set(2, 4, 99999);
-
-        assertEquals(expected, copy.toString());
-
-        int[] ints = new int[] {
-                3, 4, 5,
-                6, 7, 8,
-                -1, 0, 1,
-                4, 3, 2,
-                1, 0, 0
-        };
-        IntMatrix m3 = IntMatrix.create(5, 3, ints);
-        String actual3 = m3.toString();
-        String expected3 =
-                "    3    4    5\n" +
-                "    6    7    8\n" +
-                "   -1    0    1\n" +
-                "    4    3    2\n" +
-                "    1    0    0\n";
-        assertEquals(expected3, actual3);
-        assertTrue(m3.equalsUnwrapped(ints));
-    }
-
-    /** Wolfe p. 113 */
-    public void testReduceRow()
-    {
-        IntMatrix a = IntMatrix.create(1, 3,
-            6, -4, 14);
-        Reduce r = a.reduce();
-        assertTrue(r.getColumnEchelonForm().equalsUnwrapped(2, 0, 0));
-        assertTrue(r.getUnimodularMatrix().equalsUnwrapped(
-            1, 2, -1,
-            1, 3,  2,
-            0, 0,  1));
-    }
-
-    /** Wolfe p. 116 */
-    public void testReduceMatrix()
-    {
-        IntMatrix a = IntMatrix.create(3, 3,
-            3,  2, -1,
-            2, -2,  5,
-            0,  0,  0);
-        Reduce r = a.reduce();
-        assertTrue(r.getColumnEchelonForm().equalsUnwrapped(
-            -1, 0, 0,
-             5, 1, 0,
-             0, 0, 0));
-        assertTrue(r.getUnimodularMatrix().equalsUnwrapped(
-            0,  1, -8,
-            0, -2, 17,
-            1, -1, 10));
-
-        IntVector t = r.getColumnEchelonForm().forwardSubstitute(9, 7, 0);
-        assertEquals(-9, t.get(1));
-        assertEquals(52, t.get(2));
-    }
-
-    public void testForwardSubstitute()
-    {
-        IntMatrix u = IntMatrix.create(3, 3,
-            -15, 0, 0,
-            -8, -4, 0,
-             3,  2, 1);
-        int[] c = new int[] { -15, -16, 15 };
-        IntVector x = u.forwardSubstitute(c);
-        assertEquals(3, x.size());
-        assertEquals(1, x.get(1));
-        assertEquals(2, x.get(2));
-        assertEquals(8, x.get(3));
-    }
-
-    /** Wolfe p. 226 */
-    public void testSolve0()
-    {
-        IntMatrix a = IntMatrix.create(4, 4,
-            1, -1, 0, 0,
-            0,  0, 1, -1,
-            0,  0, 0,  0,
-            0,  0, 0,  0);
-        IntVector t = a.solve(-1, 0, 0, 0);
-        assertEquals(4, t.size());
-        assertEquals(-1, t.get(1));
-        assertEquals(0, t.get(2));
-        assertEquals(0, t.get(3));
-        assertEquals(0, t.get(4));
-    }
-
-    public void testSolve1()
-    {
-        IntMatrix a = IntMatrix.create(4, 4,
-            1, -1, 1, -1,
-            0,  0, 1, -1,
-            0,  0, 0,  0,
-            0,  0, 0,  0);
-        IntVector t = a.solve(-1, 0, 0, 0);
-        assertEquals(4, t.size());
-        assertEquals(-1, t.get(1));
-        assertEquals(0, t.get(2));
-        assertEquals(0, t.get(3));
-        assertEquals(0, t.get(4));
-    }
-
-    // http://tutorial.math.lamar.edu/Classes/LinAlg/SolvingSystemsOfEqns.aspx
-    public void testSolve2()
-    {
-        IntMatrix a = IntMatrix.create(3, 3,
-            -2, 1, -1,
-             1, 2,  3,
-             3, 0,  1);
-        IntVector t = a.solve(4, 13, -1);
-        assertEquals(3, t.size());
-        assertEquals(-1, t.get(1));
-        assertEquals(4, t.get(2));
-        assertEquals(2, t.get(3));
-    }
-
-    // http://tutorial.math.lamar.edu/Classes/LinAlg/SolvingSystemsOfEqns.aspx
-    public void testSolve3()
-    {
-        IntMatrix a = IntMatrix.create(3, 3,
-            1, -2, 3,
-            -1, 1, -2,
-            2, -1, 3);
-        // No solutions
-        IntVector t = a.solve(-2, 3, 1);
-        assertNull(t);
-    }
-
-    // http://tutorial.math.lamar.edu/Classes/LinAlg/SolvingSystemsOfEqns.aspx
-    public void testSolve4()
-    {
-        IntMatrix a = IntMatrix.create(3, 3,
-            1, -2, 3,
-            -1, 1, -2,
-            2, -1, 3);
-        // Infinite solutions
-        IntVector t = a.solve(-2, 3, -7);
-        assertEquals(3, t.size());
-        assertEquals(-4, t.get(1));
-        assertEquals(-1, t.get(2));
-        assertEquals(0, t.get(3));
-    }
-}

diff --git a/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/flow/FlowGraphTests.java b/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/flow/FlowGraphTests.java
deleted file mode 100644
index d4c110f..0000000
--- a/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/flow/FlowGraphTests.java
+++ /dev/null

@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.core.tests.flow;
-
-import junit.framework.TestCase;
-
-import org.eclipse.rephraserengine.core.analysis.flow.BasicBlock;
-import org.eclipse.rephraserengine.core.analysis.flow.BasicBlockBuilder;
-import org.eclipse.rephraserengine.core.analysis.flow.FlowGraph;
-import org.eclipse.rephraserengine.core.analysis.flow.FlowGraphNode;
-
-/**
- * Unit tests for {@link FlowGraph} and {@link FlowGraphNode}.
- *
- * @author Jeff Overbey
- */
-public class FlowGraphTests extends TestCase
-{
-    /**
-     * <pre>
-     *   (1)
-     *    |
-     *   (2)
-     *   / \
-     * (3)  (4)
-     *  |    |
-     * (5)  (6)
-     *  \   /|\
-     *   \ / | \
-     *   (7)(8)(9)
-     * </pre>
-     */
-    @SuppressWarnings("unchecked")
-    public void testTraversalAndBasicBlocks()
-    {
-        FlowGraphNode<Integer>
-            n1 = new FlowGraphNode<Integer>("n1", 1),
-            n2 = new FlowGraphNode<Integer>("n2", 2),
-            n3 = new FlowGraphNode<Integer>("n3", 3),
-            n4 = new FlowGraphNode<Integer>("n4", 4),
-            n5 = new FlowGraphNode<Integer>("n5", 5),
-            n6 = new FlowGraphNode<Integer>("n6", 6),
-            n7 = new FlowGraphNode<Integer>("n7", 7),
-            n8 = new FlowGraphNode<Integer>("n8", 8),
-            n9 = new FlowGraphNode<Integer>("n9", 9);
-        n1.connectTo(n2);
-        n2.connectTo(n3, n4);
-        n3.connectTo(n5);
-        n4.connectTo(n6);
-        n5.connectTo(n7);
-        n6.connectTo(n7, n8, n9);
-
-        assertEquals("n1", n1.getName());
-        assertEquals("n9", n9.getName());
-
-        StringBuilder sb = new StringBuilder();
-        for (FlowGraphNode<Integer> n : n6.getSuccessors())
-            sb.append(n.getData());
-        assertEquals("789", sb.toString());
-
-        sb = new StringBuilder();
-        for (FlowGraphNode<Integer> n : n6.getSuccessorsInReverse())
-            sb.append(n.getData());
-        assertEquals("987", sb.toString());
-
-        sb = new StringBuilder();
-        for (FlowGraphNode<Integer> n : n6.getPrecedessors())
-            sb.append(n.getData());
-        assertEquals("4", sb.toString());
-
-        sb = new StringBuilder();
-        for (FlowGraphNode<Integer> n : n7.getPrecedessors())
-            sb.append(n.getData());
-        assertEquals("56", sb.toString());
-
-        FlowGraph<Integer> cfg = new FlowGraph<Integer>(n1, null);
-
-        sb = new StringBuilder();
-        for (Integer n : cfg.dataInReversePostOrder())
-            sb.append(n);
-        assertEquals("987645321", sb.toString());
-
-        sb = new StringBuilder();
-        for (Integer n : cfg.dataInPreOrder())
-            sb.append(n);
-        assertEquals("123574689", sb.toString());
-
-        FlowGraph<BasicBlock<Integer>> bbCfg = new FlowGraph<Integer>(n1, null).formBasicBlocks();
-        assertEquals(
-            "n1: 12\n" +
-            "    => n3\n" +
-            "    => n4\n" +
-            "n3: 35\n" +
-            "    => n7\n" +
-            "n7: 7\n" +
-            "n4: 46\n" +
-            "    => n7\n" +
-            "    => n8\n" +
-            "    => n9\n" +
-            "n8: 8\n" +
-            "n9: 9",
-            bbCfg.toString());
-    }
-
-    /**
-     * <pre>
-     * (1)
-     *  |
-     * (2)
-     *  |
-     * (3) <-- goto
-     *  |
-     * (4)
-     * </pre>
-     */
-    public void testBasicBlocksGoto()
-    {
-        FlowGraphNode<Integer>
-            n1 = new FlowGraphNode<Integer>("n1", 1),
-            n2 = new FlowGraphNode<Integer>("n2", 2),
-            n3 = new FlowGraphNode<Integer>("n3", 3),
-            n4 = new FlowGraphNode<Integer>("n4", 4);
-        n1.connectTo(n2);
-        n2.connectTo(n3);
-        n3.connectTo(n4);
-
-        BasicBlockBuilder<Integer> builder = new BasicBlockBuilder<Integer>()
-        {
-            @Override
-            protected boolean isGoToOrStop(Integer data)
-            {
-                return data.intValue() == 3;
-            }
-        };
-
-        FlowGraph<BasicBlock<Integer>> bbFlowGraph = new FlowGraph<Integer>(n1, null).formBasicBlocks(builder);
-        assertEquals(
-            "n1: 123\n" +
-        	"    => n4\n" +
-        	"n4: 4",
-        	bbFlowGraph.toString());
-    }
-}

diff --git a/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/flow/ReachingDefsTest.java b/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/flow/ReachingDefsTest.java
deleted file mode 100644
index f17d71c..0000000
--- a/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/flow/ReachingDefsTest.java
+++ /dev/null

@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.core.tests.flow;
-
-import java.util.BitSet;
-
-import junit.framework.TestCase;
-
-import org.eclipse.rephraserengine.core.analysis.flow.FlowGraph;
-import org.eclipse.rephraserengine.core.analysis.flow.FlowGraphNode;
-import org.eclipse.rephraserengine.core.analysis.flow.ReachingDefsAnalysis;
-
-/**
- * Unit tests for {@link ReachingDefsAnalysis}.
- *
- * @author Jeff Overbey
- */
-public class ReachingDefsTest extends TestCase
-{
-    private static class RDAnalysis extends ReachingDefsAnalysis<Integer>
-    {
-        public RDAnalysis(FlowGraph<Integer> cfg)
-        {
-            super(cfg, countDefs(cfg));
-        }
-
-        private static int countDefs(FlowGraph<Integer> cfg)
-        {
-            int numDefs = 0;
-            for (Integer n : cfg.dataInReversePostOrder())
-                numDefs = Math.max(numDefs, n);
-            return numDefs;
-        }
-
-        @Override protected BitSet gen(Integer node)
-        {
-            BitSet result = new BitSet(numDefs);
-            if (node > 0)
-                result.set(node);
-            return result;
-        }
-
-        @Override protected BitSet kill(Integer node)
-        {
-            BitSet result = new BitSet(numDefs);
-            if (node > 0)
-            {
-                result.set(node);
-                result.flip(0, numDefs);
-            }
-            return result;
-        }
-    }
-
-    public void test1()
-    {
-        /*                    CFG Node    Def/Use
-         *                    ========    =======
-         * read a               N1        D1
-         * read a               N2        D2
-         * print a              N3             U1
-         */
-
-        //                            Def
-        FlowGraphNode<Integer> n1 = new FlowGraphNode<Integer>("n1", 1),
-                n2 = new FlowGraphNode<Integer>("n2", 2),
-                n3 = new FlowGraphNode<Integer>("n3", 0);
-
-        FlowGraph<Integer> cfg = new FlowGraph<Integer>(
-            new FlowGraphNode<Integer>("entry", 0),
-            new FlowGraphNode<Integer>("exit", 0));
-        cfg.getEntryNode().connectTo(n1);
-        n1.connectTo(n2);
-        n2.connectTo(n3);
-        n3.connectTo(cfg.getExitNode());
-
-        RDAnalysis analysis = new RDAnalysis(cfg);
-        analysis.run();
-        //System.out.println(analysis);
-        assertEquals("{}", analysis.defsReaching(cfg.getEntryNode()).toString());
-        assertEquals("{}", analysis.defsReaching(n1).toString());
-        assertEquals("{1}", analysis.defsReaching(n2).toString());
-        assertEquals("{2}", analysis.defsReaching(n3).toString());
-        assertEquals("{2}", analysis.defsReaching(cfg.getExitNode()).toString());
-    }
-
-    public void test2()
-    {
-        /*                    CFG Node    Def/Use
-         *                    ========    =======
-         * read a               N1        D1
-         * while (a < 10)       N2             U1
-         *   a *= 2               N3      D2   U2
-         * if (a == 11)         N4             U3
-         *   a = 999              N5      D3
-         * print a              N6             U4
-         */
-
-        //                            Def
-        FlowGraphNode<Integer> n1 = new FlowGraphNode<Integer>("n1", 1),
-                n2 = new FlowGraphNode<Integer>("n2", 0),
-                n3 = new FlowGraphNode<Integer>("n3", 2),
-                n4 = new FlowGraphNode<Integer>("n4", 0),
-                n5 = new FlowGraphNode<Integer>("n5", 3),
-                n6 = new FlowGraphNode<Integer>("n6", 0);
-
-        FlowGraph<Integer> cfg = new FlowGraph<Integer>(
-            new FlowGraphNode<Integer>("entry", 0),
-            new FlowGraphNode<Integer>("exit", 0));
-        cfg.getEntryNode().connectTo(n1);
-        n1.connectTo(n2);
-        n2.connectTo(n3); n2.connectTo(n4);
-        n3.connectTo(n2); n3.connectTo(n4);
-        n4.connectTo(n5); n4.connectTo(n6);
-        n5.connectTo(n6);
-        n6.connectTo(cfg.getExitNode());
-
-        RDAnalysis analysis = new RDAnalysis(cfg);
-        analysis.run();
-        //System.out.println(analysis);
-        assertEquals("{}", analysis.defsReaching(cfg.getEntryNode()).toString());
-        assertEquals("{}", analysis.defsReaching(n1).toString());
-        assertEquals("{1, 2}", analysis.defsReaching(n2).toString());
-        assertEquals("{1, 2}", analysis.defsReaching(n3).toString());
-        assertEquals("{1, 2}", analysis.defsReaching(n4).toString());
-        assertEquals("{1, 2}", analysis.defsReaching(n5).toString());
-        assertEquals("{1, 2, 3}", analysis.defsReaching(n6).toString());
-        assertEquals("{1, 2, 3}", analysis.defsReaching(cfg.getExitNode()).toString());
-    }
-}

diff --git a/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/vpg/InternalCDTDBTests.java b/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/vpg/InternalCDTDBTests.java
deleted file mode 100644
index 0a00ce2..0000000
--- a/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/vpg/InternalCDTDBTests.java
+++ /dev/null

@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.core.tests.vpg;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.rephraserengine.internal.core.vpg.db.cdt.InternalCDTDB;
-import org.eclipse.rephraserengine.internal.core.vpg.db.cdt.InternalCDTDB.Annotations;
-import org.eclipse.rephraserengine.internal.core.vpg.db.cdt.InternalCDTDB.Dependencies;
-import org.eclipse.rephraserengine.internal.core.vpg.db.cdt.InternalCDTDB.Edges;
-import org.eclipse.rephraserengine.internal.core.vpg.db.cdt.InternalCDTDB.Files;
-
-public class InternalCDTDBTests extends TestCase
-{
-    private InternalCDTDB db = null;
-
-    @Override
-    protected void setUp() throws Exception
-    {
-        File dbFile = File.createTempFile("vpg", null);
-        dbFile.deleteOnExit();
-
-        db = new InternalCDTDB(dbFile);
-    }
-
-    public void testFiles() throws CoreException
-    {
-        assertNotNull(db);
-        Files f = db.files;
-        assertNotNull(f);
-
-        assertEquals(0, numFiles());
-        assertTrue(f.findRecordFor("a") < 0);
-        assertTrue(f.findRecordFor("a") < 0);
-
-        for (String filename : new String[] { "a", "b", "c" })
-        {
-            int record = f.ensure(filename);
-            assertTrue(record >= 0);
-            assertEquals(record, f.ensure(filename));
-            assertEquals(record, f.findRecordFor(filename));
-            assertEquals(filename, f.getFilename(record).getString());
-        }
-
-        assertEquals(3, numFiles());
-
-        f.delete("b");
-
-        assertTrue(f.findRecordFor("a") >= 0);
-        assertTrue(f.findRecordFor("b") < 0);
-        assertTrue(f.findRecordFor("c") >= 0);
-        assertEquals(2, numFiles());
-
-        int record = f.findRecordFor("a");
-        f.setModificationStamp(record, 12345);
-        assertEquals(12345, f.getModificationStamp(record));
-        f.setModificationStamp(record, 54321);
-        assertEquals(54321, f.getModificationStamp(record));
-
-        f.delete("a");
-        f.delete("c");
-        f.delete("c");
-        assertEquals(0, numFiles());
-    }
-
-    private int numFiles() throws CoreException
-    {
-        return db.files.findAllFileRecords().size();
-    }
-
-    public void testDependencies() throws CoreException
-    {
-        assertNotNull(db);
-        Dependencies d = db.dependencies;
-        assertNotNull(d);
-
-        assertEquals(0, numFiles());
-        assertDependencies(0, 0, 0, 0, 0, 0);
-
-        d.ensure("a", "b");
-        assertDependencies(0, 1, 1, 0, 0, 0);
-        d.ensure("a", "b");
-        assertDependencies(0, 1, 1, 0, 0, 0);
-
-        d.ensure("a", "c");
-        assertDependencies(0, 2, 1, 0, 1, 0);
-
-        d.ensure("c", "a");
-        assertDependencies(1, 2, 1, 0, 1, 1);
-
-        d.delete("a", "b");
-        assertDependencies(1, 1, 0, 0, 1, 1);
-
-        d.delete("c", "a");
-        assertDependencies(0, 1, 0, 0, 1, 0);
-
-        d.delete("a", "c");
-        assertDependencies(0, 0, 0, 0, 0, 0);
-
-        db.files.delete("a");
-        db.files.delete("b");
-        db.files.delete("c");
-        assertEquals(0, numFiles());
-    }
-
-    private void assertDependencies(int inA, int outA, int inB, int outB, int inC, int outC) throws CoreException
-    {
-        assertEquals(inA, db.dependencies.findAllIncomingDependencyRecordsTo("a").size());
-        assertEquals(outA, db.dependencies.findAllOutgoingDependencyRecordsFrom("a").size());
-
-        assertEquals(inB, db.dependencies.findAllIncomingDependencyRecordsTo("b").size());
-        assertEquals(outB, db.dependencies.findAllOutgoingDependencyRecordsFrom("b").size());
-
-        assertEquals(inC, db.dependencies.findAllIncomingDependencyRecordsTo("c").size());
-        assertEquals(outC, db.dependencies.findAllOutgoingDependencyRecordsFrom("c").size());
-
-        assertEquals(inA > 0, db.dependencies.hasIncomingDependencyRecords("a"));
-        assertEquals(outA > 0, db.dependencies.hasOutgoingDependencyRecords("a"));
-
-        assertEquals(inB > 0, db.dependencies.hasIncomingDependencyRecords("b"));
-        assertEquals(outB > 0, db.dependencies.hasOutgoingDependencyRecords("b"));
-
-        assertEquals(inC > 0, db.dependencies.hasIncomingDependencyRecords("c"));
-        assertEquals(outC > 0, db.dependencies.hasOutgoingDependencyRecords("c"));
-    }
-
-    public void testEdges() throws CoreException
-    {
-        assertNotNull(db);
-        Edges e = db.edges;
-        assertNotNull(e);
-
-        assertEquals(0, numFiles());
-
-        e.ensure("a", 1, 2, "b", 3, 4, 5);
-        assertEdges(0, 1, 1, 0, 0, 0);
-        e.ensure("a", 1, 2, "b", 3, 4, 5);
-        assertEdges(0, 1, 1, 0, 0, 0);
-
-        e.ensure("a", 1, 2, "b", 3, 4, 6);
-        assertEdges(0, 2, 2, 0, 0, 0);
-
-        int record = e.ensure("b", 3, 4, "a", 1, 2, 6);
-        assertEdges(1, 2, 2, 1, 0, 0);
-
-        assertEquals("b", db.files.getFilename(e.getFromFileRecordPtr(record)).getString());
-        assertEquals(3, e.getFromOffset(record));
-        assertEquals(4, e.getFromLength(record));
-        assertEquals("a", db.files.getFilename(e.getToFileRecordPtr(record)).getString());
-        assertEquals(1, e.getToOffset(record));
-        assertEquals(2, e.getToLength(record));
-        assertEquals(6, e.getEdgeType(record));
-
-        assertEquals(2, e.findAllOutgoingEdgeRecordsFrom("a", 1, 2).size());
-        assertEquals(2, e.findAllIncomingEdgeRecordsTo("b", 3, 4).size());
-
-        assertEquals(1, e.findAllOutgoingEdgeRecordsFrom("a", 1, 2, 5).size());
-        assertEquals(1, e.findAllIncomingEdgeRecordsTo("b", 3, 4, 5).size());
-        assertEquals(1, e.findAllOutgoingEdgeRecordsFrom("a", 1, 2, 6).size());
-        assertEquals(1, e.findAllIncomingEdgeRecordsTo("b", 3, 4, 6).size());
-        assertEquals(0, e.findAllOutgoingEdgeRecordsFrom("a", 1, 2, 7).size());
-        assertEquals(0, e.findAllIncomingEdgeRecordsTo("b", 3, 4, 7).size());
-
-        db.files.delete("a");
-        db.files.delete("b");
-        db.files.delete("c");
-        assertEquals(0, numFiles());
-    }
-
-    private void assertEdges(int inA, int outA, int inB, int outB, int inC, int outC) throws CoreException
-    {
-        assertEquals(inA, db.edges.findAllIncomingEdgeRecordsTo("a").size());
-        assertEquals(outA, db.edges.findAllOutgoingEdgeRecordsFrom("a").size());
-
-        assertEquals(inB, db.edges.findAllIncomingEdgeRecordsTo("b").size());
-        assertEquals(outB, db.edges.findAllOutgoingEdgeRecordsFrom("b").size());
-
-        assertEquals(inC, db.edges.findAllIncomingEdgeRecordsTo("c").size());
-        assertEquals(outC, db.edges.findAllOutgoingEdgeRecordsFrom("c").size());
-
-        assertEquals(inA > 0, db.edges.hasIncomingEdges("a"));
-        assertEquals(outA > 0, db.edges.hasOutgoingEdges("a"));
-
-        assertEquals(inB > 0, db.edges.hasIncomingEdges("b"));
-        assertEquals(outB > 0, db.edges.hasOutgoingEdges("b"));
-
-        assertEquals(inC > 0, db.edges.hasIncomingEdges("c"));
-        assertEquals(outC > 0, db.edges.hasOutgoingEdges("c"));
-    }
-
-    public void testAnnotations() throws CoreException
-    {
-        assertNotNull(db);
-        Annotations a = db.annotations;
-        assertNotNull(a);
-
-        assertEquals(0, numFiles());
-
-        byte[] a1 = new byte[] { 1, 2, 3 };
-        byte[] a2 = new byte[] { 4, 5, 6 };
-
-        a.set("a", 1, 2, 0, a2);
-        assertAnnotations(1, 0);
-
-        a.set("a", 1, 2, 0, a1);
-        assertAnnotations(1, 0);
-
-        a.set("a", 1, 2, 1, a2);
-        assertAnnotations(2, 0);
-
-        System.out.println(a);
-
-        a.set("a", 1, 3, 1, a2);
-        System.out.println(a);
-        assertAnnotations(3, 0);
-
-        assertEquals(2, db.annotations.findAllAnnotationRecordsFor("a", 1, 2).size());
-        assertEquals(1, db.annotations.findAllAnnotationRecordsFor("a", 1, 3).size());
-
-        db.files.delete("a");
-        db.files.delete("b");
-        db.files.delete("c");
-        assertEquals(0, numFiles());
-    }
-
-    private void assertAnnotations(int numA, int numB) throws CoreException
-    {
-        assertEquals(numA, db.annotations.findAllAnnotationRecordsFor("a").size());
-        assertEquals(numB, db.annotations.findAllAnnotationRecordsFor("b").size());
-    }
-}

diff --git a/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/vpg/RAMDBTests.java b/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/vpg/RAMDBTests.java
deleted file mode 100644
index 4b24c9a..0000000
--- a/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/vpg/RAMDBTests.java
+++ /dev/null

@@ -1,295 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.

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

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *    UIUC - Initial API and implementation

- *******************************************************************************/

-package org.eclipse.rephraserengine.internal.core.tests.vpg;

-

-import java.io.File;

-import java.io.IOException;

-import java.io.ObjectInputStream;

-import java.io.Serializable;

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-import java.util.TreeSet;

-

-import junit.framework.TestCase;

-

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

-import org.eclipse.rephraserengine.core.util.Pair;

-import org.eclipse.rephraserengine.core.util.TwoKeyHashMap;

-import org.eclipse.rephraserengine.core.vpg.IVPGNode;

-import org.eclipse.rephraserengine.core.vpg.VPGDependency;

-import org.eclipse.rephraserengine.core.vpg.VPGEdge;

-import org.eclipse.rephraserengine.core.vpg.db.ram.RAMDB;

-

-/**

- * Class that checks the correctness of NewDB.java

- * 

- * @author Esfar Huq

- * @author Rui Wang

- * @author Jeff Overbey - replaced public fields with MyRAMDB

- */

-@SuppressWarnings(value={"unchecked", "rawtypes"})

-public class RAMDBTests extends TestCase

-{

-    private static class MyRAMDB<A, T, R extends IVPGNode<T>> extends RAMDB<A, T, R>

-    {

-        private static File tempFile = null;

-        

-        public MyRAMDB() throws IOException

-        {

-            super(null, createTempFile());

-        }

-

-        private static File createTempFile() throws IOException

-        {

-            if (tempFile == null)

-            {

-                tempFile = File.createTempFile("rephraser", "ramdb");

-                tempFile.deleteOnExit();

-            }

-            return tempFile;

-        }

-

-        @Override

-        public long getModificationStamp(String filename)

-        {

-            return 0L;

-        }

-        

-        public HashMap<String, Long> files() { return files; }

-        public HashSet<VPGDependency<A, T, R>> dependencies() { return dependencies; }

-        public HashMap<R, Set<VPGEdge<A, T, R>>> outgoingEdges() { return outgoingEdges; }

-        //public HashMap<R, Set<VPGEdge<A, T, R>>> incomingEdges() { return incomingEdges; }

-        public TwoKeyHashMap<R, Integer, Serializable> annotations() { return annotations; }

-

-        @Override protected Object readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { return in.readObject(); }

-    }

-    

-    private MyRAMDB db;

-    

-    @Override

-    protected void setUp() throws Exception

-    {

-        super.setUp();

-        

-        this.db = new MyRAMDB();

-    }

-

-    public void testDependencies() throws CoreException

-    {

-        assertNotNull(db);

-        assertNotNull(db.dependencies());

-        

-        VPGDependency d1 = new VPGDependency("A.txt", "B.txt");

-        VPGDependency d2 = new VPGDependency("C.txt", "D.txt");

-        VPGDependency d3 = new VPGDependency("C.txt", "E.txt");

-        VPGDependency d4 = new VPGDependency("C.txt", "F.txt");

-        

-        //ENSURE

-        db.ensure(d1);

-        db.ensure(d2);

-        db.ensure(d2);  //check if duplicates are handled

-        db.ensure(d3);

-        db.ensure(d4);

-        assertEquals(4, db.dependencies().size());

-        

-        //DELETE

-        db.delete(d1);

-        db.delete(d1);

-        assertEquals(3, db.dependencies().size());

-        assertEquals(true, db.dependencies().contains(d2));

-        

-        //GET OUTGOING DEPENDENCIES FROM

-        Iterable<String> result1 = db.getOutgoingDependenciesFrom("C.txt");

-        assertEquals("[D.txt, E.txt, F.txt]", result1.toString());

-        

-        //GET INCOMING DEPENDENCIES TO

-        Iterable<String> result2 = db.getIncomingDependenciesTo("E.txt");

-        assertEquals("[C.txt]", result2.toString());

-    }

-    

-    public void testEdges() throws CoreException

-    {

-        assertNotNull(db);

-        assertNotNull(db.outgoingEdges());

-        

-        VPGEdge e1 = new VPGEdge(new TestTokenRef(db, "C.txt", 0, 0), new TestTokenRef(db, "D.txt", 0, 0), Integer.MIN_VALUE);

-        VPGEdge e2 = new VPGEdge(new TestTokenRef(db, "A.txt", 0, 0), new TestTokenRef(db, "B.txt", 0, 0), Integer.MIN_VALUE);

-        VPGEdge e3 = new VPGEdge(new TestTokenRef(db, "C.txt", 0, 0), new TestTokenRef(db, "A.txt", 0, 0), Integer.MIN_VALUE);

-        

-        //ENSURE

-        db.ensure(e1);

-        db.ensure(e2);

-        db.ensure(e3);

-        db.ensure(e1);

-        assertEquals(2, db.outgoingEdges().keySet().size());

-        

-        //DELETE

-        db.delete(e3);

-        db.delete(e3);

-        //System.out.println(db.outgoingEdges());

-        assertEquals(2, db.outgoingEdges().keySet().size());

-        

-        //GET ALL EDGES FOR

-        Iterable<VPGEdge> result1 = db.getAllEdgesFor("B.txt");

-        List<VPGEdge> r1 = new ArrayList<VPGEdge>();

-        r1.add(e2);

-        

-        assertEquals(result1.toString(),r1.toString());

-    }

-    

-    public void testAnnotations() throws CoreException

-    {

-        assertNotNull(db);

-        assertNotNull(db.annotations());

-        

-        //SET ANNOTATION

-        int count = 0;

-        

-        TestTokenRef r1 = new TestTokenRef(db, "A.txt", 0, 0);

-        TestTokenRef r2 = new TestTokenRef(db, "B.txt", 0, 0);

-        TestTokenRef r3 = new TestTokenRef(db, "C.txt", 0, 0);

-        

-        byte[] b1 = new byte[] {1, 2, 3};

-        byte[] b2 = new byte[] {1, 2, 3};

-        byte[] b3 = new byte[] {1, 2, 3};

-        

-        db.setAnnotation(r1, 0, b1);

-        db.setAnnotation(r2, 1, b2);

-        db.setAnnotation(r3, 2, b3);

-        db.setAnnotation(r1, 0, b1);

-        

-        for(TestTokenRef r : (Set<TestTokenRef>)db.annotations().keySet())

-        {

-            count += db.annotations().getAllEntriesFor(r).keySet().size();

-        }

-        

-        assertEquals(3, count);

-        

-        //DELETE ANNOTATION

-        count = 0;

-        db.deleteAnnotation(r2, 1);

-        db.deleteAnnotation(r3, 2);

-        db.deleteAnnotation(r1, -1);

-        

-        for(TestTokenRef r : (Set<TestTokenRef>)db.annotations().keySet())

-        {

-            count += db.annotations().getAllEntriesFor(r).keySet().size();

-        }

-        

-        assertEquals(1, count);

-               

-        //GET ANNOTATION

-        assertEquals(b1, db.getAnnotation(r1, 0));

-        assertEquals(null, db.getAnnotation(r3, 2));

-        

-        //GET ALL ANNOTATIONS FOR

-        Iterable<Pair<TestTokenRef, Integer>> a = db.getAllAnnotationsFor("A.txt");

-        assertEquals(a.iterator().next(), new Pair<TestTokenRef, Integer>(r1, 0));

-    }

-    

-    public void testFiles()

-    {

-        //reset the database for convenience

-        try

-        {

-            this.setUp();

-        }catch(Exception e)

-        {

-            e.printStackTrace();

-        }

-       

-        assertNotNull(db);

-        assertNotNull(db.files());

-       

-        //MODIFICATION STAMP

-        db.updateModificationStamp("A.txt");

-        assertEquals(0L, db.getModificationStamp("A.txt"));

-       

-        //DELETE ALL ENTRIES FOR

-        VPGDependency d1 = new VPGDependency("A.txt", "B.txt");

-        VPGDependency d2 = new VPGDependency("C.txt", "D.txt");

-        VPGDependency d3 = new VPGDependency("C.txt", "E.txt");

-        VPGDependency d4 = new VPGDependency("C.txt", "F.txt");

-        

-        db.ensure(d1);

-        db.ensure(d2);

-        db.ensure(d3);

-        db.ensure(d4);

-        

-        VPGEdge e1 = new VPGEdge(new TestTokenRef(db, "C.txt", 0, 0), new TestTokenRef(db, "D.txt", 0, 0), Integer.MIN_VALUE);

-        VPGEdge e2 = new VPGEdge(new TestTokenRef(db, "A.txt", 0, 0), new TestTokenRef(db, "B.txt", 0, 0), Integer.MIN_VALUE);

-        VPGEdge e3 = new VPGEdge(new TestTokenRef(db, "C.txt", 0, 0), new TestTokenRef(db, "A.txt", 0, 0), Integer.MIN_VALUE);

-        

-        db.ensure(e1);

-        db.ensure(e2);

-        db.ensure(e3);

-        

-        TestTokenRef r1 = new TestTokenRef(db, "A.txt", 0, 0);

-        TestTokenRef r2 = new TestTokenRef(db, "B.txt", 0, 0);

-        TestTokenRef r3 = new TestTokenRef(db, "C.txt", 0, 0);

-        

-        byte[] b1 = new byte[] {1, 2, 3};

-        byte[] b2 = new byte[] {1, 2, 3};

-        byte[] b3 = new byte[] {1, 2, 3};

-        

-        db.setAnnotation(r1, 0, b1);

-        db.setAnnotation(r2, 1, b2);

-        db.setAnnotation(r3, 2, b3);

-        

-        db.deleteAllEntriesFor("A.txt");

-        assertEquals(3, db.dependencies().size());

-        assertEquals(1, db.outgoingEdges().keySet().size());

-        assertEquals(2, db.annotations().keySet().size());

-        

-        //LIST ALL FILENAMES

-        TreeSet<String> filenames = new TreeSet<String>(db.listAllFilenames());

-        assertEquals("[A.txt, B.txt, C.txt, D.txt, E.txt, F.txt]", filenames.toString());

-        

-        //LIST ALL FILENAMES WITH DEPENDENTS

-        filenames = new TreeSet<String>(db.listAllFilenamesWithDependents());

-        assertEquals("[D.txt, E.txt, F.txt]", filenames.toString());

-        

-        //LIST ALL DEPENDENT FILENAMES

-        filenames = new TreeSet<String>(db.listAllDependentFilenames());

-        assertEquals("[C.txt]", filenames.toString());

-    }

-    

-    public void testFlush() throws Exception

-    {

-        //reset the database for convenience

-        this.setUp();

-       

-        assertNotNull(db);

-        assertNotNull(db.files());

-        assertNotNull(db.dependencies());

-        assertNotNull(db.outgoingEdges());

-        assertNotNull(db.annotations());

-        

-        VPGDependency d1 = new VPGDependency("A.txt", "B.txt");

-        VPGDependency d2 = new VPGDependency("C.txt", "D.txt");

-        

-        db.ensure(d1);

-        db.ensure(d2);

-        

-        VPGEdge e2 = new VPGEdge(new TestTokenRef(db, "A.txt", 0, 0), new TestTokenRef(db, "B.txt", 0, 0), Integer.MIN_VALUE);

-        db.ensure(e2);

-        

-        db.flush();

-        this.setUp();

-        

-        assertEquals(2, db.dependencies().size());

-        assertEquals(1, db.outgoingEdges().keySet().size());

-        assertEquals(4, db.files().keySet().size());

-    }

-}


diff --git a/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/vpg/TestTokenRef.java b/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/vpg/TestTokenRef.java
deleted file mode 100644
index 2639be6..0000000
--- a/org.eclipse.rephraserengine.core.vpg.tests/src/org/eclipse/rephraserengine/internal/core/tests/vpg/TestTokenRef.java
+++ /dev/null

@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.core.tests.vpg;
-
-import java.io.Serializable;
-
-import org.eclipse.rephraserengine.core.vpg.VPG;
-import org.eclipse.rephraserengine.core.vpg.NodeRef;
-import org.eclipse.rephraserengine.core.vpg.IVPGNode;
-import org.eclipse.rephraserengine.core.vpg.VPGDB;
-
-public class TestTokenRef extends NodeRef<Object> implements Serializable
-{
-    private static final long serialVersionUID = 1L;
-
-    private transient final VPGDB<?,?,TestTokenRef> db;
-
-    public TestTokenRef(VPGDB<?,?,TestTokenRef> db, String filename, int offset, int length)
-    {
-        super(filename, offset, length);
-        this.db = db;
-    }
-
-    @Override public Object getASTNode() { throw new UnsupportedOperationException(); }
-
-    @Override protected <R extends IVPGNode<Object>> VPG< ? , Object, R> getVPG() { throw new UnsupportedOperationException(); }
-
-    @SuppressWarnings("unchecked")
-    @Override protected VPGDB<?,?,TestTokenRef> getDB() { return db; }
-}
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine.doc.isv/.project b/org.eclipse.rephraserengine.doc.isv/.project
deleted file mode 100644
index 080cc8f..0000000
--- a/org.eclipse.rephraserengine.doc.isv/.project
+++ /dev/null

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rephraserengine.doc.isv</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.rephraserengine.doc.isv/META-INF/MANIFEST.MF b/org.eclipse.rephraserengine.doc.isv/META-INF/MANIFEST.MF
deleted file mode 100644
index d333af5..0000000
--- a/org.eclipse.rephraserengine.doc.isv/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Rephraser Engine ISV Documentation
-Bundle-SymbolicName: org.eclipse.rephraserengine.doc.isv; singleton:=true
-Bundle-Version: 3.0.0.qualifier
-Bundle-Vendor: Eclipse.org - Photran

diff --git a/org.eclipse.rephraserengine.doc.isv/about.html b/org.eclipse.rephraserengine.doc.isv/about.html
deleted file mode 100644
index 9c7ba0a..0000000
--- a/org.eclipse.rephraserengine.doc.isv/about.html
+++ /dev/null

@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>About</title></head>
-
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine.doc.isv/build.properties b/org.eclipse.rephraserengine.doc.isv/build.properties
deleted file mode 100644
index cccaee3..0000000
--- a/org.eclipse.rephraserengine.doc.isv/build.properties
+++ /dev/null

@@ -1,12 +0,0 @@
-bin.includes = plugin.xml,\
-               META-INF/,\
-               html/,\
-               *.xml,\
-               images/,\
-               about.html
-src.includes = about.html,\
-               html/,\
-               images/,\
-               toc.xml,\
-               tocsamples.xml,\
-               tocconcepts.xml

diff --git a/org.eclipse.rephraserengine.doc.isv/html/concepts/introduction.html b/org.eclipse.rephraserengine.doc.isv/html/concepts/introduction.html
deleted file mode 100644
index 14d2063..0000000
--- a/org.eclipse.rephraserengine.doc.isv/html/concepts/introduction.html
+++ /dev/null

@@ -1,77 +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>Introduction</title>
-</head>
-
-<body>
-<h1>Introduction</h1>
-
-The Rephraser Engine is an Eclipse-based library that expedites the development of refactoring tools.  It contains the following components:
-<ul>
-<li> The <i>refactoring</i> component allows plug-ins to easily contribute refactorings to the Eclipse user interface.
-<li> The <i>virtual program graph (VPG)</i> component provides a language-independent program database and indexing infrastructure.
-<li> The <i>testing</i> component provides several utility classes for constructing JUnit test suites.
-</ul>
-
-<p>These components share a common suite of utility classes, many of which are useful to clients as well.</p>
-
-<p>The dependencies among the projects comprising the Rephraser Engine are as follows.  Note that the Refactoring component does <i>not</i>
-require that the VPG component be used.</p>
-
-<p><img src="../../images/architecture.png" border="0" /></p>
-
-<p>"Rephraser" is an acronym which stands for
-Rapid
-Eclipse
-Prototyping
-Host for
-Research on <!-- Approximate Semantic -->
-            <!-- Agnostic Specified -->
-Abstract
-Specified
-Equivalence-based
-Refactoring.</p>
-
-<h2>Features</h2>
-
-<h3>Refactoring</h3>
-
-<p>The Refactoring component extends the Eclipse Language ToolKit (LTK) and
-<ul>
-<li> contributes a Refactor menu to the workbench menu bar, as well as to the context menu for resource selections in the workbench;
-<li> provides an extension point that allows refactorings to be contributed to this menu; and
-<li> does not require any user interface code to be written for simple refactorings.
-</ul></p>
-
-<h3>VPG</h3>
-
-<p>The VPG component
-<ul>
-<li> provides a set of base classes for building persistable program graphs;
-<li> provides an indexing infrastructure by registering a resource listener and automatically updating program graphs as workspace resources change; and
-<li> contributes a "(Debugging)" sub-menu to the workbench Refactoring menu, which provides various actions for viewing, analyzing, and manipulating VPG databases.
-</ul></p>
-
-<h3>Testing</h3>
-
-<p>The Testing component
-<ul>
-<li> provides classes to construct a test suite (dynamically) from set of files or from a set of &quot;markers&quot; in a single file; and
-<li> provides utility classes to aid in combinatorial testing.
-</ul></p>
-
-<h3>Common Components/Miscellany</h3>
-
-<p>The Rephraser Engine also includes
-<ul>
-<li> classes to aid in contributing to the Eclipse Search UI (e.g., SearchResult),
-<li> assorted classes to aid in writing common static analyses (e.g., SymbolTable),
-<li> several utility classes (e.g., TwoKeyHashMap, Spawner, StringUtil, OffsetLength).
-</ul>
-</p>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine.doc.isv/html/concepts/refactorings.html b/org.eclipse.rephraserengine.doc.isv/html/concepts/refactorings.html
deleted file mode 100644
index ff13316..0000000
--- a/org.eclipse.rephraserengine.doc.isv/html/concepts/refactorings.html
+++ /dev/null

@@ -1,106 +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>Contributing Refactorings</title>
-<style type="text/css">
-<!--
-span.st1 
-    {
-    font-family: Courier New;
-    font-size: 10pt;
-    color: #800000;
-    }
-span.st2 
-    {
-    font-family: Courier New;
-    font-size: 10pt;
-    color: #000000;
-    }
-span.st3 
-    {
-    font-family: Courier New;
-    font-size: 10pt;
-    color: #000080;
-    }
-span.st4 
-    {
-    font-family: Courier New;
-    font-size: 10pt;
-    color: #008000;
-    }
-span.st5 
-    {
-    font-family: Times New Roman;
-    font-size: 12pt;
-    color: #000000;
-    }
--->
-</style>
-</head>
-
-<body>
-<h1>Contributing Refactorings</h1>
-
-TODO
-
-org.eclipse.rephraserengine.ui.refactoring.refactorings extension point
-
-<h2>Examples</h2>
-
-<!-- http://www.sautinsoft.net/rtf-to-html-convert.aspx -->
-
-<div><span class="st2"> &nbsp;&nbsp;</span><span class="st3">&lt;extension</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">point=</span><span class="st4">"org.eclipse.rephraserengine.ui.refactoring.refactorings"</span><span class="st3">&gt;</span></div>
-<div><span class="st2"></span>&nbsp;</div>
-
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st1">&lt;!-- The resource filter determines what must be selected for these refactorings to be visible --&gt;</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">&lt;resourceFilter</span><span class="st2"> </span><span class="st3">class=</span><span class="st4">"org.eclipse.rephraserengine.examples.text.TextFileResourceFilter"</span><span class="st2"> </span><span class="st3">/&gt;</span></div>
-<div><span class="st2"></span>&nbsp;</div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st1">&lt;!-- Each group defines a new (separated) section in the Refactor menu --&gt;</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">&lt;group&gt;</span></div>
-
-<div><span class="st2"></span>&nbsp;</div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st1">&lt;!-- A resource refactoring which uses an auto-generated user interface --&gt;</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">&lt;resourceRefactoring</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">class=</span><span class="st4">"org.eclipse.rephraserengine.examples.text.ConvertTabsToSpacesRefactoring"</span><span class="st2"> </span><span class="st3">/&gt;</span></div>
-<div><span class="st2"></span>&nbsp;</div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st1">&lt;!-- An editor refactoring which uses an auto-generated user interface --&gt;</span></div>
-
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">&lt;editorRefactoring</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">class=</span><span class="st4">"org.eclipse.photran.internal.core.refactoring.MakePrivateEntityPublicRefactoring"</span><span class="st2"> </span><span class="st3">/&gt;</span></div>
-<div><span class="st2"></span>&nbsp;</div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st1">&lt;!-- Same as previous, except the given label ("Increase Visibility") will appear in the menu;</span></div>
-<div><span class="st2"></span><span class="st1"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;when the label attribute is absent, the label will be whatever is returned by the refactoring&amp;apos;s</span></div>
-
-<div><span class="st2"></span><span class="st1"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;#getName method --&gt;</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">&lt;editorRefactoring</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">label=</span><span class="st4">"Increase Visibility"</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">class=</span><span class="st4">"org.eclipse.photran.internal.core.refactoring.MakePrivateEntityPublicRefactoring"</span><span class="st2"> </span><span class="st3">/&gt;</span></div>
-<div><span class="st2"></span>&nbsp;</div>
-
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st1">&lt;!-- An editor refactoring which uses a custom user interface --&gt;</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">&lt;editorRefactoring</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">class=</span><span class="st4">"org.eclipse.photran.internal.core.refactoring.AddOnlyToUseStmtRefactoring"</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">inputPage=</span><span class="st4">"org.eclipse.photran.internal.refactoring.ui.AddOnlyToUseStmtInputPage"</span><span class="st2"> </span><span class="st3">/&gt;</span></div>
-<div><span class="st2"></span>&nbsp;</div>
-
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st1">&lt;!-- A command which is contributed as an editor refactoring --&gt;</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st1">&lt;!-- Note that this is the only way to give a refactoring a key binding --&gt;</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">&lt;editorRefactoring</span><span class="st2"> </span><span class="st3">command=</span><span class="st4">"org.eclipse.photran.ui.RenameRefactoringCommand"</span><span class="st2"> </span><span class="st3">/&gt;</span></div>
-<div><span class="st2"></span>&nbsp;</div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st1">&lt;!-- An editor refactoring which only appears in the menu when the</span></div>
-
-<div><span class="st2"></span><span class="st1"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PHOTRAN_INCLUDE_TEST_REFACTORINGS environment variable is set to a non-null value --&gt;</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">&lt;editorRefactoring</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">require_env=</span><span class="st4">"PHOTRAN_INCLUDE_TEST_REFACTORINGS"</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">class=</span><span class="st4">"org.eclipse.photran.internal.core.refactoring.AddEmptySubprogramRefactoring"</span><span class="st2"> </span><span class="st3">/&gt;</span></div>
-<div><span class="st2"></span>&nbsp;</div>
-
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">&lt;/group&gt;</span></div>
-<div><span class="st2"> &nbsp;&nbsp;</span><span class="st3">&lt;/extension&gt;</span></div>
-</pre>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine.doc.isv/html/concepts/vpg.html b/org.eclipse.rephraserengine.doc.isv/html/concepts/vpg.html
deleted file mode 100644
index e93dcad..0000000
--- a/org.eclipse.rephraserengine.doc.isv/html/concepts/vpg.html
+++ /dev/null

@@ -1,65 +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>Contributing a Virtual Program Graph</title>
-<style type="text/css">
-<!--
-span.st1 
-    {
-    font-family: Courier New;
-    font-size: 10pt;
-    color: #800000;
-    }
-span.st2 
-    {
-    font-family: Courier New;
-    font-size: 10pt;
-    color: #000000;
-    }
-span.st3 
-    {
-    font-family: Courier New;
-    font-size: 10pt;
-    color: #000080;
-    }
-span.st4 
-    {
-    font-family: Courier New;
-    font-size: 10pt;
-    color: #008000;
-    }
-span.st5 
-    {
-    font-family: Times New Roman;
-    font-size: 12pt;
-    color: #000000;
-    }
--->
-</style>
-</head>
-
-<body>
-<h1>Contributing a Virtual Program Graph</h1>
-
-TODO
-
-<h2>Example</h2>
-
-<!-- http://www.sautinsoft.net/rtf-to-html-convert.aspx -->
-
-<div><span class="st1"> &nbsp;&nbsp;&lt;!-- This will automatically add some actions to the (Debugging) sub-menu of the Refactor</span></div>
-<div><span class="st2"></span><span class="st1"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;menu in the menu bar, such as Display VPG Database, Refresh VPG Database, etc. --&gt;</span></div>
-<div><span class="st2"> &nbsp;&nbsp;</span><span class="st3">&lt;extension</span></div>
-
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">point=</span><span class="st4">"org.eclipse.rephraserengine.ui.vpg.vpg"</span><span class="st3">&gt;</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">&lt;vpg</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">id=</span><span class="st4">"org.eclipse.photran.ui.vpg"</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">name=</span><span class="st4">"Fortran"</span></div>
-<div><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">class=</span><span class="st4">"org.eclipse.photran.internal.ui.vpg.PhotranVPGContribution"</span><span class="st2"> </span><span class="st3">/&gt;</span></div>
-
-<div><span class="st2"> &nbsp;&nbsp;</span><span class="st3">&lt;/extension&gt;</span></div>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine.doc.isv/html/samples/samples.html b/org.eclipse.rephraserengine.doc.isv/html/samples/samples.html
deleted file mode 100644
index bec1c51..0000000
--- a/org.eclipse.rephraserengine.doc.isv/html/samples/samples.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">
-	<title>Samples</title>
-</head>
-
-<body>
-<h1>Samples</h1>
-
-<h2>org.eclipse.rephraserengine.examples.text</h2>
-
-<h2>org.eclipse.rephraserengine.examples.testing</h2>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine.doc.isv/html/tasks/contribute-vpg-actions-editor.html b/org.eclipse.rephraserengine.doc.isv/html/tasks/contribute-vpg-actions-editor.html
deleted file mode 100644
index 3a1d93d..0000000
--- a/org.eclipse.rephraserengine.doc.isv/html/tasks/contribute-vpg-actions-editor.html
+++ /dev/null

@@ -1,51 +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>Tasks</title>
-<style type="text/css">
-<!--
-span.st1 
-	{
-	font-family: Helvetica;
-	font-size: 10pt;
-	color: #800000;
-	}
-span.st2 
-	{
-	font-family: Helvetica;
-	font-size: 10pt;
-	color: #000000;
-	}
-span.st3 
-	{
-	font-family: Helvetica;
-	font-size: 10pt;
-	color: #000080;
-	}
-span.st4 
-	{
-	font-family: Helvetica;
-	font-size: 10pt;
-	color: #008000;
-	}
--->
-</style>
-</head>
-
-<body>
-<h1>Contributing the VPG "(Debugging)" Action Set to an Editor</h1>
-
-<h2>Example</h2>
-
-<!-- Converted using http://www.sautinsoft.net/rtf-to-html-convert.aspx -->
-<div style="text-indent:0pt;"><span class="st1">&lt;!-- Associate the action set with the workbench text editor --&gt;</span></div>
-<div style="text-indent:0pt;"><span class="st2"></span><span class="st3">&lt;extension</span><span class="st2"> </span><span class="st3">point=</span><span class="st4">"org.eclipse.ui.actionSetPartAssociations"</span><span class="st3">&gt;</span></div>
-<div style="text-indent:0pt;"><span class="st2"> &nbsp;&nbsp;</span><span class="st3">&lt;actionSetPartAssociation</span><span class="st2"> </span><span class="st3">targetID=</span><span class="st4">"org.eclipse.rephraserengine.ui.DebugActionSet"</span><span class="st3">&gt;</span></div>
-<div style="text-indent:0pt;"><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">&lt;part</span><span class="st2"> </span><span class="st3">id=</span><span class="st4">"org.eclipse.ui.DefaultTextEditor"</span><span class="st3">/&gt;</span></div>
-<div style="text-indent:0pt;"><span class="st2"> &nbsp;&nbsp;</span><span class="st3">&lt;/actionSetPartAssociation&gt;</span></div>
-<div style="text-indent:0pt;"><span class="st2"></span><span class="st3">&lt;/extension&gt;</span></div><div align="center">Trial version can convert no more than 30000 symbols.<br /><a href="http://www.sautinsoft.com/convert-rtf-to-html/order.php">Get the full featured version!</a></div></body>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine.doc.isv/html/tasks/contribute-vpg-actions-editor.rtf b/org.eclipse.rephraserengine.doc.isv/html/tasks/contribute-vpg-actions-editor.rtf
deleted file mode 100644
index 05b58dc..0000000
--- a/org.eclipse.rephraserengine.doc.isv/html/tasks/contribute-vpg-actions-editor.rtf
+++ /dev/null

@@ -1,15 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fnil\fcharset0 Monaco;}
-{\colortbl;\red255\green255\blue255;\red128\green0\blue0;\red0\green0\blue128;\red0\green128\blue0;
-}
-\margl1440\margr1440\vieww12040\viewh9180\viewkind0
-\deftab720
-\pard\pardeftab720\ql\qnatural
-
-\f0\fs20 \cf2 <!-- Associate the action set with the workbench text editor -->\cf0 \
-\pard\pardeftab720\ql\qnatural
-\cf3 <extension\cf0  \cf3 point=\cf4 "org.eclipse.ui.actionSetPartAssociations"\cf3 >\cf0 \
-   \cf3 <actionSetPartAssociation\cf0  \cf3 targetID=\cf4 "org.eclipse.rephraserengine.ui.DebugActionSet"\cf3 >\cf0 \
-      \cf3 <part\cf0  \cf3 id=\cf4 "org.eclipse.ui.DefaultTextEditor"\cf3 />\cf0 \
-   \cf3 </actionSetPartAssociation>\cf0 \
-\cf3 </extension>}
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine.doc.isv/html/tasks/contribute-vpg-actions-perspective.html b/org.eclipse.rephraserengine.doc.isv/html/tasks/contribute-vpg-actions-perspective.html
deleted file mode 100644
index 25ed42a..0000000
--- a/org.eclipse.rephraserengine.doc.isv/html/tasks/contribute-vpg-actions-perspective.html
+++ /dev/null

@@ -1,51 +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>Tasks</title>
-<style type="text/css">
-<!--
-span.st1 
-	{
-	font-family: Helvetica;
-	font-size: 10pt;
-	color: #800000;
-	}
-span.st2 
-	{
-	font-family: Helvetica;
-	font-size: 10pt;
-	color: #000000;
-	}
-span.st3 
-	{
-	font-family: Helvetica;
-	font-size: 10pt;
-	color: #000080;
-	}
-span.st4 
-	{
-	font-family: Helvetica;
-	font-size: 10pt;
-	color: #008000;
-	}
--->
-</style>
-</head>
-
-<body>
-<h1>Contributing the VPG "(Debugging)" Action Set to a Perspective</h1>
-
-<h2>Example</h2>
-
-<!-- Converted using http://www.sautinsoft.net/rtf-to-html-convert.aspx -->
-<div style="text-indent:0pt;"><span class="st1">&lt;!-- Associate the action set with the Resource perspective --&gt;</span></div>
-<div style="text-indent:0pt;"><span class="st2"></span><span class="st3">&lt;extension</span><span class="st2"> </span><span class="st3">point=</span><span class="st4">"org.eclipse.ui.perspectiveExtensions"</span><span class="st3">&gt;</span></div>
-<div style="text-indent:0pt;"><span class="st2"> &nbsp;&nbsp;</span><span class="st3">&lt;perspectiveExtension</span><span class="st2"> </span><span class="st3">targetID=</span><span class="st4">"org.eclipse.ui.resourcePerspective"</span><span class="st3">&gt;</span></div>
-<div style="text-indent:0pt;"><span class="st2"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span><span class="st3">&lt;actionSet</span><span class="st2"> </span><span class="st3">id=</span><span class="st4">"org.eclipse.rephraserengine.ui.DebugActionSet"</span><span class="st3">/&gt;</span></div>
-<div style="text-indent:0pt;"><span class="st2"> &nbsp;&nbsp;</span><span class="st3">&lt;/perspectiveExtension&gt;</span></div>
-<div style="text-indent:0pt;"><span class="st2"></span><span class="st3">&lt;/extension&gt;</span></div><div align="center">Trial version can convert no more than 30000 symbols.<br /><a href="http://www.sautinsoft.com/convert-rtf-to-html/order.php">Get the full featured version!</a></div></body>
-
-</body>
-</html>
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine.doc.isv/html/tasks/contribute-vpg-actions-perspective.rtf b/org.eclipse.rephraserengine.doc.isv/html/tasks/contribute-vpg-actions-perspective.rtf
deleted file mode 100644
index 51f45bb..0000000
--- a/org.eclipse.rephraserengine.doc.isv/html/tasks/contribute-vpg-actions-perspective.rtf
+++ /dev/null

@@ -1,15 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fnil\fcharset0 Monaco;}
-{\colortbl;\red255\green255\blue255;\red128\green0\blue0;\red0\green0\blue128;\red0\green128\blue0;
-}
-\margl1440\margr1440\vieww9000\viewh8400\viewkind0
-\deftab720
-\pard\pardeftab720
-
-\f0\fs20 \cf2 <!-- Associate the action set with the Resource perspective -->\cf0 \
-\pard\pardeftab720
-\cf3 <extension\cf0  \cf3 point=\cf4 "org.eclipse.ui.perspectiveExtensions"\cf3 >\cf0 \
-   \cf3 <perspectiveExtension\cf0  \cf3 targetID=\cf4 "org.eclipse.ui.resourcePerspective"\cf3 >\cf0 \
-      \cf3 <actionSet\cf0  \cf3 id=\cf4 "org.eclipse.rephraserengine.ui.DebugActionSet"\cf3 />\cf0 \
-   \cf3 </perspectiveExtension>\cf0 \
-\cf3 </extension>}
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine.doc.isv/images/architecture.graffle b/org.eclipse.rephraserengine.doc.isv/images/architecture.graffle
deleted file mode 100644
index c50e3ae..0000000
--- a/org.eclipse.rephraserengine.doc.isv/images/architecture.graffle
+++ /dev/null

@@ -1,2605 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>ActiveLayerIndex</key>
-	<integer>0</integer>
-	<key>ApplicationVersion</key>
-	<array>
-		<string>com.omnigroup.OmniGraffle</string>
-		<string>138.12.0.121252</string>
-	</array>
-	<key>AutoAdjust</key>
-	<false/>
-	<key>BackgroundGraphic</key>
-	<dict>
-		<key>Bounds</key>
-		<string>{{0, 0}, {414, 450}}</string>
-		<key>Class</key>
-		<string>SolidGraphic</string>
-		<key>ID</key>
-		<integer>2</integer>
-		<key>Style</key>
-		<dict>
-			<key>shadow</key>
-			<dict>
-				<key>Draws</key>
-				<string>NO</string>
-			</dict>
-			<key>stroke</key>
-			<dict>
-				<key>Draws</key>
-				<string>NO</string>
-			</dict>
-		</dict>
-	</dict>
-	<key>CanvasOrigin</key>
-	<string>{0, 0}</string>
-	<key>CanvasSize</key>
-	<string>{414, 450}</string>
-	<key>ColumnAlign</key>
-	<integer>1</integer>
-	<key>ColumnSpacing</key>
-	<real>36</real>
-	<key>CreationDate</key>
-	<string>2010-02-24 15:53:57 -0600</string>
-	<key>Creator</key>
-	<string>Jeffrey Overbey</string>
-	<key>DisplayScale</key>
-	<string>1 0/72 in = 1.0000 in</string>
-	<key>GraphDocumentVersion</key>
-	<integer>6</integer>
-	<key>GraphicsList</key>
-	<array>
-		<dict>
-			<key>Bounds</key>
-			<string>{{283.129, 40.5977}, {68, 29}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FitText</key>
-			<string>YES</string>
-			<key>Flow</key>
-			<string>Resize</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>BankGothic-Medium</string>
-				<key>Size</key>
-				<real>89</real>
-			</dict>
-			<key>ID</key>
-			<integer>426</integer>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>ShadowVector</key>
-					<string>{0, 2}</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Pad</key>
-				<integer>0</integer>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\froman\fcharset0 Times-Roman;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\i\fs48 \cf0 \kerning1\expnd2\expndtw13
-engine}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-			<key>Wrap</key>
-			<string>NO</string>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{64.4942, 9}, {287, 51}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FitText</key>
-			<string>YES</string>
-			<key>Flow</key>
-			<string>Resize</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>BankGothic-Medium</string>
-				<key>Size</key>
-				<real>89</real>
-			</dict>
-			<key>ID</key>
-			<integer>425</integer>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>ShadowVector</key>
-					<string>{0, 2}</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Pad</key>
-				<integer>0</integer>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fnil\fcharset0 BankGothic-Medium;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\fs96 \cf0 Rephraser}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-			<key>Wrap</key>
-			<string>NO</string>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{50.4942, 218.122}, {315, 216}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>405</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>Width</key>
-					<real>2</real>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{50.4942, 191.122}, {315, 27}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica-Bold</string>
-				<key>Size</key>
-				<real>14</real>
-			</dict>
-			<key>ID</key>
-			<integer>404</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>Width</key>
-					<real>2</real>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\b\fs28 \cf0 Rephraser Engine End-User Runtime}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{68.4942, 398.998}, {279, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica</string>
-				<key>Size</key>
-				<real>12</real>
-			</dict>
-			<key>ID</key>
-			<integer>414</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{68.4942, 236.499}, {279, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica</string>
-				<key>Size</key>
-				<real>12</real>
-			</dict>
-			<key>ID</key>
-			<integer>413</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\b\fs24 \cf0 Language-Independent Infrastructure}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{-18.7441, 348.999}, {80.9999, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>412</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Rotation</key>
-			<real>270</real>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\fs24 \cf0 Core}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{-9.74414, 277.249}, {63, 18.4999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>411</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Rotation</key>
-			<real>270</real>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>b</key>
-						<string>0.826087</string>
-						<key>g</key>
-						<string>0.826087</string>
-						<key>r</key>
-						<string>0.826087</string>
-					</dict>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc\pardirnatural
-
-\f0\fs24 \cf0 UI}</string>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{68.4942, 318.188}, {279, 80.9999}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>380</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Bounds</key>
-			<string>{{68.4942, 254.999}, {279, 63}}</string>
-			<key>Class</key>
-			<string>ShapedGraphic</string>
-			<key>ID</key>
-			<integer>379</integer>
-			<key>Magnets</key>
-			<array>
-				<string>{0, 1}</string>
-				<string>{0, -1}</string>
-				<string>{1, 0}</string>
-				<string>{-1, 0}</string>
-			</array>
-			<key>Shape</key>
-			<string>Rectangle</string>
-			<key>Style</key>
-			<dict>
-				<key>fill</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-			</dict>
-			<key>Text</key>
-			<dict>
-				<key>VerticalPad</key>
-				<integer>0</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>ID</key>
-			<integer>415</integer>
-			<key>Points</key>
-			<array>
-				<string>{184.756, 358.483}</string>
-				<string>{221.129, 376.483}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>395</integer>
-			</dict>
-			<key>ID</key>
-			<integer>401</integer>
-			<key>Points</key>
-			<array>
-				<string>{139.628, 144.811}</string>
-				<string>{139.628, 330.316}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>archive</key>
-						<data>
-						YnBsaXN0MDDUAQIDBAUGCQpYJHZl
-						cnNpb25UJHRvcFkkYXJjaGl2ZXJY
-						JG9iamVjdHMSAAGGoNEHCFRyb290
-						gAFfEA9OU0tleWVkQXJjaGl2ZXKl
-						CwwVGR5VJG51bGzUDQ4PEBESExRW
-						JGNsYXNzXE5TQ29sb3JTcGFjZV8Q
-						Ek5TQ3VzdG9tQ29sb3JTcGFjZVdO
-						U1doaXRlgAQQA4ACRDAuNQDSDRYX
-						GFROU0lEgAMQAtIaGxwOWCRjbGFz
-						c2VzWiRjbGFzc25hbWWiDh1YTlNP
-						YmplY3TSGhsfIKIgHVdOU0NvbG9y
-						CBEaHykyNzo/QVNZX2hvfJGZm52f
-						pKmusLK3wMvO19zfAAAAAAAAAQEA
-						AAAAAAAAIQAAAAAAAAAAAAAAAAAA
-						AOc=
-						</data>
-						<key>b</key>
-						<string>0.500023</string>
-						<key>g</key>
-						<string>0.500023</string>
-						<key>r</key>
-						<string>0.500023</string>
-					</dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>399</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{83.6285, 105.739}, {112, 38.5719}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>FontInfo</key>
-					<dict>
-						<key>Color</key>
-						<dict>
-							<key>w</key>
-							<string>0</string>
-						</dict>
-						<key>Font</key>
-						<string>Helvetica</string>
-						<key>Size</key>
-						<real>12</real>
-					</dict>
-					<key>ID</key>
-					<integer>399</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-						<key>stroke</key>
-						<dict>
-							<key>Color</key>
-							<dict>
-								<key>archive</key>
-								<data>
-								YnBsaXN0MDDU
-								AQIDBAUGCQpY
-								JHZlcnNpb25U
-								JHRvcFkkYXJj
-								aGl2ZXJYJG9i
-								amVjdHMSAAGG
-								oNEHCFRyb290
-								gAFfEA9OU0tl
-								eWVkQXJjaGl2
-								ZXKlCwwVGR5V
-								JG51bGzUDQ4P
-								EBESExRWJGNs
-								YXNzXE5TQ29s
-								b3JTcGFjZV8Q
-								Ek5TQ3VzdG9t
-								Q29sb3JTcGFj
-								ZVdOU1doaXRl
-								gAQQA4ACRDAu
-								NQDSDRYXGFRO
-								U0lEgAMQAtIa
-								GxwOWCRjbGFz
-								c2VzWiRjbGFz
-								c25hbWWiDh1Y
-								TlNPYmplY3TS
-								GhsfIKIgHVdO
-								U0NvbG9yCBEa
-								HykyNzo/QVNZ
-								X2hvfJGZm52f
-								pKmusLK3wMvO
-								19zfAAAAAAAA
-								AQEAAAAAAAAA
-								IQAAAAAAAAAA
-								AAAAAAAAAOc=
-								</data>
-								<key>b</key>
-								<string>0.500023</string>
-								<key>g</key>
-								<string>0.500023</string>
-								<key>r</key>
-								<string>0.500023</string>
-							</dict>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>RTFD</key>
-						<data>
-						BAtzdHJlYW10eXBlZIHoA4QBQISE
-						hBJOU0F0dHJpYnV0ZWRTdHJpbmcA
-						hIQITlNPYmplY3QAhZKEhIQITlNT
-						dHJpbmcBlIQBKxBFeGFtcGxlOgpU
-						ZXN0aW5nhoQCaUkBEJKEhIQMTlNE
-						aWN0aW9uYXJ5AJSEAWkDkoSWlgdO
-						U0NvbG9yhpKEhIQHTlNDb2xvcgCU
-						hAFjA4QCZmaDAAAAPwGGkoSWlgZO
-						U0ZvbnSGkoSEhAZOU0ZvbnQelJkc
-						hAVbMjhjXQYAAAAUAAAA//5IAGUA
-						bAB2AGUAdABpAGMAYQCEAWYMmwCb
-						AZsAmwCGkoSWlhBOU1BhcmFncmFw
-						aFN0eWxlhpKEhIQQTlNQYXJhZ3Jh
-						cGhTdHlsZQCUhARDQ0BTAgCEhIQH
-						TlNBcnJheQCUmQyShISECU5TVGV4
-						dFRhYgCUhAJDZgAchpKEpaQAOIaS
-						hKWkAFSGkoSlpABwhpKEpaQAgYwA
-						hpKEpaQAgagAhpKEpaQAgcQAhpKE
-						paQAgeAAhpKEpaQAgfwAhpKEpaQA
-						gRgBhpKEpaQAgTQBhpKEpaQAgVAB
-						hoYAhoaG
-						</data>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;\red128\green128\blue128;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf2 Example:\
-Testing}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{83.6285, 99.3113}, {32.9412, 6.42865}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>FontInfo</key>
-					<dict>
-						<key>Font</key>
-						<string>Helvetica</string>
-						<key>Size</key>
-						<real>12</real>
-					</dict>
-					<key>ID</key>
-					<integer>400</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-						<key>stroke</key>
-						<dict>
-							<key>Color</key>
-							<dict>
-								<key>archive</key>
-								<data>
-								YnBsaXN0MDDU
-								AQIDBAUGCQpY
-								JHZlcnNpb25U
-								JHRvcFkkYXJj
-								aGl2ZXJYJG9i
-								amVjdHMSAAGG
-								oNEHCFRyb290
-								gAFfEA9OU0tl
-								eWVkQXJjaGl2
-								ZXKlCwwVGR5V
-								JG51bGzUDQ4P
-								EBESExRWJGNs
-								YXNzXE5TQ29s
-								b3JTcGFjZV8Q
-								Ek5TQ3VzdG9t
-								Q29sb3JTcGFj
-								ZVdOU1doaXRl
-								gAQQA4ACRDAu
-								NQDSDRYXGFRO
-								U0lEgAMQAtIa
-								GxwOWCRjbGFz
-								c2VzWiRjbGFz
-								c25hbWWiDh1Y
-								TlNPYmplY3TS
-								GhsfIKIgHVdO
-								U0NvbG9yCBEa
-								HykyNzo/QVNZ
-								X2hvfJGZm52f
-								pKmusLK3wMvO
-								19zfAAAAAAAA
-								AQEAAAAAAAAA
-								IQAAAAAAAAAA
-								AAAAAAAAAOc=
-								</data>
-								<key>b</key>
-								<string>0.500023</string>
-								<key>g</key>
-								<string>0.500023</string>
-								<key>r</key>
-								<string>0.500023</string>
-							</dict>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>398</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>389</integer>
-			</dict>
-			<key>ID</key>
-			<integer>387</integer>
-			<key>Points</key>
-			<array>
-				<string>{277.129, 144.811}</string>
-				<string>{277.129, 275.007}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>Color</key>
-					<dict>
-						<key>archive</key>
-						<data>
-						YnBsaXN0MDDUAQIDBAUGCQpYJHZl
-						cnNpb25UJHRvcFkkYXJjaGl2ZXJY
-						JG9iamVjdHMSAAGGoNEHCFRyb290
-						gAFfEA9OU0tleWVkQXJjaGl2ZXKl
-						CwwVGR5VJG51bGzUDQ4PEBESExRW
-						JGNsYXNzXE5TQ29sb3JTcGFjZV8Q
-						Ek5TQ3VzdG9tQ29sb3JTcGFjZVdO
-						U1doaXRlgAQQA4ACRDAuNQDSDRYX
-						GFROU0lEgAMQAtIaGxwOWCRjbGFz
-						c2VzWiRjbGFzc25hbWWiDh1YTlNP
-						YmplY3TSGhsfIKIgHVdOU0NvbG9y
-						CBEaHykyNzo/QVNZX2hvfJGZm52f
-						pKmusLK3wMvO19zfAAAAAAAAAQEA
-						AAAAAAAAIQAAAAAAAAAAAAAAAAAA
-						AOc=
-						</data>
-						<key>b</key>
-						<string>0.500023</string>
-						<key>g</key>
-						<string>0.500023</string>
-						<key>r</key>
-						<string>0.500023</string>
-					</dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>385</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{221.129, 105.739}, {112, 38.5719}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>FontInfo</key>
-					<dict>
-						<key>Color</key>
-						<dict>
-							<key>w</key>
-							<string>0</string>
-						</dict>
-						<key>Font</key>
-						<string>Helvetica</string>
-						<key>Size</key>
-						<real>12</real>
-					</dict>
-					<key>ID</key>
-					<integer>385</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-						<key>stroke</key>
-						<dict>
-							<key>Color</key>
-							<dict>
-								<key>archive</key>
-								<data>
-								YnBsaXN0MDDU
-								AQIDBAUGCQpY
-								JHZlcnNpb25U
-								JHRvcFkkYXJj
-								aGl2ZXJYJG9i
-								amVjdHMSAAGG
-								oNEHCFRyb290
-								gAFfEA9OU0tl
-								eWVkQXJjaGl2
-								ZXKlCwwVGR5V
-								JG51bGzUDQ4P
-								EBESExRWJGNs
-								YXNzXE5TQ29s
-								b3JTcGFjZV8Q
-								Ek5TQ3VzdG9t
-								Q29sb3JTcGFj
-								ZVdOU1doaXRl
-								gAQQA4ACRDAu
-								NQDSDRYXGFRO
-								U0lEgAMQAtIa
-								GxwOWCRjbGFz
-								c2VzWiRjbGFz
-								c25hbWWiDh1Y
-								TlNPYmplY3TS
-								GhsfIKIgHVdO
-								U0NvbG9yCBEa
-								HykyNzo/QVNZ
-								X2hvfJGZm52f
-								pKmusLK3wMvO
-								19zfAAAAAAAA
-								AQEAAAAAAAAA
-								IQAAAAAAAAAA
-								AAAAAAAAAOc=
-								</data>
-								<key>b</key>
-								<string>0.500023</string>
-								<key>g</key>
-								<string>0.500023</string>
-								<key>r</key>
-								<string>0.500023</string>
-							</dict>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>RTFD</key>
-						<data>
-						BAtzdHJlYW10eXBlZIHoA4QBQISE
-						hBJOU0F0dHJpYnV0ZWRTdHJpbmcA
-						hIQITlNPYmplY3QAhZKEhIQITlNT
-						dHJpbmcBlIQBKw1FeGFtcGxlOgpU
-						ZXh0hoQCaUkBDZKEhIQMTlNEaWN0
-						aW9uYXJ5AJSEAWkDkoSWlgdOU0Nv
-						bG9yhpKEhIQHTlNDb2xvcgCUhAFj
-						A4QCZmaDAAAAPwGGkoSWlgZOU0Zv
-						bnSGkoSEhAZOU0ZvbnQelJkchAVb
-						MjhjXQYAAAAUAAAA//5IAGUAbAB2
-						AGUAdABpAGMAYQCEAWYMmwCbAZsA
-						mwCGkoSWlhBOU1BhcmFncmFwaFN0
-						eWxlhpKEhIQQTlNQYXJhZ3JhcGhT
-						dHlsZQCUhARDQ0BTAgCEhIQHTlNB
-						cnJheQCUmQyShISECU5TVGV4dFRh
-						YgCUhAJDZgAchpKEpaQAOIaShKWk
-						AFSGkoSlpABwhpKEpaQAgYwAhpKE
-						paQAgagAhpKEpaQAgcQAhpKEpaQA
-						geAAhpKEpaQAgfwAhpKEpaQAgRgB
-						hpKEpaQAgTQBhpKEpaQAgVABhoYA
-						hoaG
-						</data>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;\red128\green128\blue128;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf2 Example:\
-Text}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{221.129, 99.3113}, {32.9412, 6.42865}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>FontInfo</key>
-					<dict>
-						<key>Font</key>
-						<string>Helvetica</string>
-						<key>Size</key>
-						<real>12</real>
-					</dict>
-					<key>ID</key>
-					<integer>386</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-						<key>stroke</key>
-						<dict>
-							<key>Color</key>
-							<dict>
-								<key>archive</key>
-								<data>
-								YnBsaXN0MDDU
-								AQIDBAUGCQpY
-								JHZlcnNpb25U
-								JHRvcFkkYXJj
-								aGl2ZXJYJG9i
-								amVjdHMSAAGG
-								oNEHCFRyb290
-								gAFfEA9OU0tl
-								eWVkQXJjaGl2
-								ZXKlCwwVGR5V
-								JG51bGzUDQ4P
-								EBESExRWJGNs
-								YXNzXE5TQ29s
-								b3JTcGFjZV8Q
-								Ek5TQ3VzdG9t
-								Q29sb3JTcGFj
-								ZVdOU1doaXRl
-								gAQQA4ACRDAu
-								NQDSDRYXGFRO
-								U0lEgAMQAtIa
-								GxwOWCRjbGFz
-								c2VzWiRjbGFz
-								c25hbWWiDh1Y
-								TlNPYmplY3TS
-								GhsfIKIgHVdO
-								U0NvbG9yCBEa
-								HykyNzo/QVNZ
-								X2hvfJGZm52f
-								pKmusLK3wMvO
-								19zfAAAAAAAA
-								AQEAAAAAAAAA
-								IQAAAAAAAAAA
-								AAAAAAAAAOc=
-								</data>
-								<key>b</key>
-								<string>0.500023</string>
-								<key>g</key>
-								<string>0.500023</string>
-								<key>r</key>
-								<string>0.500023</string>
-							</dict>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>384</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{83.6285, 330.816}, {112, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>395</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 testing.junit3}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{83.6285, 326.245}, {32.9412, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>396</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>394</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>382</integer>
-			</dict>
-			<key>ID</key>
-			<integer>391</integer>
-			<key>Points</key>
-			<array>
-				<string>{277.129, 303.436}</string>
-				<string>{277.129, 363.132}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>StickArrow</string>
-					<key>Pattern</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>389</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{221.129, 275.507}, {112, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>389</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 ui}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{221.129, 270.936}, {32.9412, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>390</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>388</integer>
-		</dict>
-		<dict>
-			<key>Class</key>
-			<string>Group</string>
-			<key>Graphics</key>
-			<array>
-				<dict>
-					<key>Bounds</key>
-					<string>{{221.129, 363.632}, {112, 27.4286}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>382</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-					<key>Text</key>
-					<dict>
-						<key>Text</key>
-						<string>{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
-
-\f0\fs24 \cf0 core}</string>
-						<key>VerticalPad</key>
-						<integer>0</integer>
-					</dict>
-				</dict>
-				<dict>
-					<key>Bounds</key>
-					<string>{{221.129, 359.061}, {32.9412, 4.57143}}</string>
-					<key>Class</key>
-					<string>ShapedGraphic</string>
-					<key>ID</key>
-					<integer>383</integer>
-					<key>Shape</key>
-					<string>Rectangle</string>
-					<key>Style</key>
-					<dict>
-						<key>shadow</key>
-						<dict>
-							<key>Draws</key>
-							<string>NO</string>
-						</dict>
-					</dict>
-				</dict>
-			</array>
-			<key>ID</key>
-			<integer>381</integer>
-		</dict>
-	</array>
-	<key>GridInfo</key>
-	<dict>
-		<key>ShowsGrid</key>
-		<string>YES</string>
-		<key>SnapsToGrid</key>
-		<string>YES</string>
-	</dict>
-	<key>GuidesLocked</key>
-	<string>NO</string>
-	<key>GuidesVisible</key>
-	<string>YES</string>
-	<key>HPages</key>
-	<integer>1</integer>
-	<key>ImageCounter</key>
-	<integer>1</integer>
-	<key>KeepToScale</key>
-	<false/>
-	<key>Layers</key>
-	<array>
-		<dict>
-			<key>Lock</key>
-			<string>NO</string>
-			<key>Name</key>
-			<string>Layer 1</string>
-			<key>Print</key>
-			<string>YES</string>
-			<key>View</key>
-			<string>YES</string>
-		</dict>
-	</array>
-	<key>LayoutInfo</key>
-	<dict>
-		<key>Animate</key>
-		<string>NO</string>
-		<key>circoMinDist</key>
-		<real>18</real>
-		<key>circoSeparation</key>
-		<real>0.0</real>
-		<key>layoutEngine</key>
-		<string>dot</string>
-		<key>neatoSeparation</key>
-		<real>0.0</real>
-		<key>twopiSeparation</key>
-		<real>0.0</real>
-	</dict>
-	<key>LinksVisible</key>
-	<string>NO</string>
-	<key>MagnetsVisible</key>
-	<string>NO</string>
-	<key>MasterSheets</key>
-	<array/>
-	<key>ModificationDate</key>
-	<string>2010-03-05 15:36:30 -0600</string>
-	<key>Modifier</key>
-	<string>Jeffrey Overbey</string>
-	<key>NotesVisible</key>
-	<string>NO</string>
-	<key>Orientation</key>
-	<integer>2</integer>
-	<key>OriginVisible</key>
-	<string>NO</string>
-	<key>PageBreaks</key>
-	<string>YES</string>
-	<key>PrintInfo</key>
-	<dict>
-		<key>NSBottomMargin</key>
-		<array>
-			<string>float</string>
-			<string>41</string>
-		</array>
-		<key>NSLeftMargin</key>
-		<array>
-			<string>float</string>
-			<string>18</string>
-		</array>
-		<key>NSPaperSize</key>
-		<array>
-			<string>size</string>
-			<string>{612, 792}</string>
-		</array>
-		<key>NSRightMargin</key>
-		<array>
-			<string>float</string>
-			<string>18</string>
-		</array>
-		<key>NSTopMargin</key>
-		<array>
-			<string>float</string>
-			<string>18</string>
-		</array>
-	</dict>
-	<key>PrintOnePage</key>
-	<false/>
-	<key>QuickLookPreview</key>
-	<data>
-	JVBERi0xLjMKJcTl8uXrp/Og0MTGCjUgMCBvYmoKPDwgL0xlbmd0aCA2IDAgUiAvRmls
-	dGVyIC9GbGF0ZURlY29kZSA+PgpzdHJlYW0KeAG1WE1TIzcQvftX6MgeLNT6GinHEFJF
-	KocseCuHrRxcZiCmjAFjJ/vz83o0o/nw2BhXBYodM6tudbdeP73mTXwVb0Lh25IV1imx
-	KcWfYi0ur95JLN4FVd/vCzFV0qnqS7SfWqPJg7j8o9wsytftbr4SmyXcGuUq14USzkkb
-	LXlhiiAWz+Ly5pnELy/V7sGnAAqhCytJhyCMj9IqbSZpqU5LL2/L1Xy7/Ke8elm9bJbP
-	5XazXPBWWhPbRRG8NL6wwmiJ3SgKK11B+IS0ECGJ3/DzlJK7uqu2VeLuCrFS9cuUH1wF
-	7JudGhel8qT3vU5QrDvkUC8NwgUZTdRWEJbrQlodXOSSPhzbgvM10hute3aNdxyF5qNQ
-	AsfQiVQXRapWoaV3xhmO+ueZwNZ8oFM8p0TSF4SK2skMVf+VpEKqswdxsXjZlF/E7Elc
-	z5DB3nHn7AlnYjmlvZpyfEfziiiBQkH8SOm4KL3SkS1QZbtfgqNbBGzhAMyib9d475Zu
-	MlY68koWRXAjpbPS+xhxJlYMSrdbfpk0hfuO/7biL9T7vns2LYqaQzLKSGtcEEBWfueM
-	1Dj2yaqqhQI8FeD5/RR3nirTA+50UHUn1Vv01jW2K4TSdFyzLoVS42GS2z8AoDpYD4RG
-	ScFkPABabY8BD02PdapdFYNbOTsx2kttXcZF3wnjol7qRCRZOKfdXmuM4yLbGaNkIEBv
-	2Irs/RAuyMQqTUEKhOXjGC4MKhGCRchDXGzL9+1y/Sifduvl1rQYOdxcxlqpvaK2uTxz
-	hneJM6owmaca6p18xFUxSoOEwSgNA3Yc9voN5Mx5xKo+JvAZxg87OlSFKUBxXbO9bsvh
-	HiAso62MhY0jXaedVKRA4VPTL+/k4vrH/Pl1Vf7UslYHY21PHfYNMlTKRGCahmw4O9sp
-	4oVPxY0xdFr+2LZuTyYKAiYCwVuHKLR3ElXR4vNEoQtTmR5wl4kib9HdtrbFtpkomnU1
-	Z+1hu+3xAbaD6EDxRJ4Ywrnno0cTn4NzZgnu83PhnMnif4DzKb5BxKlV9pE3DueTnJqD
-	ThO7nY7ovF0H0fmd0UpCD34C0R3TUJkC0Z132R1ZyCFcVaDA+l1vXbIFosn4/roa0c0F
-	1m3YCuUfCUYKlq+qKHDLSxuM5pYjLXX1DiJNsZo4vYNxvlazYgZRW+UOeNNkpOMbI2lm
-	XMy8a9+U+5egxDQ0osGNXwQaJNth0ixdPLKoNLt2oGtIIZBAFFCqPAXohvTfoBGS3MSj
-	ls7Z0lCAWAjJEpIEXqBFa+nXUAfuadyBoVCT/Ak3Xv2ONS9q6JRj3sathr1xZ3FokYNJ
-	F+UwfBYb2aoOH+aNFe5GjqQTSFdgs0LmnDBU4DgxnRByxuwT2etAX/t9FfDtpm2RvRTb
-	xDrJ5hSxl4OscwrCowm2rlqtCIaJ8g2aEoWtoULiVsXdXCfaVPzAJDFIlJLWUtAE+4kC
-	ZUrZsUHianSQaA9w7BMyzhihyFcoDpXRVUdOh5VIttPoX4AgYauxGzvSnvBXBc4eU4ZW
-	UF4o9FiqCsRQQKnXAg+Yq2em3+frx938sZzerO/L1xL/rLfiZv2wmb9vN7vFdoeRKk8G
-	R86+RQHDO2cEdDuFcnQqEcIJlTARY2esuyxVou0yBxJMXWxIBsw6gAnvkLo4edfi39Hh
-	JdsSVDhpsFeyPb3K1knDe9aAsjVVQN7BnYzgYIHxLSm9ps6Ti9vy9W/UtNyI6/Xjcl3i
-	cT/9xr/f7tZbDP5th401RA5boxht2OSbPugY6QYQljiQFCfEfUVpeE7JGmkcQfmCBFKg
-	aAWQHg/ROdDRgLgf058zIggUf86o3WOYrtzjOcU0gQHZGAEFnvSjzXAbT/MUr6gtfIIg
-	R7yuz441yhiANT/m9fFcr4jUYwIadbo81+mxSM/O/1hRO0f19T/cRxc4CmVuZHN0cmVh
-	bQplbmRvYmoKNiAwIG9iagoxNDQzCmVuZG9iagozIDAgb2JqCjw8IC9UeXBlIC9QYWdl
-	IC9QYXJlbnQgNCAwIFIgL1Jlc291cmNlcyA3IDAgUiAvQ29udGVudHMgNSAwIFIgL01l
-	ZGlhQm94IFswIDAgNDE0IDQ1MF0KPj4KZW5kb2JqCjcgMCBvYmoKPDwgL1Byb2NTZXQg
-	WyAvUERGIC9UZXh0IC9JbWFnZUIgL0ltYWdlQyAvSW1hZ2VJIF0gL0NvbG9yU3BhY2Ug
-	PDwgL0NzMSA4IDAgUgovQ3MyIDEzIDAgUiA+PiAvRm9udCA8PCAvRjMuMCAxNiAwIFIg
-	L0YyLjAgMTUgMCBSIC9GNC4wIDE3IDAgUiAvRjEuMCAxNCAwIFIKPj4gL1hPYmplY3Qg
-	PDwgL0ltMSA5IDAgUiAvSW0yIDExIDAgUiA+PiA+PgplbmRvYmoKOSAwIG9iago8PCAv
-	TGVuZ3RoIDEwIDAgUiAvVHlwZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRo
-	IDYxMCAvSGVpZ2h0IDE0MCAvQ29sb3JTcGFjZQoxOCAwIFIgL1NNYXNrIDE5IDAgUiAv
-	Qml0c1BlckNvbXBvbmVudCA4IC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4
-	Ae3QAQ0AAADCoPdP7ewBESgMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBg
-	wIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYM
-	GDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIABAwYMGDBgwIAB
-	AwYMGDBgwIABAwY+MOj1AAEKZW5kc3RyZWFtCmVuZG9iagoxMCAwIG9iagoxMTQwCmVu
-	ZG9iagoxMSAwIG9iago8PCAvTGVuZ3RoIDEyIDAgUiAvVHlwZSAvWE9iamVjdCAvU3Vi
-	dHlwZSAvSW1hZ2UgL1dpZHRoIDE3MiAvSGVpZ2h0IDk0IC9Db2xvclNwYWNlCjIxIDAg
-	UiAvU01hc2sgMjIgMCBSIC9CaXRzUGVyQ29tcG9uZW50IDggL0ZpbHRlciAvRmxhdGVE
-	ZWNvZGUgPj4Kc3RyZWFtCngB7dCBAAAAAMOg+VMf5IVQYcCAAQMGDBgwYMCAAQMGDBgw
-	YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMG
-	DBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCA
-	AQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgw
-	YMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMCAAQMGDBgwYMDA+8AAvXgAAQplbmRz
-	dHJlYW0KZW5kb2JqCjEyIDAgb2JqCjIzNAplbmRvYmoKMjIgMCBvYmoKPDwgL0xlbmd0
-	aCAyMyAwIFIgL1R5cGUgL1hPYmplY3QgL1N1YnR5cGUgL0ltYWdlIC9XaWR0aCAxNzIg
-	L0hlaWdodCA5NCAvQ29sb3JTcGFjZQovRGV2aWNlR3JheSAvQml0c1BlckNvbXBvbmVu
-	dCA4IC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Ae2ZiVJbSxJEjTGLAQmh
-	HdAuwAbEIrHZ/v8Pm5NZ3VpA8Jh5TAwvRhWB0HJvdVZ2VnV33S9fVrZiYMXAioEVAysG
-	VgysGFgxsGJgxcCKgRUD/1gG1v4ZyNdm9rkBG+fXML3/xGhBl4D632dGm6GuY1NuPye1
-	mdT19W/fMtpPqoMEVUi/bUzRfkqwAVVIN2xCm1T7yWSwgHQTE94M979YDpS+y20JQelC
-	MQinQri5tbW9vb21ADe7W+LgP/sqHEYCv/Kax5xDmK5Mk2+g3zHBDbywO/PmGwXvmad/
-	qxRz79Sjk1iFR6aUzja9Yv6NfwxGN8Xo951dbGdHcBNeZ5qum7/v2XsAvIviDFTulMUo
-	zf80pfMWY2q205Wz6zZj6gV0r4DtBV4RnOQgR1nBGWc44tVfvAetKU0ocajUCNtaML6L
-	8Rbj0KXic/u7ge4Vi8X9/f1iEbwCvCuC7Sfu5+a5QOUQyzH8FdpAGqUmsaORbVJeWHxO
-	EnQ8Hj9dx8R75vcKAC0dYKUScGVieAcfyYHDDYB6VaCY4JrcN8F6+p3AMYliJ5tY2Qty
-	9DYoMkcxsKPQxfqNCwFaBGi5gpUDsCFbEHP3C91CpCET5+AbYBOpGxvOimCHUcM09pxZ
-	hKIIC3waH5DI05fti9JypVqt1apV4bUdHCSGE8VpKrIfxQrrW3D7NlhBFambKX0Z1mqz
-	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
-	zx3MPi/yEN+DIs/12/8z3Jk7olww/WLqjday1bomc/Fh+qVSJYmlp+tjxqae9NUrpqHe
-	Rrj46wK0l3emLLQUlGZ+DKYChan46OmU0zmS5KUDj6avFwfyp0UkH/BpAa2ybGY7z5B+
-	wGh/14UKXKpwlJ0olXpVpZvj9O8O8zH3B7Wx1E3LJYVTpeeddedjgLzHS6RL1DdXyecV
-	8hWdvsf3h19DKoQQ5mokBfP9FfLDEb3hMIFVNY7qrmLpUsQvb9z3v/kpozXA6csnBBr0
-	PIPLx89H6dxECt/U5r5fvV0xsGJgxcD/MwP/AuA/ryUKZW5kc3RyZWFtCmVuZG9iagoy
-	MyAwIG9iagozMzYzCmVuZG9iagoxOSAwIG9iago8PCAvTGVuZ3RoIDIwIDAgUiAvVHlw
-	ZSAvWE9iamVjdCAvU3VidHlwZSAvSW1hZ2UgL1dpZHRoIDYxMCAvSGVpZ2h0IDE0MCAv
-	Q29sb3JTcGFjZQovRGV2aWNlR3JheSAvQml0c1BlckNvbXBvbmVudCA4IC9GaWx0ZXIg
-	L0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Ae2dB3cUSdK1d8cweA/CyCAkgZBB3nvvvRdI
-	CCe8h2Hczqz5499zI7K6q4VMN/vOd87sqTxnhpZU1ZUZeTPMjcisv/0taYkEEgkkEkgk
-	kEggkUAigUQCiQQSCSQSSCSQSCCRQCKBRAKJBBIJJBJIJJBIIJFAIoFEAokEEgkkEkgk
-	kEggkUAigUQCiQQSCSQSSCSQSCCRQCKBRAKJBBIJJBJIJJBIIJFAIoFEAokEEgkkEkgk
-	kEggkUAigUQCiQQSCSQSSCSQSCCRQCKBRAKJBBIJJBJIJJBIIJFAIoFEAokEEgn8j0jg
-	77Rvsmq68u//I6NOhvH/RQIpbH377bffWft+l+Z/+Y5rvjUgJjD7/zI5/wMPcdUFtISq
-	Q4cO/aB2+Itmv/7hBy7Qdd99ZzBLdNn/AAD+5CEYvgxehwSrI0eOHj16bM/GH48c4TKA
-	BspMmSUg+5Nn6C/+9QLYt2gv4HUEZB0/fuIk7dQeTX87ceL4sWNHgdkPBjIMZuKT/cVB
-	8Gd2PwBM+DoGuE6dPnPm7Nlz5/ds586dPXPmzGlwdvzY0cOHA8YSNfZnztFf+7ulwb7/
-	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
-	k7SjS25KuMUGG0NrvF87Ppt0Mx6Z+cOuHYg6kvlv9NzUF+x1724X+jj5S+j83l8SXSFM
-	RC11dfwDF2Z2MPbTzqfE7+OzSXaHpOI/mtTC/KYeEjp20L32PTGxc1u4M94JfhXrLh+j
-	a6Ihu0b44rLMm3b5iTvibZcrwq+4Kt4hd1TSl+tLYn9PdSv+If13e2R0s/0Q/S/6Zbb/
-	Rvfp333v2e/C/f7mX6or0t3Xp/g99nnfp9sfd96S/ur4d8clxufYU3X/zqfwq9gVO+71
-	H9N/3/EF+jFqO7833bc9b9/9lj/9t1GP9/73T+/CX/YBe8vsC2DtHOM+t4Y/7bwj+TmR
-	QCKBRAKJBBIJJBJIJJBIIJFAIoFEAokEEgkkEkgkkEggkUAigUQCiQQSCSQSSCSQSCCR
-	QCKBRAKJBBIJJBJIJJBIIJFAIoFEAokEEgkkEkgkkEggkUAigUQCiQQSCSQSSCSQSCCR
-	QCKBRAKJBBIJJBJIJJBIIJFAIoFEAokEEgkkEkgkkEggkUAigUQC/9sS+H8SYUBOCmVu
-	ZHN0cmVhbQplbmRvYmoKMjAgMCBvYmoKMTgxODEKZW5kb2JqCjI0IDAgb2JqCjw8IC9M
-	ZW5ndGggMjUgMCBSIC9OIDMgL0FsdGVybmF0ZSAvRGV2aWNlUkdCIC9GaWx0ZXIgL0Zs
-	YXRlRGVjb2RlID4+CnN0cmVhbQp4AYWUTUgUYRjH/7ONBLEG0ZcIxdDBJFQmC1IC0/Ur
-	U7Zl1UwJYp19d50cZ6eZ3S1FIoTomHWMLlZEh4hO4aFDpzpEBJl1iaCjRRAFXiK2/zuT
-	u2NUvjAzv3me//t8vcMAVY9SjmNFNGDKzrvJ3ph2enRM2/waVahGFFwpw3M6EokBn6mV
-	z/Vr9S0UaVlqlLHW+zZ8q3aZEFA0KndkAz4seTzg45Iv5J08NWckGxOpNNkhN7hDyU7y
-	LfLWbIjHQ5wWngFUtVOTMxyXcSI7yC1FIytjPiDrdtq0ye+lPe0ZU9Sw38g3OQvauPL9
-	QNseYNOLim3MAx7cA3bXVWz1NcDOEWDxUMX2PenPR9n1ysscavbDKdEYa/pQKn2vAzbf
-	AH5eL5V+3C6Vft5hDtbx1DIKbtHXsjDlJRDUG+xm/OQa/YuDnnxVC7DAOY5sAfqvADc/
-	AvsfAtsfA4lqYKgVkctsN7jy4iLnAnTmnGnXzE7ktWZdP6J18GiF1mcbTQ1ayrI03+Vp
-	rvCEWxTpJkxZBc7ZX9t4jwp7eJBP9he5JLzu36zMpVNdnCWa2NantOjqJjeQ72fMnj5y
-	Pa/3GbdnOGDlgJnvGwo4csq24jwXqYnU2OPxk2TGV1QnH5PzkDznFQdlTN9+LnUiQa6l
-	PTmZ65eaXdzbPjMxxDOSrFgzE53x3/zGLSRl3n3U3HUs/5tnbZFnGIUFARM27zY0JNGL
-	GBrhwEUOGXpMKkxapV/QasLD5F+VFhLlXRYVvVjhnhV/z3kUuFvGP4VYHHMN5Qia/k7/
-	oi/rC/pd/fN8baG+4plzz5rGq2tfGVdmltXIuEGNMr6sKYhvsNoOei1kaZ3iFfTklfWN
-	4eoy9nxt2aPJHOJqfDXUpQhlasQ448muZfdFssU34edby/av6VH7fPZJTSXXsrp4Zin6
-	fDZcDWv/s6tg0rKr8OSNkC48a6HuVQ+qfWqL2gpNPaa2q21qF9+OqgPlHcOclYkLrNtl
-	9Sn2YGOa3spJV2aL4N/CL4b/pV5hC9c0NPkPTbi5jGkJ3xHcNnCHlP/DX7MDDd4KZW5k
-	c3RyZWFtCmVuZG9iagoyNSAwIG9iago3OTIKZW5kb2JqCjggMCBvYmoKWyAvSUNDQmFz
-	ZWQgMjQgMCBSIF0KZW5kb2JqCjI2IDAgb2JqCjw8IC9MZW5ndGggMjcgMCBSIC9OIDEg
-	L0FsdGVybmF0ZSAvRGV2aWNlR3JheSAvRmlsdGVyIC9GbGF0ZURlY29kZSA+PgpzdHJl
-	YW0KeAGFUk9IFFEc/s02EoSIQYV4iHcKCZUprKyg2nZ1WZVtW5XSohhn37qjszPTm9k1
-	xZMEXaI8dQ+iY3Ts0KGbl6LArEvXIKkgCDx16PvN7OoohG95O9/7/f1+33tEbZ2m7zsp
-	QVRzQ5UrpaduTk2Lgx8pRR3UTlimFfjpYnGMseu5kr+719Zn0tiy3se1dvv2PbWVZWAh
-	6i22txD6IZFmAB+ZnyhlgLPAHZav2D4BPFgOrBrwI6IDD5q5MNPRnHSlsi2RU+aiKCqv
-	YjtJrvv5uca+i7WJg/5cj2bWjr2z6qrRTNS090ShvA+uRBnPX1T2bDUUpw3jnEhDGiny
-	rtXfK0zHEZErEEoGUjVkuZ9qTp114HUYu126k+P49hClPslgqIm16bKZHYV9AHYqy+wQ
-	8AXo8bJiD+eBe2H/W1HDk8AnYT9kh3nWrR/2F65T4HuEPTXgzhSuxfHaih9eLQFD91Qj
-	aIxzTcTT1zlzpIjvMdQZmPdGOaYLMXeWqhM3gDthH1mqZgqxXfuu6iXuewJ30+M70Zs5
-	C1ygHElysRXZFNA8CVgUfYuwSQ48Ps4eVeB3qJjAHLmJ3M0o9x7VERtno1KBVnqNV8ZP
-	47nxxfhlbBjPgH6sdtd7fP/p4xV117Y+PPmNetw5rr2dG1VhVnFlC93/xzKEj9knOabB
-	06FZWGvYduQPmsxMsAwoxH8FPpf6khNV3NXu7bhFEsxQPixsJbpLVG4p1Oo9g0qsHCvY
-	AHZwksQsWhy4U2u6OXh32CJ6bflNV7Lrhv769nr72vIebcqoKSgTzbNEZpSxW6Pk3Xjb
-	/WaREZ84Or7nvYpayf5JRRA/hTlaKvIUVfRWUNbEb2cOfhu2flw/pef1Qf08CT2tn9Gv
-	6KMRvgx0Sc/Cc1Efo0nwsGkh4hKgioMz1E5UY40D4inx8rRbZJH9D0AZ/WYKZW5kc3Ry
-	ZWFtCmVuZG9iagoyNyAwIG9iago3MDQKZW5kb2JqCjEzIDAgb2JqClsgL0lDQ0Jhc2Vk
-	IDI2IDAgUiBdCmVuZG9iagoyOCAwIG9iago8PCAvTGVuZ3RoIDI5IDAgUiAvTiAzIC9B
-	bHRlcm5hdGUgL0RldmljZVJHQiAvRmlsdGVyIC9GbGF0ZURlY29kZSA+PgpzdHJlYW0K
-	eAGtkz9oE1Ecx79JLA1qo1bpYocbpFiI8lpR3ExtVKpVzhip7eTlcklOkstxd2kNOBQn
-	cbcVWlxaRKXgZq1TRag6CIJgS3HUTXQIZJFyft8dIV2Ciw9+9z7ve9/f7937c0BsRbPt
-	chRAxfKczKXzyq3JKaV7GzHsQQ+Ool/TXXtEVcdp6dCaXxGRr76ckLWez6/v/f3y1Y+3
-	gx/71V8bjzokteSEwwmBSJLCkWLIKcm5kLOSZzzbo6ckWS9pefI9ctLJZkbJz8iJYsiv
-	JedC/iB5Wi/K3C2ysPKmBUTj5LN5w9XJKXIu7+oV8jL5TaVSZf3YbfJx3XaYG3tAPib3
-	hT3bjADOpemfb2uTh4CVJtC30NYG5oDD34C1RltrbAV7FemLu4VTw0G5yL5VoGvO9xsT
-	QPcgsLPp+39WfX/nKefeBtabes2ZDrxcSOQT8K9xuOawOvD5fos6cbgvgYtrW0oBE7PA
-	FQqLjAF+X+8CoFLPphA9/a4V4R7SAsTTpmuXtXow+J+PSrnGcwpaF5/7DevmDfYJxnjB
-	uZhhz2/G1B3tssq+l/HQ9MbkvZGeRcO9IP0HGS+QhgkXNsrQUMdVVGFR8WCgBgcK8iSF
-	4zo9kky+1wOXhdq1nkJCWOK9WBJrYlP8FMu7KlSZr7KqxWyN9eUMCO8SZ8aZxzxLXM8+
-	+b4xdGBWKrubZ9zlPQNGq3bdMYslTxnhn2QklTFLP5lUhsWQwF/FaKjWCmVuZHN0cmVh
-	bQplbmRvYmoKMjkgMCBvYmoKNTUyCmVuZG9iagoxOCAwIG9iagpbIC9JQ0NCYXNlZCAy
-	OCAwIFIgXQplbmRvYmoKMzAgMCBvYmoKPDwgL0xlbmd0aCAzMSAwIFIgL04gMyAvQWx0
-	ZXJuYXRlIC9EZXZpY2VSR0IgL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngB
-	rZM/aBNRHMe/SSwNaqNW6WKHG6RYiPJaUdxMbVSqVc4Yqe3k5XJJTpLLcXdpDTgUJ3G3
-	FVpcWkSl4GatU0WoOgiCYEtx1E10CGSRcn7fHSFdgosPfvc+73vf3+/d+3NAbEWz7XIU
-	QMXynMyl88qtySmlexsx7EEPjqJf0117RFXHaenQml8Rka++nJC1ns+v7/398tWPt4Mf
-	+9VfG486JLXkhMMJgUiSwpFiyCnJuZCzkmc826OnJFkvaXnyPXLSyWZGyc/IiWLIryXn
-	Qv4geVovytwtsrDypgVE4+SzecPVySlyLu/qFfIy+U2lUmX92G3ycd12mBt7QD4m94U9
-	24wAzqXpn29rk4eAlSbQt9DWBuaAw9+AtUZba2wFexXpi7uFU8NBuci+VaBrzvcbE0D3
-	ILCz6ft/Vn1/5ynn3gbWm3rNmQ68XEjkE/CvcbjmsDrw+X6LOnG4L4GLa1tKAROzwBUK
-	i4wBfl/vAqBSz6YQPf2uFeEe0gLE06Zrl7V6MPifj0q5xnMKWhef+w3r5g32CcZ4wbmY
-	Yc9vxtQd7bLKvpfx0PTG5L2RnkXDvSD9BxkvkIYJFzbK0FDHVVRhUfFgoAYHCvIkheM6
-	PZJMvtcDl4XatZ5CQljivVgSa2JT/BTLuypUma+yqsVsjfXlDAjvEmfGmcc8S1zPPvm+
-	MXRgViq7m2fc5T0DRqt23TGLJU8Z4Z9kJJUxSz+ZVIbFkMBfxWio1gplbmRzdHJlYW0K
-	ZW5kb2JqCjMxIDAgb2JqCjU1MgplbmRvYmoKMjEgMCBvYmoKWyAvSUNDQmFzZWQgMzAg
-	MCBSIF0KZW5kb2JqCjQgMCBvYmoKPDwgL1R5cGUgL1BhZ2VzIC9NZWRpYUJveCBbMCAw
-	IDYxMiA3OTJdIC9Db3VudCAxIC9LaWRzIFsgMyAwIFIgXSA+PgplbmRvYmoKMzIgMCBv
-	YmoKPDwgL1R5cGUgL0NhdGFsb2cgL091dGxpbmVzIDIgMCBSIC9QYWdlcyA0IDAgUiAv
-	VmVyc2lvbiAvMS40ID4+CmVuZG9iagoyIDAgb2JqCjw8IC9MYXN0IDMzIDAgUiAvRmly
-	c3QgMzQgMCBSID4+CmVuZG9iagozNCAwIG9iago8PCAvQ291bnQgMCAvRGVzdCBbIDMg
-	MCBSIC9YWVogMCA0NTAgMCBdIC9UaXRsZSAoQ2FudmFzIDEpID4+CmVuZG9iagozMyAw
-	IG9iago8PCAvQ291bnQgMCAvRGVzdCBbIDMgMCBSIC9YWVogMCA0NTAgMCBdIC9UaXRs
-	ZSAoQ2FudmFzIDEpID4+CmVuZG9iagozNSAwIG9iago8PCAvTGVuZ3RoIDM2IDAgUiAv
-	TGVuZ3RoMSAyNjMyIC9GaWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4AYVWbWxb
-	Vxl+z73X324S2/GSze10by5J58SN03w0pXHru8ROGrJ2WboN36516zlpnFE3UXFLJ6gW
-	plDAiFGxiSI0tGwaC2JFc0oFTqqiQjTGRIUqPiTYh/jBNgqFSpvGfiSNw3PsGydFRVz7
-	3HOe95z7nuf9OvcSIyInTZJIWjKdmKAOugzJVbT9yZMZ+dyfvvFZInYf8PSRidH04R++
-	YgX+Ndro6NEnj+xfWOwnEluITJnUSGL4w++e+x6R9WWs35aCQPiNaRr4HeBPpdKZU9WH
-	hPNENkCSj44nE+ZJ6RNgGdidTpyaEFqEKeB2Pn8skR6pVJswtj0M3Dgx/vkMvcsagSeB
-	WyeOj0w0fPL914AvAj+LxvDjl5PMtBf9ENUZkqL4DjfBkInFXvqvFSZgM1mIFldmmCQc
-	hNLf7b989/abv//SwAevPv/t9B8unvjbI88tdZ183nohG1bPv33oqdet9VOf2V348PGe
-	ns5/LLyw1738k4ue+h1f/+fXrh05LR381sdd43/deObsloa35/viM8+8d3Pqy1u3vzw9
-	1LdU+ONRf3p3/eLrbx1I3Xj/+Jnajb+4dexZW/QFgUJE1RShGCVwT9EpznPlOzB4hkgA
-	a41R4GRUzon1UTWRqlVThyNb8mQPDOTJNhibZewZPc9WvpKnyKY5uF88FMe0IyDL0bFI
-	jh0GcAYgaFQw2hCQe6Godyim6nJWzvYPZ+VeOZUYzkn1xR4TI1k9KOdoX2wM94djSk7T
-	feXhiK7vgJ4KrgePYHlWh4YnDA3oi6LgMhZVBgbAumEw9lAsNxnx5bSI7lMUOZq7MhjL
-	XYn4FF3HqqoyUzA+PVZrcHaBc1Uj5t0lLfugAyr0bJbrBBIalNyVbNaXhSVFiarkGRmC
-	PBXXwGV5pg3G+JSmKr6iDxVVAQ+dO9ETGNgXi4KJom+BsykMr/9UuIWKsdCjmsysVs0m
-	WCSRkdkkioJJkshilpjAkFKMek8GO2spHAqGqpb5nwVDywDLIdrawvpTc4ijtT+VyGlD
-	se2uzjmyrlzZrre5FFd9m0sNsy8U3lhcFG4tS2HhKeyN2hCuI94b6G46i/g2XcKwDzoq
-	mhC3qkskAd1VRFLVPKFUSXK5P83n4OpreZLQ+96hPN0fjeWJBX1z4Lh3l24IiAuIdpcF
-	Ni6wccElclEPNPKdXNBiRXNAI6uaowrqudWyFaxbN7HqJlajbla9TPEqrZ3bdrL2zQ1T
-	bD6Tidw8f+04qyh8xCo2OiorHYI0/OTwwsICe/Ws2XbPrntsZuwMG+/F7YvIa4Hs9KC2
-	iTkcmtMswLsiXCzZrCaJ2S0AxETDuTUh7l/u2+XmZmo2HCuSY71jHdyxnW2bmafNo25W
-	LB/8Mln481JyJdNRuN7xo1zhFTZT0A8e5BwYxcHBDw4OGtUamdOpbbA7+KYCthd5qO02
-	CeGWrIg7DzVzrI91mAeaEzLiXRNqLl5rIXeuZ+Y0Qu5VvG1eFfc4+1XhpatXWZLNDBzo
-	Tz24xmm8yOlxg5PZYUfCgQ2YFYmBjN1mNkHEHFbL+vyDi2oMH9WUErBmXQbeiU6bV+lA
-	CnaATop1j44Wfs5mXnyxoF+4gMhw/+wCFwu5KV3KQzf1GtnhRh5WAJmKuVKBPHGjMeQK
-	H1eXs8/IrQfKyWblyWYtJZtI3VRVVCDiIRuSjKgbScZUb1srkooh2e5CtqmKl71240aw
-	MMlOtweThb+z+ERdoK7wEptpCMSHfsB9V+L7BPhuIO9a3fRiarVuTODrKSKTUTem2+rG
-	BBI1ZeZG3awx/z910/0/64abdHvdeAwD4+x0MrnjzedmEzdgHpsZGn5oenqaxU/Uba0D
-	cUb7YFgPbFLoq6UICLChpmiDgAjIZYtkcPeg0TW0YJ44NmNsNsZq2S4fD4CP1uyyc4F9
-	NSI9hot4RHxGRLA1RjgaeGx4yfOgmFWlrmEn60QKFQft27oYn7Cw9wvvMo/W3KwV/qUF
-	D7DOws1wS0t4aWerzh7T/V07uvz+LqerNeHvCnb5G7bZPTx+/J2O9vSbpvcOVYb+TVXi
-	dS5+42f+v5R7fmpcx6nMcC6vvtPxjCivVBNZ/Et7VvZLjxU18UdWLyv7mMJiHU0JZ+he
-	4TDFhd+iZdCyaOe4j2kX5egjFmJPs7eEiDAPCedjpQewTwRJLmCs4e2MAZvFAcxnGeqC
-	9/zroZZosH9PtFtv6k4c+1zfeCY1ltyyZ2R47EQa8wbXlR8jXHe6+BHegX120wDYPEKP
-	El1CaZjxiWNvarpMURzK7aQi8G6gXvLji6cWlcNR322o+7aVPdRK9+G50soI0Opz89hL
-	IheO+ftL71rNIuCEA49v8k+IaCpS+s+KIgazkoQ7/Qe9l1YkCmVuZHN0cmVhbQplbmRv
-	YmoKMzYgMCBvYmoKMTc3NwplbmRvYmoKMzcgMCBvYmoKPDwgL1R5cGUgL0ZvbnREZXNj
-	cmlwdG9yIC9Bc2NlbnQgODAwIC9DYXBIZWlnaHQgNzExIC9EZXNjZW50IC0yMzYgL0Zs
-	YWdzIDMyCi9Gb250QkJveCBbMzAgMCA3NDQgNzY0XSAvRm9udE5hbWUgL1BJTUVCWStC
-	YW5rR290aGljLU1lZGl1bSAvSXRhbGljQW5nbGUKMCAvU3RlbVYgMCAvTWF4V2lkdGgg
-	MTgzMyAvWEhlaWdodCA1MzMgL0ZvbnRGaWxlMiAzNSAwIFIgPj4KZW5kb2JqCjM4IDAg
-	b2JqClsgODAyIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCA2NDYgMCAwIDAgNjA4
-	IDAgMCA3MTggMCAwIDAgMCAwIDAgMCA2MjgKMCA2NTAgNjYzIF0KZW5kb2JqCjE2IDAg
-	b2JqCjw8IC9UeXBlIC9Gb250IC9TdWJ0eXBlIC9UcnVlVHlwZSAvQmFzZUZvbnQgL1BJ
-	TUVCWStCYW5rR290aGljLU1lZGl1bSAvRm9udERlc2NyaXB0b3IKMzcgMCBSIC9XaWR0
-	aHMgMzggMCBSIC9GaXJzdENoYXIgODIgL0xhc3RDaGFyIDExNSAvRW5jb2RpbmcgL01h
-	Y1JvbWFuRW5jb2RpbmcKPj4KZW5kb2JqCjM5IDAgb2JqCjw8IC9MZW5ndGggNDAgMCBS
-	IC9MZW5ndGgxIDkxNjQgL0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngBvVkL
-	dJTVtd7nf80jr5kk80wmM5OZZJLJTN7JZJKQ/AmTF8lASEJIMIGEEAwUMCiiiFAQFAhY
-	UKsg0ksteGux2iEoDlK4XEqXWuVefF2totQWEaUpLY1SCzNz9/kTUnC5vKx1XebPmX3e
-	5zvf3ucNBACiYQ2wIPYt7h2EM2Q2xryO7njf8mWWW6syRQCyDYB9YP7grYtP9X+6F4DX
-	AygTbl20Yn71tgMDAHEudM0D/b3zvvDt+hAg5V4sXzyAEYoHZCYMP49h+8DiZXf3bZWH
-	MfwehrsW3dbXm+5yYn3mQgznLu69e1C+UnkVw/MwbFnSu7j/hXeTX8Twegw7Bm+7YxmT
-	x9Zi+JcYbh68vX8w1LJpPoaxDPvfGEfwo3/RIMBBlBZoH4+Ror/2w3wt/H8F2fEMnCT5
-	67ILkl92Xcz1XjkGFKCEKMQVA7EQN56oAjX64tElQCJoQIvMHgM1fxzc/HYwcdWA3EXe
-	R/cBleHWyEX+FCgjocgIi4yRVOrOXCGJ8CuQwYuwGjh4E/YRBdhghOTD74mJOOE9CMMH
-	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
-	VZCkDZv9tNhBc5PjpLmRNj1sFscaKh6rvcguIc4fa9ZlP2zOGGshleYWE8wWe5PZhPW7
-	fvqY2WWfba5yBsnTL9ZnOO31jseKg2RUaoMKBErFkjHR5zhCfo76zCSz8Jrl8QP1mYiZ
-	bBs2r0Ox80B9hictyJ4X480HHPWO9eiK0aWhmxEkbaJLtl02TzZDViDLkmXK0mVWWYos
-	SZYoj5er5LHyaLlSLpcLck7OyEGeGIz8QcyiIy1RUFEhcPSXk/wqtEMiGSOaLl78MGhc
-	QQHu1y6v1FfGV6i9tb5v+OmRInt8Wf/6wwlw4k9PTIHH8NEjsM/UGcinnoipcyL1/+fp
-	r8byjS0rDrSsuNAuvZvZavp78PkssHk5Pm+umWux7L+wgibQF5yeuX0DVPb2B1bY+n2B
-	CzafZX+LVO5rye00ucXm2w/tNW0d+9vFft9wi9hC38U6DzTX1OO0jo1ca2vTRFv1Nd/Q
-	Vg2trJ621SyV+1pbU2lyM21rKm1rKm2rWWyW2srKqlnQWg3/C1CnSRgKZW5kc3RyZWFt
-	CmVuZG9iago0MCAwIG9iago2MDEzCmVuZG9iago0MSAwIG9iago8PCAvVHlwZSAvRm9u
-	dERlc2NyaXB0b3IgL0FzY2VudCA3NzAgL0NhcEhlaWdodCA2ODQgL0Rlc2NlbnQgLTIz
-	MCAvRmxhZ3MgMzIKL0ZvbnRCQm94IFsxMCAtMjE4IDgyNiA3MzRdIC9Gb250TmFtZSAv
-	WkhBQ1dBK0hlbHZldGljYS1Cb2xkIC9JdGFsaWNBbmdsZQowIC9TdGVtViAwIC9NYXhX
-	aWR0aCAxNTAwIC9YSGVpZ2h0IDUxMyAvRm9udEZpbGUyIDM5IDAgUiA+PgplbmRvYmoK
-	NDIgMCBvYmoKWyAyNzggMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMzMzIDAgMCAwIDAg
-	MCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMAowIDAgMCA2NjcgMCAwIDAgMjc4
-	IDAgMCA2MTEgMCAwIDAgMCAwIDcyMiAwIDAgNzIyIDAgMCAwIDAgMCAwIDAgMCAwIDAg
-	MCA1NTYKMCA1NTYgNjExIDU1NiAzMzMgNjExIDYxMSAyNzggMCAwIDAgODg5IDYxMSAw
-	IDYxMSAwIDM4OSA1NTYgMzMzIDYxMSBdCmVuZG9iagoxNSAwIG9iago8PCAvVHlwZSAv
-	Rm9udCAvU3VidHlwZSAvVHJ1ZVR5cGUgL0Jhc2VGb250IC9aSEFDV0ErSGVsdmV0aWNh
-	LUJvbGQgL0ZvbnREZXNjcmlwdG9yCjQxIDAgUiAvV2lkdGhzIDQyIDAgUiAvRmlyc3RD
-	aGFyIDMyIC9MYXN0Q2hhciAxMTcgL0VuY29kaW5nIC9NYWNSb21hbkVuY29kaW5nCj4+
-	CmVuZG9iago0MyAwIG9iago8PCAvTGVuZ3RoIDQ0IDAgUiAvTGVuZ3RoMSA3Mjg4IC9G
-	aWx0ZXIgL0ZsYXRlRGVjb2RlID4+CnN0cmVhbQp4Ab1ZC1gbx7U+M7vSioeEAAECLHaF
-	EAIk8X7KPBaQACOwZYxd5AQbjHGwE8fE9kdsJ7g0NrYjEld52c3DTZPe9uZFsiZusjQv
-	N/Gt3dTOu75truOkX0mbzwlJH3H6SED37ILtuF9vvvS7/brDzJkz58yZM/+ZGe0OQAAg
-	FkaAAbFvY+8gJMEBbDmJOa9vaKvwlnb7h1j/C4DGu27wqo03t9VfA6CtBuBOX3XN9nWb
-	Pn41HcBgwrbYgf7etee/f18ngEnAPuUD2KCfMu5Dvgv5rIGNW7clPAIvIX8j8qZrNvX1
-	0tPsi1gNIx+7sXfboK47qhD5+5AXru3d2P/knm//CvlnkbcPbtqyNfIHxWHTFBauwc39
-	g1/8yYn2k4zozzpsI5iUJxa0kIG0H6LVFop1RhGoD4uz2Yq5EtI0yyGR2QhpAJG3MX+A
-	+Q+zKyOzmlJwzz4S+TWzAHt8bz6rncEKj8Cd8CJsg2Gs3wQy5EAeNKH9h6AdgjBFRCgE
-	CvfCXtT7DMzQDFeT93CMR2EAXkE9O/jgICRj+1oYwv7Z0Ii6P4IzUAFXwHY4DD+D02jb
-	BR2wHI7R8cgbUATfgdfI0ywTCaOlfCiHjbAb9kceAzfUoKUR2ENsZEtkGroxbUS/boMH
-	4a3IGzgvDlFQfKxGzaU40mESRTKISEYRJQMY0Z9CCOBIK7DHEaKjzZHN2CsRSkGEemiB
-	LvT7BrgF7kHPXoK3ySq6lRmPeCPPRV5FSLKwfzZ6UQWtsAQ2w1Yc4SA8BZPwV7KCGiJZ
-	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
-	YmoKNDg5NAplbmRvYmoKNDUgMCBvYmoKPDwgL1R5cGUgL0ZvbnREZXNjcmlwdG9yIC9B
-	c2NlbnQgNzUwIC9DYXBIZWlnaHQgNjY3IC9EZXNjZW50IC0yNTAgL0ZsYWdzIDk2Ci9G
-	b250QkJveCBbLTkgLTIwNyA3NjcgNjU2XSAvRm9udE5hbWUgL0pMS0VCWStUaW1lcy1J
-	dGFsaWMgL0l0YWxpY0FuZ2xlIC0xNQovU3RlbVYgMCAvTWF4V2lkdGggMTYxMCAvWEhl
-	aWdodCA1MDAgL0ZvbnRGaWxlMiA0MyAwIFIgPj4KZW5kb2JqCjQ2IDAgb2JqClsgNDQ0
-	IDAgNTAwIDAgMjc4IDAgMCAwIDAgNTAwIF0KZW5kb2JqCjE3IDAgb2JqCjw8IC9UeXBl
-	IC9Gb250IC9TdWJ0eXBlIC9UcnVlVHlwZSAvQmFzZUZvbnQgL0pMS0VCWStUaW1lcy1J
-	dGFsaWMgL0ZvbnREZXNjcmlwdG9yCjQ1IDAgUiAvV2lkdGhzIDQ2IDAgUiAvRmlyc3RD
-	aGFyIDEwMSAvTGFzdENoYXIgMTEwIC9FbmNvZGluZyAvTWFjUm9tYW5FbmNvZGluZwo+
-	PgplbmRvYmoKNDcgMCBvYmoKPDwgL0xlbmd0aCA0OCAwIFIgL0xlbmd0aDEgMTAxMjgg
-	L0ZpbHRlciAvRmxhdGVEZWNvZGUgPj4Kc3RyZWFtCngBvTp5fFTVud+5y9w7SyYzyUxm
-	z8zNzWzZFxISEsgQkpAAiTFBTJBgAgQCgkaMqbFKo4JKRKpQA0KfglpWNUNIYQDxUR4W
-	6Wsr2rqhXSxg7XvNT9uHVguZed+5E1Loz9fnH/117pz93HO+7Xzfd849QABAB/3AQmjx
-	qo5u+Iwsx5qfYnhxcW+P5/E/THsGgNwDwK5c2r1slfG3//ETAO4CgEa3bGXfUufolyoA
-	/WcAyVVdnR1LLj3x/Q8B0ibh+8VdWKFJE/KxvBLL6V2reu7piKl/hOUnsLxk5R2LO0rX
-	TOvF8iUsT1rVcU+3eL/mKwA5gGXP7R2rOhvuuncDlmuxnNZ9x109zMPsY1im483tXt3Z
-	/cpDt+P48gmE7w2sI/jQnw5UsAPTHJg9XkNrGRpN/NiJ3NUMhxl+vIBYfc1PAPFrammV
-	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
-	WJSYMtyzSGirdPh9xwZPhAq3ioOGp1N+wO0Rdxn2pkTE18V3uYv6P5h0U0SVyyroXEla
-	m2CzmRl/ot2h9pttdkeEqNFijWvauBc84QsoKjULLJxPm6xGrWhkfESwYI5PwJzGpPOh
-	PGMkpqCBYvUYUYOvRJlomNKTisZ5hFYpCV1dBv2EuFH67bq8OUd/MDj4PH5EuxL9y6+i
-	V0jS71U9JHHX4MLvXRnef4E9F/1j9FJ0LPoyybyCTkOIRz71Rm/ivIi6HtKgJ5S1V9xt
-	YQKix2nUq1xmIVGldzm1aXrGb7Wna3IMOVIwLdEmpz8iHY+jhx7ihbgpUYwHZcz41suZ
-	4gDe7uN84EDE+BSMiE3vA9ai4KRgRN2YdNw/xXlmpg4gGZdP/LBBlyq6LEaZ+fFub83R
-	Y9VejKM5Q8WhW759KHq4Z1tfU17ZSN8v3upfcODYkm333byLPbCxLlAe/QPi+NzgrUWp
-	dWO/Gl/HzCZcg0a4IeTzs76EyexMjtOLBkavNqp1fpGKoVEj2pNJjiFoBFtScoRUo/it
-	UZQ4xbHBgFvcivqKU2OnqLWMbzCV1URFL8VipjsPFYrc+v3mF27jrS6Dw/DoJlwqR4q3
-	M+yrLDO0emwrXReVsXfZQ9xstDe5JCf03RL1Vn4w6WnTVvPWDFUg3esvlmqkmekz/fPS
-	b/YvTV/m69P1JfTpe+We9B5vj29X6p6sZBbNLJ/N5SSD3eywOK3mbFNOIFG7XPR5i72M
-	Ny1Bw2UmW3/sdCULnCtnW6Y2V1DrDYwAuVKu3W1Nsfot0wI+wR+w5+vdfsM08OfY8vKH
-	J3wDVCFxm1VqwBxFtzQXY1xylMfUm6Uq5U5FkueQbMZn9tp9kt4tgdonSITNQn8Y96QS
-	cSVhncNklYgnMU0CKU2fIPo1EvF51RqSjRtYVRCjVKNTIrYUjBQXQdnUKVFc6Kn4o5jg
-	Bi/56ubb78ulbgG6sVSPCXLcRaDi4ybUkzDFdfynordqz5KtU/13fXf99J4Pjvz5thnM
-	Pt437emly6sDDd86Wbn8/V9/elogh0nj/Lybb76lOh29qrSMuge2vrJxftfUgpkNoZoM
-	W7IrN6v6e989+/4O5ivU55bYp4yan4/aoemHCTmaE3oSIRUhL5dSamFVeo3Rjuoav6QG
-	waw3J7JulmGvpNhs9ivSsnEPdqyt9FQudbDihi+XKumx8lHD2AXFeNC9ubIRGvfZfUVG
-	tF57Du3f7zPnJ6Sa3DP8a+Y/+SQ/P/r25rHqkmQtYTaqxQeWMa9tRpvFQH/sPPtrXM8W
-	hHBhaErE9LqJUSeLJluyzRRQfYt9VxBE4PUaUCVoeNRdVsFqRbc4RxPUae12EqTAvnXV
-	pNRT5UXFf8J3qSinAkENCWm7bscmT1Z8NuSK0UtK7HkPvVLlHdnHyJOWbb7YnE23tGOl
-	TZPa98z/N0Z/+c1npmbMfbppPfOena5PvHHAfsTlYlpELfv4PpZFK67CoEZLjttqVJVJ
-	pUfxZsDVnDieo7tdB7GoiYx/kvqHL776ILqF9H0c/SIavUD6uNzoI6SPH7s89gHZFL2d
-	8cZtO43h1//9yJ9uTSz/HIzxSxGnDwd/Q+tpih5HmcqLpyH0ZgShtfjDVBWMBvGCBPmy
-	88qo9smJlng7gI1PgkqmFIa4uyAf0/N4D2I+Pw+GMH+GOw8SlvdhWxMHUIZpLYap5DSs
-	Jadj5zBdr9oHa7GOBtrey+yD9diXjmnBcj/m6Q2NSTAXv45nkVfw+7eVqWE2si3sOe4F
-	fg5/Lz+CX6+bVC8LPmGr8GvxVbVe3aV+ToHUht/dWbgNTwIYvNdhgDYA4RONDqlKMSR4
-	CyKOqQrbYO7sujlz5mfWdq7s7exZvrgDezBxNGOdeA/h6342rDTiSYAL/Z0A3qiYjDcy
-	qqAGbzfMwvsL9XCDcsOiCW9N3ATz4GZogVvi55d16MdVYCjCkJk53Qr9ZBc8gWEHBhaW
-	k8egD8N6DE9j4CZye7F0hDw2zImho6QP7HhaqOXcc002t1Wjdb+FbsTIM+73reePERve
-	aPmI2IYTQD1dQ3aQZ2EJuMkPcDd2L8IXINsOBle627FpL3Rj6MfAKjEhe4dTC9yvkizw
-	cgTf8UEqRw65f5+f7b6YH2HIsPukP8Jh8qNULIUS3Sdcz7j/3bXM/SqG/fGmfUHscci9
-	17XSvTk1QrYNuzdRZ27Y/WQ8uduFrx5yrwoOupfkK+1zBiPM/mF3KbbPC2ndxSWSu8h1
-	wZ3rj4gEy9muOe6M/J+50/FF7ObBQb0ho9vp2uyegk2prmr/FAzHyD6yHTLI9mHvLPdR
-	zCK6B+uCJYMR8u2DtYF8b4TcGyquDQwGa/3e4By3N1jj92N+3uvCWuEWYbpQIGTiBQhU
-	7IJDMIlJokHUizpRI4qiECEvDle4VcfIfqhAsuw/KKpEPkJexkruGHlJqXzpsMiJjAii
-	KRL77QiVMXRl94+geBHAzCGVklNFyEt45kyrXgq5UcQJcEqDASUOD9hQrFAwGSIyKEhh
-	8nhEBetSeiusFUnTjKU1Vf9X1K60XI2pJfk/flbiCg/it87wPlcrflbGTMzVerUvOgH/
-	z6/nbuzQWZmZObup72Bv94qlymdyubqzHb+Whx/rxWsL/Ys8ngMrusfvAPjaFy3uot9p
-	OzrD3XJnVXiFXOU50Ku8R6uvaV5Km3vlqgOwtHpuy4Gloc6q4d5QbzW9LnBwUeXqtuvm
-	Wj8x1+rKr5mrkg62ms61SHnv7+Zqo82L6FxtdK42Otei0CJlLkqC6uXNlXf1oHTip3T8
-	lB1oDtfdOL8Fb4y0VkXILvp9/W74X1inI44KZW5kc3RyZWFtCmVuZG9iago0OCAwIG9i
-	ago2Nzc4CmVuZG9iago0OSAwIG9iago8PCAvVHlwZSAvRm9udERlc2NyaXB0b3IgL0Fz
-	Y2VudCA3NzAgL0NhcEhlaWdodCA2ODQgL0Rlc2NlbnQgLTIzMCAvRmxhZ3MgMzIKL0Zv
-	bnRCQm94IFstMTkgLTIyMSA3NjggNzM3XSAvRm9udE5hbWUgL1RLSUxMWitIZWx2ZXRp
-	Y2EgL0l0YWxpY0FuZ2xlIDAgL1N0ZW1WCjAgL01heFdpZHRoIDE1MDAgL1hIZWlnaHQg
-	NTEzIC9Gb250RmlsZTIgNDcgMCBSID4+CmVuZG9iago1MCAwIG9iagpbIDI3OCAwIDAg
-	MCAwIDU1NiAwIDAgMCAwIDAgMCAyNzggMCAwIDAgMCAwIDAgMCAwIDcyMiAwIDY2NyAw
-	IDAgMCAyNzggMCAwCjAgMCAwIDAgMCAwIDAgMCA2MTEgNzIyIDAgMCAwIDAgMCAwIDAg
-	MCAwIDAgMCA1NTYgMCA1MDAgMCA1NTYgMCA1NTYgMCAyMjIKMjIyIDAgMjIyIDgzMyA1
-	NTYgNTU2IDU1NiAwIDMzMyA1MDAgMjc4IDU1NiAwIDAgNTAwIF0KZW5kb2JqCjE0IDAg
-	b2JqCjw8IC9UeXBlIC9Gb250IC9TdWJ0eXBlIC9UcnVlVHlwZSAvQmFzZUZvbnQgL1RL
-	SUxMWitIZWx2ZXRpY2EgL0ZvbnREZXNjcmlwdG9yCjQ5IDAgUiAvV2lkdGhzIDUwIDAg
-	UiAvRmlyc3RDaGFyIDQ2IC9MYXN0Q2hhciAxMjAgL0VuY29kaW5nIC9NYWNSb21hbkVu
-	Y29kaW5nCj4+CmVuZG9iagoxIDAgb2JqCjw8IC9UaXRsZSAoVW50aXRsZWQpIC9BdXRo
-	b3IgKEplZmZyZXkgT3ZlcmJleSkgL0NyZWF0b3IgKE9tbmlHcmFmZmxlKSAvUHJvZHVj
-	ZXIKKE1hYyBPUyBYIDEwLjUuOCBRdWFydHogUERGQ29udGV4dCkgL0NyZWF0aW9uRGF0
-	ZSAoRDoyMDEwMDMwNTIxMzYzMVowMCcwMCcpCi9Nb2REYXRlIChEOjIwMTAwMzA1MjEz
-	NjMxWjAwJzAwJykgPj4KZW5kb2JqCnhyZWYKMCA1MQowMDAwMDAwMDAwIDY1NTM1IGYg
-	CjAwMDAwNTEzMjMgMDAwMDAgbiAKMDAwMDAyODk5MSAwMDAwMCBuIAowMDAwMDAxNTU5
-	IDAwMDAwIG4gCjAwMDAwMjg4MjggMDAwMDAgbiAKMDAwMDAwMDAyMiAwMDAwMCBuIAow
-	MDAwMDAxNTM5IDAwMDAwIG4gCjAwMDAwMDE2NjMgMDAwMDAgbiAKMDAwMDAyNjUwMyAw
-	MDAwMCBuIAowMDAwMDAxODc1IDAwMDAwIG4gCjAwMDAwMDMxOTcgMDAwMDAgbiAKMDAw
-	MDAwMzIxOCAwMDAwMCBuIAowMDAwMDAzNjM0IDAwMDAwIG4gCjAwMDAwMjczNjcgMDAw
-	MDAgbiAKMDAwMDA1MTE0OCAwMDAwMCBuIAowMDAwMDM4MTgwIDAwMDAwIG4gCjAwMDAw
-	MzE0MTEgMDAwMDAgbiAKMDAwMDA0MzYzOSAwMDAwMCBuIAowMDAwMDI4MDc5IDAwMDAw
-	IG4gCjAwMDAwMDcyMTEgMDAwMDAgbiAKMDAwMDAyNTU2NiAwMDAwMCBuIAowMDAwMDI4
-	NzkxIDAwMDAwIG4gCjAwMDAwMDM2NTQgMDAwMDAgbiAKMDAwMDAwNzE5MCAwMDAwMCBu
-	IAowMDAwMDI1NTg4IDAwMDAwIG4gCjAwMDAwMjY0ODMgMDAwMDAgbiAKMDAwMDAyNjUz
-	OSAwMDAwMCBuIAowMDAwMDI3MzQ3IDAwMDAwIG4gCjAwMDAwMjc0MDQgMDAwMDAgbiAK
-	MDAwMDAyODA1OSAwMDAwMCBuIAowMDAwMDI4MTE2IDAwMDAwIG4gCjAwMDAwMjg3NzEg
-	MDAwMDAgbiAKMDAwMDAyODkxMSAwMDAwMCBuIAowMDAwMDI5MTE3IDAwMDAwIG4gCjAw
-	MDAwMjkwMzkgMDAwMDAgbiAKMDAwMDAyOTE5NSAwMDAwMCBuIAowMDAwMDMxMDYyIDAw
-	MDAwIG4gCjAwMDAwMzEwODMgMDAwMDAgbiAKMDAwMDAzMTMwOSAwMDAwMCBuIAowMDAw
-	MDMxNTk0IDAwMDAwIG4gCjAwMDAwMzc2OTcgMDAwMDAgbiAKMDAwMDAzNzcxOCAwMDAw
-	MCBuIAowMDAwMDM3OTQ0IDAwMDAwIG4gCjAwMDAwMzgzNjAgMDAwMDAgbiAKMDAwMDA0
-	MzM0NCAwMDAwMCBuIAowMDAwMDQzMzY1IDAwMDAwIG4gCjAwMDAwNDM1OTEgMDAwMDAg
-	biAKMDAwMDA0MzgxOCAwMDAwMCBuIAowMDAwMDUwNjg3IDAwMDAwIG4gCjAwMDAwNTA3
-	MDggMDAwMDAgbiAKMDAwMDA1MDkzMCAwMDAwMCBuIAp0cmFpbGVyCjw8IC9TaXplIDUx
-	IC9Sb290IDMyIDAgUiAvSW5mbyAxIDAgUiAvSUQgWyA8MzU5N2YwMWRmMGI0NmQzYmRh
-	OGJjNDgzNjYwOTlmZWY+CjwzNTk3ZjAxZGYwYjQ2ZDNiZGE4YmM0ODM2NjA5OWZlZj4g
-	XSA+PgpzdGFydHhyZWYKNTE1MzIKJSVFT0YKMSAwIG9iago8PC9BdXRob3IgKEplZmZy
-	ZXkgT3ZlcmJleSkvQ3JlYXRpb25EYXRlIChEOjIwMTAwMjI0MjE1MzAwWikvQ3JlYXRv
-	ciAoT21uaUdyYWZmbGUgNS4yLjEpL01vZERhdGUgKEQ6MjAxMDAzMDUyMTM2MDBaKS9Q
-	cm9kdWNlciAoTWFjIE9TIFggMTAuNS44IFF1YXJ0eiBQREZDb250ZXh0KS9UaXRsZSAo
-	YXJjaGl0ZWN0dXJlLmdyYWZmbGUpPj4KZW5kb2JqCnhyZWYKMSAxCjAwMDAwNTI3MTAg
-	MDAwMDAgbiAKdHJhaWxlcgo8PC9JRCBbPDM1OTdmMDFkZjBiNDZkM2JkYThiYzQ4MzY2
-	MDk5ZmVmPiA8MzU5N2YwMWRmMGI0NmQzYmRhOGJjNDgzNjYwOTlmZWY+XSAvSW5mbyAx
-	IDAgUiAvUHJldiA1MTUzMiAvUm9vdCAzMiAwIFIgL1NpemUgNTE+PgpzdGFydHhyZWYK
-	NTI5MTgKJSVFT0YK
-	</data>
-	<key>QuickLookThumbnail</key>
-	<data>
-	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
-	AA==
-	</data>
-	<key>ReadOnly</key>
-	<string>NO</string>
-	<key>RowAlign</key>
-	<integer>1</integer>
-	<key>RowSpacing</key>
-	<real>36</real>
-	<key>SheetTitle</key>
-	<string>Canvas 1</string>
-	<key>SmartAlignmentGuidesActive</key>
-	<string>YES</string>
-	<key>SmartDistanceGuidesActive</key>
-	<string>YES</string>
-	<key>UniqueID</key>
-	<integer>1</integer>
-	<key>UseEntirePage</key>
-	<false/>
-	<key>VPages</key>
-	<integer>1</integer>
-	<key>WindowInfo</key>
-	<dict>
-		<key>CurrentSheet</key>
-		<integer>0</integer>
-		<key>ExpandedCanvases</key>
-		<array>
-			<dict>
-				<key>name</key>
-				<string>Canvas 1</string>
-			</dict>
-		</array>
-		<key>Frame</key>
-		<string>{{28, 42}, {1085, 704}}</string>
-		<key>ListView</key>
-		<true/>
-		<key>OutlineWidth</key>
-		<integer>142</integer>
-		<key>RightSidebar</key>
-		<false/>
-		<key>ShowRuler</key>
-		<true/>
-		<key>Sidebar</key>
-		<true/>
-		<key>SidebarWidth</key>
-		<integer>120</integer>
-		<key>VisibleRegion</key>
-		<string>{{-268, -50}, {950, 550}}</string>
-		<key>Zoom</key>
-		<real>1</real>
-		<key>ZoomValues</key>
-		<array>
-			<array>
-				<string>Canvas 1</string>
-				<real>1</real>
-				<real>2</real>
-			</array>
-		</array>
-	</dict>
-	<key>saveQuickLookFiles</key>
-	<string>YES</string>
-</dict>
-</plist>

diff --git a/org.eclipse.rephraserengine.doc.isv/images/architecture.png b/org.eclipse.rephraserengine.doc.isv/images/architecture.png
deleted file mode 100644
index f59da8d..0000000
--- a/org.eclipse.rephraserengine.doc.isv/images/architecture.png
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.rephraserengine.doc.isv/plugin.xml b/org.eclipse.rephraserengine.doc.isv/plugin.xml
deleted file mode 100644
index 8b546a7..0000000
--- a/org.eclipse.rephraserengine.doc.isv/plugin.xml
+++ /dev/null

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.help.toc">
-      <toc
-            file="toc.xml"
-            primary="true">
-      </toc>
-      <toc
-            file="tocconcepts.xml">
-      </toc>
-      <toc
-            file="tocsamples.xml">
-      </toc>
-   </extension>
-
-</plugin>

diff --git a/org.eclipse.rephraserengine.doc.isv/toc.xml b/org.eclipse.rephraserengine.doc.isv/toc.xml
deleted file mode 100644
index 96759ac..0000000
--- a/org.eclipse.rephraserengine.doc.isv/toc.xml
+++ /dev/null

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Rephraser Engine Plug-in Developer Guide">
-   <topic label="Concepts">
-      <anchor id="concepts"/>
-   </topic>
-   <topic label="Tasks">
-      <anchor id="tasks"/>
-   </topic>
-   <topic label="Samples">
-      <anchor id="samples"/>
-   </topic>
-</toc>

diff --git a/org.eclipse.rephraserengine.doc.isv/tocconcepts.xml b/org.eclipse.rephraserengine.doc.isv/tocconcepts.xml
deleted file mode 100644
index c00f10d..0000000
--- a/org.eclipse.rephraserengine.doc.isv/tocconcepts.xml
+++ /dev/null

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Concepts" link_to="toc.xml#concepts">
-    <topic label="Introduction"  href="html/concepts/introduction.html" />
-    <topic label="Contributing Refactorings"  href="html/concepts/refactorings.html" />
-    <topic label="Contributing a Virtual Program Graph"  href="html/concepts/vpg.html" />
-</toc>

diff --git a/org.eclipse.rephraserengine.doc.isv/tocsamples.xml b/org.eclipse.rephraserengine.doc.isv/tocsamples.xml
deleted file mode 100644
index 186714f..0000000
--- a/org.eclipse.rephraserengine.doc.isv/tocsamples.xml
+++ /dev/null

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Samples" link_to="toc.xml#samples">
-	<topic label="Samples"  href="html/samples/samples.html" />
-</toc>

diff --git a/org.eclipse.rephraserengine.doc.isv/toctasks.xml b/org.eclipse.rephraserengine.doc.isv/toctasks.xml
deleted file mode 100644
index 994cdd8..0000000
--- a/org.eclipse.rephraserengine.doc.isv/toctasks.xml
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Tasks" link_to="toc.xml#tasks">
-    <topic label="Contributing the VPG &quot;(Debugging)&quot; Action Set to a Perspective" href="html/tasks/contribute-vpg-actions-perspective.html" />
-    <topic label="Contributing the VPG &quot;(Debugging)&quot; Action Set to an Editor" href="html/tasks/contribute-vpg-actions-editor.html" />
-</toc>

diff --git a/org.eclipse.rephraserengine.examples.testing/.classpath b/org.eclipse.rephraserengine.examples.testing/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/org.eclipse.rephraserengine.examples.testing/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.rephraserengine.examples.testing/.project b/org.eclipse.rephraserengine.examples.testing/.project
deleted file mode 100644
index 9886c31..0000000
--- a/org.eclipse.rephraserengine.examples.testing/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rephraserengine.examples.testing</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>net.sourceforge.metrics.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>net.sourceforge.metrics.nature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.rephraserengine.examples.testing/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.rephraserengine.examples.testing/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 1facd69..0000000
--- a/org.eclipse.rephraserengine.examples.testing/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,335 +0,0 @@
-#Thu May 27 09:50:33 CDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=disabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=18
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=18
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=100
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=100
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

diff --git a/org.eclipse.rephraserengine.examples.testing/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.rephraserengine.examples.testing/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 4a93907..0000000
--- a/org.eclipse.rephraserengine.examples.testing/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,6 +0,0 @@
-#Fri Feb 12 01:04:05 CST 2010
-eclipse.preferences.version=1
-formatter_profile=_Photran
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) ${year} University of Illinois at Urbana-Champaign and others.\r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n *\r\n * Contributors\:\r\n *    UIUC - Initial API and implementation\r\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * \r\n * @author ${user}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

diff --git a/org.eclipse.rephraserengine.examples.testing/META-INF/MANIFEST.MF b/org.eclipse.rephraserengine.examples.testing/META-INF/MANIFEST.MF
deleted file mode 100644
index b2171c0..0000000
--- a/org.eclipse.rephraserengine.examples.testing/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Rephraser Engine Unit Testing Examples
-Bundle-SymbolicName: org.eclipse.rephraserengine.examples.testing
-Bundle-Version: 3.0.0.qualifier
-Bundle-Vendor: Eclipse.org - Photran
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.rephraserengine.testing.junit3,
- org.junit,
- org.eclipse.rephraserengine.core,
- org.eclipse.rephraserengine.core.vpg,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.jface.text

diff --git a/org.eclipse.rephraserengine.examples.testing/build.properties b/org.eclipse.rephraserengine.examples.testing/build.properties
deleted file mode 100644
index 34d2e4d..0000000
--- a/org.eclipse.rephraserengine.examples.testing/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .

diff --git a/org.eclipse.rephraserengine.examples.testing/src/org/eclipse/rephraserengine/internal/examples/testing/ForEachExamples.java b/org.eclipse.rephraserengine.examples.testing/src/org/eclipse/rephraserengine/internal/examples/testing/ForEachExamples.java
deleted file mode 100644
index e72ca97..0000000
--- a/org.eclipse.rephraserengine.examples.testing/src/org/eclipse/rephraserengine/internal/examples/testing/ForEachExamples.java
+++ /dev/null

@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.examples.testing;
-
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.rephraserengine.core.util.MathUtil;
-import org.eclipse.rephraserengine.core.util.Pair;
-import org.eclipse.rephraserengine.testing.combinatorial.ForEach;
-
-/**
- * Examples of how to use {@link ForEach} methods.
- * 
- * @author Jeff Overbey
- */
-public class ForEachExamples extends TestCase
-{
-    private final List<String> people = Arrays.asList("Jim", "Kathy", "Bob", "Alice", "Sam", "Eor");
-
-    private final List<Integer> numbers = Arrays.asList(Integer.MIN_VALUE, -19, -18, -17, -11, -5,
-        -2, -1, 0, 1, 2, 5, 10, 11, 16, 17, 18, 19, Integer.MAX_VALUE);
-
-    private final List<String> colors = Arrays.asList("Red", "Blue");
-
-    /**
-     * Illustrates a simple use of {@link ForEach#combinationOf(List)}.
-     * <p>
-     * This example prints all combinations of 1 to 4 people to {@link System#out}.
-     */
-    public void testForeachCombination()
-    {
-        for (List<String> combination : ForEach.combinationOf(people))
-            System.out.println(combination);
-    }
-
-    /**
-     * This test verifies that {@link ForEach#combinationOf(int, int, List)} returns the expected
-     * number of results.
-     */
-    public void testCountCombinations()
-    {
-        for (int min = 1; min <= people.size(); min++)
-        {
-            for (int max = min; max <= people.size(); max++)
-            {
-                System.out.println("Choosing at least " + min + " and at most " + max + " people");
-
-                long actualCombinations = 0;
-                for (List<String> combination : ForEach.combinationOf(min, max, people))
-                {
-                    System.out.println(combination);
-                    actualCombinations++;
-                }
-
-                long expectedCombinations = 0L;
-                for (int k = min; k <= max; k++)
-                    expectedCombinations += MathUtil.binomialCoefficient(people.size(), k);
-
-                assertEquals(expectedCombinations, actualCombinations);
-            }
-        }
-    }
-
-    /**
-     * Illustrates a simple use of {@link ForEach#pairOf(List)}.
-     * <p>
-     * This example tests that an alternative implementation of the modulo operator (
-     * {@link #mod(int, int)}) returns the same results as Java's <code>%</code> operator.
-     */
-    public void testForEachPair()
-    {
-        for (Pair<Integer, Integer> pair : ForEach.pairOf(numbers))
-        {
-            if (pair.snd == 0) continue;
-
-            int expected = pair.fst % pair.snd;
-            int actual = mod(pair.fst, pair.snd);
-            System.out.println("Checking mod(" + pair.fst + ", " + pair.snd + ") == " + expected);
-            assertEquals(expected, actual);
-        }
-    }
-
-    /**
-     * Alternative definition of the modulo operator.
-     * <p>
-     * See, for example, http://en.wikipedia.org/wiki/Modulo_operation
-     * 
-     * @return lhs % rhs
-     */
-    private static int mod(int lhs, int rhs)
-    {
-        return lhs - rhs * (lhs / rhs);
-    }
-
-    /**
-     * Illustrates a simple use of {@link ForEach#combinationOf(List)}.
-     * <p>
-     * This example prints all combinations of 1 to 4 people to {@link System#out}.
-     */
-    @SuppressWarnings("unchecked")
-    public void testForeachTuple1()
-    {
-        for (List<Integer> tuple : ForEach.tupleOf(numbers, numbers))
-            System.out.println(tuple);
-    }
-
-    /**
-     * Illustrates a simple use of {@link ForEach#combinationOf(List)}.
-     * <p>
-     * This example prints all combinations of 1 to 4 people to {@link System#out}.
-     */
-    @SuppressWarnings("unchecked")
-    public void testForeachTuple2()
-    {
-        for (List<Object> tuple : ForEach.<Object> tupleOf(people, numbers, colors))
-            System.out.println(tuple);
-    }
-
-    /**
-     * This test verifies that {@link ForEach#combinationOf(int, int, List)} returns the expected
-     * number of results.
-     */
-    @SuppressWarnings("unused")
-    public void testCountTuples()
-    {
-        for (int tupleSize = 1; tupleSize <= 5; tupleSize++)
-        {
-            List<?>[] sets = new List<?>[tupleSize];
-            for (int i = 0; i < sets.length; i++)
-                sets[i] = numbers;
-
-            int count = 0;
-            for (List<?> tuple : ForEach.tupleOf(sets))
-                count++;
-
-            assertEquals((int)Math.pow(numbers.size(), tupleSize), count);
-        }
-    }
-}

diff --git a/org.eclipse.rephraserengine.examples.testing/src/org/eclipse/rephraserengine/internal/examples/testing/GeneralTestSuiteFromFilesExample.java b/org.eclipse.rephraserengine.examples.testing/src/org/eclipse/rephraserengine/internal/examples/testing/GeneralTestSuiteFromFilesExample.java
deleted file mode 100644
index bd6ef7b..0000000
--- a/org.eclipse.rephraserengine.examples.testing/src/org/eclipse/rephraserengine/internal/examples/testing/GeneralTestSuiteFromFilesExample.java
+++ /dev/null

@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.examples.testing;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.rephraserengine.core.util.StringUtil;
-import org.eclipse.rephraserengine.testing.junit3.GeneralTestSuiteFromFiles;
-
-/**
- * Simple example illustrating how to use {@link GeneralTestSuiteFromFiles}.
- * 
- * @author Jeff Overbey
- */
-public class GeneralTestSuiteFromFilesExample extends GeneralTestSuiteFromFiles
-{
-    public static Test suite() throws Exception
-    {
-        return new GeneralTestSuiteFromFilesExample();
-    }
-
-    public GeneralTestSuiteFromFilesExample() throws FileNotFoundException, IOException
-    {
-        super("Running GeneralTestSuiteFromFilesExample on", "test-files-1", ".txt");
-    }
-
-    // To prevent the JUnit runner from trying to instantiate and run ExampleTestCase,
-    // we make it abstract and instantiate it as an anonymous inner class
-
-    public static abstract class ExampleTestCase extends TestCase
-    {
-        private final File file;
-        
-        public ExampleTestCase(File file)
-        {
-            super("testExample"); // Argument is the name of the test method to run
-            this.file = file;
-        }
-
-        public void testExample() throws IOException
-        {
-            assertEquals("This is " + file.getName().toLowerCase(), StringUtil.read(file).trim());
-        }
-    }
-    
-    @Override
-    protected Test createTestFor(File file)
-    {
-        return new ExampleTestCase(file) {};
-    }
-}

diff --git a/org.eclipse.rephraserengine.examples.testing/src/org/eclipse/rephraserengine/internal/examples/testing/GeneralTestSuiteFromMarkersExample.java b/org.eclipse.rephraserengine.examples.testing/src/org/eclipse/rephraserengine/internal/examples/testing/GeneralTestSuiteFromMarkersExample.java
deleted file mode 100644
index a66f13e..0000000
--- a/org.eclipse.rephraserengine.examples.testing/src/org/eclipse/rephraserengine/internal/examples/testing/GeneralTestSuiteFromMarkersExample.java
+++ /dev/null

@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.examples.testing;
-
-import java.io.File;
-import java.io.IOException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.rephraserengine.core.util.StringUtil;
-import org.eclipse.rephraserengine.testing.junit3.GeneralTestSuiteFromMarkers;
-
-/**
- * Simple example illustrating how to use {@link GeneralTestSuiteFromMarkers}.
- * 
- * @author Jeff Overbey
- */
-public class GeneralTestSuiteFromMarkersExample extends GeneralTestSuiteFromMarkers
-{
-    public static Test suite() throws Exception
-    {
-        return new GeneralTestSuiteFromMarkersExample();
-    }
-
-    public GeneralTestSuiteFromMarkersExample() throws Exception
-    {
-        super("Running GeneralTestSuiteFromMarkersExample in", "<<<", new File("test-files-2"), ".txt");
-    }
-
-    // To prevent the JUnit runner from trying to instantiate and run ExampleTestCase,
-    // we make it abstract and instantiate it as an anonymous inner class
-
-    public static abstract class ExampleTestCase extends TestCase
-    {
-        private final File fileContainingMarker;
-        private final String markerText;
-
-        public ExampleTestCase(File fileContainingMarker, String markerText)
-        {
-            super("testExample"); // Argument is the name of the test method to run
-            this.fileContainingMarker = fileContainingMarker;
-            this.markerText = markerText;
-        }
-
-        public void testExample() throws IOException
-        {
-            String[] lineColStrings = markerText.split(",");
-            for (int i = 0; i < lineColStrings.length; i++)
-                lineColStrings[i] = lineColStrings[i].trim();
-            
-            assertTrue(lineColStrings.length >= 2);
-            int line = Integer.parseInt(lineColStrings[0]);
-            int col = Integer.parseInt(lineColStrings[1]);
-            
-            String fileContents = StringUtil.read(fileContainingMarker);
-            int offset = StringUtil.offsetOf(line, col, fileContents);
-            assertTrue(offset >= 0);
-            assertEquals("is", fileContents.substring(offset, offset+2));
-        }
-    }
-
-    @Override
-    protected Test createTestFor(File fileContainingMarker,
-                                 int markerOffset,
-                                 String markerText)
-    {
-        TestSuite suite = new TestSuite(fileContainingMarker.getName() + " - " + markerText);
-        suite.addTest(new ExampleTestCase(fileContainingMarker, markerText) {});
-        return suite;
-    }
-}

diff --git a/org.eclipse.rephraserengine.examples.testing/src/org/eclipse/rephraserengine/internal/examples/testing/TestSuiteFromFilesExample.java b/org.eclipse.rephraserengine.examples.testing/src/org/eclipse/rephraserengine/internal/examples/testing/TestSuiteFromFilesExample.java
deleted file mode 100644
index 6a79388..0000000
--- a/org.eclipse.rephraserengine.examples.testing/src/org/eclipse/rephraserengine/internal/examples/testing/TestSuiteFromFilesExample.java
+++ /dev/null

@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.examples.testing;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-
-import org.eclipse.rephraserengine.core.util.StringUtil;
-import org.eclipse.rephraserengine.testing.junit3.TestSuiteFromFiles;
-
-/**
- * Simple example illustrating how to use {@link TestSuiteFromFiles}.
- * 
- * @author Jeff Overbey
- */
-public class TestSuiteFromFilesExample extends TestSuiteFromFiles
-{
-    public static Test suite() throws Exception
-    {
-        return new TestSuiteFromFilesExample();
-    }
-
-    public TestSuiteFromFilesExample() throws FileNotFoundException, IOException
-    {
-        super("Running TestSuiteFromFilesExample on", "test-files-1", ".txt");
-    }
-
-    @Override protected void test(File file) throws Exception
-    {
-        Assert.assertEquals("This is " + file.getName().toLowerCase(), StringUtil.read(file).trim());
-    }
-}

diff --git a/org.eclipse.rephraserengine.examples.testing/src/org/eclipse/rephraserengine/internal/examples/testing/TestSuiteFromMarkersExample.java b/org.eclipse.rephraserengine.examples.testing/src/org/eclipse/rephraserengine/internal/examples/testing/TestSuiteFromMarkersExample.java
deleted file mode 100644
index f4a6eac..0000000
--- a/org.eclipse.rephraserengine.examples.testing/src/org/eclipse/rephraserengine/internal/examples/testing/TestSuiteFromMarkersExample.java
+++ /dev/null

@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.examples.testing;
-
-import java.io.File;
-
-import junit.framework.Assert;
-import junit.framework.Test;
-
-import org.eclipse.rephraserengine.core.util.StringUtil;
-import org.eclipse.rephraserengine.testing.junit3.TestSuiteFromMarkers;
-
-/**
- * Simple example illustrating how to use {@link TestSuiteFromMarkers}.
- * 
- * @author Jeff Overbey
- */
-public class TestSuiteFromMarkersExample extends TestSuiteFromMarkers
-{
-    public static Test suite() throws Exception
-    {
-        return new TestSuiteFromMarkersExample();
-    }
-
-    public TestSuiteFromMarkersExample() throws Exception
-    {
-        super("Running TestSuiteFromMarkersExample in", "<<<", new File("test-files-2"), ".txt");
-    }
-
-    @Override
-    protected void test(File fileContainingMarker,
-                        int markerOffset,
-                        String markerText) throws Exception
-    {
-        String[] lineColStrings = markerText.split(",");
-        for (int i = 0; i < lineColStrings.length; i++)
-            lineColStrings[i] = lineColStrings[i].trim();
-        
-        Assert.assertTrue(lineColStrings.length >= 2);
-        int line = Integer.parseInt(lineColStrings[0]);
-        int col = Integer.parseInt(lineColStrings[1]);
-        
-        String fileContents = StringUtil.read(fileContainingMarker);
-        int offset = StringUtil.offsetOf(line, col, fileContents);
-        Assert.assertTrue(offset >= 0);
-        Assert.assertEquals("is", fileContents.substring(offset, offset+2));
-    }
-}

diff --git a/org.eclipse.rephraserengine.examples.testing/test-files-1/file1.txt b/org.eclipse.rephraserengine.examples.testing/test-files-1/file1.txt
deleted file mode 100644
index 97f701c..0000000
--- a/org.eclipse.rephraserengine.examples.testing/test-files-1/file1.txt
+++ /dev/null

@@ -1 +0,0 @@
-This is file1.txt
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine.examples.testing/test-files-1/file2.txt b/org.eclipse.rephraserengine.examples.testing/test-files-1/file2.txt
deleted file mode 100644
index 4649318..0000000
--- a/org.eclipse.rephraserengine.examples.testing/test-files-1/file2.txt
+++ /dev/null

@@ -1 +0,0 @@
-This is file2.txt
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine.examples.testing/test-files-2/file-with-markers-1.txt b/org.eclipse.rephraserengine.examples.testing/test-files-2/file-with-markers-1.txt
deleted file mode 100644
index 05c4eda..0000000
--- a/org.eclipse.rephraserengine.examples.testing/test-files-2/file-with-markers-1.txt
+++ /dev/null

@@ -1,4 +0,0 @@
-This example illustrates a simple use of markers.                      <<<1,3
-For this example, the marker consists of three less-than symbols.      <<<2,7 <<<2,34
-Each marker is followed by a line and column where the substring "is"  <<<3,13 <<<3,67
-appears.

diff --git a/org.eclipse.rephraserengine.examples.testing/test-files-2/file-with-markers-2.txt b/org.eclipse.rephraserengine.examples.testing/test-files-2/file-with-markers-2.txt
deleted file mode 100644
index 2199458..0000000
--- a/org.eclipse.rephraserengine.examples.testing/test-files-2/file-with-markers-2.txt
+++ /dev/null

@@ -1 +0,0 @@
-See file-with-markers-1.txt for details of what this is. <<<1,51 <<< 1, 54

diff --git a/org.eclipse.rephraserengine.examples.text/.classpath b/org.eclipse.rephraserengine.examples.text/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/org.eclipse.rephraserengine.examples.text/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.rephraserengine.examples.text/.project b/org.eclipse.rephraserengine.examples.text/.project
deleted file mode 100644
index 51add19..0000000
--- a/org.eclipse.rephraserengine.examples.text/.project
+++ /dev/null

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rephraserengine.examples.text</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>net.sourceforge.metrics.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>net.sourceforge.metrics.nature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.rephraserengine.examples.text/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.rephraserengine.examples.text/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index da92793..0000000
--- a/org.eclipse.rephraserengine.examples.text/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,331 +0,0 @@
-#Thu May 27 09:50:48 CDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=disabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=18
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=18
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=100
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=100
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

diff --git a/org.eclipse.rephraserengine.examples.text/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.rephraserengine.examples.text/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 4f04746..0000000
--- a/org.eclipse.rephraserengine.examples.text/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,6 +0,0 @@
-#Wed Oct 14 16:59:49 CDT 2009
-eclipse.preferences.version=1
-formatter_profile=_Photran
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} University of Illinois at Urbana-Champaign and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *    UIUC - Initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * \n * @author ${user}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

diff --git a/org.eclipse.rephraserengine.examples.text/META-INF/MANIFEST.MF b/org.eclipse.rephraserengine.examples.text/META-INF/MANIFEST.MF
deleted file mode 100644
index 177ca53..0000000
--- a/org.eclipse.rephraserengine.examples.text/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Rephraser Engine Text File Manipulation Example
-Bundle-SymbolicName: org.eclipse.rephraserengine.examples.text;singleton:=true
-Bundle-Version: 3.0.0.qualifier
-Bundle-Vendor: Eclipse.org - Photran
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.rephraserengine.core,
- org.eclipse.rephraserengine.core.refactoring,
- org.eclipse.rephraserengine.ui,
- org.eclipse.rephraserengine.ui.refactoring,
- org.eclipse.core.resources,
- org.eclipse.jface.text,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.search
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy

diff --git a/org.eclipse.rephraserengine.examples.text/README.txt b/org.eclipse.rephraserengine.examples.text/README.txt
deleted file mode 100644
index 8f7fa31..0000000
--- a/org.eclipse.rephraserengine.examples.text/README.txt
+++ /dev/null

@@ -1,41 +0,0 @@
-REPHRASER ENGINE - TEXT EXAMPLE
-
-This is a simple example of
-(1) how to contribute a refactoring to the Rephraser Refactoring UI and
-(2) how to contribute a search page to the workbench Search dialog using several supporting
-    classes from the Rephraser UI plug-in.
-(Note that this does *not* use the VPG components of the Rephraser engine.)
-
-(1) This plug-in contributes a "Convert Tabs to Spaces" item to the Refactor menu.  The Refactor
-    menu will be visible in the menu bar in the Resource and Java perspectives (among others).
-    To use the refactoring, open any text file (including source code), and select
-    Refactor > Convert Tabs to Spaces.  A Refactor sub-menu should also be available when you
-    select and then right-click one or more text files, folders, or projects in the Project
-    Explorer view (i.e., when the current selection in the workbench is a resource).  The
-    refactoring itself is defined in ConvertTabsToSpacesRefactoring.java.  That class is
-    contributed to the Rephraser Engine's refactoring extension point.
-
-(2) A "resource filter" is also contributed, which determines when this refactoring will be
-    available.  We contribute a resource filter class defined in TextFileResourceFilter.java,
-    which accepts any file that has a text content type (according to the Eclipse Platform's
-    content type manager); this includes .txt files as well as most source code (e.g., .java files,
-    .c files, etc.)
-
-(3) This plug-in also contributes a "Text Search" page to the workbench Search dialog and adds
-    a "Text..." item to the Search menu in the menu bar.  This is implemented in TextSearchPage.java
-    (which includes two inner classes) and is contributed to the usual platform extension points.
-    The Rephraser Engine provides many of the superclasses used to implement the search functions.
-
-For details, see the plugin.xml file, and then look in the classes referenced in there.
-
-Notice that, in the plugin.xml file, we contribute the ConvertTabsToSpacesRefactoring class, but
-we don't give it a name, and we don't provide any user interface for it.  In this case,
-* the name is determined by calling the refactoring's getName() method, and
-* the user input dialog is constructed by looking for @UserInputString and @UserInputBoolean
-  annotations in the ConvertTabsToSpacesRefactoring class.  In this case, there is one method with
-  a @UserInputBoolean annotation, so the dialog has a single checkbox.  When the user checks or
-  unchecks the checkbox, that method is invoked on the refactoring class.
-Of course, it is possible to customize the name and/or the user interface, but we do not need to
-in this simple example.
-
---Jeff Overbey 10/14/09, 2/25/10
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine.examples.text/about.html b/org.eclipse.rephraserengine.examples.text/about.html
deleted file mode 100644
index 9c7ba0a..0000000
--- a/org.eclipse.rephraserengine.examples.text/about.html
+++ /dev/null

@@ -1,24 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>About</title></head>
-
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>May 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL").  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body></html>
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine.examples.text/build.properties b/org.eclipse.rephraserengine.examples.text/build.properties
deleted file mode 100644
index c9723d4..0000000
--- a/org.eclipse.rephraserengine.examples.text/build.properties
+++ /dev/null

@@ -1,11 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               icons/
-src.includes = README.txt,\
-               about.html,\
-               test/,\
-               icons/

diff --git a/org.eclipse.rephraserengine.examples.text/icons/search_obj.gif b/org.eclipse.rephraserengine.examples.text/icons/search_obj.gif
deleted file mode 100644
index 304c01d..0000000
--- a/org.eclipse.rephraserengine.examples.text/icons/search_obj.gif
+++ /dev/null
Binary files differ

diff --git a/org.eclipse.rephraserengine.examples.text/plugin.xml b/org.eclipse.rephraserengine.examples.text/plugin.xml
deleted file mode 100644
index 1c9f557..0000000
--- a/org.eclipse.rephraserengine.examples.text/plugin.xml
+++ /dev/null

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.rephraserengine.ui.refactoring.refactorings">
-
-      <!-- Define a ResourceFilter, which tells what types of projects and files we can refactor -->
-      <resourceFilter class="org.eclipse.rephraserengine.internal.examples.text.TextFileResourceFilter" />
-
-      <!-- Add a new group to the Refactor menu... -->
-      <group>
-         <!-- ...and put our refactoring in that group -->
-         <resourceRefactoring
-            class="org.eclipse.rephraserengine.internal.examples.text.ConvertTabsToSpacesRefactoring" />
-      </group>
-   </extension>
-
-   <!-- Associate the "(Debugging)" action set with the workbench text editor -->
-   <extension
-         point="org.eclipse.ui.actionSetPartAssociations">
-      <actionSetPartAssociation targetID="org.eclipse.rephraserengine.ui.DebugActionSet">
-         <part id="org.eclipse.ui.DefaultTextEditor"/>
-      </actionSetPartAssociation>
-   </extension>
-
-   <!-- Add a Text page to the Search dialog -->
-   <extension point="org.eclipse.search.searchPages">
-     <page
-        canSearchEnclosingProjects="true"
-        class="org.eclipse.rephraserengine.internal.examples.text.TextSearchPage"
-        id="org.eclipse.rephraserengine.examples.text.searchPage"
-        label="Text Search"
-        icon="icons/search_obj.gif"
-        showScopeSection="true"
-        sizeHint="460, 160"/>
-   </extension>
-   
-   <!-- Add a Search > Text menu item -->
-   <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            description="Text Search"
-            id="org.eclipse.rephraserengine.examples.text.searchActionSet"
-            label="Text Search"
-            visible="true">
-         <action
-               class="org.eclipse.rephraserengine.internal.examples.text.TextSearchPage$OpenTextSearchPageAction"
-               id="org.eclipse.rephraserengine.examples.text.openTextSearchPage"
-               label="Te&amp;xt..."
-               icon="icons/search_obj.gif"
-               menubarPath="org.eclipse.search.menu/dialogGroup" />
-      </actionSet>
-   </extension>
-</plugin>

diff --git a/org.eclipse.rephraserengine.examples.text/src/org/eclipse/rephraserengine/internal/examples/text/ConvertTabsToSpacesRefactoring.java b/org.eclipse.rephraserengine.examples.text/src/org/eclipse/rephraserengine/internal/examples/text/ConvertTabsToSpacesRefactoring.java
deleted file mode 100644
index a8c6461..0000000
--- a/org.eclipse.rephraserengine.examples.text/src/org/eclipse/rephraserengine/internal/examples/text/ConvertTabsToSpacesRefactoring.java
+++ /dev/null

@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.examples.text;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-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.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.Refactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.rephraserengine.core.refactorings.IResourceRefactoring;
-import org.eclipse.rephraserengine.core.refactorings.UserInputBoolean;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.ReplaceEdit;
-
-/**
- * A "refactoring" (sort of) that converts tabs to spaces in a text file.
- *
- * @author Jeff Overbey
- */
-public final class ConvertTabsToSpacesRefactoring extends Refactoring implements IResourceRefactoring
-{
-    private List<IFile> files = null;
-
-    private int tabWidth = 4;
-
-    public void initialize(List<IFile> files)
-    {
-        this.files = files;
-    }
-
-    @Override
-    public RefactoringStatus checkInitialConditions(IProgressMonitor pm)
-    {
-        assert files != null && !files.isEmpty();
-
-        pm.beginTask("Checking files", files.size());
-        pm.setTaskName("Checking files");
-        for (IFile file : files)
-        {
-            if (!file.isAccessible())
-                return fatalError("The file " + file.getName() + " is not accessible.");
-
-            if (file.isReadOnly())
-                return fatalError("The file " + file.getName() + " is read-only.");
-
-            pm.worked(1);
-        }
-        pm.done();
-
-        return new RefactoringStatus();
-    }
-
-    private RefactoringStatus fatalError(String message)
-    {
-        return RefactoringStatus.createFatalErrorStatus(message);
-    }
-
-    @UserInputBoolean(label="Use 8-character instead of 4-character tab stops", defaultValue=false)
-    public void setWideTabs(boolean useWideTabs)
-    {
-        tabWidth = useWideTabs ? 8 : 4;
-    }
-
-    @Override
-    public RefactoringStatus checkFinalConditions(IProgressMonitor pm)
-    {
-        assert files != null && !files.isEmpty();
-
-        return new RefactoringStatus();
-    }
-
-    @Override
-    public Change createChange(IProgressMonitor pm) throws CoreException
-    {
-        assert files != null && !files.isEmpty();
-
-        CompositeChange change = new CompositeChange(getName());
-        pm.beginTask("Converting tabs", files.size());
-        pm.setTaskName("Converting tabs");
-
-        for (IFile file : files)
-        {
-            try
-            {
-                pm.subTask("Modifying " + file.getName());
-                TextFileChange fileChange = change(file);
-                if (fileChange != null)
-                    change.add(fileChange);
-            }
-            catch (IOException e)
-            {
-                throw new CoreException(new Status(
-                    IStatus.ERROR,
-                    "org.eclipse.rephraserengine.examples.text",
-                    IStatus.OK,
-                    "The file " + file.getName() + " could not be read",
-                    e));
-            }
-            pm.worked(1);
-        }
-
-        pm.done();
-        return change;
-    }
-
-    /** @return a TextFileChange that will replace all tabs with spaces in the given file, or
-     *          <code>null</code> if there are no tab characters in the file */
-    private TextFileChange change(IFile file) throws IOException, CoreException
-    {
-        TextFileChange change = new TextFileChange("Replace tabs in " + file.getName(), file);
-        change.setEdit(new MultiTextEdit());
-
-        Reader in = new BufferedReader(new InputStreamReader(file.getContents(true),
-                                                             file.getCharset()));
-        int offset = 0;
-        int column = 0;
-        int numberOfTabsReplaced = 0;
-        for (int ch = in.read(); ch >= 0; ch = in.read())
-        {
-            if (ch == '\t')
-            {
-                int spacesToNextTabStop = tabWidth - (column % tabWidth);
-                change.addEdit(new ReplaceEdit(offset, 1, spaces(spacesToNextTabStop)));
-                column += spacesToNextTabStop;
-                numberOfTabsReplaced += 1;
-            }
-            else if (ch == '\n')
-            {
-                column = 0;
-            }
-            else
-            {
-                column++;
-            }
-            offset++;
-        }
-        in.close();
-
-        if (numberOfTabsReplaced == 0)
-            return null;
-        else
-            return change;
-    }
-
-    private String spaces(int count)
-    {
-        assert 0 <= count && count <= tabWidth && tabWidth <= 8;
-
-        switch (count)
-        {
-            case 0: return "";
-            case 1: return " ";
-            case 2: return "  ";
-            case 3: return "   ";
-            case 4: return "    ";
-            case 5: return "     ";
-            case 6: return "      ";
-            case 7: return "       ";
-            case 8: return "        ";
-            default: throw new IllegalArgumentException();
-        }
-    }
-
-    @Override
-    public String getName()
-    {
-        return "Convert Tabs to Spaces";
-    }
-}

diff --git a/org.eclipse.rephraserengine.examples.text/src/org/eclipse/rephraserengine/internal/examples/text/TextFileResourceFilter.java b/org.eclipse.rephraserengine.examples.text/src/org/eclipse/rephraserengine/internal/examples/text/TextFileResourceFilter.java
deleted file mode 100644
index 583e719..0000000
--- a/org.eclipse.rephraserengine.examples.text/src/org/eclipse/rephraserengine/internal/examples/text/TextFileResourceFilter.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.examples.text;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.rephraserengine.core.resources.IResourceFilter;
-
-/**
- * Resource filter that accepts any kind of text file (but not binaries) in any project or folder,
- * excluding files named *makefile or .*
- * <p>
- * Only resources that are accessible and not "derived resources" (according to the Eclipse
- * Platform) are considered.
- *
- * @author Jeff Overbey
- */
-public class TextFileResourceFilter implements IResourceFilter
-{
-    private static final IContentType TEXT_CONTENT_TYPE =
-        Platform.getContentTypeManager().getContentType(IContentTypeManager.CT_TEXT);
-
-    public boolean shouldProcess(IResource resource)
-    {
-        if (!(resource instanceof IFile)) return true; // Process all projects, all folders
-
-        String filename = resource.getName();
-        if (filename.toLowerCase().endsWith("makefile") || filename.startsWith(".")) return false;
-
-        IContentType contentType = Platform.getContentTypeManager().findContentTypeFor(filename);
-        return contentType != null
-            && contentType.isKindOf(TEXT_CONTENT_TYPE)
-            && resource.isAccessible()
-            && !resource.isDerived();
-    }
-
-    public String getError(IResource resource)
-    {
-        return "The file " + resource.getName() + " is not a text file, or it is not accessible.";
-    }
-}

diff --git a/org.eclipse.rephraserengine.examples.text/src/org/eclipse/rephraserengine/internal/examples/text/TextSearchPage.java b/org.eclipse.rephraserengine.examples.text/src/org/eclipse/rephraserengine/internal/examples/text/TextSearchPage.java
deleted file mode 100644
index 7b02f66..0000000
--- a/org.eclipse.rephraserengine.examples.text/src/org/eclipse/rephraserengine/internal/examples/text/TextSearchPage.java
+++ /dev/null

@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.internal.examples.text;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.rephraserengine.core.util.Pair;
-import org.eclipse.rephraserengine.core.util.StringUtil;
-import org.eclipse.rephraserengine.ui.search.OpenSearchPageAction;
-import org.eclipse.rephraserengine.ui.search.SearchMatch;
-import org.eclipse.rephraserengine.ui.search.SearchPage;
-import org.eclipse.rephraserengine.ui.search.SearchQuery;
-import org.eclipse.rephraserengine.ui.search.SearchResult;
-import org.eclipse.search.ui.ISearchQuery;
-
-/**
- * A new page ("Text Search") that is contributed to the workbench Search dialog and added to the
- * Search menu in the menu bar.
- * 
- * @author Jeff Overbey
- */
-public class TextSearchPage extends SearchPage
-{
-    public static final String SEARCH_PAGE_ID = "org.eclipse.rephraserengine.examples.text.searchPage";
-    
-    /**
-     * An action that opens the Text Search dialog.  This appears as the Search &gt; Text...
-     * menu item.
-     * 
-     * @author Jeff Overbey
-     */
-    public static class OpenTextSearchPageAction extends OpenSearchPageAction
-    {
-        @Override
-        protected String searchPageID()
-        {
-            return SEARCH_PAGE_ID;
-        }
-    }
-    
-    public static class TextSearchQuery extends SearchQuery<SearchResult>
-    {
-        public TextSearchQuery(List<IResource> scope, String scopeDescription,
-            String patternDescription, String patternRegex, int flags)
-        {
-            super(scope, scopeDescription, patternDescription, patternRegex, flags);
-        }
-
-        public static final int FIND_TEXT = 0x10;
-        
-        public static final int FIND_ALL_OCCURRENCES = 0x01;
-        public static final int FIND_FIRST_OCCURRENCES = 0x02;
-        
-        @Override
-        protected SearchResult createInitialSearchResult()
-        {
-            return new SearchResult(this);
-        }
-
-        @Override
-        protected boolean shouldProcess(IResource resource)
-        {
-            return new TextFileResourceFilter().shouldProcess(resource);
-        }
-
-        @Override
-        protected void search(IFile file)
-        {
-            String contents = StringUtil.readOrReturnNull(file);
-            Matcher matcher = Pattern.compile(patternRegex).matcher(contents == null ? "" : contents);
-            if ((searchFlags & FIND_ALL_OCCURRENCES) != 0)
-                while (matcher.find())
-                    result.addMatch(new SearchMatch(file, matcher.start(), matcher.end()-matcher.start()));
-            else
-                if (matcher.find())
-                    result.addMatch(new SearchMatch(file, matcher.start(), matcher.end()-matcher.start()));
-        }
-    }
-
-    @Override protected String PAGE_NAME() { return "RephraserExampleTextSearchPage"; }
-
-    @Override protected List<Pair<String, Integer>> searchFor()
-    {
-        List<Pair<String, Integer>> searchFor = new ArrayList<Pair<String, Integer>>(6);
-        searchFor.add(Pair.of("Text", TextSearchQuery.FIND_TEXT));
-        return searchFor;
-    }
-
-    @Override protected List<Pair<String, Integer>> limitTo()
-    {
-        List<Pair<String, Integer>> searchFor = new ArrayList<Pair<String, Integer>>(3);
-        searchFor.add(Pair.of("All occurrences", TextSearchQuery.FIND_ALL_OCCURRENCES));
-        searchFor.add(Pair.of("First occurrences", TextSearchQuery.FIND_FIRST_OCCURRENCES));
-        return searchFor;
-    }
-    
-    @Override protected ISearchQuery createSearchQuery(
-        List<IResource> scope,
-        String scopeDesc,
-        String patternDesc,
-        String patternRegex,
-        int searchFlags)
-    {
-        return new TextSearchQuery(scope, scopeDesc, patternDesc, patternRegex, searchFlags);
-    }
-    
-    @Override protected int defaultSearchFlags()
-    {
-        return TextSearchQuery.FIND_TEXT | TextSearchQuery.FIND_ALL_OCCURRENCES;
-    }
-}
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine.examples.text/test/tab-example.txt b/org.eclipse.rephraserengine.examples.text/test/tab-example.txt
deleted file mode 100644
index eca9272..0000000
--- a/org.eclipse.rephraserengine.examples.text/test/tab-example.txt
+++ /dev/null

@@ -1,23 +0,0 @@
-program tabs
-    implicit none
-	!
- 	!
-  	!
-   	!
-    	!
-     	!
-      	!
-       	!
-        	!
-         	!
-          	!
-           	!
-        		!
-         		!
-          		!
-           		!
-        	a	!
-         	ab	!
-          	abc	!
-           	abcd	!
-end program tabs

diff --git a/org.eclipse.rephraserengine.testing.junit3/.classpath b/org.eclipse.rephraserengine.testing.junit3/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/org.eclipse.rephraserengine.testing.junit3/.classpath
+++ /dev/null

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

diff --git a/org.eclipse.rephraserengine.testing.junit3/.project b/org.eclipse.rephraserengine.testing.junit3/.project
deleted file mode 100644
index 35d12b2..0000000
--- a/org.eclipse.rephraserengine.testing.junit3/.project
+++ /dev/null

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rephraserengine.testing.junit3</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>net.sourceforge.metrics.builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>net.sourceforge.metrics.nature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>

diff --git a/org.eclipse.rephraserengine.testing.junit3/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.rephraserengine.testing.junit3/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7e988b1..0000000
--- a/org.eclipse.rephraserengine.testing.junit3/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null

@@ -1,335 +0,0 @@
-#Thu May 27 16:30:35 CDT 2010
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=error
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=disabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=20
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=18
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=18
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=20
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=100
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=true
-org.eclipse.jdt.core.formatter.join_wrapped_lines=true
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=true
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=100
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true

diff --git a/org.eclipse.rephraserengine.testing.junit3/.settings/org.eclipse.jdt.ui.prefs b/org.eclipse.rephraserengine.testing.junit3/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 9a7644f..0000000
--- a/org.eclipse.rephraserengine.testing.junit3/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null

@@ -1,6 +0,0 @@
-#Thu Feb 11 19:44:47 CST 2010
-eclipse.preferences.version=1
-formatter_profile=_Photran
-formatter_settings_version=11
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\n * Copyright (c) ${year} University of Illinois at Urbana-Champaign and others.\n * All rights reserved. This program and the accompanying materials\n * are made available under the terms of the Eclipse Public License v1.0\n * which accompanies this distribution, and is available at\n * http\://www.eclipse.org/legal/epl-v10.html\n *\n * Contributors\:\n *    UIUC - Initial API and implementation\n *******************************************************************************/</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * \n * @author ${user}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="false" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="false" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.php.ui.editor.templates.php.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created JavaScript files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for vars" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding function" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-JSDoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate functions" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created function stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated function stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.wst.jsdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>

diff --git a/org.eclipse.rephraserengine.testing.junit3/META-INF/MANIFEST.MF b/org.eclipse.rephraserengine.testing.junit3/META-INF/MANIFEST.MF
deleted file mode 100644
index 68a8695..0000000
--- a/org.eclipse.rephraserengine.testing.junit3/META-INF/MANIFEST.MF
+++ /dev/null

@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Rephraser Engine JUnit 3 Testing Support
-Bundle-SymbolicName: org.eclipse.rephraserengine.testing.junit3
-Bundle-Version: 3.0.0.qualifier
-Bundle-Vendor: Eclipse.org - Photran
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.junit,
- org.eclipse.rephraserengine.core,
- org.eclipse.rephraserengine.core.refactoring,
- org.eclipse.rephraserengine.core.vpg,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.jface.text
-Export-Package: org.eclipse.rephraserengine.testing.combinatorial,
- org.eclipse.rephraserengine.testing.junit3

diff --git a/org.eclipse.rephraserengine.testing.junit3/build.properties b/org.eclipse.rephraserengine.testing.junit3/build.properties
deleted file mode 100644
index 34d2e4d..0000000
--- a/org.eclipse.rephraserengine.testing.junit3/build.properties
+++ /dev/null

@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .

diff --git a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/combinatorial/CombinationGenerator.java b/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/combinatorial/CombinationGenerator.java
deleted file mode 100644
index fcfe4f6..0000000
--- a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/combinatorial/CombinationGenerator.java
+++ /dev/null

@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.testing.combinatorial;
-
-import java.util.Iterator;
-
-/**
- * Generates all combinations of non-negative integers within specified limits.
- * <p>
- * If a {@link CombinationGenerator} is constructed with parameters (5, 2), it will generate all
- * combinations of up to two integers, each in the range 0..4. Successive calls to
- * {@link #nextCombination(int[])} will return the following int arrays:
- * <pre>
- * 0
- * 1
- * 2
- * 3
- * 4
- * 0 1
- * 0 2
- * 0 3
- * 0 4
- * 1 2
- * 1 3
- * 1 4
- * 2 3
- * 2 4
- * 3 4
- * null
- * </pre>
- * 
- * @author Jeff Overbey
- * 
- * @since 2.0
- */
-public class CombinationGenerator implements Iterable<int[]>
-{
-    private int maxValuePlusOne, maxItems;
-
-    public CombinationGenerator(int maxValuePlusOne, int maxItems)
-    {
-        this.maxValuePlusOne = maxValuePlusOne;
-        this.maxItems = Math.min(maxItems, maxValuePlusOne);
-    }
-
-    /**
-     * Returns the first combination of integers. This is always {0}.
-     * <p>
-     * It can be passed to {@link #nextCombination(int[])} to generate the next combination.
-     * 
-     * @return the first combination of integers (always {0})
-     * */
-    public int[] firstCombination()
-    {
-        return new int[] { 0 };
-    }
-
-    /**
-     * Returns the first combination of <i>n</i> integers. This is always {0, 1, ..., n-1}.
-     * <p>
-     * It can be passed to {@link #nextCombination(int[])} to generate the next combination.
-     * 
-     * @return the first combination of <i>n</i> integers (always {0, 1, ..., n-1})
-     * */
-    public int[] firstCombination(int n)
-    {
-        int[] result = new int[n];
-        for (int i = 0; i < n; i++)
-            result[i] = i;
-        return result;
-    }
-
-    /**
-     * Returns the next combination of integers (according to the parameters pass to this
-     * {@link CombinationGenerator}'s constructor), given the previous combination returned by this
-     * method or by {@link #firstCombination()}.  <i>Note that the <code>lastCombination</code>
-     * array is modified in-place.</i>
-     * 
-     * @param lastCombination an array returned by {@link #firstCombination()} or
-     *            {@link #nextCombination(int[])}
-     * 
-     * @return a combination of integers, or <code>null</code> if there are no more combinations to
-     *         generate
-     */
-    public int[] nextCombination(int[] lastCombination)
-    {
-        if (lastCombination == null) return null;
-
-        int indexToIncrement = findIndexToIncrement(lastCombination);
-        if (indexToIncrement < 0)
-        {
-            return increaseLength(lastCombination);
-        }
-        else
-        {
-            incrementIndex(indexToIncrement, lastCombination);
-            return lastCombination;
-        }
-    }
-
-    private int findIndexToIncrement(int[] configuration)
-    {
-        int indexToIncrement = configuration.length - 1;
-
-        // The goal is to do something like this:
-        // if (configuration[7] == maxValue-1)
-        // indexToIncrement = 6;
-        // if (configuration[6] == maxValue-2)
-        // indexToIncrement = 5;
-
-        for (int i = configuration.length - 1; i >= 0; i--)
-        {
-            if (configuration[i] == maxValuePlusOne - (configuration.length - i))
-            {
-                indexToIncrement--;
-            }
-        }
-
-        return indexToIncrement;
-    }
-
-    private void incrementIndex(int indexToIncrement, int[] configuration)
-    {
-        configuration[indexToIncrement]++;
-
-        for (int i = indexToIncrement + 1; i < configuration.length; i++)
-            configuration[i] = configuration[i - 1] + 1;
-    }
-
-    private int[] increaseLength(int[] configuration)
-    {
-        if (configuration.length == maxItems) return null;
-
-        int[] newConfig = new int[configuration.length + 1];
-        for (int i = 0; i < newConfig.length; i++)
-            newConfig[i] = i;
-        return newConfig;
-    }
-
-    /* @see java.lang.Iterable#iterator() */
-    public Iterator<int[]> iterator()
-    {
-        return new Iterator<int[]>()
-        {
-            private int[] nextCombination = firstCombination();
-            
-            public boolean hasNext()
-            {
-                return nextCombination != null;
-            }
-
-            public int[] next()
-            {
-                int[] result = nextCombination.clone();
-                nextCombination = nextCombination(nextCombination);
-                return result;
-            }
-
-            public void remove()
-            {
-                throw new UnsupportedOperationException();
-            }
-        };
-    }
-}

diff --git a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/combinatorial/ForEach.java b/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/combinatorial/ForEach.java
deleted file mode 100644
index 3e22af6..0000000
--- a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/combinatorial/ForEach.java
+++ /dev/null

@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.testing.combinatorial;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.rephraserengine.core.util.Pair;
-
-/**
- * 
- * @author Jeff Overbey
- * 
- * @since 2.0
- */
-public class ForEach
-{
-    private ForEach() {;}
-    
-    public static <T> Iterable<List<T>> combinationOf(List<T> list)
-    {
-        return combinationOf(1, list.size(), list);
-    }
-    
-    public static <T> Iterable<List<T>> combinationOf(int numElementsToChoose,
-                                                      List<T> list)
-    {
-        return combinationOf(numElementsToChoose, numElementsToChoose, list);
-    }
-
-    public static <T> Iterable<List<T>> combinationOf(final int minNumElementsInCombination,
-                                                      final int maxNumElementsInCombination,
-                                                      final List<T> list)
-    {
-        return new Iterable<List<T>>()
-        {
-            public Iterator<List<T>> iterator()
-            {
-                return new CombinationIterator<T>(minNumElementsInCombination,
-                                                  maxNumElementsInCombination,
-                                                  list);
-            }
-        };
-    }
-    
-    private static class CombinationIterator<T> implements Iterator<List<T>>
-    {
-        protected List<T> list;
-        protected CombinationGenerator gen;
-        protected int[] nextCombination;
-        
-        public CombinationIterator(int minNumElementsInCombination,
-                                   int maxNumElementsInCombination,
-                                   List<T> list)
-        {
-            if (minNumElementsInCombination < 1
-                || minNumElementsInCombination > list.size()
-                || maxNumElementsInCombination < 0
-                || maxNumElementsInCombination > list.size())
-                throw new IllegalArgumentException();
-            
-            this.list = list;
-            this.gen = new CombinationGenerator(list.size(), maxNumElementsInCombination);
-            this.nextCombination = gen.firstCombination(minNumElementsInCombination);
-        }
-
-        public boolean hasNext()
-        {
-            return nextCombination != null;
-        }
-
-        public List<T> next()
-        {
-            if (nextCombination == null) return null;
-            
-            List<T> combination = new ArrayList<T>(nextCombination.length);
-            for (int i = 0; i < nextCombination.length; i++)
-                combination.add(list.get(nextCombination[i]));
-            
-            nextCombination = gen.nextCombination(nextCombination);
-            return combination;
-        }
-
-        public void remove()
-        {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * @return all pairs of two objects from the given set
-     */
-    public static <T> Iterable<Pair<T,T>> pairOf(final List<T> objects)
-    {
-        return new Iterable<Pair<T,T>>()
-        {
-            public Iterator<Pair<T,T>> iterator()
-            {
-                return new PairIterator<T>(objects);
-            }
-        };
-    }
-    
-    private static class PairIterator<T> implements Iterator<Pair<T,T>>
-    {
-        /** Set of objects from which pairs will be generated */
-        protected final List<T> objects;
-        
-        /** Index of the first component of the pair in {@link #objects} */
-        protected int fstIndex;
-        
-        /** Index of the second component of the pair in {@link #objects} */
-        protected int sndIndex;
-        
-        public PairIterator(List<T> objects)
-        {
-            if (objects == null) throw new IllegalArgumentException();
-            if (objects == null || objects.isEmpty())
-                throw new IllegalArgumentException();
-            
-            this.objects = objects;
-            this.fstIndex = 0;
-            this.sndIndex = 0;
-        }
-
-        public boolean hasNext()
-        {
-            return fstIndex < objects.size();
-        }
-
-        public Pair<T,T> next()
-        {
-            if (fstIndex == objects.size()) return null;
-            
-            Pair<T,T> result = new Pair<T,T>(objects.get(fstIndex), objects.get(sndIndex));
-            
-            if (++sndIndex == objects.size())
-            {
-                ++fstIndex;
-                sndIndex = 0;
-            }
-            
-            return result;
-        }
-
-        public void remove()
-        {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * @return all tuples of objects with one component from each of the given sets
-     */
-    public static <T> Iterable<List<T>> tupleOf(final List<? extends T>... objects)
-    {
-        return new Iterable<List<T>>()
-        {
-            public Iterator<List<T>> iterator()
-            {
-                return new TupleIterator<T>(objects);
-            }
-        };
-    }
-    
-    private static class TupleIterator<T> implements Iterator<List<T>>
-    {
-        /** Sets of objects from which pairs will be generated */
-        protected final List<? extends T>[] objects;
-        
-        /** Indices of the components of the tuple: <code>index[i]</code> is an
-         * index into {@link #objects}[i] */
-        protected int[] indices;
-        
-        public TupleIterator(List<? extends T>... objects)
-        {
-            if (objects == null) throw new IllegalArgumentException();
-            for (List<? extends T> list : objects)
-                if (list == null || list.isEmpty())
-                    throw new IllegalArgumentException();
-            
-            this.objects = objects;
-            this.indices = new int[objects.length];
-        }
-
-        public boolean hasNext()
-        {
-            return indices[0] < objects[0].size();
-        }
-
-        public List<T> next()
-        {
-            if (indices[0] == objects[0].size()) return null;
-            
-            List<T> result = new ArrayList<T>(indices.length);
-            for (int i = 0; i < indices.length; i++)
-                result.add(objects[i].get(indices[i]));
-            incrementIndices();
-            return result;
-        }
-
-        private void incrementIndices()
-        {
-            for (int i = indices.length-1; i >= 0; i--)
-            {
-                indices[i]++;
-                if (indices[i] < objects[i].size())
-                    break;
-                else if (i > 0)
-                    indices[i] = 0;
-            }
-        }
-
-        public void remove()
-        {
-            throw new UnsupportedOperationException();
-        }
-    }
-}

diff --git a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/GeneralTestSuiteFromFiles.java b/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/GeneralTestSuiteFromFiles.java
deleted file mode 100644
index 01c77cc..0000000
--- a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/GeneralTestSuiteFromFiles.java
+++ /dev/null

@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.testing.junit3;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * A {@link TestSuite} containing a test for each file found in the subdirectories of a particular
- * directory.
- * <p>
- * Most people will want to subclass from {@link TestSuiteFromFiles} instead.
- * <p>
- * Subclasses must override {@link #createTestFor(File)}.
- * 
- * @author Jeff Overbey
- * @see TestSuiteFromFiles
- * 
- * @since 2.0
- */
-public abstract class GeneralTestSuiteFromFiles extends TestSuite
-{
-    protected final String description;
-    protected final String testDirectory;
-    protected final FilenameFilter filenameFilter;
-
-    public GeneralTestSuiteFromFiles(String description, String directorySuffix, FilenameFilter filenameFilter,
-        boolean mustExist, Object... initializationData) throws FileNotFoundException, IOException
-    {
-        this.description = description;
-        this.testDirectory = getFullPath(directorySuffix);
-        this.filenameFilter = filenameFilter;
-
-        setName(getDescription(directorySuffix, mustExist));
-
-        initialize(initializationData);
-        
-        File dir = new File(testDirectory);
-        if (mustExist && !dir.exists())
-            throw new FileNotFoundException(Messages.bind(Messages.GeneralTestSuiteFromFiles_DirectoryNotFound, dir.getAbsolutePath()));
-
-        if (dir.exists())
-        {
-            processDirectory(dir, getFilesToSkip(dir));
-    
-            if (this.countTestCases() == 0)
-                throw new FileNotFoundException(Messages.bind(Messages.GeneralTestSuiteFromFiles_NoTestFilesFoundInDirectory, dir.getAbsolutePath()));
-        }
-    }
-
-    public GeneralTestSuiteFromFiles(String description, String directorySuffix, FilenameFilter filenameFilter)
-        throws FileNotFoundException, IOException
-    {
-        this(description, directorySuffix, filenameFilter, true);
-    }
-
-    public GeneralTestSuiteFromFiles(String description, String directorySuffix, final String filenameExtension,
-        boolean mustExist) throws FileNotFoundException, IOException
-    {
-        this(description, directorySuffix, new FilenameFilter()
-        {
-            public boolean accept(File dir, String name)
-            {
-                return name.endsWith(filenameExtension);
-            }
-        }, mustExist);
-    }
-
-    public GeneralTestSuiteFromFiles(String description, String directorySuffix, final String filenameExtension)
-        throws FileNotFoundException, IOException
-    {
-        this(description, directorySuffix, filenameExtension, true);
-    }
-
-    protected void initialize(Object... initializationData)
-    {
-    }
-    
-    protected String getDescription(String directorySuffix, boolean mustExist)
-    {
-        String dir = getFullPath(directorySuffix);
-
-        StringBuffer sb = new StringBuffer(256);
-        sb.append(description);
-        sb.append(' ');
-        sb.append(directorySuffix);
-        String message = sb.toString();
-
-        if (!new File(dir).exists())
-        {
-            if (mustExist)
-                throw new Error(
-                    Messages.bind(
-                        Messages.GeneralTestSuiteFromFiles_UnableToFindDirectory,
-                        dir,
-                        getWorkingDirectory()));
-            else
-                message = Messages.bind(Messages.GeneralTestSuiteFromFiles_SomeOptionalTestFilesAreNotPresent, dir);
-        }
-
-        return message;
-    }
-
-    private String getWorkingDirectory()
-    {
-        try
-        {
-            return new File(".").getCanonicalPath(); //$NON-NLS-1$
-        }
-        catch (IOException e)
-        {
-            return "???"; //$NON-NLS-1$
-        }
-    }
-
-    private String getFullPath(String directorySuffix)
-    {
-        StringBuilder sb = new StringBuilder();
-
-        String rootDirectory = getRootDirectory();
-        sb.append(rootDirectory);
-        if (!rootDirectory.equals("") && !rootDirectory.endsWith("/")) sb.append('/'); //$NON-NLS-1$ //$NON-NLS-2$
-
-        sb.append(directorySuffix);
-        if (!directorySuffix.endsWith("/")) sb.append('/'); //$NON-NLS-1$
-
-        return sb.toString();
-    }
-
-    protected String getRootDirectory()
-    {
-        return ""; //$NON-NLS-1$
-    }
-
-    protected Set<String> getFilesToSkip(File subdirectory)
-    {
-        File list = new File(subdirectory, nameOfTextFileContainingFilesToSkip());
-        if (!list.exists())
-            list = new File(testDirectory, nameOfTextFileContainingFilesToSkip());
-        if (!list.exists())
-            list = new File(getRootDirectory(), nameOfTextFileContainingFilesToSkip());
-
-        if (list.exists() && list.canRead())
-            return filesListedIn(list);
-        else
-            return Collections.<String> emptySet();
-    }
-
-    protected String nameOfTextFileContainingFilesToSkip()
-    {
-        return "FILES-TO-SKIP.txt"; //$NON-NLS-1$
-    }
-
-    protected Set<String> filesListedIn(File list)
-    {
-        try
-        {
-            Set<String> result = new HashSet<String>();
-
-            BufferedReader r = new BufferedReader(new FileReader(list));
-            for (String line = r.readLine(); line != null; line = r.readLine())
-            {
-                line = line.trim();
-                if (!line.equals("") && !line.startsWith("#")) //$NON-NLS-1$ //$NON-NLS-2$
-                    result.add(line);
-            }
-
-            return result;
-        }
-        catch (IOException e)
-        {
-            throw new Error(e);
-        }
-    }
-
-    private void processDirectory(File dir, Set<String> filenamesToSkip)
-    {
-        addTestsFor(dir.listFiles(filenameFilter), filenamesToSkip);
-
-        for (File subdir : dir.listFiles(DIRECTORY_FILTER))
-            processDirectory(subdir, filenamesToSkip);
-    }
-
-    private void addTestsFor(File[] filesInDirectory, Set<String> filenamesToSkip)
-    {
-        for (File file : filesInDirectory)
-        {
-            if (!file.isDirectory() && !shouldSkip(file, filenamesToSkip))
-            {
-                TestSuite subSuite = new TestSuite(description + " " + describe(file)); //$NON-NLS-1$
-                subSuite.addTest(createTestFor(file));
-                addTest(subSuite);
-            }
-        }
-    }
-
-    protected boolean shouldSkip(File file, Set<String> filenamesToSkip)
-    {
-        for (String filename : filenamesToSkip)
-            if (file.getAbsolutePath().replace('\\', '/').endsWith(filename.replace('\\', '/')))
-                return true;
-
-        return false;
-    }
-
-    protected String describe(File file)
-    {
-        return file.getAbsolutePath().substring(file.getAbsolutePath().lastIndexOf(File.separatorChar) + 1);
-    }
-
-    private static FileFilter DIRECTORY_FILTER = new FileFilter()
-    {
-        public boolean accept(File f)
-        {
-            return f.isDirectory();
-        }
-    };
-
-    public void test() {} // to keep JUnit quiet
-
-    protected abstract Test createTestFor(File file);
-}
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/GeneralTestSuiteFromMarkers.java b/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/GeneralTestSuiteFromMarkers.java
deleted file mode 100644
index 396803a..0000000
--- a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/GeneralTestSuiteFromMarkers.java
+++ /dev/null

@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.testing.junit3;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FilenameFilter;
-import java.io.IOException;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.rephraserengine.core.util.StringUtil;
-
-/**
- * A {@link TestSuite} containing a test for each <i>marker</i> found in the files in a particular
- * directory.  A <i>marker</i> is an arbitrary string (Photran uses <pre>!&lt;&lt;&lt;&lt;&lt;</pre>),
- * since <pre>!</pre> is the comment character in Fortran) followed by arbitrary text which continues
- * to the end of the line or the next marker, whichever appears first.
- * <p>
- * Most people will want to subclass from {@link TestSuiteFromMarkers} instead.
- * <p>
- * Subclasses must override {@link #createTestFor(List, File, int, String))}.
- * 
- * @author Jeff Overbey
- * @see TestSuiteFromMarkers
- * 
- * @since 2.0
- */
-public abstract class GeneralTestSuiteFromMarkers extends TestSuite
-{
-    protected final String description;
-    protected final String marker;
-    /** @since 3.0 */
-    protected final String markerEnd;
-    
-    /**
-     * Constructor.  Creates this {@link TestSuite} and populates it with test cases.
-     * 
-     * @param description
-     * @param marker
-     * @param fileOrDirectory
-     * @param filenameFilter
-     * @param initializationData these arguments (if any) will be passed directly to {@link #initialize(Object...)} before adding tests to the test suite
-     * @throws Exception
-     */
-    public GeneralTestSuiteFromMarkers(String description, String marker, File fileOrDirectory, FilenameFilter filenameFilter, Object... initializationData) throws Exception
-    {
-        this(description, marker, "\n", fileOrDirectory, filenameFilter, initializationData); //$NON-NLS-1$
-    }
-    
-    /**
-     * Constructor.  Creates this {@link TestSuite} and populates it with test cases.
-     * 
-     * @param description
-     * @param marker
-     * @param markerEnd
-     * @param fileOrDirectory
-     * @param filenameFilter
-     * @param initializationData these arguments (if any) will be passed directly to {@link #initialize(Object...)} before adding tests to the test suite
-     * @throws Exception
-     * 
-     * @since 3.0
-     */
-    public GeneralTestSuiteFromMarkers(String description, String marker, String markerEnd, File fileOrDirectory, FilenameFilter filenameFilter, Object... initializationData) throws Exception
-    {
-        this.description = description;
-        this.marker = marker;
-        this.markerEnd = markerEnd;
-        setName(getDescription(fileOrDirectory));
-        
-        initialize(initializationData);
-        
-        addTestsForFileOrDirectory(fileOrDirectory, filenameFilter);
-
-        if (countTestCases() == 0)
-            throw new Exception(Messages.bind(Messages.GeneralTestSuiteFromMarkers_NoMarkersFound, marker, fileOrDirectory.getName()));
-    }
-
-    /**
-     * Callback method which is invoked before adding tests to this test suite.
-     * <p>
-     * This may be overridden to configure the object (e.g., set field values) before tests are added.
-     * 
-     * @param initializationData the <code>initializationData</code> argument(s) passed to the constructor
-     */
-    protected void initialize(Object... initializationData)
-    {
-    }
-
-    public GeneralTestSuiteFromMarkers(String description, String marker, File fileOrDirectory, final String filenameExtension)
-        throws Exception
-    {
-        this(description, marker, fileOrDirectory, new FilenameFilter()
-        {
-            public boolean accept(File dir, String name)
-            {
-                return name.endsWith(filenameExtension);
-            }
-        });
-    }
-
-    private void addTestsForFileOrDirectory(File fileOrDirectory, FilenameFilter filenameFilter) throws Exception
-    {
-        if (!fileOrDirectory.exists())
-            throw new FileNotFoundException(Messages.bind(Messages.GeneralTestSuiteFromMarkers_FileNotFound, fileOrDirectory.getAbsolutePath()));
-        if (!fileOrDirectory.canRead())
-            throw new IOException(Messages.bind(Messages.GeneralTestSuiteFromMarkers_FileCannotBeRead, fileOrDirectory.getAbsolutePath()));
-
-        if (fileOrDirectory.isDirectory())
-            for (File file : fileOrDirectory.listFiles(filenameFilter))
-                addTestsForFileOrDirectory(file, filenameFilter);
-        else
-            addTestForFile(fileOrDirectory);
-    }
-
-    private void addTestForFile(File file) throws IOException, Exception
-    {
-        String fileContents = StringUtil.read(file);
-        for (int index = fileContents.indexOf(marker);
-             index >= 0;
-             index = fileContents.indexOf(marker, index+1))
-        {
-            int endOfLine = fileContents.indexOf(markerEnd, index);
-            if (endOfLine < 0) endOfLine = fileContents.length();
-            
-            int nextMarker = fileContents.indexOf(marker, index+1);
-            if (nextMarker < 0) nextMarker = fileContents.length();
-            
-            int markerEnd = Math.min(endOfLine, nextMarker);
-
-            this.addTest(createTestFor(file, index,
-                fileContents.substring(index+marker.length(), markerEnd).trim()));
-        }
-    }
-
-    protected String getDescription(File fileOrDirectory)
-    {
-        StringBuffer sb = new StringBuffer(256);
-        sb.append(description);
-        sb.append(' ');
-        sb.append(fileOrDirectory.getName());
-        String message = sb.toString();
-
-        if (!fileOrDirectory.exists())
-        {
-            message = Messages.bind(Messages.GeneralTestSuiteFromMarkers_SomeOptionalTestFilesAreNotPresent, fileOrDirectory);
-        }
-
-        return message;
-    }
- 
-    public void test() {} // to keep JUnit quiet
-
-    protected abstract Test createTestFor(File fileContainingMarker, int markerOffset, String markerText) throws Exception;
-}
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/MarkerUtil.java b/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/MarkerUtil.java
deleted file mode 100644
index 16f97a6..0000000
--- a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/MarkerUtil.java
+++ /dev/null

@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.testing.junit3;
-
-import java.util.LinkedList;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.TextSelection;
-
-/**
- * Utility methods for
- * 
- * @author Jeff Overbey
- * 
- * @since 3.0
- */
-public class MarkerUtil
-{
-    private MarkerUtil() {;}
-
-    public static TextSelection determineSelection(String markerText, IDocument document) throws BadLocationException
-    {
-        return determineSelection(parseMarker(markerText), document);
-    }
-    
-    public static LinkedList<String> parseMarker(String markerText)
-    {
-        LinkedList<String> result = new LinkedList<String>();
-        for (String field : markerText.split(",")) //$NON-NLS-1$
-            result.add(field.trim());
-        return result;
-    }
-
-    public static TextSelection determineSelection(LinkedList<String> markerFields, IDocument document) throws BadLocationException
-    {
-        if (markerFields.size() < 2) throw new IllegalArgumentException();
-        
-        int fromLine = Integer.parseInt(markerFields.removeFirst());
-        int fromCol = Integer.parseInt(markerFields.removeFirst());
-        int toLine = fromLine;
-        int toCol = fromCol;
-        if (markerFields.size() >= 2 && isInteger(markerFields.get(0)) && isInteger(markerFields.get(1)))
-        {
-            toLine = Integer.parseInt(markerFields.removeFirst());
-            toCol = Integer.parseInt(markerFields.removeFirst());
-        }
-        
-        IRegion fromLineRegion = document.getLineInformation(fromLine-1);
-        IRegion toLineRegion = document.getLineInformation(toLine-1);
-        
-        int fromOffset = fromLineRegion.getOffset() + fromCol - 1;
-        int toOffset = toLineRegion.getOffset() + toCol - 1;
-        int length = toOffset - fromOffset;
-        
-        return new TextSelection(document, fromOffset, length);
-    }
-
-    /**
-     * @return true iff {@link Integer#parseInt(String)} can successfully parse the given
-     *         string can be parsed as an integer
-     */
-    private static boolean isInteger(String string)
-    {
-        try
-        {
-            Integer.parseInt(string);
-            return true;
-        }
-        catch (NumberFormatException e)
-        {
-            return false;
-        }
-    }
-}

diff --git a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/Messages.java b/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/Messages.java
deleted file mode 100644
index 493a544..0000000
--- a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/Messages.java
+++ /dev/null

@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.testing.junit3;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Externalized strings.
- */
-public class Messages extends NLS
-{
-    private static final String BUNDLE_NAME = "org.eclipse.rephraserengine.testing.junit3.messages"; //$NON-NLS-1$
-
-    public static String GeneralTestSuiteFromFiles_DirectoryNotFound;
-
-    public static String GeneralTestSuiteFromFiles_NoTestFilesFoundInDirectory;
-
-    public static String GeneralTestSuiteFromFiles_SomeOptionalTestFilesAreNotPresent;
-
-    public static String GeneralTestSuiteFromFiles_UnableToFindDirectory;
-
-    public static String GeneralTestSuiteFromMarkers_FileCannotBeRead;
-
-    public static String GeneralTestSuiteFromMarkers_FileNotFound;
-
-    public static String GeneralTestSuiteFromMarkers_NoMarkersFound;
-
-    public static String GeneralTestSuiteFromMarkers_SomeOptionalTestFilesAreNotPresent;
-    static
-    {
-        // initialize resource bundle
-        NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-    }
-
-    private Messages()
-    {
-    }
-}

diff --git a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/RefactoringTestCase.java b/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/RefactoringTestCase.java
deleted file mode 100644
index 2899274..0000000
--- a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/RefactoringTestCase.java
+++ /dev/null

@@ -1,303 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.testing.junit3;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.Refactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.rephraserengine.core.refactorings.IEditorRefactoring;
-import org.eclipse.rephraserengine.core.refactorings.IResourceRefactoring;
-import org.eclipse.rephraserengine.core.util.StringUtil;
-import org.eclipse.rephraserengine.core.vpg.eclipse.EclipseVPG;
-
-/**
- * Test case for a refactoring (used in a {@link GeneralTestSuiteFromMarkers}).
- * <p>
- * Most clients will want to subclass {@link RefactoringTestSuite} instead of manually constructing
- * a suite of {@link RefactoringTestCase}s.
- * <p>
- * Assuming the marker prefix is &quot;!&lt;&lt;&lt;&lt;&lt;&quot; and the marker suffix is
- * &quot;\n&quot;, markers are expected to have one of the following forms:
- * <ol>
- * <li> <tt>!&lt;&lt;&lt;&lt;&lt; line, col, ..., pass</tt>
- * <li> <tt>!&lt;&lt;&lt;&lt;&lt; fromLine, fromCol, toLine, toCol, ..., pass</tt>
- * </ol>
- * That is, the first two fields in each marker are expected to be a line and column number; the
- * text selection passed to the refactoring will be the offset of that line and column. The third
- * fourth fields may also be a line and column number; then, the selection passed to the refactoring
- * will extend from the first line/column to the second line/column.
- * <p>
- * The line and column numbers may be followed by an arbitrary number of fields that contain data
- * specific to the refactoring being invoked. Many refactorings don't require any additional data;
- * the Extract Local Variable test suite uses one field for the new variable declaration; the Add
- * ONLY to USE Statement test suite uses these fields to list the module entities to add; etc.
- * <p>
- * The final field must be either &quot;pass&quot;, &quot;fail-initial&quot;, or
- * &quot;fail-final&quot;, indicating whether the refactoring should succeed, fail its initial
- * precondition check, or fail its final precondition check.
- * <p>
- * If the refactoring is expected to succeed, the program may be compiled and run before and after
- * the refactoring in order to ensure that the refactoring actually preserved behavior. See the
- * documentation for {@link RefactoringTestCase} for more information.
- * 
- * @author Jeff Overbey
- * 
- * @see RefactoringTestSuite
- * @see GeneralTestSuiteFromMarkers
- * 
- * @since 3.0
- */
-public abstract class RefactoringTestCase<R extends Refactoring> extends WorkspaceTestCase
-{
-    /** Text of the last marker field when a refactoring is pass all precondition checks */
-    protected static final String PASS = "pass"; //$NON-NLS-1$
-    /** Text of the last marker field when a refactoring is expected to fail initial precondition check */
-    protected static final String FAIL_INITIAL = "fail-initial"; //$NON-NLS-1$
-    /** Text of the last marker field when a refactoring is expected to fail final precondition check */
-    protected static final String FAIL_FINAL = "fail-final"; //$NON-NLS-1$
-
-    private final File jioFileContainingMarker;
-    private final String markerText;
-    private final FilenameFilter filenameFilter;
-    private String description;
-    private Map<String, IFile> files;
-
-    public RefactoringTestCase(File fileContainingMarker,
-                               int markerOffset,
-                               String markerText,
-                               FilenameFilter filenameFilter) throws Exception {
-        this(fileContainingMarker, markerOffset, markerText, null, filenameFilter);
-    }
-
-    public RefactoringTestCase(File fileContainingMarker,
-                               int markerOffset,
-                               String markerText,
-                               EclipseVPG<?,?,?> vpg,
-                               FilenameFilter filenameFilter) throws Exception {
-        super("test", vpg); //$NON-NLS-1$
-        this.jioFileContainingMarker = fileContainingMarker;
-        this.markerText = markerText;
-        this.filenameFilter = filenameFilter;
-        this.description = fileContainingMarker.getName();
-    }
-
-    public void test() throws Exception
-    {
-        this.files = importFiles();
-        
-        IFile fileContainingMarker = files.get(jioFileContainingMarker.getName());
-        assertNotNull(fileContainingMarker);
-        
-        R refactoring = createRefactoring();
-
-        LinkedList<String> markerFields = MarkerUtil.parseMarker(markerText);
-        TextSelection selection = MarkerUtil.determineSelection(markerFields, createDocument(fileContainingMarker));
-
-        appendFilenameToDescription(markerFields);
-
-        RefactoringStatus status =
-            checkInitialConditions(refactoring,
-                initializeRefactoring(refactoring, fileContainingMarker, selection, markerFields));
-
-        if (!status.hasFatalError())
-        {
-            String before = shouldCompile(fileContainingMarker)
-                ? compileAndRunProgram(files)
-                : ""; //$NON-NLS-1$
-            
-            status = checkFinalConditions(refactoring,
-                configureRefactoring(refactoring, fileContainingMarker, selection, markerFields));
-
-            if (!status.hasFatalError())
-            {
-                performChange(refactoring);
-                refreshProject();
-                
-                if (!status.hasError() && shouldCompile(fileContainingMarker))
-                    assertEquals(before, compileAndRunProgram(files));
-                compareAgainstResultFile();
-            }
-        }
-        
-        deinitializeRefactoring(refactoring, fileContainingMarker, selection, markerFields);
-    }
-
-    protected Map<String, IFile> importFiles() throws Exception
-    {
-        Map<String, IFile> result = importAllFiles(jioFileContainingMarker.getParentFile(), filenameFilter);
-        refreshProject();
-        return result;
-    }
-
-    protected void refreshProject() throws CoreException
-    {
-        NullProgressMonitor pm = new NullProgressMonitor();
-        project.refreshLocal(IResource.DEPTH_INFINITE, pm);
-        if (vpg != null) vpg.ensureVPGIsUpToDate(pm);
-    }
-
-    /**
-     * This method is invoked to instantiate the refactoring class.
-     */
-    protected abstract R createRefactoring() throws Exception;
-
-    private void appendFilenameToDescription(LinkedList<String> markerStrings)
-    {
-        description += " (" + jioFileContainingMarker.getName() + " " + markerStrings + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-    }
-
-    /**
-     * This method is invoked after the refactoring is created ({@link #createRefactoring()}) but
-     * before {@link Refactoring#checkInitialConditions(org.eclipse.core.runtime.IProgressMonitor)}
-     * is invoked.  Override if necessary.
-     *
-     * @return true iff the refactoring is expected to pass initial precondition checking
-     */
-    protected boolean initializeRefactoring(R refactoring, IFile file, TextSelection selection, LinkedList<String> markerFields)
-    {
-        if (refactoring instanceof IEditorRefactoring)
-            ((IEditorRefactoring)refactoring).initialize(file, selection);
-        else if (refactoring instanceof IResourceRefactoring)
-            ((IResourceRefactoring)refactoring).initialize(Collections.singletonList(file));
-        else
-            throw new IllegalStateException("Must override #initializeRefactoring"); //$NON-NLS-1$
-        
-        if (lastMarkerField(markerFields).equals(PASS) || lastMarkerField(markerFields).equals(FAIL_FINAL))
-            return true;
-        else if (lastMarkerField(markerFields).equals(FAIL_INITIAL))
-            return false;
-        else
-            throw new IllegalStateException("Last marker field should be pass, fail-initial, or fail-final"); //$NON-NLS-1$
-    }
-
-    protected String lastMarkerField(LinkedList<String> markerFields)
-    {
-        return markerFields.getLast();
-    }
-
-    /**
-     * This method is invoked after initial preconditions have been checked
-     * ({@link Refactoring#checkInitialConditions(org.eclipse.core.runtime.IProgressMonitor)})
-     * but before final preconditions are checked
-     * ({@link Refactoring#checkFinalConditions(org.eclipse.core.runtime.IProgressMonitor)}).
-     * Override if necessary to supply user input.
-     *
-     * @return true iff the refactoring is expected to pass final precondition checking
-     */
-    protected boolean configureRefactoring(R refactoring, IFile file, TextSelection selection, LinkedList<String> markerFields)
-    {
-        if (lastMarkerField(markerFields).equals(PASS))
-            return true;
-        else if (lastMarkerField(markerFields).equals(FAIL_FINAL))
-            return false;
-        else
-            throw new IllegalStateException();
-    }
-
-    private RefactoringStatus checkInitialConditions(R refactoring, boolean shouldSucceed) throws OperationCanceledException, CoreException
-    {
-        RefactoringStatus status = refactoring.checkInitialConditions(new NullProgressMonitor());
-        if (shouldSucceed)
-            assertTrue(description + " failed initial precondition check: " + status.toString(), !status.hasError()); //$NON-NLS-1$
-        else
-            assertTrue(description + " should have failed initial precondition check but did not: " + status.toString(), status.hasError()); //$NON-NLS-1$
-        return status;
-    }
-
-    private RefactoringStatus checkFinalConditions(R refactoring, boolean shouldSucceed) throws OperationCanceledException, CoreException
-    {
-        RefactoringStatus status;
-        status = refactoring.checkFinalConditions(new NullProgressMonitor());
-        if (shouldSucceed)
-            assertTrue(description + " failed final precondition check: " + status.toString(), !status.hasError()); //$NON-NLS-1$
-        else
-            assertTrue(description + " should have failed final precondition check but did not: " + status.toString(), status.hasError()); //$NON-NLS-1$
-        return status;
-    }
-
-    private void performChange(R refactoring) throws CoreException
-    {
-        IProgressMonitor pm = new NullProgressMonitor();
-        Change change = refactoring.createChange(pm);
-        assertNotNull(description + " returned null Change object", change); //$NON-NLS-1$
-        assertTrue(description + " returned invalid Change object", change.isValid(pm).isOK()); //$NON-NLS-1$
-        change.perform(pm);
-    }
-
-    private void compareAgainstResultFile() throws IOException, URISyntaxException, CoreException
-    {
-        for (String filename : files.keySet())
-        {
-            if (resultFileFor(filename).exists())
-            {
-                String expected = StringUtil.read(resultFileFor(filename)).replaceAll("\\r", ""); //$NON-NLS-1$ //$NON-NLS-2$
-                String actual = readWorkspaceFile(filename).replaceAll("\\r", ""); //$NON-NLS-1$ //$NON-NLS-2$
-                assertEquals(expected, actual);
-            }
-        }
-    }
-
-    private File resultFileFor(String filename)
-    {
-        return new File(jioFileContainingMarker.getParent()
-            + File.separator
-            + filename
-            +  ".result"); //$NON-NLS-1$
-    }
-
-    /**
-     * @return true iff the program should be compiled and run using {@link #compileAndRunProgram(Map)}
-     */
-    protected boolean shouldCompile(IFile fileContainingMarker)
-    {
-        return false;
-    }
-
-    /**
-     * Compiles and runs the test program.
-     * <p>
-     * This method is invoked iff {@link #shouldCompile(IFile)} returns <code>true</code>.
-     * 
-     * @return the output of running the program
-     * 
-     * @throws Exception if compilation or execution fails
-     */
-    protected String compileAndRunProgram(Map<String, IFile> files) throws Exception
-    {
-        throw new UnsupportedOperationException("Must override #compileAndRunProgram if #shouldCompile can return true"); //$NON-NLS-1$
-    }
-
-    /**
-     * This method is invoked after the refactoring has been performed (after
-     * {@link Refactoring#createChange(IProgressMonitor)} and
-     * {@link Change#perform(IProgressMonitor)}. Override if necessary.
-     * 
-     * @throws Exception 
-     */
-    protected void deinitializeRefactoring(R refactoring, IFile file, TextSelection selection, LinkedList<String> markerFields) throws Exception
-    {
-    }
-}

diff --git a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/RefactoringTestSuite.java b/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/RefactoringTestSuite.java
deleted file mode 100644
index 76054fd..0000000
--- a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/RefactoringTestSuite.java
+++ /dev/null

@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 University of Illinois at Urbana-Champaign and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     UIUC - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.rephraserengine.testing.junit3;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.util.LinkedList;
-import java.util.Map;
-
-import junit.framework.Test;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.Refactoring;
-import org.eclipse.rephraserengine.core.vpg.eclipse.EclipseVPG;
-import org.eclipse.rephraserengine.testing.junit3.GeneralTestSuiteFromMarkers;
-
-/**
- * Test suite for a refactoring.
- * <p>
- * The test suite is constructed by importing files from a directory in the source tree, searching
- * its files for <i>markers,</i> and adding one test case to the suite for each marker.
- * <p>
- * The prefix and suffix of the marker are passed as the <code>marker</code> and
- * <code>markerEnd</code> arguments to the constructor. Assuming <code>marker</code> is
- * &quot;!&lt;&lt;&lt;&lt;&lt;&quot; and <code>markerEnd</code> is &quot;\n&quot;, markers are
- * expected to have one of the following forms:
- * <ol>
- * <li> <tt>!&lt;&lt;&lt;&lt;&lt; line, col, ..., pass</tt>
- * <li> <tt>!&lt;&lt;&lt;&lt;&lt; fromLine, fromCol, toLine, toCol, ..., pass</tt>
- * </ol>
- * That is, the first two fields in each marker are expected to be a line and column number; the
- * text selection passed to the refactoring will be the offset of that line and column. The third
- * fourth fields may also be a line and column number; then, the selection passed to the refactoring
- * will extend from the first line/column to the second line/column.
- * <p>
- * The line and column numbers may be followed by an arbitrary number of fields that contain data
- * specific to the refactoring being invoked. Many refactorings don't require any additional data;
- * the Extract Local Variable test suite uses one field for the new variable declaration; the Add
- * ONLY to USE Statement test suite uses these fields to list the module entities to add; etc.
- * <p>
- * The final field must be either &quot;pass&quot;, &quot;fail-initial&quot;, or
- * &quot;fail-final&quot;, indicating whether the refactoring should succeed, fail its initial
- * precondition check, or fail its final precondition check.
- * <p>
- * If the refactoring is expected to succeed, the program may be compiled and run before and after
- * the refactoring in order to ensure that the refactoring actually preserved behavior.  See the
- * documentation for {@link RefactoringTestCase} for more information.
- * 
- * @author Jeff Overbey
- * 
- * @see RefactoringTestCase
- * @see GeneralTestSuiteFromMarkers
- * 
- * @since 3.0
- */
-public class RefactoringTestSuite<R extends Refactoring> extends GeneralTestSuiteFromMarkers {
-
-    private Class<R> refactoringClass;
-    private EclipseVPG<?, ?, ?> vpg;
-    private FilenameFilter filenameFilter;
-
-    public RefactoringTestSuite(Class<R> refactoringClass,
-                                String marker,
-                                String markerEnd,
-                                File fileOrDirectory,
-                                FilenameFilter filenameFilter) throws Exception {
-        this(refactoringClass, marker, markerEnd, fileOrDirectory, filenameFilter, null);
-    }
-
-    public RefactoringTestSuite(Class<R> refactoringClass,
-                                String marker,
-                                String markerEnd,
-                                File fileOrDirectory,
-                                FilenameFilter filenameFilter,
-                                EclipseVPG<?,?,?> vpg) throws Exception {
-        super(refactoringClass.getName(),
-              marker,
-              markerEnd,
-              fileOrDirectory,
-              filenameFilter,
-              // Initialization data:
-              refactoringClass,
-              filenameFilter,
-              vpg);
-    }
-
-    // Callback method which is invoked before adding tests to this test suite.
-    @SuppressWarnings("unchecked")
-    @Override
-    protected void initialize(Object... initializationData)
-    {
-        this.refactoringClass = (Class<R>)initializationData[0];
-        this.filenameFilter = (FilenameFilter)initializationData[1];
-        this.vpg = (EclipseVPG<?,?,?>)initializationData[2];
-    }
-
-    @Override
-    protected Test createTestFor(File fileContainingMarker, int markerOffset, String markerText)
-            throws Exception {
-        return new IndividualRefactoringTestCase(
-                fileContainingMarker,
-                markerOffset,
-                markerText,
-                refactoringClass,
-                vpg,
-                filenameFilter);
-    }
-    
-    public class IndividualRefactoringTestCase extends RefactoringTestCase<R> {
-        private final Class<R> refactoringClass;
-        
-        public IndividualRefactoringTestCase(File fileContainingMarker, int markerOffset, String markerText, Class<R> refactoringClass, EclipseVPG<?,?,?> vpg, FilenameFilter filenameFilter) throws Exception {
-            super(fileContainingMarker, markerOffset, markerText, vpg, filenameFilter);
-            this.refactoringClass = refactoringClass;
-        }
-        
-        @Override
-        protected R createRefactoring() throws Exception {
-            return refactoringClass.newInstance();
-        }
-
-        @Override
-        protected boolean initializeRefactoring(R refactoring, IFile file, TextSelection selection, LinkedList<String> markerFields) {
-            RefactoringTestSuite.this.initializeRefactoring(refactoring, file, selection, markerFields);
-            return super.initializeRefactoring(refactoring, file, selection, markerFields);
-        }
-
-        @Override
-        protected boolean configureRefactoring(R refactoring, IFile file, TextSelection selection, LinkedList<String> markerFields) {
-            RefactoringTestSuite.this.configureRefactoring(refactoring, file, selection, markerFields);
-            return super.configureRefactoring(refactoring, file, selection, markerFields);
-        }
-
-        @Override
-        protected boolean shouldCompile(IFile fileContainingMarker)
-        {
-            return RefactoringTestSuite.this.shouldCompile(fileContainingMarker);
-        }
-
-        @Override
-        protected String compileAndRunProgram(Map<String, IFile> files) throws Exception
-        {
-            return RefactoringTestSuite.this.compileAndRunProgram(files);
-        }
-
-        @Override
-        protected void deinitializeRefactoring(R refactoring, IFile file, TextSelection selection, LinkedList<String> markerFields) throws Exception {
-            RefactoringTestSuite.this.deinitializeRefactoring(refactoring, file, selection, markerFields);
-            super.deinitializeRefactoring(refactoring, file, selection, markerFields);
-        }
-    }
-    
-    /**
-     * This method is invoked after the refactoring is created ({@link #createRefactoring()}) but
-     * before {@link Refactoring#checkInitialConditions(org.eclipse.core.runtime.IProgressMonitor)}
-     * is invoked.  Override if necessary.
-     */
-    protected void initializeRefactoring(R refactoring, IFile file, TextSelection selection, LinkedList<String> markerFields) {
-        ;
-    }
-
-    /**
-     * This method is invoked after initial preconditions have been checked
-     * ({@link Refactoring#checkInitialConditions(org.eclipse.core.runtime.IProgressMonitor)})
-     * but before final preconditions are checked
-     * ({@link Refactoring#checkFinalConditions(org.eclipse.core.runtime.IProgressMonitor)}).
-     * Override if necessary to supply user input.
-     */
-    protected void configureRefactoring(R refactoring, IFile file, TextSelection selection, LinkedList<String> markerFields) {
-        ;
-    }
-
-    /**
-     * @return true iff the program should be compiled and run using {@link #compileAndRunProgram(Map)}
-     */
-    protected boolean shouldCompile(IFile fileContainingMarker)
-    {
-        return false;
-    }
-
-    /**
-     * Compiles and runs the test program.
-     * <p>
-     * This method is invoked iff {@link #shouldCompile(IFile)} returns <code>true</code>.
-     * 
-     * @return the output of running the program
-     * 
-     * @throws Exception if compilation or execution fails
-     */
-    protected String compileAndRunProgram(Map<String, IFile> files) throws Exception
-    {
-        throw new UnsupportedOperationException("Must override #compileAndRunProgram if #shouldCompile can return true"); //$NON-NLS-1$
-    }
-
-    /**
-     * This method is invoked after the refactoring has been performed (after
-     * {@link Refactoring#createChange(IProgressMonitor)} and
-     * {@link Change#perform(IProgressMonitor)}. Override if necessary.
-     * 
-     * @throws Exception 
-     */
-    protected void deinitializeRefactoring(R refactoring, IFile file, TextSelection selection, LinkedList<String> markerFields) throws Exception {
-        ;
-    }
-}

diff --git a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/TestSuiteFromFiles.java b/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/TestSuiteFromFiles.java
deleted file mode 100644
index b3fa8c6..0000000
--- a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/TestSuiteFromFiles.java
+++ /dev/null

@@ -1,74 +0,0 @@
-package org.eclipse.rephraserengine.testing.junit3;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FilenameFilter;
-import java.io.IOException;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * A {@link TestSuite} containing a test for each file found in the subdirectories of a particular
- * directory.
- * <p>
- * Subclasses must override {@link #test(File)}.
- * <p>
- * To run an entire suite of tests for the given file, or to construct an arbitrary TestCase,
- * subclass from {@link GeneralTestSuiteFromFiles} instead.
- * 
- * @author Jeff Overbey
- * 
- * @since 2.0
- */
-public abstract class TestSuiteFromFiles extends GeneralTestSuiteFromFiles
-{
-    public TestSuiteFromFiles(String description, String directorySuffix, FilenameFilter filenameFilter,
-        boolean mustExist) throws FileNotFoundException, IOException
-    {
-        super(description, directorySuffix, filenameFilter, mustExist);
-    }
-
-    public TestSuiteFromFiles(String description, String directorySuffix, FilenameFilter filenameFilter)
-        throws FileNotFoundException, IOException
-    {
-        super(description, directorySuffix, filenameFilter);
-    }
-
-    public TestSuiteFromFiles(String description, String directorySuffix, final String filenameExtension,
-        boolean mustExist) throws FileNotFoundException, IOException
-    {
-        super(description, directorySuffix, filenameExtension, mustExist);
-    }
-
-    public TestSuiteFromFiles(String description, String directorySuffix, final String filenameExtension)
-        throws FileNotFoundException, IOException
-    {
-        super(description, directorySuffix, filenameExtension);
-    }
-
-    @Override
-    protected final Test createTestFor(final File file)
-    {
-        return new SimpleFileTestCase(file) {};
-    }
-
-    public abstract class SimpleFileTestCase extends TestCase
-    {
-        protected File file;
-
-        public SimpleFileTestCase(File file)
-        {
-            super("test"); //$NON-NLS-1$
-            this.file = file;
-        }
-
-        public void test() throws Exception
-        {
-            TestSuiteFromFiles.this.test(file);
-        }
-    }
-
-    protected abstract void test(File file) throws Exception;
-}
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/TestSuiteFromMarkers.java b/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/TestSuiteFromMarkers.java
deleted file mode 100644
index 4cadcb6..0000000
--- a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/TestSuiteFromMarkers.java
+++ /dev/null

@@ -1,66 +0,0 @@
-package org.eclipse.rephraserengine.testing.junit3;
-
-import java.io.File;
-import java.io.FilenameFilter;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * A {@link TestSuite} containing a test for each <i>marker</i> found in the files in a particular
- * directory.  A <i>marker</i> is an arbitrary string (Photran uses <pre>!&lt;&lt;&lt;&lt;&lt;</pre>),
- * since <pre>!</pre> is the comment character in Fortran) followed by arbitrary text which continues
- * to the end of the line or the next marker, whichever appears first.
- * <p>
- * Subclasses must override {@link #createTestFor(List, File, int, String))}.
- * <p>
- * To run an entire suite of tests for the given file, or to construct an arbitrary TestCase,
- * subclass from {@link GeneralTestSuiteFromMarkers} instead.
- * 
- * @author Jeff Overbey
- * 
- * @since 2.0
- */
-public abstract class TestSuiteFromMarkers extends GeneralTestSuiteFromMarkers
-{
-    public TestSuiteFromMarkers(String description, String marker, File fileOrDirectory, FilenameFilter filenameFilter) throws Exception
-    {
-        super(description, marker, fileOrDirectory, filenameFilter);
-    }
-
-    public TestSuiteFromMarkers(String description, String marker, File fileOrDirectory, final String filenameExtension) throws Exception
-    {
-        super(description, marker, fileOrDirectory, filenameExtension);
-    }
-
-    @Override
-    protected final Test createTestFor(File fileContainingMarker, int markerOffset, String markerText)
-    {
-        TestSuite suite = new TestSuite(fileContainingMarker.getName() + " - " + markerText); //$NON-NLS-1$
-        suite.addTest(new SimpleFileTestCase(fileContainingMarker, markerOffset, markerText) {});
-        return suite;
-    }
-
-    public abstract class SimpleFileTestCase extends TestCase
-    {
-        protected final File fileContainingMarker;
-        protected final int markerOffset;
-        protected final String markerText;
-
-        public SimpleFileTestCase(File fileContainingMarker, int markerOffset, String markerText)
-        {
-            super("test"); //$NON-NLS-1$
-            this.fileContainingMarker = fileContainingMarker;
-            this.markerOffset = markerOffset;
-            this.markerText = markerText;
-        }
-
-        public void test() throws Exception
-        {
-            TestSuiteFromMarkers.this.test(fileContainingMarker, markerOffset, markerText);
-        }
-    }
-
-    protected abstract void test(File fileContainingMarker, int markerOffset, String markerText) throws Exception;
-}
\ No newline at end of file

diff --git a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/WorkspaceTestCase.java b/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/WorkspaceTestCase.java
deleted file mode 100644
index debe903..0000000
--- a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/WorkspaceTestCase.java
+++ /dev/null

@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Markus Schorn (Wind River Systems)
- *******************************************************************************/
-
-/*
- * Created on Oct 4, 2004
- */
-package org.eclipse.rephraserengine.testing.junit3;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Map;
-import java.util.TreeMap;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-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.NullProgressMonitor;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.rephraserengine.core.util.StringUtil;
-import org.eclipse.rephraserengine.core.vpg.eclipse.EclipseVPG;
-
-/**
- * Base class for a test case that imports files into the runtime workspace and then operates on the
- * runtime workspace.
- * <p>
- * This class is based on org.eclipse.cdt.core.tests.BaseTestFramework.
- * 
- * @author aniefer
- * @author Jeff Overbey
- * 
- * @since 3.0
- */
-public abstract class WorkspaceTestCase extends TestCase
-{
-    /** Used to give each project a new name */
-    protected static int n = 0;
-    
-    protected IWorkspace workspace;
-    protected IProject project;
-    protected final EclipseVPG<?,?,?> vpg;
-    
-    public WorkspaceTestCase()
-    {
-        super();
-        this.vpg = null;
-    }
-
-    public WorkspaceTestCase(String name)
-    {
-        super(name);
-        this.vpg = null;
-    }
-
-    public WorkspaceTestCase(String name, EclipseVPG<?,?,?> vpg)
-    {
-        super(name);
-        this.vpg = vpg;
-    }
-    
-	@Override
-	protected void setUp() throws Exception
-	{
-		super.setUp();
-
-        if (project != null) return;
-
-        if (vpg != null)
-        {
-            vpg.releaseAllASTs();
-            vpg.clearDatabase();
-        }
-        
-        workspace = ResourcesPlugin.getWorkspace();
-        project = createProject("TestProject" + (++n)); //$NON-NLS-1$
-        if (project == null)
-            fail("Unable to create project"); //$NON-NLS-1$
-	}
-            
-    protected static IProject createProject(final String projectName) throws CoreException
-    {
-        class CreateProject implements IWorkspaceRunnable
-        {
-            IProject project = null;
-            
-            public void run(IProgressMonitor monitor) throws CoreException {
-                IWorkspace workspace = ResourcesPlugin.getWorkspace();
-                project = workspace.getRoot().getProject(projectName);
-                if (!project.exists())
-                    project.create(monitor);
-                else
-                    project.refreshLocal(IResource.DEPTH_INFINITE, null);
-                if (!project.isOpen())
-                    project.open(monitor);
-            }
-        }
-        
-        CreateProject runnable = new CreateProject();
-        runnable.run(new NullProgressMonitor());
-        return runnable.project;
-    }
-
-	@Override
-	protected void tearDown() throws Exception
-	{
-        if (project == null || !project.exists()) return;
-        
-        try
-        {
-            project.delete(true, true, new NullProgressMonitor());
-        }
-        catch (Throwable e)
-        {
-            project.close(new NullProgressMonitor());
-        }
-        finally
-        {
-            if (vpg != null)
-            {
-                // To speed things up a bit and conserve memory...
-                vpg.releaseAllASTs();
-                vpg.clearDatabase();
-            }
-
-            project = null;
-        }
-	}
-
-    protected IFile importFile(String fileName, String contents) throws Exception
-    {
-        IFile file = project.getProject().getFile(fileName);
-        InputStream stream = new ByteArrayInputStream(contents.getBytes());
-
-        if (file.exists())
-            file.setContents(stream, false, false, new NullProgressMonitor());
-        else
-            file.create(stream, false, new NullProgressMonitor());
-
-        return file;
-    }
-
-    protected IFile importFile(String fileName, File fileToCopyIntoWorkspace) throws Exception
-    {
-        return importFile(fileName, StringUtil.read(fileToCopyIntoWorkspace));
-    }
-
-    protected IFile importFile(File fileToCopyIntoWorkspace) throws Exception
-    {
-        return importFile(fileToCopyIntoWorkspace.getName(), fileToCopyIntoWorkspace);
-    }
-
-    protected IFile importFile(Plugin activator, String path) throws Exception
-    {
-        int lastSeparator = Math.max(path.lastIndexOf('/'), path.lastIndexOf('\\'));
-        String filename = path.substring(lastSeparator+1);
-        
-        //project.getProject().getFile(filename).delete(true, new NullProgressMonitor());
-        IFile result = importFile(filename, readTestFile(activator, path));
-        //project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-        return result;
-    }
-
-    protected String readTestFile(Plugin activator, String path) throws IOException, URISyntaxException
-    {
-        URL resource = activator.getBundle().getResource(path);
-        assertNotNull(resource);
-        return StringUtil.read(resource.openStream());
-    }
-
-    protected Map<String, IFile> importAllFiles(File directory, FilenameFilter filenameFilter) throws Exception
-    {
-        Map<String, IFile> filesImported = new TreeMap<String, IFile>();
-        for (File file : directory.listFiles(filenameFilter))
-        {
-            IFile thisFile = importFile(file);
-            filesImported.put(thisFile.getName(), thisFile);
-        }
-        return filesImported;
-    }
-
-    protected String readWorkspaceFile(String filename) throws IOException, CoreException
-    {
-        return StringUtil.read(project.getFile(filename).getContents(true));
-    }
-
-    protected IDocument createDocument(IFile file) throws IOException, CoreException
-    {
-        return new Document(readWorkspaceFile(file.getName()));
-    }
-}

diff --git a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/messages.properties b/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/messages.properties
deleted file mode 100644
index 8529e4b..0000000
--- a/org.eclipse.rephraserengine.testing.junit3/src/org/eclipse/rephraserengine/testing/junit3/messages.properties
+++ /dev/null

@@ -1,8 +0,0 @@
-GeneralTestSuiteFromFiles_DirectoryNotFound=Directory {0} not found
-GeneralTestSuiteFromFiles_NoTestFilesFoundInDirectory=No test files found in {0}
-GeneralTestSuiteFromFiles_SomeOptionalTestFilesAreNotPresent=NOTE: Some optional test files are not present: directory {0} does not exist
-GeneralTestSuiteFromFiles_UnableToFindDirectory=Unable to find directory {0} (working directory is {1})
-GeneralTestSuiteFromMarkers_FileCannotBeRead={0} cannot be read
-GeneralTestSuiteFromMarkers_FileNotFound={0} not found
-GeneralTestSuiteFromMarkers_NoMarkersFound=No markers of the form {0} found in {1}
-GeneralTestSuiteFromMarkers_SomeOptionalTestFilesAreNotPresent=NOTE: Some optional test files are not present: directory {0} does not exist
commit	599f1a7bb8e961b5601f07c883e69d5d08043b94	[log] [tgz]
author	cvs2svn <ptp-dev@eclipse.org>	Mon Jun 13 15:32:52 2011 +0000
committer	cvs2svn <ptp-dev@eclipse.org>	Mon Jun 13 15:32:52 2011 +0000
tree	54525d8ac0456eb5f0c3bd397df03412164815fe
parent	e5f6fab10b208de0002e882eee13cb3914e0f532 [diff]