clean up some formatting and ordering issues

benfry · benfry · commit e0defac4a8d0 · 2019-03-02T17:57:42.000-05:00
diff --git a/java/src/processing/mode/java/VariableInspector.java b/java/src/processing/mode/java/VariableInspector.java
@@ -244,10 +244,10 @@ Container createScrollPane() {
     //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));
diff --git a/java/src/processing/mode/java/pdex/ErrorChecker.java b/java/src/processing/mode/java/pdex/ErrorChecker.java
@@ -144,18 +144,21 @@ private void handleSketchProblems(PreprocessedSketch ps) {
         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 @@ static private boolean isUndefinedTypeProblem(IProblem iproblem) {
 
 
   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);
