Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: DrJavaAtRice/drjava
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: DrJavaAtRice/drjava
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: java9+
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 55 files changed
  • 2 contributors

Commits on Nov 17, 2024

  1. Corrected errors in build.xml. Builds now suceed in Java 11, but some…

    … tests fail. Developing ...
    
      On branch jshell-min-set
    
      Changes to be committed:
     	modified:   build.xml
    ponderosaTX committed Nov 17, 2024
    Configuration menu
    Copy the full SHA
    e4a85d6 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2024

  1. Adding JVM + JShell documentation

    Use this to get a better picture of communication b/w the 2 JVMs, JShell in InterpreterJVM, and next steps for JShell
    EmilyGianotti authored Dec 12, 2024
    Configuration menu
    Copy the full SHA
    7b11da3 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2025

  1. This commit inlcudes numerous changes to the build file and source fi…

    …les for DrJava incorporating the JShell from Java 9+. The backward compatiblity of Java 9+ with Java 8
    
    is flawed so some features (notably searching for all occurrences of a string) no longer work.  Language levels support is completely broken; the converter falls over when it is executed with Java 9 or later (even in our Java 8 version of DrJava).
    
    Changes to be committed:
    	modified:   build.xml
    	deleted:    build_old.xml
    	new file:   extlib/cldrdata.jar
    	new file:   extlib/dnsns.jar
    	new file:   extlib/icedtea-sound.jar
    	new file:   extlib/jaccess.jar
    	new file:   extlib/libatk-wrapper.so
    	new file:   extlib/localedata.jar
    	new file:   extlib/nashorn.jar
    	new file:   extlib/rt.jar
    	new file:   extlib/sunec.jar
    	new file:   extlib/sunjce_provider.jar
    	new file:   extlib/sunpkcs11.jar
    	new file:   extlib/tools.jar
    	new file:   extlib/zipfs.jar
    	modified:   src/edu/rice/cs/drjava/RemoteControlServer.java
    	modified:   src/edu/rice/cs/drjava/Version.orig
    	modified:   src/edu/rice/cs/drjava/config/ConfigOptionListeners.java
    	modified:   src/edu/rice/cs/drjava/config/DrJavaPropertySetup.java
    	modified:   src/edu/rice/cs/drjava/config/DrJavaPropertySetupTest.java
    	modified:   src/edu/rice/cs/drjava/config/KeyStrokeOption.java
    	modified:   src/edu/rice/cs/drjava/config/KeyStrokeOptionTest.java
    	modified:   src/edu/rice/cs/drjava/config/LongOptionTest.java
    	modified:   src/edu/rice/cs/drjava/config/Option.java
    	modified:   src/edu/rice/cs/drjava/config/OptionConstants.java
    	modified:   src/edu/rice/cs/drjava/config/UnaryOpProperty.java
    	modified:   src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java
    	modified:   src/edu/rice/cs/drjava/model/compiler/Javac160FilteringCompiler.java
    	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/compiler/LanguageLevelStackTraceMapper.java
    	modified:   src/edu/rice/cs/drjava/model/debug/jpda/JPDADebugger.java
    	modified:   src/edu/rice/cs/drjava/model/definitions/ColoringGlyphPainter.java
    	modified:   src/edu/rice/cs/drjava/model/definitions/ColoringView.java
    	modified:   src/edu/rice/cs/drjava/model/definitions/DefinitionsDocument.java
    	modified:   src/edu/rice/cs/drjava/model/repl/InteractionsModel.java
    	modified:   src/edu/rice/cs/drjava/model/repl/JavaInterpreterTest.java
    	modified:   src/edu/rice/cs/drjava/model/repl/newjvm/MainJVM.java
    	modified:   src/edu/rice/cs/drjava/ui/AbstractDJPane.java
    	modified:   src/edu/rice/cs/drjava/ui/DefinitionsPane.java
    	modified:   src/edu/rice/cs/drjava/ui/DefinitionsPaneMemoryLeakTest.java
    	modified:   src/edu/rice/cs/drjava/ui/DefinitionsPaneTest.java
    	modified:   src/edu/rice/cs/drjava/ui/ErrorPanel.java
    	modified:   src/edu/rice/cs/drjava/ui/FindReplacePanel.java
    	modified:   src/edu/rice/cs/drjava/ui/InteractionsController.java
    	modified:   src/edu/rice/cs/drjava/ui/InteractionsPane.java
    	modified:   src/edu/rice/cs/drjava/ui/InteractionsPaneTest.java
    	modified:   src/edu/rice/cs/drjava/ui/MainFrameTest.java
    	modified:   src/edu/rice/cs/drjava/ui/PreviewFrame.java
    	modified:   src/edu/rice/cs/drjava/ui/ReverseHighlighter.java
    	modified:   src/edu/rice/cs/drjava/ui/config/BooleanOptionComponentTest.java
    	modified:   src/edu/rice/cs/util/InputStreamRedirector.java
    	modified:   src/edu/rice/cs/util/StringOps.java
    ponderosaTX committed Apr 20, 2025
    Configuration menu
    Copy the full SHA
    616b793 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2025

  1. Fixed a bug in the unjar-libs target in build.xml. The bug was errone…

    …ously including all jar files in extlib in the unjarred file tree (slated for conversion to a jar file).
    
     On branch java9+
      Changes to be committed:
    	modified:   build.xml
    ponderosaTX committed Apr 21, 2025
    Configuration menu
    Copy the full SHA
    ca0531d View commit details
    Browse the repository at this point in the history
  2. Merge branch 'jshell-min-set' into java9+

    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
    ponderosaTX committed Apr 21, 2025
    Configuration menu
    Copy the full SHA
    4fb90e2 View commit details
    Browse the repository at this point in the history
  3. Adding forgotten file JavaxToolsCompiler from last commit

     Changes to be committed:
    	modified:   src/edu/rice/cs/drjava/model/compiler/JavaxToolsCompiler.java
    ponderosaTX committed Apr 21, 2025
    Configuration menu
    Copy the full SHA
    650c21d View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2025

  1. This revision includes many patches to support using the JShell in pl…

    …ace of DynamicJava and the incompatible (!) changes to Java 11 since Java 8.
    ponderosaTX committed Apr 24, 2025
    Configuration menu
    Copy the full SHA
    efdc09a View commit details
    Browse the repository at this point in the history
Loading