eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:processing/processing4

Browse Source
This commit is contained in:
Ben Fry
2023-01-09 21:37:25 -05:00
parent f71ecce223 907a4ddf57
commit ab89a0d1a6
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/src/processing/mode/java/preproc/PdeParseTreeListener.java
+2 -9
View File
@@ -1076,17 +1076,10 @@ public class PdeParseTreeListener extends ProcessingBaseListener {
*/
protected void writeImports(PrintWriterWithEditGen headerWriter,
RewriteResultBuilder resultBuilder) {
if (!userImportingManually) {
writeImportList(headerWriter, coreImports, resultBuilder);
}
writeImportList(headerWriter, coreImports, resultBuilder);
writeImportList(headerWriter, codeFolderImports, resultBuilder);
writeImportList(headerWriter, foundImports, resultBuilder);
if (!userImportingManually) {
writeImportList(headerWriter, defaultImports, resultBuilder);
}
writeImportList(headerWriter, defaultImports, resultBuilder);
}
/**
java/test/resources/customrootclass.expected
+13
View File
@@ -3,6 +3,19 @@ import processing.data.*;
import processing.event.*;
import processing.opengl.*;
import processing.core.*;
import processing.data.*;
import processing.event.*;
import processing.opengl.*;
import java.util.HashMap;
import java.util.ArrayList;
import java.io.File;
import java.io.BufferedReader;
import java.io.PrintWriter;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.IOException;
import java.util.HashMap;
import java.util.ArrayList;
import java.io.File;