eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-11 01:29:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:processing/processing

Browse Source
This commit is contained in:
Ben Fry
2014-11-15 16:30:26 -07:00
parent c16359ac47 32d2491cde
commit 2bfad647f3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/processing/core/PApplet.java
View File

@@ -4196,6 +4196,7 @@ public class PApplet extends Applet
*
* @webref structure
* @usage Application
* @param name name of the function to be executed in a separate thread
* @see PApplet#setup()
* @see PApplet#draw()
* @see PApplet#loop()

6
pdex/src/processing/mode/experimental/ErrorMessageSimplifier.java
View File

@@ -83,14 +83,14 @@ public class ErrorMessageSimplifier {
+ "\" should go here";
}
else {
result = "Code error on \"" + args[0]
result = "Error on \"" + args[0]
+ "\"";
}
}
break;
case IProblem.ParsingErrorDeleteToken:
if (args.length > 0) {
result = "Code error on \"" + args[0] + "\"";
result = "Error on \"" + args[0] + "\"";
}
break;
case IProblem.ParsingErrorInsertToComplete:
@@ -115,7 +115,7 @@ public class ErrorMessageSimplifier {
result = "\"color\" and \"int\" are reserved words & can't be used as variable names";
}
else {
result = "Code error on \"" + args[0] + "\"";
result = "Error on \"" + args[0] + "\"";
}
}
}