Removed core dependency from the pre-processor

Author: Stefterv

java/preprocessor/build.gradle.kts

@@ -23,8 +23,6 @@ sourceSets{
 }
 
 dependencies{
-    implementation(project(":core"))
-
     implementation(libs.antlr)
     implementation(libs.eclipseJDT)
 

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

@@ -32,7 +32,6 @@
 
 import processing.app.Base;
 import processing.app.Preferences;
-import processing.core.PApplet;
 import processing.mode.java.preproc.PdePreprocessor.Mode;
 
 /**
@@ -1237,16 +1236,16 @@ protected void writeMain(PrintWriterWithEditGen footerWriter,
       boolean shouldFullScreen = Preferences.getBoolean("export.application.present");
       shouldFullScreen = shouldFullScreen || Preferences.getBoolean("export.application.fullscreen");
       if (shouldFullScreen) {
-        argsJoiner.add("\"" + PApplet.ARGS_FULL_SCREEN + "\"");
+        argsJoiner.add("\"--full-screen\"");
 
         String bgColor = Preferences.get("run.present.bgcolor");
-        argsJoiner.add("\"" + PApplet.ARGS_BGCOLOR + "=" + bgColor + "\"");
+        argsJoiner.add("\"--bgcolor=" + bgColor + "\"");
 
         if (Preferences.getBoolean("export.application.stop")) {
           String stopColor = Preferences.get("run.present.stop.color");
-          argsJoiner.add("\"" + PApplet.ARGS_STOP_COLOR + "=" + stopColor + "\"");
+          argsJoiner.add("\"--stop-color=" + stopColor + "\"");
         } else {
-          argsJoiner.add("\"" + PApplet.ARGS_HIDE_STOP + "\"");
+          argsJoiner.add("\"--hide-stop\"");
         }
       }
 

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

@@ -8,8 +8,6 @@
 import java.util.ListIterator;
 import java.util.stream.Collectors;
 
-import processing.core.PApplet;
-
 
 public class TextTransform {
 
@@ -256,7 +254,7 @@ public int getInputOffset(int outputOffset) {
         i = -(i + 1);
         i -= 1;
       }
-      i = PApplet.constrain(i, 0, outMap.size()-1);
+      i = constrain(i, 0, outMap.size()-1);
       Edit edit = outMap.get(i);
       int diff = outputOffset - edit.toOffset;
       return edit.fromOffset + Math.min(diff, Math.max(0, edit.fromLength - 1));
@@ -271,7 +269,7 @@ public int getOutputOffset(int inputOffset) {
         i = -(i + 1);
         i -= 1;
       }
-      i = PApplet.constrain(i, 0, inMap.size()-1);
+      i = constrain(i, 0, inMap.size()-1);
       Edit edit = inMap.get(i);
       int diff = inputOffset - edit.fromOffset;
       return edit.toOffset + Math.min(diff, Math.max(0, edit.toLength - 1));
@@ -283,6 +281,10 @@ public OffsetMapper thenMapping(OffsetMapper mapper) {
     }
   }
 
+  static public final int constrain(int amt, int low, int high) {
+    return (amt < low) ? low : ((amt > high) ? high : amt);
+  }
+
 
   private static class CompositeOffsetMapper implements OffsetMapper {
     private List<OffsetMapper> mappers = new ArrayList<>();