DrJava Legacy SVN Repository

Compiler changes can determine syntax highlighting too.

Syntax highlighting had to be updated when a file was opened, too.

DrJava updated with the most recent soot jar file, new jar file transformed a class that wasn't a singleton to a singleton, and adds the class to the singleton list.

Trunk into branch.

Added machinery to change syntax-highlighted keywords, e.g.
for Habanero Java.

M drjava/src/edu/rice/cs/drjava/model/AbstractDJDocument.java
M drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java

Changed "Smart Run" to always run the main method if there is one,
even if the program is an ACM Java Task Force program or an applet.
This was done in response to

https://sourceforge.net/tracker/?func=detail&atid=438936&aid=3047855&group_id=44253

Null object pattern for JDKDescriptors.

Changing Linux LAF back to Metal for Java older than 6.

Merging trunk into branch.

% svn merge https://drjava.svn.sourceforge.net/svnroot/drjava/trunk
Conflict discovered in 'eclipse/lib/plt.jar'.
Select: (p) postpone,
(mf) mine-full, (tf) theirs-full,
(s) show all options: s

(e) edit - change merged file in an editor
(df) diff-full - show all changes made to merged file
(r) resolved - accept merged version of file

(dc) display-conflict - show all conflicts (ignoring merged version)
(mc) mine-conflict - accept my version for all conflicts (same)
(tc) theirs-conflict - accept their version for all conflicts (same)

(mf) mine-full - accept my version of entire file (even non-conflicts)
(tf) theirs-full - accept their version of entire file (same)

(p) postpone - mark the conflict to be resolved later
(l) launch - launch external tool to resolve conflict
(s) show all - show this list

Select: (p) postpone,
(mf) mine-full, (tf) theirs-full,
(s) show all options: tf
--- Merging r5346 through r5368 into '.':
U eclipse/lib/plt.jar
U platform/src-windows/edu/rice/cs/drjava/platform/WindowsRegistry.java
A platform/src-windows/edu/rice/cs/drjava/platform/WindowsRegistryTest.java
U platform/classes/base-windows/edu/rice/cs/drjava/platform/WindowsRegistry.class
Conflict discovered in 'dynamicjava/lib/plt.jar'.
Select: (p) postpone,
(mf) mine-full, (tf) theirs-full,
(s) show all options: tf
U dynamicjava/lib/plt.jar
Conflict discovered in 'drjava/lib/platform.jar'.
Select: (p) postpone,
(mf) mine-full, (tf) theirs-full,
(s) show all options: tf
U drjava/lib/platform.jar
Conflict discovered in 'drjava/lib/javalanglevels-base.jar'.
Select: (p) postpone,
(mf) mine-full, (tf) theirs-full,
(s) show all options: tf
U drjava/lib/javalanglevels-base.jar
Conflict discovered in 'drjava/lib/dynamicjava-base.jar'.
Select: (p) postpone,
(mf) mine-full, (tf) theirs-full,
(s) show all options: tf
U drjava/lib/dynamicjava-base.jar
Conflict discovered in 'drjava/lib/plt.jar'.
Select: (p) postpone,
(mf) mine-full, (tf) theirs-full,
(s) show all options: tf
U drjava/lib/plt.jar
U drjava/src/edu/rice/cs/drjava/DrJava.java
U drjava/src/edu/rice/cs/drjava/model/definitions/CompoundUndoManager.java
U drjava/src/edu/rice/cs/drjava/model/repl/InteractionsDJDocument.java
U drjava/src/edu/rice/cs/drjava/model/DocumentRegion.java
U drjava/src/edu/rice/cs/drjava/model/FindReplaceMachine.java
U drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
U drjava/src/edu/rice/cs/drjava/config/OptionConstants.java
U drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
U drjava/src/edu/rice/cs/drjava/ui/InteractionsPane.java
U drjava/src/edu/rice/cs/drjava/ui/DetachedFrame.java
U drjava/src/edu/rice/cs/drjava/ui/KeyBindingManager.java
U drjava/src/edu/rice/cs/drjava/ui/DefinitionsPane.java
U drjava/src/edu/rice/cs/drjava/ui/MainFrameStatics.java
U drjava/src/edu/rice/cs/drjava/ui/avail/GUIAvailabilityNotifier.java
A drjava/src/edu/rice/cs/drjava/ui/avail/OrGUIAvailabilityActionAdapter.java
A drjava/src/edu/rice/cs/drjava/ui/avail/AndGUIAvailabilityActionAdapter.java
U drjava/src/edu/rice/cs/drjava/ui/avail/DefaultGUIAvailabilityNotifier.java
A drjava/src/edu/rice/cs/drjava/ui/avail/OrGUIAvailabilityComponentAdapter.java
U drjava/src/edu/rice/cs/drjava/ui/avail/GUIAvailabilityListener.java
A drjava/src/edu/rice/cs/drjava/ui/avail/AndGUIAvailabilityComponentAdapter.java
A drjava/src/edu/rice/cs/drjava/ui/avail/OrGUIAvailabilityListener.java
A drjava/src/edu/rice/cs/drjava/ui/avail/AndGUIAvailabilityListener.java
D drjava/src/edu/rice/cs/drjava/ui/avail/ConjoinedGUIAvailabilityListener.java
D drjava/src/edu/rice/cs/drjava/ui/avail/ConjoinedGUIAvailabilityActionAdapter.java
D drjava/src/edu/rice/cs/drjava/ui/avail/ConjoinedGUIAvailabilityComponentAdapter.java
U drjava/src/edu/rice/cs/drjava/ui/config/VectorKeyStrokeOptionComponent.java
U drjava/src/edu/rice/cs/drjava/ui/config/ConfigFrame.java
U drjava/src/edu/rice/cs/drjava/ui/config/ConfigPanel.java
U drjava/src/edu/rice/cs/drjava/ui/MainFrameTest.java
U drjava/src/edu/rice/cs/drjava/ui/RegionsTreePanel.java
U drjava/src/edu/rice/cs/drjava/ui/InteractionsController.java
U drjava/src/edu/rice/cs/drjava/ui/AbstractConsoleController.java
U drjava/src/edu/rice/cs/util/swing/DelegatingAction.java
Conflict discovered in 'javalanglevels/lib/plt.jar'.
Select: (p) postpone,
(mf) mine-full, (tf) theirs-full,
(s) show all options: tf
U javalanglevels/lib/plt.jar

