This inserts the patches regarding the progress bar into java9+ which were cluelessly omitted.
Conflicts:
drjava/build.xml
drjava/src/edu/rice/cs/drjava/model/compiler/JavaxToolsCompiler.java
Your branch and 'origin/jshell-min-set' have diverged,
and have 2 and 10 different commits each, respectively.
All conflicts fixed but you are still merging.
Changes to be committed:
new file: ../drjava.jar
modified: build.xml
new file: extlib/java-atk-wrapper.jar
modified: src/edu/rice/cs/drjava/model/compiler/JavacCompiler.java
modified: src/edu/rice/cs/drjava/model/compiler/JavaxToolsCompiler.java
modified: src/edu/rice/cs/drjava/model/junit/JUnitTestRunner.java
modified: src/edu/rice/cs/drjava/model/repl/newjvm/InterpreterJVM.java
modified: src/edu/rice/cs/drjava/model/repl/newjvm/MainJVM.java
new file: src/edu/rice/cs/drjava/model/repl/newjvm/jshell-min-set_documentation.md
modified: src/edu/rice/cs/drjava/ui/ErrorPanel.java
modified: src/edu/rice/cs/drjava/ui/GenerateCustomDrJavaJarFrame.java
modified: src/edu/rice/cs/drjava/ui/JUnitPanel.java
modified: src/edu/rice/cs/drjava/ui/MainFrame.java
modified: src/edu/rice/cs/drjava/ui/NewJavaClassDialog.java
modified: ../platform/src-openjdk6/edu/rice/cs/drjava/model/compiler/Javac160OpenJDKCompiler.java
Changes not staged for commit:
modified: src/edu/rice/cs/drjava/model/compiler/JavaxToolsCompiler.java