Skip to content
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.

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

Move to ANTLR 4 with Java 11 lang features and localization. #5

Merged
merged 12 commits into from
Oct 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,16 @@ jdk:
before_install:
- sudo apt-get -qq update
- sudo apt-get install ant-optional
- sudo apt-get install wget
- wget --no-check-certificate https://www-us.apache.org/dist//ant/binaries/apache-ant-1.10.7-bin.tar.gz
- tar -xzvf apache-ant-1.10.7-bin.tar.gz
- export PATH=`pwd`/apache-ant-1.10.7/bin:$PATH

services:
- xvfb

before_script:
- export DISPLAY=:99.0
- cd build

script:
Expand Down
4 changes: 4 additions & 0 deletions app/src/processing/app/Platform.java
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ public class Platform {

// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .

static public boolean isInit() {
return inst != null;
}


static public void init() {
try {
Expand Down
2 changes: 1 addition & 1 deletion app/src/processing/app/tools/InstallCommander.java
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,4 @@ public boolean accept(File dir, String name) {
list.append(jar.getAbsolutePath());
}
}
}
}
7 changes: 3 additions & 4 deletions app/src/processing/app/ui/Editor.java
Original file line number Diff line number Diff line change
Expand Up @@ -2898,7 +2898,6 @@ public void statusError(String what) {
* Show an exception in the editor status bar.
*/
public void statusError(Exception e) {
e.printStackTrace();
// if (e == null) {
// System.err.println("Editor.statusError() was passed a null exception.");
// return;
Expand All @@ -2909,9 +2908,7 @@ public void statusError(Exception e) {

// Make sure something is printed into the console
// Status bar is volatile
if (!re.isStackTraceEnabled()) {
System.err.println(re.getMessage());
}
System.err.println(re.getMessage());

// Move the cursor to the line before updating the status bar, otherwise
// status message might get hidden by a potential message caused by moving
Expand Down Expand Up @@ -2940,6 +2937,8 @@ public void statusError(Exception e) {
textarea.getLineStopOffset(line) - 1);
}
}
} else {
e.printStackTrace();
}

// Since this will catch all Exception types, spend some time figuring
Expand Down
53 changes: 0 additions & 53 deletions app/test/resources/annotations.expected

This file was deleted.

29 changes: 0 additions & 29 deletions app/test/resources/bug1064.expected

This file was deleted.

41 changes: 0 additions & 41 deletions app/test/resources/bug136.expected

This file was deleted.

29 changes: 0 additions & 29 deletions app/test/resources/bug1362.expected

This file was deleted.

28 changes: 0 additions & 28 deletions app/test/resources/bug1442.expected

This file was deleted.

37 changes: 0 additions & 37 deletions app/test/resources/bug1511.expected

This file was deleted.

29 changes: 0 additions & 29 deletions app/test/resources/bug1512.expected

This file was deleted.

45 changes: 0 additions & 45 deletions app/test/resources/bug1518a.expected

This file was deleted.