DrJava Legacy SVN Repository

Working on new language level support.

Added bash scripts to find files with incorrect svn:eol-style and svn:keywords.

Allowing conversion of .dj files too.

D javalanglevels/testFiles/forElementaryLevelTest/AFriend.java
M javalanglevels/src/edu/rice/cs/javalanglevels/TypeChecker.java
M javalanglevels/src/edu/rice/cs/javalanglevels/LanguageLevelConverter.java

Deleting branch, it has been merged into the trunk.

D https://drjava.svn.sourceforge.net/svnroot/drjava/branches/drjava-custombundle

drjava-custombundle branch merged back into trunk.

mgricken@... - ~/drjava/drjava.all/trunk/drjava
% svn merge -r 5222:head https://drjava.svn.sourceforge.net/svnroot/drjava/branches/drjava-custombundle
--- Merging r5223 through r5231 into '.':
U src/edu/rice/cs/drjava/DrJava.java
U src/edu/rice/cs/drjava/config/OptionConstants.java
U src/edu/rice/cs/drjava/config/SavableConfiguration.java
A src/edu/rice/cs/drjava/config/options.properties
U src/edu/rice/cs/drjava/config/FileConfiguration.java
U src/edu/rice/cs/drjava/config/Configuration.java
A src/edu/rice/cs/drjava/config/ResourceBundleConfiguration.java
U src/edu/rice/cs/drjava/config/OptionParser.java
U src/edu/rice/cs/drjava/config/Option.java
U src/edu/rice/cs/drjava/ui/MainFrame.java
A src/edu/rice/cs/drjava/ui/GenerateCustomDrJavaJarFrame.java
U src/edu/rice/cs/drjava/ui/config/LabelComponent.java
U src/edu/rice/cs/drjava/ui/config/IntegerOptionComponent.java
U src/edu/rice/cs/drjava/ui/config/VectorOptionComponent.java
U src/edu/rice/cs/drjava/ui/config/ToolbarOptionComponent.java
U src/edu/rice/cs/drjava/ui/config/ConfigFrame.java
U src/edu/rice/cs/drjava/ui/config/DirectoryOptionComponent.java
U src/edu/rice/cs/drjava/ui/config/FontOptionComponent.java
U src/edu/rice/cs/drjava/ui/config/StringOptionComponent.java
U src/edu/rice/cs/drjava/ui/config/ConfigPanel.java
U src/edu/rice/cs/drjava/ui/config/ForcedChoiceOptionComponent.java
U src/edu/rice/cs/drjava/ui/config/ColorOptionComponent.java
U src/edu/rice/cs/drjava/ui/config/FileOptionComponent.java
U src/edu/rice/cs/drjava/ui/config/BooleanOptionComponent.java
U src/edu/rice/cs/drjava/ui/config/OptionComponent.java
U src/edu/rice/cs/drjava/ui/config/KeyStrokeOptionComponent.java
U src/edu/rice/cs/drjava/ui/config/ButtonComponent.java
U src/edu/rice/cs/drjava/ui/AboutDialog.java
U src/edu/rice/cs/drjava/ui/DrJavaErrorWindow.java
U src/edu/rice/cs/drjava/ui/ProjectPropertiesFrame.java
A src/edu/rice/cs/util/MD5ChecksumProperties.java
U build.xml

Result:

