getting rid of the pdex package

java/src/processing/mode/java/ASTUtils.java

@@ -1,4 +1,4 @@
-package processing.mode.java.pdex;
+package processing.mode.java;
 
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.ASTVisitor;

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

@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex;
+package processing.mode.java;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;

java/src/processing/mode/java/CompletionCandidate.java

@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex;
+package processing.mode.java;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

java/src/processing/mode/java/CompletionGenerator.java

@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex;
+package processing.mode.java;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -61,7 +61,6 @@ import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
 import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
 
 import processing.app.Messages;
-import processing.mode.java.JavaMode;
 
 import com.google.classpath.ClassPath;
 import com.google.classpath.RegExpResourceFilter;

java/src/processing/mode/java/CompletionPanel.java

@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex;
+package processing.mode.java;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -44,7 +44,6 @@ import processing.app.Messages;
 import processing.app.Mode;
 import processing.app.syntax.JEditTextArea;
 import processing.app.ui.Toolkit;
-import processing.mode.java.JavaEditor;
 
 
 public class CompletionPanel {

java/src/processing/mode/java/DebugTree.java

@@ -1,4 +1,4 @@
-package processing.mode.java.pdex;
+package processing.mode.java;
 
 import java.awt.EventQueue;
 import java.awt.Rectangle;
@@ -21,8 +21,7 @@ import org.eclipse.jdt.core.dom.CompilationUnit;
 
 import processing.app.Messages;
 import processing.app.ui.ZoomTreeCellRenderer;
-import processing.mode.java.JavaEditor;
-import processing.mode.java.pdex.PreprocessedSketch.SketchInterval;
+import processing.mode.java.PreprocessedSketch.SketchInterval;
 
 
 class DebugTree {

java/src/processing/mode/java/ErrorChecker.java

@@ -1,4 +1,4 @@
-package processing.mode.java.pdex;
+package processing.mode.java;
 
 import java.awt.EventQueue;
 import java.util.ArrayList;
@@ -26,9 +26,7 @@ import com.google.classpath.RegExpResourceFilter;
 
 import processing.app.Language;
 import processing.app.Problem;
-import processing.mode.java.JavaEditor;
-import processing.mode.java.JavaMode;
-import processing.mode.java.pdex.PreprocessedSketch.SketchInterval;
+import processing.mode.java.PreprocessedSketch.SketchInterval;
 
 
 class ErrorChecker {

java/src/processing/mode/java/ImportStatement.java

@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex;
+package processing.mode.java;
 
 import java.util.regex.MatchResult;
 import java.util.regex.Matcher;

java/src/processing/mode/java/InspectMode.java

@@ -1,4 +1,7 @@
-package processing.mode.java.pdex;
+package processing.mode.java;
+
+import static processing.mode.java.ASTUtils.getSimpleNameAt;
+import static processing.mode.java.ASTUtils.resolveBinding;
 
 import java.awt.EventQueue;
 import java.awt.event.InputEvent;
@@ -21,12 +24,7 @@ import org.eclipse.jdt.core.dom.VariableDeclaration;
 import processing.app.Language;
 import processing.app.Messages;
 import processing.app.Platform;
-import processing.mode.java.JavaEditor;
-import processing.mode.java.JavaMode;
-import processing.mode.java.pdex.PreprocessedSketch.SketchInterval;
-
-import static processing.mode.java.pdex.ASTUtils.getSimpleNameAt;
-import static processing.mode.java.pdex.ASTUtils.resolveBinding;
+import processing.mode.java.PreprocessedSketch.SketchInterval;
 
 
 class InspectMode {

java/src/processing/mode/java/JavaBuild.java

@@ -40,8 +40,6 @@ import processing.core.PApplet;
 import processing.core.PConstants;
 import processing.data.StringList;
 import processing.data.XML;
-import processing.mode.java.pdex.ImportStatement;
-import processing.mode.java.pdex.util.ProblemFactory;
 import processing.mode.java.preproc.PdePreprocessor;
 import processing.mode.java.preproc.PreprocessorResult;
 

java/src/processing/mode/java/JavaEditor.java

@@ -51,12 +51,6 @@ import processing.app.ui.Toolkit;
 import processing.mode.java.debug.LineBreakpoint;
 import processing.mode.java.debug.LineHighlight;
 import processing.mode.java.debug.LineID;
-import processing.mode.java.pdex.PreprocessingService;
-import processing.mode.java.pdex.ImportStatement;
-import processing.mode.java.pdex.JavaTextArea;
-import processing.mode.java.pdex.PDEX;
-import processing.mode.java.pdex.JavaProblem;
-import processing.mode.java.pdex.SourceUtils;
 import processing.mode.java.preproc.PdePreprocessor;
 import processing.mode.java.runner.Runner;
 import processing.mode.java.tweak.ColorControlBox;

java/src/processing/mode/java/JavaProblem.java

@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex;
+package processing.mode.java;
 
 import org.eclipse.jdt.core.compiler.IProblem;
 

java/src/processing/mode/java/JavaTextArea.java

@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex;
+package processing.mode.java;
 
 import java.awt.EventQueue;
 import java.awt.Point;
@@ -38,9 +38,6 @@ import processing.app.Messages;
 import processing.app.Platform;
 import processing.app.syntax.PdeTextArea;
 import processing.app.syntax.TextAreaDefaults;
-import processing.mode.java.JavaEditor;
-import processing.mode.java.JavaInputHandler;
-import processing.mode.java.JavaMode;
 import processing.mode.java.tweak.ColorControlBox;
 import processing.mode.java.tweak.Handle;
 

java/src/processing/mode/java/JavaTextAreaPainter.java

@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex;
+package processing.mode.java;
 
 import java.awt.Cursor;
 import java.awt.Dimension;
@@ -38,7 +38,6 @@ import java.util.List;
 import processing.app.SketchCode;
 import processing.app.syntax.PdeTextAreaPainter;
 import processing.app.syntax.TextAreaDefaults;
-import processing.mode.java.JavaEditor;
 import processing.mode.java.tweak.ColorControlBox;
 import processing.mode.java.tweak.ColorSelector;
 import processing.mode.java.tweak.Handle;

java/src/processing/mode/java/JdtCompilerUtil.java

@@ -1,4 +1,4 @@
-package processing.mode.java.pdex;
+package processing.mode.java;
 
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.dom.ASTParser;

java/src/processing/mode/java/PDEX.java

@@ -1,11 +1,10 @@
-package processing.mode.java.pdex;
+package processing.mode.java;
 
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.swing.text.Document;
 
 import processing.app.SketchCode;
-import processing.mode.java.JavaEditor;
 
 
 public class PDEX {

java/src/processing/mode/java/PreprocessedSketch.java

@@ -1,4 +1,4 @@
-package processing.mode.java.pdex;
+package processing.mode.java;
 
 import com.google.classpath.ClassPath;
 
@@ -15,7 +15,7 @@ import java.util.List;
 import processing.app.Problem;
 import processing.app.Sketch;
 import processing.core.PApplet;
-import processing.mode.java.pdex.TextTransform.OffsetMapper;
+import processing.mode.java.TextTransform.OffsetMapper;
 
 public class PreprocessedSketch {
 

java/src/processing/mode/java/PreprocessingService.java

@@ -18,11 +18,15 @@ along with this program; if not, write to the Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex;
+package processing.mode.java;
 
 import java.io.File;
 import java.io.StringWriter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CompletableFuture;
@@ -42,17 +46,17 @@ import org.eclipse.jdt.core.dom.AST;
 import org.eclipse.jdt.core.dom.ASTParser;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 
-import processing.app.*;
-import processing.data.IntList;
-import processing.data.StringList;
-import processing.mode.java.JavaEditor;
-import processing.mode.java.JavaMode;
-import processing.mode.java.pdex.TextTransform.OffsetMapper;
-import processing.mode.java.pdex.util.ProblemFactory;
-import processing.mode.java.pdex.util.RuntimePathBuilder;
+import processing.app.Messages;
+import processing.app.Sketch;
+import processing.app.SketchCode;
+import processing.app.SketchException;
+import processing.app.Util;
+import processing.mode.java.TextTransform.OffsetMapper;
 import processing.mode.java.preproc.PdePreprocessor;
 import processing.mode.java.preproc.PreprocessorResult;
-import processing.mode.java.preproc.code.SyntaxUtil;
+import processing.mode.java.preproc.SyntaxUtil;
+import processing.data.IntList;
+import processing.data.StringList;
 
 
 /**
@@ -85,7 +89,7 @@ public class PreprocessingService {
   private CompletableFuture<PreprocessedSketch> preprocessingTask = new CompletableFuture<>();
 
   private CompletableFuture<?> lastCallback =
-      new CompletableFuture<Object>() {{
+      new CompletableFuture<>() {{
         complete(null); // initialization block
       }};
 

java/src/processing/mode/java/ProblemFactory.java

@@ -1,4 +1,4 @@
-package processing.mode.java.pdex.util;
+package processing.mode.java;
 
 import java.util.List;
 import java.util.OptionalInt;

java/src/processing/mode/java/Rename.java

@@ -1,4 +1,8 @@
-package processing.mode.java.pdex;
+package processing.mode.java;
+
+import static processing.mode.java.ASTUtils.findAllOccurrences;
+import static processing.mode.java.ASTUtils.getSimpleNameAt;
+import static processing.mode.java.ASTUtils.resolveBinding;
 
 import java.awt.Dimension;
 import java.awt.EventQueue;
@@ -39,12 +43,7 @@ import processing.app.SketchCode;
 import processing.app.syntax.SyntaxDocument;
 import processing.app.ui.EditorStatus;
 import processing.app.ui.Toolkit;
-import processing.mode.java.JavaEditor;
-import processing.mode.java.pdex.PreprocessedSketch.SketchInterval;
-
-import static processing.mode.java.pdex.ASTUtils.findAllOccurrences;
-import static processing.mode.java.pdex.ASTUtils.getSimpleNameAt;
-import static processing.mode.java.pdex.ASTUtils.resolveBinding;
+import processing.mode.java.PreprocessedSketch.SketchInterval;
 
 
 class Rename {

java/src/processing/mode/java/RuntimePathBuilder.java

@@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-package processing.mode.java.pdex.util;
+package processing.mode.java;
 
 import java.io.File;
 import java.net.MalformedURLException;
@@ -41,9 +41,6 @@ import processing.app.Messages;
 import processing.app.Sketch;
 import processing.app.SketchException;
 import processing.app.Util;
-import processing.mode.java.JavaMode;
-import processing.mode.java.pdex.ImportStatement;
-import processing.mode.java.pdex.PreprocessedSketch;
 
 
 /**

java/src/processing/mode/java/ShowUsage.java

@@ -1,6 +1,6 @@
-package processing.mode.java.pdex;
+package processing.mode.java;
 
-import static processing.mode.java.pdex.ASTUtils.findAllOccurrences;
+import static processing.mode.java.ASTUtils.findAllOccurrences;
 
 import java.awt.Color;
 import java.awt.EventQueue;
@@ -33,8 +33,7 @@ import processing.app.Language;
 import processing.app.ui.EditorStatus;
 import processing.app.ui.Toolkit;
 import processing.app.ui.ZoomTreeCellRenderer;
-import processing.mode.java.JavaEditor;
-import processing.mode.java.pdex.PreprocessedSketch.SketchInterval;
+import processing.mode.java.PreprocessedSketch.SketchInterval;
 
 
 class ShowUsage {

java/src/processing/mode/java/SourceUtils.java

@@ -1,4 +1,4 @@
-package processing.mode.java.pdex;
+package processing.mode.java;
 
 import org.eclipse.jdt.core.dom.ASTVisitor;
 import org.eclipse.jdt.core.dom.CompilationUnit;
@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import processing.mode.java.pdex.TextTransform.Edit;
+import processing.mode.java.TextTransform.Edit;
 import processing.mode.java.preproc.PdePreprocessor;
 
 public class SourceUtils {

java/src/processing/mode/java/SyntaxProblem.java

@@ -1,7 +1,4 @@
-package processing.mode.java.pdex.util;
-
-import processing.mode.java.pdex.JavaProblem;
-
+package processing.mode.java;
 
 /**
  * Problem identifying a syntax error found in preprocessing.

java/src/processing/mode/java/TabLine.java

@@ -1,4 +1,4 @@
-package processing.mode.java.pdex.util;
+package processing.mode.java;
 
 
 /**

java/src/processing/mode/java/TextTransform.java

@@ -1,4 +1,4 @@
-package processing.mode.java.pdex;
+package processing.mode.java;
 
 import java.util.ArrayList;
 import java.util.Collection;

java/src/processing/mode/java/preproc/PdeParseTreeListener.java

@@ -31,10 +31,9 @@ import org.antlr.v4.runtime.misc.Interval;
 import org.antlr.v4.runtime.tree.ParseTree;
 import processing.app.Preferences;
 import processing.core.PApplet;
-import processing.mode.java.pdex.ImportStatement;
-import processing.mode.java.pdex.TextTransform;
+import processing.mode.java.ImportStatement;
+import processing.mode.java.TextTransform;
 import processing.mode.java.preproc.PdePreprocessor.Mode;
-import processing.mode.java.preproc.code.*;
 import processing.mode.java.preproc.issue.PdePreprocessIssue;
 import processing.mode.java.preproc.issue.PreprocessIssueMessageSimplifier;
 

java/src/processing/mode/java/preproc/PreprocessorResult.java

@@ -25,8 +25,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import processing.mode.java.pdex.ImportStatement;
-import processing.mode.java.pdex.TextTransform;
+import processing.mode.java.ImportStatement;
+import processing.mode.java.TextTransform;
 import processing.mode.java.preproc.issue.PdePreprocessIssue;
 
 

java/src/processing/mode/java/preproc/RewriteResult.java

@@ -1,9 +1,9 @@
-package processing.mode.java.preproc.code;
-
-import processing.mode.java.pdex.TextTransform;
+package processing.mode.java.preproc;
 
 import java.util.List;
 
+import processing.mode.java.TextTransform;
+
 
 /**
  * Data structure describing the result of preprocessor rewrite.

java/src/processing/mode/java/preproc/RewriteResultBuilder.java

@@ -1,10 +1,10 @@
-package processing.mode.java.preproc.code;
-
-import processing.mode.java.pdex.TextTransform;
+package processing.mode.java.preproc;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import processing.mode.java.TextTransform;
+
 
 /**
  * Builder to help create a {RewriteResult}.

java/src/processing/mode/java/preproc/SyntaxUtil.java

@@ -19,7 +19,7 @@ along with this program; if not, write to the Free Software Foundation,
 Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-package processing.mode.java.preproc.code;
+package processing.mode.java.preproc;
 
 /**
  * Convenience functions useful for working on syntax checking for source.

java/src/processing/mode/java/preproc/issue/IssueLocationFactory.java

@@ -21,10 +21,10 @@ Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 package processing.mode.java.preproc.issue;
 
-import processing.mode.java.preproc.code.SyntaxUtil;
-
 import java.util.Optional;
 
+import processing.mode.java.preproc.SyntaxUtil;
+
 
 /**
  * Utility that can help clean up where in source an issue should be reported.

java/src/processing/mode/java/preproc/issue/PreprocessIssueMessageSimplifier.java

@@ -24,7 +24,7 @@ package processing.mode.java.preproc.issue;
 
 import processing.app.Language;
 import processing.app.Platform;
-import processing.mode.java.preproc.code.SyntaxUtil;
+import processing.mode.java.preproc.SyntaxUtil;
 
 import java.util.ArrayList;
 import java.util.List;

java/src/processing/mode/java/tweak/ColorControlBox.java

@@ -26,7 +26,7 @@ import java.awt.Graphics2D;
 import java.awt.geom.AffineTransform;
 import java.util.ArrayList;
 
-import processing.mode.java.pdex.JavaTextAreaPainter;
+import processing.mode.java.JavaTextAreaPainter;
 
 
 public class ColorControlBox {