Merge pull request #744 from vasl-developers/feature/fix660

final bug fixes for 6.6.0
vasl-developers · Sep 24, 2020 · 3a6f820 · 3a6f820
2 parents abd7af9 + fce213b
commit 3a6f820
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/src/VASL/build/module/map/ASLPieceMover.java b/src/VASL/build/module/map/ASLPieceMover.java
@@ -35,6 +35,7 @@
 import VASSAL.counters.Properties;
 import VASSAL.counters.Stack;
 import VASSAL.tools.LaunchButton;
+import VASSAL.tools.image.LabelUtils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -369,7 +370,7 @@ public Command _movePieces(Map map, Point p) {
 
         // Apply key after move to each moved piece
         if (map.getMoveKey() != null) {
-            applyKeyAfterMove(allDraggedPieces, comm, map.getMoveKey());
+            comm.append(applyKeyAfterMove(allDraggedPieces, map.getMoveKey()));
         }
 
         tracker.repaint();

diff --git a/src/VASL/build/module/map/CounterDetailViewer.java b/src/VASL/build/module/map/CounterDetailViewer.java
@@ -29,6 +29,7 @@
 import VASSAL.counters.Decorator;
 import VASSAL.counters.GamePiece;
 import VASSAL.counters.Labeler;
+import VASSAL.tools.image.LabelUtils;
 import VASSAL.counters.Properties;
 import VASSAL.counters.Stack;
 import VASSAL.i18n.Resources;
@@ -250,7 +251,7 @@ protected void drawGraphics(Graphics g, Point pt, JComponent comp, List<GamePiec
 
         if (text.length() > 0) 
         {
-          drawLabel(g, new Point(x, y + 5), text, Labeler.CENTER, Labeler.TOP);
+          drawLabel(g, new Point(x, y + 5), text, LabelUtils.CENTER, LabelUtils.TOP);
         }
       }
     }
@@ -296,7 +297,7 @@ protected void drawText(Graphics g, Point pt, JComponent comp, List<GamePiece> p
     }
 
     if (report.length() > 0) {
-      drawLabel(g, new Point(x, y), report, Labeler.RIGHT, Labeler.BOTTOM);
+      drawLabel(g, new Point(x, y), report, LabelUtils.RIGHT, LabelUtils.BOTTOM);
     }
   }
 }
diff --git a/src/VASL/counters/ASLHighlighter.java b/src/VASL/counters/ASLHighlighter.java
@@ -24,7 +24,7 @@
 import VASSAL.counters.ColoredBorder;
 import VASSAL.counters.GamePiece;
 import VASSAL.counters.Labeler;
-
+import VASSAL.tools.image.LabelUtils;
 import java.awt.*;
 
 import org.w3c.dom.Element;
@@ -49,8 +49,8 @@ public void draw(GamePiece p, Graphics g, int x, int y, Component obs, double zo
         r = p.getParent().bottomPiece().getShape().getBounds();
       }
       y += (int) (zoom * (r.y + r.height + 6));
-      Labeler.drawLabel(g, p.getMap().locationName(p.getPosition()),
-                        x, y, f, Labeler.CENTER, Labeler.TOP,
+      LabelUtils.drawLabel(g, p.getMap().locationName(p.getPosition()),
+                        x, y, f, LabelUtils.CENTER, LabelUtils.TOP,
                         Color.black, Color.white, Color.black);
     }
   }

diff --git a/vasl.iml b/vasl.iml
@@ -8,9 +8,9 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
+    <orderEntry type="library" name="Maven: org.vassalengine:vassal-app:3.4.2" level="project" />
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.vassalengine:vassal-app:3.4.2" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
     <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
     <orderEntry type="library" name="Maven: com.miglayout:miglayout-swing:5.2" level="project" />