REPORT-8947 10.0水印导出的pdf，水印字体变小且字体模糊锯齿严重=>字体大小校正

designer-form/src/com/fr/design/mainframe/FormDesignerUI.java

@@ -120,8 +120,8 @@ public class FormDesignerUI extends ComponentUI {
     private void paintWatermark(Graphics2D g) {
         WatermarkAttr watermark = ReportUtils.getWatermarkFromAttrMarkFile(designer.getTarget());
         // 不要每次都 new 一个 WatermarkPainter
-        if (watermarkPainter == null || !ComparatorUtils.equals(watermarkPainter.getWatermark(), watermark)) {
+        if (watermarkPainter == null || watermarkPainter.isOutDated(watermark, designer.getResolution())) {
-            watermarkPainter = new WatermarkPainter(watermark);
+            watermarkPainter = new WatermarkPainter(watermark, designer.getResolution());
         }
         watermarkPainter.paint(g, 0, designer.getParaHeight(), designer.getArea().getBounds());
     }

designer-realize/src/com/fr/grid/GridUI.java

@@ -1106,8 +1106,8 @@ public class GridUI extends ComponentUI {
         WatermarkAttr watermark = ReportUtils.getWatermarkFromAttrMarkFile(book);
 
         // 不要每次都 new 一个 WatermarkPainter
-        if (watermarkPainter == null || !ComparatorUtils.equals(watermarkPainter.getWatermark(), watermark)) {
+        if (watermarkPainter == null || watermarkPainter.isOutDated(watermark, resolution)) {
-            watermarkPainter = new WatermarkPainter(watermark);
+            watermarkPainter = new WatermarkPainter(watermark, resolution);
         }
         watermarkPainter.paint(g2d, gridSize.width, gridSize.height);
     }

designer-realize/src/com/fr/poly/PolyDesignUI.java

@@ -114,8 +114,8 @@ public class PolyDesignUI extends ComponentUI {
         WatermarkAttr watermark = ReportUtils.getWatermarkFromAttrMarkFile(book);
 
         // 不要每次都 new 一个 WatermarkPainter
-        if (watermarkPainter == null || !ComparatorUtils.equals(watermarkPainter.getWatermark(), watermark)) {
+        if (watermarkPainter == null || watermarkPainter.isOutDated(watermark, resolution)) {
-            watermarkPainter = new WatermarkPainter(watermark);
+            watermarkPainter = new WatermarkPainter(watermark, resolution);
         }
         watermarkPainter.paint(g2d, width, height);
     }