Skip to content

Updating my local version #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kmader merged 33 commits into from
Dec 5, 2014
Merged

Updating my local version #1

Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
35ca6b0
Fix annotation processing when running javac without -d <directory>
dscho Oct 7, 2014
c637b29
Let Eclipse clean up AnnotationProcessor's source code
dscho Oct 7, 2014
8bbd4f8
Adapt instances of AnnotationValue in the annotation processor
dscho Oct 8, 2014
8fa230a
Merge pull request #131 from scijava/annotation-value
dscho Oct 8, 2014
d0c26b5
Merge pull request #129 from 4Quant/master
dscho Oct 11, 2014
d09c4f4
Fix OptionsTest's assumption that bar was not persisted previously
dscho Oct 11, 2014
13bf97f
Fix Javadocs
dscho Jun 27, 2014
b321573
Avoid compiler warning
dscho Jul 1, 2014
6470e08
PrefService: Provide an API for Iterables
dscho Jun 27, 2014
71ca10e
Add a data structure keeping n unique last-recently-used items
dscho Jul 2, 2014
e89f212
Add a history class for the upcoming script interpreters
dscho Jul 2, 2014
b7904e0
Add the UI-agnostic part of the script interpreters
dscho Jul 2, 2014
7e52d8f
Let LastRecentlyUsed implement the full Collection contract
dscho Jul 26, 2014
64e577c
Test LastRecentlyUsed#remove(Object)
dscho Jul 26, 2014
b7eb86a
ScriptInterpreter: remove irrelevant modifiers
ctrueden Oct 6, 2014
e7b80c6
DefaultScriptInterpreter: remove redundant javadoc
ctrueden Oct 6, 2014
52acdad
DefaultScriptInterpreter: add final keywords
ctrueden Oct 6, 2014
f998ed8
ScriptInterpreter: add missing punctuation
ctrueden Oct 6, 2014
6b186e3
ScriptInterpreter: remember the associated language
ctrueden Oct 6, 2014
b91b703
DefaultScriptInterpreter: add more final keywords
ctrueden Oct 6, 2014
f9c3057
Script Interpreter: keep a record of a 'current command'
dscho Oct 14, 2014
a571896
Merge pull request #127 from scijava/interpreter
dscho Oct 15, 2014
dc938f1
Bump to next development cycle
dscho Oct 15, 2014
2bc186d
Add an ol' classic: ReflectedUniverse, aka CurtisJ
ctrueden Oct 24, 2014
ea3c750
ReflectedUniverse: remove LogService usage
ctrueden Oct 24, 2014
44d2aaf
POM: bump to the latest pom-scijava 4.2 release
ctrueden Oct 24, 2014
2d16186
Bump to next development cycle
ctrueden Oct 24, 2014
11e439c
ShadowMenu: avoid NPE when child module is null
ctrueden Oct 30, 2014
bce7b69
AbstractUIDetails: fix potential comparison NPE
ctrueden Nov 4, 2014
93c340f
AbstractUIDetails: do not let getTitle return null
ctrueden Nov 4, 2014
0b033f1
Merge pull request #126 from scijava/javac-annotations
ctrueden Nov 12, 2014
e9bc21f
Bump to latest pom-scijava
hinerm Nov 14, 2014
28759bc
Bump to next development cycle
hinerm Nov 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
DefaultScriptInterpreter: add more final keywords
  • Loading branch information
@ctrueden @dscho
ctrueden authored and dscho committed Oct 14, 2014
commit b91b7034fc806e5c97546d89b05f6eae0b048101
6 changes: 4 additions & 2 deletions src/main/java/org/scijava/script/DefaultScriptInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,16 @@ public synchronized void writeHistory() {
}

@Override
public synchronized String walkHistory(final String currentCommand, boolean forward) {
public synchronized String walkHistory(final String currentCommand,
final boolean forward)
{
if (history == null) return currentCommand;
history.replace(currentCommand);
return forward ? history.next() : history.previous();
}

@Override
public void eval(String command) throws ScriptException {
public void eval(final String command) throws ScriptException {
if (history != null) history.add(command);
if (engine == null) throw new java.lang.IllegalArgumentException();
engine.eval(command);
Expand Down