Menu ▾ ▴

Legacy SVN Repository Commit Log


Commit Date  
[r5346] by mgricken

Merged trunk into branch, worked on HJ compiler adapter.

% svn merge --dry-run https://drjava.svn.sourceforge.net/svnroot/drjava/trunk .
--- Merging r5337 through r5345 into '.':
C plt/src/edu/rice/cs/plt/reflect/JavaVersion.java
U plt/src/edu/rice/cs/plt/reflect/JavaVersionTest.java
C eclipse/lib/plt.jar
U platform/src-mint/edu/rice/cs/drjava/model/compiler/MintCompiler.java
C platform/classes/base-mint/edu/rice/cs/drjava/model/compiler/MintCompiler$CompilerErrorListener.class
C platform/classes/base-mint/edu/rice/cs/drjava/model/compiler/MintCompiler.class
C platform/classes/base-mint/edu/rice/cs/drjava/model/compiler/MintCompiler$2.class
C platform/classes/base-mint/edu/rice/cs/drjava/model/compiler/MintCompiler$3.class
C dynamicjava/lib/plt.jar
C drjava/lib/platform.jar
C drjava/lib/javalanglevels-base.jar
C drjava/lib/dynamicjava-base.jar
C drjava/lib/plt.jar
C drjava/src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java
C drjava/src/edu/rice/cs/drjava/model/repl/newjvm/InterpreterJVM.java
U drjava/src/edu/rice/cs/drjava/model/compiler/JavacCompiler.java
U drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
U drjava/src/edu/rice/cs/drjava/ui/DrJavaErrorHandler.java
C javalanglevels/lib/plt.jar
Summary of conflicts:
Text conflicts: 13
Tree conflicts: 1

_M .
M plt/src/edu/rice/cs/plt/reflect/JavaVersionTest.java
M plt/src/edu/rice/cs/plt/reflect/JavaVersion.java
_M plt/src/edu/rice/cs/plt/collect/MutableRelationTest.java
M eclipse/lib/plt.jar
M platform/src-hj/edu/rice/cs/drjava/model/compiler/descriptors/HjDescriptor.java
M platform/src-hj/edu/rice/cs/drjava/model/compiler/HjCompiler.java
M platform/src-mint/edu/rice/cs/drjava/model/compiler/MintCompiler.java
M platform/classes/base-nextgen/edu/rice/cs/drjava/model/compiler/NextGenCompiler$1.class
M platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/HjCompiler.class
A platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/descriptors
AM platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/descriptors/HjDescriptor.class
M platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/HjCompiler$1.class
M platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/HjCompiler$2.class
M platform/classes/base-hj/edu/rice/cs/drjava/model/compiler/HjCompiler$1$1.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
M drjava/lib/platform.jar
M drjava/lib/javalanglevels-base.jar
M drjava/lib/dynamicjava-base.jar
M drjava/lib/plt.jar
M drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java
M drjava/src/edu/rice/cs/drjava/model/compiler/JavacCompiler.java
M drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
M drjava/src/edu/rice/cs/drjava/ui/DrJavaErrorHandler.java
M javalanglevels/lib/plt.jar
M javalanglevels/src/edu/rice/cs/javalanglevels/LanguageLevelConverter.java

 2010-07-30 20:35:10 Tree
[r5345] by mgricken

Future-proofing for Oracle-branded JVMs. "Oracle" string
in java.vm.vendor is treated as "Sun" right now.

M plt/src/edu/rice/cs/plt/reflect/JavaVersionTest.java
M plt/src/edu/rice/cs/plt/reflect/JavaVersion.java
M eclipse/lib/plt.jar
M dynamicjava/lib/plt.jar
M drjava/lib/javalanglevels-base.jar
M drjava/lib/dynamicjava-base.jar
M drjava/lib/plt.jar
M drjava/src/edu/rice/cs/drjava/ui/DrJavaErrorHandler.java
M javalanglevels/lib/plt.jar

 2010-07-30 18:35:20 Tree
[r5344] by mgricken

Pushing bugfix from revision 5342 into drjava-compilers branch:

Fixing bug 3036131:
IllegalAccessException with Smart Run on non-Public Class

Using setAccessible(true), or at least give better error message.

M drjava/src/edu/rice/cs/drjava/model/compiler/JavacCompiler.java
M drjava/src/edu/rice/cs/drjava/ui/MainFrame.java

 2010-07-30 04:04:36 Tree
[r5343] by mgricken

Updating platform.jar with new Mint compiler adapter.

 2010-07-29 21:10:47 Tree
[r5342] by mgricken

Fixing bug 3036131:
IllegalAccessException with Smart Run on non-Public Class

Using setAccessible(true), or at least give better error message.

 2010-07-29 21:05:00 Tree
[r5341] by mgricken

Fixing Mint compiler adapter after Mint update.

 2010-07-29 16:02:26 Tree
[r5340] by mgricken

Updating Mint compiler adapter.

 2010-07-29 02:30:24 Tree
[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
Older >
MongoDB Logo MongoDB