formatting update

Author: madhephaestus

build.gradle

@@ -1,3 +1,15 @@
+buildscript {
+
+	dependencies {
+		classpath 'org.eclipse.jdt:org.eclipse.jdt.core:3.35.0'
+		classpath 'org.eclipse.platform:org.eclipse.text:3.14.0'
+	}
+}
+import groovy.xml.XmlSlurper
+import org.eclipse.jdt.core.ToolFactory
+import org.eclipse.jdt.core.formatter.CodeFormatter
+import org.eclipse.jface.text.Document
+
 plugins {
 	id 'eclipse'
 	id 'java'
@@ -7,16 +19,36 @@ plugins {
 	id 'com.diffplug.spotless' version '6.25.0'
 }
 
+
 spotless {
 	java {
 		lineEndings = com.diffplug.spotless.LineEnding.UNIX
-		eclipse('4.26')
+		custom('eclipseFormatterDirect') { String source ->
+			def configFile = new File(projectDir, 'config/eclipse-formatter.xml')
+			def options = new HashMap<String, String>()
+			def xml = new XmlSlurper().parse(configFile)
+			xml.profile.setting.each { setting ->
+				options[setting.@id.text()] = setting.@value.text()
+			}
+			def formatter = ToolFactory.createCodeFormatter(options, ToolFactory.M_FORMAT_EXISTING)
+			def edit = formatter.format(
+					CodeFormatter.K_COMPILATION_UNIT,
+					source, 0, source.length(), 0, System.lineSeparator()
+					)
+			if (edit == null) {
+				throw new GradleException("Eclipse formatter returned null — source may have a syntax error")
+			}
+			def doc = new Document(source)
+			edit.apply(doc)
+			doc.get()
+		}
 		removeUnusedImports()
 		trimTrailingWhitespace()
 		endWithNewline()
 	}
 }
 
+
 java {
 	sourceCompatibility = JavaVersion.VERSION_25
 	targetCompatibility = JavaVersion.VERSION_25

config/eclipse-formatter.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="21">
+    <profile kind="CodeFormatterProfile" name="SpotlessProfile" version="21">
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code_changes_on_save" value="false"/>
+
+        <!-- Preserve blank lines in code -->
+        <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="2"/>
+
+        <!-- Preserve blank lines between declarations -->
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+    </profile>
+</profiles>

src/main/java/com/neuronrobotics/manifold3d/CSGManifold3d.java

@@ -163,6 +163,7 @@ public ArrayList<Polygon> sliceAtZero(CSG incoming, Transform slicePlane, double
 			throw new RuntimeException("Failed to slice CSG at Z=0", e);
 		}
 	}
+
 	/**
 	 * Returns the union of two CSG solids. Uses {@code manifold.union(a, b)}
 	 * directly (wrapper around {@code manifold_union} in the C library).
@@ -181,6 +182,7 @@ public CSG minkowski_difference(CSG a, CSG b) throws Throwable {
 			manifold.delete(mb);
 		}
 	}
+
 	/**
 	 * calculateAreaAndSurfaceArea
 	 *
@@ -197,6 +199,7 @@ public CSG minkowski_difference(CSG a, CSG b) throws Throwable {
 	public CSG calculateAreaAndSurfaceArea(CSG in) throws Throwable {
 		return fromManifold(toManifold(in), in.getColor());
 	}
+
 	/**
 	 * Returns the union of two CSG solids. Uses {@code manifold.union(a, b)}
 	 * directly (wrapper around {@code manifold_union} in the C library).

src/main/java/eu/mihosoft/vrl/v3d/Bounds.java

@@ -219,6 +219,7 @@ public String toString() {
 	public boolean contains(Transform com) {
 		return contains(new Vector3d(com.getX(), com.getY(), com.getZ()));
 	}
+
 	/**
 	 * Helper function wrapping bounding box values
 	 *
@@ -326,6 +327,7 @@ public double getTotalY() {
 	public double getTotalZ() {
 		return (-this.getMinZ() + this.getMaxZ());
 	}
+
 	public boolean isBoundsTouching(Bounds incoming) {
 		return this.getMaxX() > incoming.getMinX() && this.getMinX() < incoming.getMaxX()
 				&& this.getMaxY() > incoming.getMinY() && this.getMinY() < incoming.getMaxY()

src/main/java/eu/mihosoft/vrl/v3d/CSG.java

@@ -556,6 +556,7 @@ public MeshView getMesh() {
 		setCurrentMeshView(newMesh());
 		return getCurrentMeshView();
 	}
+
 	/**
 	 * Gets the mesh.
 	 *
@@ -565,6 +566,7 @@ public MeshView getMesh() {
 	public MeshView newMesh() {
 		return newMesh(false);
 	}
+
 	/**
 	 * Gets the mesh.
 	 *
@@ -3946,6 +3948,7 @@ public CSG setMaterialInfillPercent(double type) {
 		getStorage().set("materialInfillPercent", type);
 		return this;
 	}
+
 	public Optional<Double> getMateriaDensity() {
 		return getStorage().getValue("materialDensity");
 	}
@@ -3954,6 +3957,7 @@ public CSG setMaterialDensity(double type) {
 		getStorage().set("materialDensity", type);
 		return this;
 	}
+
 	private void syncCadoodleCatagories(CSG dyingCSG) {
 		setIsHole(dyingCSG.isHole());
 		setIsHide(dyingCSG.isHide());

src/main/java/eu/mihosoft/vrl/v3d/CSGResponse.java

@@ -57,12 +57,14 @@ public void setState(ServerActionState state) {
 	public String getMessage() {
 		return message;
 	}
+
 	public void setMessage(Throwable t) {
 		StringWriter sw = new StringWriter();
 		PrintWriter pw = new PrintWriter(sw);
 		t.printStackTrace(pw);
 		this.message = sw.toString();
 	}
+
 	public void setMessage(String message) {
 		this.message = message;
 	}

src/main/java/eu/mihosoft/vrl/v3d/CSGServer.java

@@ -60,11 +60,13 @@ public CSGServer(int port, File APIKEYS) {
 			System.err.println("NO API KEYFILE Provided: " + APIKEYS.getAbsolutePath());
 		}
 	}
+
 	public void addListener(ICSGServerEvent e) {
 		if (listeners.contains(e))
 			return;
 		listeners.add(e);
 	}
+
 	public void removeListener(ICSGServerEvent e) {
 		if (!listeners.contains(e))
 			return;

src/main/java/eu/mihosoft/vrl/v3d/Cube.java

@@ -109,6 +109,7 @@ public Cube(Vector3d center, Vector3d dimensions) {
 	public Cube(double w, double h, double d) {
 		this(Vector3d.ZERO, new Vector3d(w, h, d));
 	}
+
 	// public Cube(LengthParameter w, LengthParameter h, LengthParameter d) {
 	// this(Vector3d.ZERO, new Vector3d(w.getMM(), h.getMM(), d.getMM()));
 	//// parametrics.add(w);

src/main/java/eu/mihosoft/vrl/v3d/Cylinder.java

@@ -166,6 +166,7 @@ public Cylinder(double startRadius, double endRadius, double height, int numSlic
 		this.endRadius = endRadius < MINIMUM_RADIUS ? MINIMUM_RADIUS : endRadius;
 		this.numSlices = numSlices;
 	}
+
 	/**
 	 * Constructor. Creates a cylinder ranging from {@code [0,0,0]} to
 	 * {@code [0,0,height]} with the specified {@code radius} and {@code height}.
@@ -201,6 +202,7 @@ public Cylinder(double startRadius, double endRadius, double height) {
 		this.startRadius = startRadius < MINIMUM_RADIUS ? MINIMUM_RADIUS : startRadius;
 		this.endRadius = endRadius < MINIMUM_RADIUS ? MINIMUM_RADIUS : endRadius;
 	}
+
 	// public Cylinder(LengthParameter startRadius, LengthParameter endRadius,
 	// LengthParameter height, int numSlices) {
 	// this(startRadius.getMM(),endRadius.getMM(),height.getMM(),numSlices);

src/main/java/eu/mihosoft/vrl/v3d/Debug3dProvider.java

@@ -6,13 +6,16 @@ public static void addObject(Object o) {
 		if (isProviderAvailible())
 			provider.addObject(o);
 	}
+
 	public static void clearScreen() {
 		if (isProviderAvailible())
 			provider.clearScreen();
 	}
+
 	public static boolean isProviderAvailible() {
 		return provider != null;
 	}
+
 	/**
 	 * @param provider
 	 *            the provider to set