diff --git a/java/src/processing/mode/java/pdex/ASTUtils.java b/java/src/processing/mode/java/ASTUtils.java similarity index 99% rename from java/src/processing/mode/java/pdex/ASTUtils.java rename to java/src/processing/mode/java/ASTUtils.java index 0a8c03e3b..b60639b1d 100644 --- a/java/src/processing/mode/java/pdex/ASTUtils.java +++ b/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; diff --git a/java/src/processing/mode/java/pdex/CompileErrorMessageSimplifier.java b/java/src/processing/mode/java/CompileErrorMessageSimplifier.java similarity index 99% rename from java/src/processing/mode/java/pdex/CompileErrorMessageSimplifier.java rename to java/src/processing/mode/java/CompileErrorMessageSimplifier.java index 2e48d9b3e..87d5c8038 100644 --- a/java/src/processing/mode/java/pdex/CompileErrorMessageSimplifier.java +++ b/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; diff --git a/java/src/processing/mode/java/pdex/CompletionCandidate.java b/java/src/processing/mode/java/CompletionCandidate.java similarity index 99% rename from java/src/processing/mode/java/pdex/CompletionCandidate.java rename to java/src/processing/mode/java/CompletionCandidate.java index 1b7533e82..97971f519 100644 --- a/java/src/processing/mode/java/pdex/CompletionCandidate.java +++ b/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; diff --git a/java/src/processing/mode/java/pdex/CompletionGenerator.java b/java/src/processing/mode/java/CompletionGenerator.java similarity index 99% rename from java/src/processing/mode/java/pdex/CompletionGenerator.java rename to java/src/processing/mode/java/CompletionGenerator.java index 04ec851d2..c024e895b 100644 --- a/java/src/processing/mode/java/pdex/CompletionGenerator.java +++ b/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; diff --git a/java/src/processing/mode/java/pdex/CompletionPanel.java b/java/src/processing/mode/java/CompletionPanel.java similarity index 99% rename from java/src/processing/mode/java/pdex/CompletionPanel.java rename to java/src/processing/mode/java/CompletionPanel.java index d28699b3a..e6125964f 100644 --- a/java/src/processing/mode/java/pdex/CompletionPanel.java +++ b/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 { diff --git a/java/src/processing/mode/java/pdex/DebugTree.java b/java/src/processing/mode/java/DebugTree.java similarity index 96% rename from java/src/processing/mode/java/pdex/DebugTree.java rename to java/src/processing/mode/java/DebugTree.java index a3ccb48e1..7bccaadd0 100644 --- a/java/src/processing/mode/java/pdex/DebugTree.java +++ b/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 { diff --git a/java/src/processing/mode/java/pdex/ErrorChecker.java b/java/src/processing/mode/java/ErrorChecker.java similarity index 98% rename from java/src/processing/mode/java/pdex/ErrorChecker.java rename to java/src/processing/mode/java/ErrorChecker.java index 9db5c0f1f..41777ef3e 100644 --- a/java/src/processing/mode/java/pdex/ErrorChecker.java +++ b/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 { diff --git a/java/src/processing/mode/java/pdex/ImportStatement.java b/java/src/processing/mode/java/ImportStatement.java similarity index 99% rename from java/src/processing/mode/java/pdex/ImportStatement.java rename to java/src/processing/mode/java/ImportStatement.java index e78e3422a..62deb6cc5 100644 --- a/java/src/processing/mode/java/pdex/ImportStatement.java +++ b/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; diff --git a/java/src/processing/mode/java/pdex/InspectMode.java b/java/src/processing/mode/java/InspectMode.java similarity index 95% rename from java/src/processing/mode/java/pdex/InspectMode.java rename to java/src/processing/mode/java/InspectMode.java index 6624f6866..8969593d9 100644 --- a/java/src/processing/mode/java/pdex/InspectMode.java +++ b/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 { diff --git a/java/src/processing/mode/java/JavaBuild.java b/java/src/processing/mode/java/JavaBuild.java index bf353a7cc..d81f0641b 100644 --- a/java/src/processing/mode/java/JavaBuild.java +++ b/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; diff --git a/java/src/processing/mode/java/JavaEditor.java b/java/src/processing/mode/java/JavaEditor.java index 9c029f93c..3cb9f959d 100644 --- a/java/src/processing/mode/java/JavaEditor.java +++ b/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; diff --git a/java/src/processing/mode/java/pdex/JavaProblem.java b/java/src/processing/mode/java/JavaProblem.java similarity index 99% rename from java/src/processing/mode/java/pdex/JavaProblem.java rename to java/src/processing/mode/java/JavaProblem.java index 06f395321..6097be42b 100644 --- a/java/src/processing/mode/java/pdex/JavaProblem.java +++ b/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; diff --git a/java/src/processing/mode/java/pdex/JavaTextArea.java b/java/src/processing/mode/java/JavaTextArea.java similarity index 99% rename from java/src/processing/mode/java/pdex/JavaTextArea.java rename to java/src/processing/mode/java/JavaTextArea.java index 3a1bcd415..c922ddebd 100644 --- a/java/src/processing/mode/java/pdex/JavaTextArea.java +++ b/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; diff --git a/java/src/processing/mode/java/pdex/JavaTextAreaPainter.java b/java/src/processing/mode/java/JavaTextAreaPainter.java similarity index 99% rename from java/src/processing/mode/java/pdex/JavaTextAreaPainter.java rename to java/src/processing/mode/java/JavaTextAreaPainter.java index 0bd682a15..b9e2ad754 100644 --- a/java/src/processing/mode/java/pdex/JavaTextAreaPainter.java +++ b/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; diff --git a/java/src/processing/mode/java/pdex/JdtCompilerUtil.java b/java/src/processing/mode/java/JdtCompilerUtil.java similarity index 99% rename from java/src/processing/mode/java/pdex/JdtCompilerUtil.java rename to java/src/processing/mode/java/JdtCompilerUtil.java index 7c938f24c..c10f60f90 100644 --- a/java/src/processing/mode/java/pdex/JdtCompilerUtil.java +++ b/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; diff --git a/java/src/processing/mode/java/pdex/PDEX.java b/java/src/processing/mode/java/PDEX.java similarity index 96% rename from java/src/processing/mode/java/pdex/PDEX.java rename to java/src/processing/mode/java/PDEX.java index 2a6790a7d..4778f331c 100644 --- a/java/src/processing/mode/java/pdex/PDEX.java +++ b/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 { diff --git a/java/src/processing/mode/java/pdex/PreprocessedSketch.java b/java/src/processing/mode/java/PreprocessedSketch.java similarity index 98% rename from java/src/processing/mode/java/pdex/PreprocessedSketch.java rename to java/src/processing/mode/java/PreprocessedSketch.java index 730527982..156c146ac 100644 --- a/java/src/processing/mode/java/pdex/PreprocessedSketch.java +++ b/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 { diff --git a/java/src/processing/mode/java/pdex/PreprocessingService.java b/java/src/processing/mode/java/PreprocessingService.java similarity index 97% rename from java/src/processing/mode/java/pdex/PreprocessingService.java rename to java/src/processing/mode/java/PreprocessingService.java index 0f1eea9c1..6c37e0909 100644 --- a/java/src/processing/mode/java/pdex/PreprocessingService.java +++ b/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 preprocessingTask = new CompletableFuture<>(); private CompletableFuture lastCallback = - new CompletableFuture() {{ + new CompletableFuture<>() {{ complete(null); // initialization block }}; diff --git a/java/src/processing/mode/java/pdex/util/ProblemFactory.java b/java/src/processing/mode/java/ProblemFactory.java similarity index 98% rename from java/src/processing/mode/java/pdex/util/ProblemFactory.java rename to java/src/processing/mode/java/ProblemFactory.java index 222232ffa..88caa5cb2 100644 --- a/java/src/processing/mode/java/pdex/util/ProblemFactory.java +++ b/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; diff --git a/java/src/processing/mode/java/pdex/Rename.java b/java/src/processing/mode/java/Rename.java similarity index 96% rename from java/src/processing/mode/java/pdex/Rename.java rename to java/src/processing/mode/java/Rename.java index 1941f4135..24f2124c1 100644 --- a/java/src/processing/mode/java/pdex/Rename.java +++ b/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 { diff --git a/java/src/processing/mode/java/pdex/util/RuntimePathBuilder.java b/java/src/processing/mode/java/RuntimePathBuilder.java similarity index 99% rename from java/src/processing/mode/java/pdex/util/RuntimePathBuilder.java rename to java/src/processing/mode/java/RuntimePathBuilder.java index 587e62947..59e178960 100644 --- a/java/src/processing/mode/java/pdex/util/RuntimePathBuilder.java +++ b/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; /** diff --git a/java/src/processing/mode/java/pdex/ShowUsage.java b/java/src/processing/mode/java/ShowUsage.java similarity index 98% rename from java/src/processing/mode/java/pdex/ShowUsage.java rename to java/src/processing/mode/java/ShowUsage.java index 91bf04383..f924cdaad 100644 --- a/java/src/processing/mode/java/pdex/ShowUsage.java +++ b/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 { diff --git a/java/src/processing/mode/java/pdex/SourceUtils.java b/java/src/processing/mode/java/SourceUtils.java similarity index 99% rename from java/src/processing/mode/java/pdex/SourceUtils.java rename to java/src/processing/mode/java/SourceUtils.java index ec619fd86..6fc48451b 100644 --- a/java/src/processing/mode/java/pdex/SourceUtils.java +++ b/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 { diff --git a/java/src/processing/mode/java/pdex/util/SyntaxProblem.java b/java/src/processing/mode/java/SyntaxProblem.java similarity index 95% rename from java/src/processing/mode/java/pdex/util/SyntaxProblem.java rename to java/src/processing/mode/java/SyntaxProblem.java index 6e140a7c7..14b9e9262 100644 --- a/java/src/processing/mode/java/pdex/util/SyntaxProblem.java +++ b/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. diff --git a/java/src/processing/mode/java/pdex/util/TabLine.java b/java/src/processing/mode/java/TabLine.java similarity index 97% rename from java/src/processing/mode/java/pdex/util/TabLine.java rename to java/src/processing/mode/java/TabLine.java index b89862dcc..a1ebde7b3 100644 --- a/java/src/processing/mode/java/pdex/util/TabLine.java +++ b/java/src/processing/mode/java/TabLine.java @@ -1,4 +1,4 @@ -package processing.mode.java.pdex.util; +package processing.mode.java; /** diff --git a/java/src/processing/mode/java/pdex/TextTransform.java b/java/src/processing/mode/java/TextTransform.java similarity index 99% rename from java/src/processing/mode/java/pdex/TextTransform.java rename to java/src/processing/mode/java/TextTransform.java index 6cba64eb7..8861adbb4 100644 --- a/java/src/processing/mode/java/pdex/TextTransform.java +++ b/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; diff --git a/java/src/processing/mode/java/preproc/PdeParseTreeListener.java b/java/src/processing/mode/java/preproc/PdeParseTreeListener.java index 1407be6b7..dd9ae8d7d 100644 --- a/java/src/processing/mode/java/preproc/PdeParseTreeListener.java +++ b/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; diff --git a/java/src/processing/mode/java/preproc/PreprocessorResult.java b/java/src/processing/mode/java/preproc/PreprocessorResult.java index f5b689eb3..e8eff3d2b 100644 --- a/java/src/processing/mode/java/preproc/PreprocessorResult.java +++ b/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; diff --git a/java/src/processing/mode/java/preproc/code/RewriteResult.java b/java/src/processing/mode/java/preproc/RewriteResult.java similarity index 90% rename from java/src/processing/mode/java/preproc/code/RewriteResult.java rename to java/src/processing/mode/java/preproc/RewriteResult.java index c5c23785e..1a3c35a6a 100644 --- a/java/src/processing/mode/java/preproc/code/RewriteResult.java +++ b/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. diff --git a/java/src/processing/mode/java/preproc/code/RewriteResultBuilder.java b/java/src/processing/mode/java/preproc/RewriteResultBuilder.java similarity index 93% rename from java/src/processing/mode/java/preproc/code/RewriteResultBuilder.java rename to java/src/processing/mode/java/preproc/RewriteResultBuilder.java index 2434a8a57..807a06b3e 100644 --- a/java/src/processing/mode/java/preproc/code/RewriteResultBuilder.java +++ b/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}. diff --git a/java/src/processing/mode/java/preproc/code/SyntaxUtil.java b/java/src/processing/mode/java/preproc/SyntaxUtil.java similarity index 98% rename from java/src/processing/mode/java/preproc/code/SyntaxUtil.java rename to java/src/processing/mode/java/preproc/SyntaxUtil.java index a98d07754..b7dca79b7 100644 --- a/java/src/processing/mode/java/preproc/code/SyntaxUtil.java +++ b/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. diff --git a/java/src/processing/mode/java/preproc/issue/IssueLocationFactory.java b/java/src/processing/mode/java/preproc/issue/IssueLocationFactory.java index 77d528c17..cd593b334 100644 --- a/java/src/processing/mode/java/preproc/issue/IssueLocationFactory.java +++ b/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. diff --git a/java/src/processing/mode/java/preproc/issue/PreprocessIssueMessageSimplifier.java b/java/src/processing/mode/java/preproc/issue/PreprocessIssueMessageSimplifier.java index 7d024466c..9469278f1 100644 --- a/java/src/processing/mode/java/preproc/issue/PreprocessIssueMessageSimplifier.java +++ b/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; diff --git a/java/src/processing/mode/java/tweak/ColorControlBox.java b/java/src/processing/mode/java/tweak/ColorControlBox.java index 987345e2b..87e2e2163 100644 --- a/java/src/processing/mode/java/tweak/ColorControlBox.java +++ b/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 {