PDS refresh improved controls with GHK feature

.gitignore

@@ -25,3 +25,6 @@ out/
 target/
 releases/
 snapshots/
+
+# MacOS
+.DS_Store

vassal-app/src/main/java/VASSAL/build/GpIdChecker.java

@@ -51,6 +51,7 @@ public class GpIdChecker {
 
   protected GpIdSupport gpIdSupport;
   protected int maxId;
+  protected int noGpIdMatch = 0; // shared to GameRefresher
   protected boolean extensionsLoaded = false;
   final Map<String, SlotElement> goodSlots = new HashMap<>();
   final List<SlotElement> errorSlots = new ArrayList<>();
@@ -75,6 +76,10 @@ public GpIdChecker(Set<String> options) {
     }
   }
 
+  public int getNoGpIdMatch() {
+    return noGpIdMatch;
+  }
+
   public boolean useLabelerName() {
     return refresherOptions.contains(GameRefresher.USE_LABELER_NAME); //$NON-NLS-1$
   }
@@ -87,6 +92,9 @@ public boolean useRotateName() {
   public boolean useName() {
     return refresherOptions.contains(GameRefresher.USE_NAME); //$NON-NLS-1$
   }
+  public boolean fixGPID() {
+    return refresherOptions.contains(GameRefresher.FIX_GPID); //$NON-NLS-1$
+  }
 
   /**
    * Add a PieceSlot to our cross-reference and any PlaceMarker
@@ -160,7 +168,7 @@ protected void testGpId(String id, SlotElement element) {
      *  If this has been called from a ModuleExtension, the GpId is prefixed with
      *  the Extension Id. Remove the Extension Id and just process the numeric part.
      *
-     *  NOTE: If GpIdChecker is being used by the GameRefesher, then there may be
+     *  NOTE: If GpIdChecker is being used by the GameRefresher, then there may be
      *  extensions loaded, so retain the extension prefix to ensure a correct
      *  unique slot id check.
      */
@@ -249,7 +257,8 @@ public GamePiece createUpdatedPiece(GamePiece oldPiece) {
       }
     }
 
-    // Failed to find a slot by gpid, try by matching piece name if option selected
+    // Failed to find a slot by gpid, try by matching piece name if option selected; always report in summaries
+    noGpIdMatch++;
     if (useName()) {
       final String oldPieceName = Decorator.getInnermost(oldPiece).getName();
       for (final SlotElement element : goodSlots.values()) {
@@ -258,11 +267,19 @@ public GamePiece createUpdatedPiece(GamePiece oldPiece) {
         if (oldPieceName.equals(gpName)) {
           newPiece = element.createPiece(oldPiece, this);
           copyState(oldPiece, newPiece);
+          if (fixGPID()) {
+            newPiece.setProperty(Properties.PIECE_ID, slotPiece.getProperty(Properties.PIECE_ID));
+          }
+          chat("!" + Resources.getString("GpIdChecker.refreshByName", oldPieceName, gpid, slotPiece.getProperty(Properties.PIECE_ID))
+            + (fixGPID() ? " <b>" + Resources.getString("GpIdChecker.fixGPID") + "</b>" : ""));
           return newPiece;
         }
       }
+      chat(GameRefresher.ERROR_MESSAGE_PREFIX + Resources.getString("GpIdChecker.refreshByNameFail", oldPieceName, gpid == null ? "" : gpid));
+    }
+    else {
+      chat(GameRefresher.ERROR_MESSAGE_PREFIX + Resources.getString("GpIdChecker.SlotNotFound", Decorator.getInnermost(oldPiece).getName(), gpid == null ? "" : gpid));
     }
-
     return oldPiece;
   }