refactor TestBuilder controller functions

Author: dr-jts

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/GeometryPopupMenu.java

@@ -35,7 +35,7 @@ private void initUI()
     extractComponentItem.addActionListener(
           new ActionListener() {
             public void actionPerformed(ActionEvent e) {
-              JTSTestBuilder.controller().extractElementsToTestCase(clickCoord);
+              JTSTestBuilder.controller().copyElementsToTestCase(clickCoord);
             }
           });
     add(extractComponentItem);

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ResultWKTPanel.java

@@ -90,7 +90,7 @@ public void actionPerformed(ActionEvent e) {
     JButton btnClearResult = SwingUtil.createButton(AppIcons.CUT, "Clear Result",         
         new ActionListener() {
       public void actionPerformed(ActionEvent e) {
-        JTSTestBuilder.controller().clearResult();
+        JTSTestBuilder.controller().resultClear();
       }
     });
 

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/controller/JTSTestBuilderController.java

@@ -88,7 +88,7 @@ public static JTSTestBuilderFrame frame() {
     return JTSTestBuilderFrame.instance();
   }
 
-  public GeometryEditModel geomEditModel() {
+  public GeometryEditModel getGeomEditModel() {
     return JTSTestBuilder.model().getGeometryEditModel();
   }
 
@@ -111,45 +111,44 @@ public void geometryViewChanged()
   }
 
   public Geometry getGeometryA() {
-    return geomEditModel().getGeometry(0);
+    return getGeomEditModel().getGeometry(0);
   }
 
   public Geometry getGeometryB() {
-    return geomEditModel().getGeometry(1);
+    return getGeomEditModel().getGeometry(1);
   }
 
   public void exchangeGeometry() {
-    geomEditModel().exchangeGeometry();
+    getGeomEditModel().exchangeGeometry();
   }
 
-  public void addTestCase(Geometry[] geom, String name)
+  public void caseAdd(Geometry[] geoms, String name)
   {
-    model().addCase(geom, name);
+    model().addCase(geoms, name);
     JTSTestBuilderFrame.instance().updateTestCases();
     JTSTestBuilderFrame.instance().showGeomsTab();
+    selectClear();
   }
 
-  public void extractElementsToTestCase(Coordinate pt)
+  public void copyElementsToTestCase(Coordinate pt)
   {
     double toleranceInModel = editPanel().getToleranceInModel();
     LayerList lyrList = model().getLayers();
     Geometry comp = lyrList.getElement(pt, toleranceInModel);
     if (comp == null) 
       return;
-    model().addCase(new Geometry[] { comp, null });
-    JTSTestBuilderFrame.instance().updateTestCases();
+    caseAdd(new Geometry[] { comp, null }, "Extract");
   }
 
-  public void extractElementsToTestCase(Geometry aoi, boolean isSegments)
+  public void copyElementsToTestCase(Geometry aoi, boolean isSegments)
   {
     //double toleranceInModel = JTSTestBuilderFrame.getGeometryEditPanel().getToleranceInModel();
     LayerList lyrList = model().getLayers();
     Geometry[] comp;
     comp = lyrList.getElements(aoi, isSegments);
     if (comp == null) 
       return;
-    model().addCase(comp);
-    JTSTestBuilderFrame.instance().updateTestCases();
+    caseAdd(comp, "Extract");
     toolbar().selectZoomButton();
     modeZoomIn();
   }
@@ -182,7 +181,11 @@ public void selectElements(Geometry aoi)
     layerListRefresh();
   }
 
-
+  public void selectClear() {
+    model().clearSelection();
+    layerListRefresh();
+  }
+  
   public void setFocusGeometry(int index) {
     model().getGeometryEditModel().setEditGeomIndex(index);
     toolbar().setFocusGeometry(index);    
@@ -214,7 +217,7 @@ public void inspectGeometryDialogForCurrentCase()
     TestBuilderDialogs.inspectGeometry(frame(), geomIndex, geometry);
   }
 
-  public void clearResult()
+  public void resultClear()
   {
     frame().getResultWKTPanel().clearResult();
     model().setResult(null);
@@ -352,23 +355,27 @@ public void caseMoveTo(int dir, boolean isZoom) {
     model().cases().nextCase();
     }
     frame().updateTestCaseView();
+    selectClear();
     if (isZoom) zoomToInput();
   }
 
   public void caseCopy() {
     model().cases().copyCase();
     frame().updateTestCases();
+    selectClear();
   }
 
   public void caseCreateNew() {
     model().cases().createNew();
     frame().showGeomsTab();
     frame().updateTestCases();
+    selectClear();
   }
 
   public void caseDelete() {
     model().cases().deleteCase();
     frame().updateTestCases();
+    selectClear();
   }
 
   //========================================

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/controller/ResultController.java

@@ -168,7 +168,7 @@ public void finished() {
         Object result = getValue();
         if (createNew) {
           String desc = "Result of " + functionInvoc.getSignature();
-          JTSTestBuilder.controller().addTestCase(new Geometry[] { (Geometry) result, null }, desc);          
+          JTSTestBuilder.controller().caseAdd(new Geometry[] { (Geometry) result, null }, desc);          
         } else {
           updateResult(functionInvoc, result, timer);
         }

modules/app/src/main/java/org/locationtech/jtstest/testbuilder/ui/tools/ExtractComponentTool.java

@@ -35,7 +35,7 @@ private ExtractComponentTool() {
   protected void gestureFinished() 
   {  
     boolean isSegments = isControlKeyDown();
-    JTSTestBuilder.controller().extractElementsToTestCase(getBox(), isSegments);
+    JTSTestBuilder.controller().copyElementsToTestCase(getBox(), isSegments);
   }
 
 }