_M drjava
M drjava/src/edu/rice/cs/drjava/DrJava.java
M drjava/src/edu/rice/cs/drjava/config/OptionConstants.java
M drjava/src/edu/rice/cs/drjava/config/SavableConfiguration.java
A + drjava/src/edu/rice/cs/drjava/config/options.properties
M drjava/src/edu/rice/cs/drjava/config/Configuration.java
M drjava/src/edu/rice/cs/drjava/config/FileConfiguration.java
A + drjava/src/edu/rice/cs/drjava/config/ResourceBundleConfiguration.java
M drjava/src/edu/rice/cs/drjava/config/OptionParser.java
M drjava/src/edu/rice/cs/drjava/config/Option.java
M drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
A + drjava/src/edu/rice/cs/drjava/ui/GenerateCustomDrJavaJarFrame.java
M drjava/src/edu/rice/cs/drjava/ui/config/IntegerOptionComponent.java
M drjava/src/edu/rice/cs/drjava/ui/config/ToolbarOptionComponent.java
M drjava/src/edu/rice/cs/drjava/ui/config/ConfigFrame.java
M drjava/src/edu/rice/cs/drjava/ui/config/StringOptionComponent.java
M drjava/src/edu/rice/cs/drjava/ui/config/FontOptionComponent.java
M drjava/src/edu/rice/cs/drjava/ui/config/ConfigPanel.java
M drjava/src/edu/rice/cs/drjava/ui/config/ForcedChoiceOptionComponent.java
M drjava/src/edu/rice/cs/drjava/ui/config/ButtonComponent.java
M drjava/src/edu/rice/cs/drjava/ui/config/LabelComponent.java
M drjava/src/edu/rice/cs/drjava/ui/config/VectorOptionComponent.java
M drjava/src/edu/rice/cs/drjava/ui/config/DirectoryOptionComponent.java
M drjava/src/edu/rice/cs/drjava/ui/config/ColorOptionComponent.java
M drjava/src/edu/rice/cs/drjava/ui/config/FileOptionComponent.java
M drjava/src/edu/rice/cs/drjava/ui/config/BooleanOptionComponent.java
M drjava/src/edu/rice/cs/drjava/ui/config/OptionComponent.java
M drjava/src/edu/rice/cs/drjava/ui/config/KeyStrokeOptionComponent.java
M drjava/src/edu/rice/cs/drjava/ui/AboutDialog.java
M drjava/src/edu/rice/cs/drjava/ui/DrJavaErrorWindow.java
M drjava/src/edu/rice/cs/drjava/ui/ProjectPropertiesFrame.java
A + drjava/src/edu/rice/cs/util/MD5ChecksumProperties.java
M drjava/build.xml

Feature request completed.

M src/edu/rice/cs/drjava/config/OptionConstants.java
M src/edu/rice/cs/drjava/config/options.properties
M src/edu/rice/cs/drjava/ui/MainFrame.java
M src/edu/rice/cs/drjava/ui/GenerateCustomDrJavaJarFrame.java
M src/edu/rice/cs/drjava/ui/AboutDialog.java
M src/edu/rice/cs/drjava/ui/DrJavaErrorWindow.java
M src/edu/rice/cs/drjava/ui/ProjectPropertiesFrame.java

Added Tools/Advanced/Generate Custom drjava.jar menu item. Frame is
almost finished.

Still TODO:

1. Choose target file. Currently always writes to drjava-custom.jar.
2. CHange options.properties file to disable New Version checks.
3. Perhaps ignore or edit/merge MANIFEST.MF files.
4. Progress dialog that shows DrJava hasn't locked up.

Code and build script support ("ant generate-md5-properties") to
create the edu.rice.cs.drjava.md5 properties file/resource bundle
containing the MD5 checksums of all files in the drjava.jar file.

Currently not used automatically when running "ant jar" since the
md5.properties file is already 0.5 MB in size. I will go back to the
approach of storing the MD5 checksums in the drjava.jar if it turns
out that generating them fresh every time is a time bottleneck.

AM src/edu/rice/cs/util/MD5ChecksumProperties.java
M build.xml

A ResourceBundleConfiguration is a configuration based on immutable
options defined in a resource bundle (property file). If an option
isn't defined in the resource bundle, the configuration delegates
to another (file-based .drjava) configuration.

This avoids the problem of also saving the immutable options into
the .drjava file.

This revision simply comments out debugging code.

The following files were modified:

M src/edu/rice/cs/javalanglevels/IntermediateLevelTest.java
M src/edu/rice/cs/javalanglevels/Data.java
M src/edu/rice/cs/javalanglevels/TryCatchBodyTypeChecker.java
M src/edu/rice/cs/javalanglevels/IntermediateVisitor.java
M src/edu/rice/cs/javalanglevels/AdvancedLevelTest.java
M src/edu/rice/cs/javalanglevels/Bob.java
M src/edu/rice/cs/javalanglevels/LanguageLevelConverter.java
M src/edu/rice/cs/javalanglevels/BodyBodyIntermediateVisitor.java
M src/edu/rice/cs/javalanglevels/LanguageLevelVisitor.java
M src/edu/rice/cs/javalanglevels/ElementaryLevelTest.java
M src/edu/rice/cs/javalanglevels/ClassBodyIntermediateVisitor.java
M src/edu/rice/cs/javalanglevels/JExpressionIFPrunableDepthFirstVisitor.java