Skip to content

Commit f1466cb

Browse files
committed
Made minor edits as described at processing/processing4#99.
1 parent 023ace3 commit f1466cb

3 files changed

Lines changed: 13 additions & 14 deletions

File tree

app/src/processing/app/ui/Editor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1303,7 +1303,7 @@ public void showReferenceFile(File file) {
13031303
}
13041304

13051305

1306-
static public void showChanges() {
1306+
static public void showChangesV3() {
13071307
// http://code.google.com/p/processing/issues/detail?id=1520
13081308
if (!Base.isCommandLine()) {
13091309
Platform.openURL("https://github.com/processing/processing/wiki/Changes");

java/src/processing/mode/java/CompileErrorMessageSimplifier.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,7 @@ public static String getSimplifiedErrorMessage(IProblem iprob, String badCode) {
245245
final String undefinedName = args[0];
246246
if (undefinedName.equals("frame")) {
247247
result = Language.interpolate("editor.status.item_removed", undefinedName, "surface");
248-
}
249-
else {
248+
} else {
250249
result = Language.interpolate("editor.status.undef_name", undefinedName);
251250
}
252251
}

java/src/processing/mode/java/Compiler.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public void close() { }
182182
exception.setMessage("processing.xml no longer exists, this code needs to be updated for 2.0.");
183183
System.err.println("The processing.xml library has been replaced " +
184184
"with a new 'XML' class that's built-in.");
185-
handleCrustyCode();
185+
handleCrustyCodeV3();
186186

187187
} else {
188188
exception.setMessage("The package " +
@@ -206,7 +206,7 @@ public void close() { }
206206
what.equals("BGraphics") ||
207207
what.equals("BImage")) {
208208
exception.setMessage(what + " has been replaced with P" + what.substring(1));
209-
handleCrustyCode();
209+
handleCrustyCodeV3();
210210

211211
} else {
212212
exception.setMessage("Cannot find a class or type " +
@@ -230,22 +230,22 @@ public void close() { }
230230
what.equals("LINE_STRIP")) {
231231
exception.setMessage("LINE_LOOP and LINE_STRIP are not available, " +
232232
"please update your code.");
233-
handleCrustyCode();
233+
handleCrustyCodeV3();
234234

235235
} else if (what.equals("framerate")) {
236236
exception.setMessage("framerate should be changed to frameRate.");
237-
handleCrustyCode();
237+
handleCrustyCodeV3();
238238

239239
} else if (what.equals("screen")) {
240240
exception.setMessage("Change screen.width and screen.height to " +
241241
"displayWidth and displayHeight.");
242-
handleCrustyCode();
242+
handleCrustyCodeV3();
243243

244244
} else if (what.equals("screenWidth") ||
245245
what.equals("screenHeight")) {
246246
exception.setMessage("Change screenWidth and screenHeight to " +
247247
"displayWidth and displayHeight.");
248-
handleCrustyCode();
248+
handleCrustyCodeV3();
249249

250250
} else if (what.equals("frame")) {
251251
exception.setMessage("frame was removed, use surface instead.");
@@ -283,15 +283,15 @@ public void close() { }
283283
if (parts != null) {
284284
if (parts[1].equals("framerate(int)")) {
285285
exception.setMessage("framerate() no longer exists, use frameRate() instead.");
286-
handleCrustyCode();
286+
handleCrustyCodeV3();
287287

288288
} else if (parts[1].equals("push()")) {
289289
exception.setMessage("push() no longer exists, use pushMatrix() instead.");
290-
handleCrustyCode();
290+
handleCrustyCodeV3();
291291

292292
} else if (parts[1].equals("pop()")) {
293293
exception.setMessage("pop() no longer exists, use popMatrix() instead.");
294-
handleCrustyCode();
294+
handleCrustyCodeV3();
295295

296296
} else {
297297
String mess = "The function " + parts[1] + " does not exist.";
@@ -325,9 +325,9 @@ static protected void printCrustyCodeMessage() {
325325
"please read the Changes page on the Wiki.");
326326
}
327327

328-
static protected void handleCrustyCode() {
328+
static protected void handleCrustyCodeV3() {
329329
printCrustyCodeMessage();
330-
Editor.showChanges();
330+
Editor.showChangesV3();
331331
}
332332

333333
static protected void handleCrustyCodeV4() {

0 commit comments

Comments
 (0)