Menu ▾ ▴

Legacy SVN Repository Commit Log


Commit Date  
[r5339] by mgricken

Beginning to integrate HJ compiler from drjava-hj branch.

M plt/src/edu/rice/cs/plt/reflect/JavaVersion.java
M eclipse/lib/plt.jar
A + platform/src-hj
A platform/src-hj/edu/rice/cs/drjava/model/compiler/descriptors
A platform/src-hj/edu/rice/cs/drjava/model/compiler/descriptors/HjDescriptor.java
A platform/classes/base-hj
A platform/classes/base-hj/edu
A platform/classes/base-hj/edu/rice
A platform/classes/base-hj/edu/rice/cs
A platform/classes/base-hj/edu/rice/cs/drjava
A platform/classes/base-hj/edu/rice/cs/drjava/model
A platform/classes/base-hj/edu/rice/cs/drjava/model/compiler
AM platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/HjCompiler.class
AM platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/HjCompiler$1.class
AM platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/HjCompiler$2.class
AM platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/HjCompiler$1$1.class
M platform/build.xml
M dynamicjava/lib/plt.jar
M drjava/lib/platform.jar
M drjava/lib/plt.jar
M drjava/src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java
M drjava/src/edu/rice/cs/drjava/model/compiler/descriptors/JDKDescriptor.java
M javalanglevels/lib/plt.jar

 2010-07-28 01:22:43 Tree
[r5338] by mgricken

Compiled NextGen adapter with Java 5.

 2010-07-27 21:03:12 Tree
[r5337] by mgricken

Merging trunk into branch.

% svn merge https://drjava.svn.sourceforge.net/svnroot/drjava/trunk .
Conflict discovered in 'drjava/lib/javalanglevels-base.jar'.
Select: (p) postpone,
(mf) mine-full, (tf) theirs-full,
(s) show all options: mf
--- Merging r5267 through r5336 into '.':
U drjava/lib/javalanglevels-base.jar
U drjava/lib/buildlib/netbeans-memory-leak-utils.jar
U drjava/src/edu/rice/cs/drjava/model/javadoc/DefaultJavadocModel.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/RecentFileManager.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/GenerateCustomDrJavaJarFrame.java
U drjava/src/edu/rice/cs/drjava/ui/MainFrameStatics.java
U drjava/src/edu/rice/cs/drjava/ui/DebugPanel.java
A drjava/src/edu/rice/cs/drjava/ui/avail
A drjava/src/edu/rice/cs/drjava/ui/avail/GUIAvailabilityNotifier.java
A drjava/src/edu/rice/cs/drjava/ui/avail/DefaultGUIAvailabilityNotifier.java
A drjava/src/edu/rice/cs/drjava/ui/avail/GUIAvailabilityListener.java
A drjava/src/edu/rice/cs/drjava/ui/avail/ConjoinedGUIAvailabilityActionAdapter.java
A drjava/src/edu/rice/cs/drjava/ui/avail/ConjoinedGUIAvailabilityComponentAdapter.java
A drjava/src/edu/rice/cs/drjava/ui/avail/ConjoinedGUIAvailabilityListener.java
U drjava/src/edu/rice/cs/drjava/ui/config/ConfigFrame.java
U drjava/src/edu/rice/cs/drjava/ui/ProjectPropertiesFrame.java
U drjava/src/edu/rice/cs/util/swing/Utilities.java
U drjava
A misc/RiceNews
A misc/RiceNews/RiceNews-DrJavaMillionDownloads.doc
U misc/netbeans-memory-leak-utils/lib/org-netbeans-insane.jar

Files changed:

_M .
_M plt/src/edu/rice/cs/plt/collect/MutableRelationTest.java
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
_M drjava
M drjava/lib/platform.jar
M drjava/lib/javalanglevels-base.jar
M drjava/lib/buildlib/netbeans-memory-leak-utils.jar
M drjava/lib/dynamicjava-base.jar
M drjava/lib/plt.jar
M drjava/src/edu/rice/cs/drjava/model/javadoc/DefaultJavadocModel.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/RecentFileManager.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/GenerateCustomDrJavaJarFrame.java
M drjava/src/edu/rice/cs/drjava/ui/MainFrameStatics.java
M drjava/src/edu/rice/cs/drjava/ui/DebugPanel.java
A + drjava/src/edu/rice/cs/drjava/ui/avail
A + drjava/src/edu/rice/cs/drjava/ui/avail/GUIAvailabilityNotifier.java
A + drjava/src/edu/rice/cs/drjava/ui/avail/DefaultGUIAvailabilityNotifier.java
A + drjava/src/edu/rice/cs/drjava/ui/avail/GUIAvailabilityListener.java
A + drjava/src/edu/rice/cs/drjava/ui/avail/ConjoinedGUIAvailabilityActionAdapter.java
A + drjava/src/edu/rice/cs/drjava/ui/avail/ConjoinedGUIAvailabilityComponentAdapter.java
A + drjava/src/edu/rice/cs/drjava/ui/avail/ConjoinedGUIAvailabilityListener.java
M drjava/src/edu/rice/cs/drjava/ui/config/ConfigFrame.java
M drjava/src/edu/rice/cs/drjava/ui/ProjectPropertiesFrame.java
M drjava/src/edu/rice/cs/util/swing/Utilities.java
A + misc/RiceNews
A + misc/RiceNews/RiceNews-DrJavaMillionDownloads.doc
M misc/netbeans-memory-leak-utils/lib/org-netbeans-insane.jar
_M javalanglevels
M javalanglevels/lib/plt.jar

 2010-07-27 19:24:16 Tree