% svn status
M .
M plt/src/edu/rice/cs/plt/collect/MutableRelationTest.java
M eclipse/lib/plt.jar
? platform/platform.jar
M platform/src-windows/edu/rice/cs/drjava/platform/WindowsRegistry.java
A + platform/src-windows/edu/rice/cs/drjava/platform/WindowsRegistryTest.java
? platform/classes/lib
? platform/classes/test-hj
M platform/classes/base-windows/edu/rice/cs/drjava/platform/WindowsRegistry.class
M dynamicjava/lib/plt.jar
M dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/ImportContext.java
M dynamicjava/src/edu/rice/cs/dynamicjava/interpreter/ClassChecker.java
? drjava/drjava.jar
? drjava/classes
M drjava/lib/platform.jar
M drjava/lib/javalanglevels-base.jar
M drjava/lib/dynamicjava-base.jar
M drjava/lib/plt.jar
? drjava/src/edu/rice/cs/drjava/CodeStatus.java
? drjava/src/edu/rice/cs/drjava/Version.java
M drjava/src/edu/rice/cs/drjava/DrJava.java
M drjava/src/edu/rice/cs/drjava/model/definitions/CompoundUndoManager.java
M drjava/src/edu/rice/cs/drjava/model/repl/InteractionsDJDocument.java
M drjava/src/edu/rice/cs/drjava/model/DocumentRegion.java
M drjava/src/edu/rice/cs/drjava/model/FindReplaceMachine.java
M drjava/src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
M drjava/src/edu/rice/cs/drjava/config/OptionConstants.java
M drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
M drjava/src/edu/rice/cs/drjava/ui/InteractionsPane.java
M drjava/src/edu/rice/cs/drjava/ui/DetachedFrame.java
M drjava/src/edu/rice/cs/drjava/ui/KeyBindingManager.java
M drjava/src/edu/rice/cs/drjava/ui/DefinitionsPane.java
M drjava/src/edu/rice/cs/drjava/ui/MainFrameStatics.java
M drjava/src/edu/rice/cs/drjava/ui/avail/GUIAvailabilityNotifier.java
A + drjava/src/edu/rice/cs/drjava/ui/avail/OrGUIAvailabilityActionAdapter.java
A + drjava/src/edu/rice/cs/drjava/ui/avail/AndGUIAvailabilityActionAdapter.java
M drjava/src/edu/rice/cs/drjava/ui/avail/DefaultGUIAvailabilityNotifier.java
A + drjava/src/edu/rice/cs/drjava/ui/avail/OrGUIAvailabilityComponentAdapter.java
M drjava/src/edu/rice/cs/drjava/ui/avail/GUIAvailabilityListener.java
A + drjava/src/edu/rice/cs/drjava/ui/avail/AndGUIAvailabilityComponentAdapter.java
A + drjava/src/edu/rice/cs/drjava/ui/avail/OrGUIAvailabilityListener.java
D drjava/src/edu/rice/cs/drjava/ui/avail/ConjoinedGUIAvailabilityActionAdapter.java
A + drjava/src/edu/rice/cs/drjava/ui/avail/AndGUIAvailabilityListener.java
D drjava/src/edu/rice/cs/drjava/ui/avail/ConjoinedGUIAvailabilityComponentAdapter.java
D drjava/src/edu/rice/cs/drjava/ui/avail/ConjoinedGUIAvailabilityListener.java
M drjava/src/edu/rice/cs/drjava/ui/config/VectorKeyStrokeOptionComponent.java
M drjava/src/edu/rice/cs/drjava/ui/config/ConfigFrame.java
M drjava/src/edu/rice/cs/drjava/ui/config/ConfigPanel.java
M drjava/src/edu/rice/cs/drjava/ui/MainFrameTest.java
M drjava/src/edu/rice/cs/drjava/ui/RegionsTreePanel.java
M drjava/src/edu/rice/cs/drjava/ui/InteractionsController.java
M drjava/src/edu/rice/cs/drjava/ui/AbstractConsoleController.java
M drjava/src/edu/rice/cs/util/swing/DelegatingAction.java
M javalanglevels/lib/plt.jar

Created tag drjava-stable-20100816-r5366