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

clean up some formatting and ordering issues

Browse Source
This commit is contained in:
Ben Fry
2019-03-02 17:57:42 -05:00
parent 828dd45b9f
commit 4cb3bc5d29
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/src/processing/mode/java/VariableInspector.java
View File

@@ -244,10 +244,10 @@ public class VariableInspector extends JDialog {
//System.out.println("renderer: " + tree.getDefaultRenderer(String.class).getClass());
//System.out.println("editor: " + tree.getDefaultEditor(String.class).getClass());
callStack = new ArrayList<DefaultMutableTreeNode>();
locals = new ArrayList<VariableNode>();
thisFields = new ArrayList<VariableNode>();
declaredThisFields = new ArrayList<VariableNode>();
callStack = new ArrayList<>();
locals = new ArrayList<>();
thisFields = new ArrayList<>();
declaredThisFields = new ArrayList<>();
// Remove ugly (and unused) focus border on OS X
scrollPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));

42
java/src/processing/mode/java/pdex/ErrorChecker.java
View File

@@ -144,18 +144,21 @@ class ErrorChecker {
EventQueue.invokeLater(() -> editor.setProblemList(problems));
}
};
scheduledUiUpdate = scheduler.schedule(uiUpdater, delay,
TimeUnit.MILLISECONDS);
scheduledUiUpdate =
scheduler.schedule(uiUpdater, delay, TimeUnit.MILLISECONDS);
}
static private JavaProblem convertIProblem(IProblem iproblem, PreprocessedSketch ps) {
SketchInterval in = ps.mapJavaToSketch(iproblem);
if (in == SketchInterval.BEFORE_START) return null;
String badCode = ps.getPdeCode(in);
int line = ps.tabOffsetToTabLine(in.tabIndex, in.startTabOffset);
JavaProblem p = JavaProblem.fromIProblem(iproblem, in.tabIndex, line, badCode);
p.setPDEOffsets(in.startTabOffset, in.stopTabOffset);
return p;
if (in != SketchInterval.BEFORE_START) {
String badCode = ps.getPdeCode(in);
int line = ps.tabOffsetToTabLine(in.tabIndex, in.startTabOffset);
JavaProblem p = JavaProblem.fromIProblem(iproblem, in.tabIndex, line, badCode);
p.setPDEOffsets(in.startTabOffset, in.stopTabOffset);
return p;
}
return null;
}
@@ -168,23 +171,20 @@ class ErrorChecker {
static private boolean isMissingBraceProblem(IProblem iproblem) {
switch (iproblem.getID()) {
case IProblem.ParsingErrorInsertToComplete: {
char brace = iproblem.getArguments()[0].charAt(0);
return brace == '{' || brace == '}';
}
case IProblem.ParsingErrorInsertTokenAfter: {
char brace = iproblem.getArguments()[1].charAt(0);
return brace == '{' || brace == '}';
}
default:
return false;
if (iproblem.getID() == IProblem.ParsingErrorInsertToComplete) {
char brace = iproblem.getArguments()[0].charAt(0);
return brace == '{' || brace == '}';
} else if (iproblem.getID() == IProblem.ParsingErrorInsertTokenAfter) {
char brace = iproblem.getArguments()[1].charAt(0);
return brace == '{' || brace == '}';
}
return false;
}
private static final Pattern CURLY_QUOTE_REGEX =
Pattern.compile("([“”‘’])", Pattern.UNICODE_CHARACTER_CLASS);
static private final Pattern CURLY_QUOTE_REGEX =
Pattern.compile("([“”‘’])", Pattern.UNICODE_CHARACTER_CLASS);
static private List<JavaProblem> checkForCurlyQuotes(PreprocessedSketch ps) {
List<JavaProblem> problems = new ArrayList<>(0);