JTSOp method renames

Author: dr-jts

modules/app/src/main/java/org/locationtech/jtstest/cmd/GeometryOutput.java

@@ -39,7 +39,10 @@ public GeometryOutput(CommandOutput out) {
     this.out = out;
   }
 
-  public void printGeometry(Geometry geom, int srid, String outputFormat) {
+  public void write(Geometry geom, int srid, String outputFormat) {
+    if (geom == null) return;
+    if (outputFormat == null) return;
+
     String txt = null;
     if (outputFormat.equalsIgnoreCase(CommandOptions.FORMAT_WKT)
         || outputFormat.equalsIgnoreCase(CommandOptions.FORMAT_TXT)) {
@@ -79,23 +82,23 @@ private static String writeGeoJSON(Geometry geom) {
     return writer.write(geom);
   }
 
-  public static String writeGeometrySummary(String label,
+  public static String writeSummary(String label,
       Geometry g)
   {
     if (g == null) return "";
     return String.format("%s: %s (%d)", label, g.getGeometryType().toUpperCase(), g.getNumPoints());
   }
 
-  public static String writeGeometrySummary(String label,
+  public static String writeSummary(String label,
       List<Geometry> geoms)
   {
     if (geoms == null) return "";
     int nVert = getNumPoints(geoms);
     String geomTypes = getTypesSummary(geoms);
-    return writeGeometrySummary(label, geoms.size(), geomTypes, nVert);
+    return writeSummary(label, geoms.size(), geomTypes, nVert);
   }
 
-  public static String writeGeometrySummary(String label,
+  public static String writeSummary(String label,
       int numGeoms, String geomTypes, int numVert)
   {
     return String.format("%s : %d %s, %d vertices", label, numGeoms, geomTypes, numVert);

modules/app/src/main/java/org/locationtech/jtstest/cmd/JTSOpRunner.java

@@ -296,7 +296,7 @@ private void executeFunctionOverA(FunctionInvoker fun) {
     String header = "";
     for (int i = 0; i < numGeom; i++) {
       Geometry comp = geomA == null ? null : geomA.get(i);
-      String hdr =  GeometryOutput.writeGeometrySummary(SYM_A + "[" + i + "]", comp);
+      String hdr =  GeometryOutput.writeSummary(SYM_A + "[" + i + "]", comp);
       if (geomB == null) {
         executeFunction(comp, fun, hdr);
       }
@@ -311,7 +311,7 @@ private void executeFunctionOverB(Geometry geomA, FunctionInvoker fun, String he
     List<Integer> targetB = geomIndexB.query(geomA);
     for (int index : targetB) {
       Geometry gb = geomB.get(index);
-      String hdr = header + ", " + GeometryOutput.writeGeometrySummary(symGeom2 + "[" + index + "]", gb);
+      String hdr = header + ", " + GeometryOutput.writeSummary(symGeom2 + "[" + index + "]", gb);
       fun.setB(gb);
       executeFunction(geomA, fun, hdr);
     }
@@ -382,7 +382,7 @@ private Object executeFunctionOnce(Geometry geomA, GeometryFunction func, Object
     return result;
   }
 
-  private String errorMsg(Throwable ex) {
+  private static String errorMsg(Throwable ex) {
     String msg = "ERROR excuting function: " + ex.getMessage() + "\n";
     msg += toStackString(ex);
     if (ex.getCause() != null) {
@@ -392,7 +392,7 @@ private String errorMsg(Throwable ex) {
     return msg;
   }
 
-  private String toStackString(Throwable ex) {
+  private static String toStackString(Throwable ex) {
     StringWriter sw = new StringWriter();
     PrintWriter pw = new PrintWriter(sw);
     ex.printStackTrace(pw);
@@ -498,13 +498,14 @@ private void outputResult(Object result, boolean isExplode, String outputFormat)
     Geometry geom = (Geometry) result;
     if (isExplode && geom instanceof GeometryCollection) {
       for (int i = 0; i < geom.getNumGeometries(); i++) {
-        printGeometry(geom.getGeometryN(i), param.srid, outputFormat);
+        writeGeometry(geom.getGeometryN(i), param.srid, outputFormat);
       }
     }
     else {
-      printGeometry(geom, param.srid, outputFormat);
+      writeGeometry(geom, param.srid, outputFormat);
     }
   }
+  
   private void outputList(List<Geometry> geoms, String outputFormat) {
     if (geoms == null) return;
     if (outputFormat == null) return;
@@ -514,14 +515,11 @@ private void outputList(List<Geometry> geoms, String outputFormat) {
     }
   }
 
-  private void printGeometry(Geometry geom, int srid, String outputFormat) {
-    if (geom == null) return;
-    if (outputFormat == null) return;
-    
+  private void writeGeometry(Geometry geom, int srid, String outputFormat) {    
     if (captureGeometry) {
       resultGeoms.add((Geometry) geom);
     }
-    geomOut.printGeometry((Geometry) geom, srid, outputFormat);
+    geomOut.write((Geometry) geom, srid, outputFormat);
   }
 
   private void printlnInfo(String s) {
@@ -535,13 +533,13 @@ private void printGeometrySummary(String label, List<Geometry> geom, String sour
 
     String srcname = "";
     if (source != null) srcname = " -- " + source;
-    printlnInfo( GeometryOutput.writeGeometrySummary(label, geom) + srcname);
+    printlnInfo( GeometryOutput.writeSummary(label, geom) + srcname);
   }
 
   private void printGeometrySummary(String label, Geometry geom) {
     // short-circuit to avoid cost
     if (! isVerbose) return;
-    printlnInfo( GeometryOutput.writeGeometrySummary(label, geom));
+    printlnInfo( GeometryOutput.writeSummary(label, geom));
   }
 
   private static String fileInfo(String filename, int limit, int offset) {