diff --git a/app/src/processing/app/Problem.java b/app/src/processing/app/Problem.java index e271836c9..d087e7bb4 100644 --- a/app/src/processing/app/Problem.java +++ b/app/src/processing/app/Problem.java @@ -28,7 +28,7 @@ public interface Problem { public int getLineNumber(); // 0-indexed public String getMessage(); - public boolean isLineOffset(); + public boolean usesLineOffset(); public int getStartOffset(); public int getStopOffset(); } diff --git a/app/src/processing/app/syntax/PdeTextAreaPainter.java b/app/src/processing/app/syntax/PdeTextAreaPainter.java index 8b3fb37d8..e55fa413c 100644 --- a/app/src/processing/app/syntax/PdeTextAreaPainter.java +++ b/app/src/processing/app/syntax/PdeTextAreaPainter.java @@ -152,7 +152,7 @@ public class PdeTextAreaPainter extends TextAreaPainter { int lineOffset = textArea.getLineStartOffset(line); - if (problem.isLineOffset()) { + if (problem.usesLineOffset()) { startOffset += lineOffset; stopOffset += lineOffset; } diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java index 77f1bb7b1..3cf6d7ba1 100644 --- a/app/src/processing/app/ui/Editor.java +++ b/app/src/processing/app/ui/Editor.java @@ -2626,7 +2626,7 @@ public abstract class Editor extends JFrame implements RunnerListener { int pEndOffset = p.getStopOffset(); int pEndLine; - if (p.isLineOffset()) { + if (p.usesLineOffset()) { int lineGlobalOffset = textarea.getLineStartOffset(pStartLine); pEndLine = textarea.getLineOfOffset(pEndOffset + lineGlobalOffset); } else { diff --git a/java/src/processing/mode/java/JavaProblem.java b/java/src/processing/mode/java/JavaProblem.java index 4b9553cd7..adf86fcab 100644 --- a/java/src/processing/mode/java/JavaProblem.java +++ b/java/src/processing/mode/java/JavaProblem.java @@ -139,7 +139,7 @@ public class JavaProblem implements Problem { importSuggestions = a; } - public boolean isLineOffset() { + public boolean usesLineOffset() { return false; } diff --git a/java/src/processing/mode/java/SyntaxProblem.java b/java/src/processing/mode/java/SyntaxProblem.java index b0f8d97df..a1af0ed8b 100644 --- a/java/src/processing/mode/java/SyntaxProblem.java +++ b/java/src/processing/mode/java/SyntaxProblem.java @@ -19,14 +19,14 @@ public class SyntaxProblem extends JavaProblem { * @param newLineNumber The line number within the tab at which the offending code can be found. * @param newMessage Human readable message describing the issue. * @param newStartOffset The character index at which the issue starts. This is relative to start - * of tab / file not relative to start of line if newIsLineOffset is true else it is line + * of tab / file not relative to start of line if newUsesLineOffset is true else it is line * offset. * @param newStopOffset The character index at which the issue ends. This is relative to start - * of tab / file not relative to start of line if newIsLineOffset is true else it is line + * of tab / file not relative to start of line if newUsesLineOffset is true else it is line * offset. */ public SyntaxProblem(int newTabIndex, int newLineNumber, String newMessage, int newStartOffset, - int newStopOffset, boolean newIsLineOffset) { + int newStopOffset, boolean newUsesLineOffset) { super(newMessage, JavaProblem.ERROR, newLineNumber, newLineNumber); @@ -35,7 +35,7 @@ public class SyntaxProblem extends JavaProblem { message = newMessage; startOffset = newStartOffset; stopOffset = newStopOffset; - lineFlag = newIsLineOffset; + lineFlag = newUsesLineOffset; } @Override @@ -73,7 +73,7 @@ public class SyntaxProblem extends JavaProblem { return stopOffset; } - public boolean isLineOffset() { + public boolean usesLineOffset() { return lineFlag; }