diff --git a/.idea/misc.xml b/.idea/misc.xml index 3d3ab27e97..24e284c347 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,6 @@ + diff --git a/.idea/modules.xml b/.idea/modules.xml index 335d8c4b3e..0caaff6466 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,7 +3,7 @@ - + @@ -12,8 +12,7 @@ - - + \ No newline at end of file diff --git a/app/src/processing/app/Sketch.java b/app/src/processing/app/Sketch.java index 8bb50352b0..35c7b7a6b6 100644 --- a/app/src/processing/app/Sketch.java +++ b/app/src/processing/app/Sketch.java @@ -263,6 +263,7 @@ protected void insertCode(SketchCode newCode) { // make sure the user didn't hide the sketch folder ensureExistence(); + // add file to the code/codeCount list, resort the list //if (codeCount == code.length) { code = (SketchCode[]) PApplet.append(code, newCode); @@ -272,6 +273,8 @@ protected void insertCode(SketchCode newCode) { } + + protected void sortCode() { // cheap-ass sort of the rest of the files // it's a dumb, slow sort, but there shouldn't be more than ~5 files @@ -808,6 +811,7 @@ public boolean isModified() { */ public void updateSketchCodes() { current.setProgram(editor.getText()); + } @@ -1431,6 +1435,7 @@ public boolean addFile(File sourceFile) { String codeExtension = null; boolean replacement = false; + boolean isCode = false; // if the file appears to be code related, drop it @@ -1578,6 +1583,7 @@ public void setCurrentCode(int which) { current = code[which]; currentIndex = which; current.visited = System.currentTimeMillis(); + //System.out.println(current); editor.setCode(current); editor.repaintHeader(); diff --git a/app/src/processing/app/SketchCode.java b/app/src/processing/app/SketchCode.java index 299b9373ae..0f3d3076fe 100644 --- a/app/src/processing/app/SketchCode.java +++ b/app/src/processing/app/SketchCode.java @@ -86,6 +86,7 @@ public SketchCode(File file, String extension) { this.file = file; this.extension = extension; + try { load(); } catch (IOException e) { diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java index 3b33119cf7..bf96a07404 100644 --- a/app/src/processing/app/ui/Editor.java +++ b/app/src/processing/app/ui/Editor.java @@ -1147,7 +1147,7 @@ public void actionPerformed(ActionEvent e) { if (sketch != null) { sketch.setModified(!getText().equals(sketch.getCurrentCode().getSavedProgram())); // Go through all tabs; Replace All, Rename or Undo could have changed them - for (SketchCode sc : sketch.getCode()) { + for ( SketchCode sc : sketch.getCode()) { if (sc.getDocument() != null) { try { sc.setModified(!sc.getDocumentText().equals(sc.getSavedProgram())); diff --git a/build/reports/problems/problems-report.html b/build/reports/problems/problems-report.html new file mode 100644 index 0000000000..b2744498d0 --- /dev/null +++ b/build/reports/problems/problems-report.html @@ -0,0 +1,663 @@ + + + + + + + + + + + + + Gradle Configuration Cache + + + +
+ +
+ Loading... +
+ + + + + + diff --git a/core/.classpath b/core/.classpath index 54476ed979..fe1b7840b4 100644 --- a/core/.classpath +++ b/core/.classpath @@ -1,13 +1,89 @@ - - + - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/core/.project b/core/.project index 42dcd4e424..fbc4db6976 100644 --- a/core/.project +++ b/core/.project @@ -10,8 +10,25 @@ + + org.eclipse.buildship.core.gradleprojectbuilder + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + + 1741977229817 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/core/.settings/org.eclipse.buildship.core.prefs b/core/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 0000000000..b1886adb46 --- /dev/null +++ b/core/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,2 @@ +connection.project.dir=.. +eclipse.preferences.version=1 diff --git a/core/.settings/org.eclipse.jdt.core.prefs b/core/.settings/org.eclipse.jdt.core.prefs index 9c1f33157e..0e6a8741a1 100644 --- a/core/.settings/org.eclipse.jdt.core.prefs +++ b/core/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,5 @@ eclipse.preferences.version=1 +org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=ignore org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull @@ -7,9 +8,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=11 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -100,7 +101,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=11 +org.eclipse.jdt.core.compiler.source=17 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false diff --git a/core/src/processing/core/PApplet.java b/core/src/processing/core/PApplet.java index 24c0d5d39a..5490f97fed 100644 --- a/core/src/processing/core/PApplet.java +++ b/core/src/processing/core/PApplet.java @@ -838,6 +838,7 @@ boolean insideSettings(String method, Object... args) { void handleSettings() { + insideSettings = true; if (!disableAWT) { @@ -933,6 +934,8 @@ void handleSettings() { public void settings() { // is this necessary? (doesn't appear to be, so removing) //size(DEFAULT_WIDTH, DEFAULT_HEIGHT, JAVA2D); + + } diff --git a/java/keywords.txt b/java/keywords.txt index bf02b74d98..42d9f4eb26 100644 --- a/java/keywords.txt +++ b/java/keywords.txt @@ -934,6 +934,7 @@ parse FUNCTION2 XML_parse_ removeChild FUNCTION2 XML_removeChild_ setContent FUNCTION2 XML_setContent_ setFloat FUNCTION2 XML_setFloat_ +setHeading FUNCTION2 PVector setInt FUNCTION2 XML_setInt_ setLong FUNCTION2 XML_setLong_ setName FUNCTION2 XML_setName_ diff --git a/java/libraries/svg/src/WriteSVG.java b/java/libraries/svg/src/WriteSVG.java index ed69b048bb..e4c5068a01 100644 --- a/java/libraries/svg/src/WriteSVG.java +++ b/java/libraries/svg/src/WriteSVG.java @@ -17,6 +17,7 @@ public class WriteSVG extends PApplet { public void settings() { size(600, 400, SVG, desktopPath("frame-####.svg")); + System.out.println("settings1"); // frameRate(1); }