Merge pull request #53 in DESIGN/design from ~PLOUGH/10-design:feature/10.0 to feature/10.0

* commit '757a2d615b69ef24fe1c3b6897513e028ad75464':
  REPORT-8383 水印支持换行与功能点入库 => 功能点入库

designer-form/src/com/fr/design/mainframe/widget/accessibles/AccessibleBodyWatermarkEditor.java

@@ -7,6 +7,9 @@ import com.fr.design.mainframe.widget.editors.ITextComponent;
 import com.fr.design.mainframe.widget.renderer.WatermarkRenderer;
 import com.fr.design.mainframe.widget.wrappers.WatermarkWrapper;
 import com.fr.design.report.WatermarkPane;
+import com.fr.plugin.ExtraClassManager;
+import com.fr.stable.ReportFunctionProcessor;
+import com.fr.stable.fun.FunctionProcessor;
 
 import javax.swing.SwingUtilities;
 import java.awt.Dimension;
@@ -40,6 +43,11 @@ public class AccessibleBodyWatermarkEditor extends UneditableAccessibleEditor {
             public void doOk() {
                 setValue(watermarkPane.update());
                 fireStateChanged();
+                // 功能点
+                FunctionProcessor processor = ExtraClassManager.getInstance().getFunctionProcessor();
+                if (processor != null) {
+                    processor.recordFunction(ReportFunctionProcessor.WATERMARK);
+                }
             }
         });
         watermarkPane.populate((WatermarkAttr) getValue());

designer-realize/src/com/fr/design/actions/report/ReportWatermarkAction.java

@@ -9,7 +9,10 @@ import com.fr.design.mainframe.JWorkBook;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.report.WatermarkPane;
 import com.fr.main.impl.WorkBook;
+import com.fr.plugin.ExtraClassManager;
 import com.fr.report.core.ReportUtils;
+import com.fr.stable.ReportFunctionProcessor;
+import com.fr.stable.fun.FunctionProcessor;
 
 import java.awt.event.ActionEvent;
 
@@ -42,6 +45,11 @@ public class ReportWatermarkAction extends JWorkBookAction {
             public void doOk() {
                 wbTpl.addAttrMark(watermarkPane.update());
                 jwb.fireTargetModified();
+                // 功能点
+                FunctionProcessor processor = ExtraClassManager.getInstance().getFunctionProcessor();
+                if (processor != null) {
+                    processor.recordFunction(ReportFunctionProcessor.WATERMARK);
+                }
             }
         }).setVisible(true);
     }