[r5336] by jrp1

New Soot jar that allows multiple files to be compiled.

 2010-07-26 18:38:46 Tree
[r5335] by mgricken

NextGen in DrJava works now.

 2010-07-24 01:48:42 Tree
[r5334] by mgricken

Deleting branch drjava-guiAvailListener, was merged into trunk.

 2010-07-22 21:39:45 Tree
[r5333] by mgricken

Merged drjava-guiAvailListener branch into trunk.

% svn merge ../drjava-guiAvailListener/
--- Merging r5320 through r5332 into '.':
U src/edu/rice/cs/drjava/model/javadoc/DefaultJavadocModel.java
C src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
C src/edu/rice/cs/drjava/ui/MainFrame.java
U src/edu/rice/cs/drjava/ui/RecentFileManager.java
U src/edu/rice/cs/drjava/ui/KeyBindingManager.java
U src/edu/rice/cs/drjava/ui/DebugPanel.java
A src/edu/rice/cs/drjava/ui/avail
A src/edu/rice/cs/drjava/ui/avail/GUIAvailabilityNotifier.java
A src/edu/rice/cs/drjava/ui/avail/DefaultGUIAvailabilityNotifier.java
A src/edu/rice/cs/drjava/ui/avail/GUIAvailabilityListener.java
A src/edu/rice/cs/drjava/ui/avail/ConjoinedGUIAvailabilityActionAdapter.java
A src/edu/rice/cs/drjava/ui/avail/ConjoinedGUIAvailabilityComponentAdapter.java
A src/edu/rice/cs/drjava/ui/avail/ConjoinedGUIAvailabilityListener.java
U src/edu/rice/cs/drjava/ui/config/ConfigFrame.java
U .
Summary of conflicts:
Text conflicts: 2

_M .
M src/edu/rice/cs/drjava/model/AbstractGlobalModel.java
M src/edu/rice/cs/drjava/ui/MainFrame.java
M src/edu/rice/cs/drjava/ui/DebugPanel.java
A + src/edu/rice/cs/drjava/ui/avail
A + src/edu/rice/cs/drjava/ui/avail/GUIAvailabilityNotifier.java
A + src/edu/rice/cs/drjava/ui/avail/DefaultGUIAvailabilityNotifier.java
A + src/edu/rice/cs/drjava/ui/avail/GUIAvailabilityListener.java
A + src/edu/rice/cs/drjava/ui/avail/ConjoinedGUIAvailabilityActionAdapter.java
A + src/edu/rice/cs/drjava/ui/avail/ConjoinedGUIAvailabilityComponentAdapter.java
A + src/edu/rice/cs/drjava/ui/avail/ConjoinedGUIAvailabilityListener.java

 2010-07-22 21:38:28 Tree
[r5332] by jrp1

DrJava-HJ with a soot.jar that has the safeguards turned off.

 2010-07-20 20:46:13 Tree
[r5331] by mgricken

Merging trunk into branch:

% svn merge -r 5321:head ../drjava
--- Merging r5328 through r5330 into '.':
U src/edu/rice/cs/drjava/model/javadoc/DefaultJavadocModel.java
U src/edu/rice/cs/drjava/ui/RecentFileManager.java
U src/edu/rice/cs/drjava/ui/config/ConfigFrame.java

_M .
M src/edu/rice/cs/drjava/model/javadoc/DefaultJavadocModel.java
M src/edu/rice/cs/drjava/ui/RecentFileManager.java
M src/edu/rice/cs/drjava/ui/config/ConfigFrame.java

 2010-07-19 20:54:26 Tree
[r5330] by mgricken

Fixed a bug with the changed RecentFileManager and how it handled menus.

 2010-07-19 20:49:48 Tree
Older >
MongoDB Logo MongoDB