From 69dcebe2b2406d01a02435aa6fa9ec43da3ce9bd Mon Sep 17 00:00:00 2001
From: XiaXiang <xiaoxia@finereport.com>
Date: Wed, 28 Nov 2018 16:52:31 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-13034=20FR=E6=A8=A1=E6=9D=BF=E6=8C=82?=
 =?UTF-8?q?=E8=BD=BD=E5=88=B0BI=EF=BC=8C=E8=87=AA=E9=80=82=E5=BA=94?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=20REPORT-12578=20=E5=85=A8=E5=B1=80=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fit/menupane/BrowserFitAttrPane.java      | 24 +++++++++++++------
 .../menupane/TemplateBrowserFitAttrPane.java  | 24 +++++++++++++------
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/report/fit/menupane/BrowserFitAttrPane.java b/designer-base/src/main/java/com/fr/design/report/fit/menupane/BrowserFitAttrPane.java
index da495c54d..ac5278563 100644
--- a/designer-base/src/main/java/com/fr/design/report/fit/menupane/BrowserFitAttrPane.java
+++ b/designer-base/src/main/java/com/fr/design/report/fit/menupane/BrowserFitAttrPane.java
@@ -1,5 +1,6 @@
 package com.fr.design.report.fit.menupane;
 
+import com.fr.config.Configuration;
 import com.fr.design.report.fit.FitType;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ibutton.UIButton;
@@ -12,6 +13,8 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.fit.ReportFitAttr;
 import com.fr.report.fit.ReportFitConfig;
+import com.fr.transaction.Configurations;
+import com.fr.transaction.Worker;
 
 import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
@@ -220,12 +223,19 @@ public class BrowserFitAttrPane extends BasicBeanPane<ReportFitAttr> {
         return attr;
     }
 
-    private void updateGlobalConfig(ReportFitAttr attr) {
-        try {
-            ReportFitConfig manager = ReportFitConfig.getInstance();
-            manager.setFrmFitAttr(attr);
-        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage());
-        }
+    private void updateGlobalConfig(final ReportFitAttr attr) {
+
+        Configurations.update(new Worker() {
+            @Override
+            public void run() {
+                ReportFitConfig manager = ReportFitConfig.getInstance();
+                manager.setFrmFitAttr(attr);
+            }
+
+            @Override
+            public Class<? extends Configuration>[] targets() {
+                return new Class[]{ReportFitConfig.class};
+            }
+        });
     }
 }
\ No newline at end of file
diff --git a/designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateBrowserFitAttrPane.java b/designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateBrowserFitAttrPane.java
index 664fa2471..40e3188e8 100644
--- a/designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateBrowserFitAttrPane.java
+++ b/designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateBrowserFitAttrPane.java
@@ -1,9 +1,12 @@
 package com.fr.design.report.fit.menupane;
 
+import com.fr.config.Configuration;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.fit.ReportFitAttr;
 import com.fr.report.fit.ReportFitConfig;
+import com.fr.transaction.Configurations;
+import com.fr.transaction.Worker;
 
 import java.awt.Component;
 
@@ -65,12 +68,19 @@ public class TemplateBrowserFitAttrPane extends BrowserFitAttrPane {
         return attr;
     }
 
-    private void updateGlobalConfig(ReportFitAttr attr) {
-        try {
-            ReportFitConfig manager = ReportFitConfig.getInstance();
-            manager.setCptFitAttr(attr);
-        } catch (Exception e) {
-            FineLoggerFactory.getLogger().error(e.getMessage());
-        }
+    private void updateGlobalConfig(final ReportFitAttr attr) {
+
+        Configurations.update(new Worker() {
+            @Override
+            public void run() {
+                ReportFitConfig manager = ReportFitConfig.getInstance();
+                manager.setCptFitAttr(attr);
+            }
+
+            @Override
+            public Class<? extends Configuration>[] targets() {
+                return new Class[]{ReportFitConfig.class};
+            }
+        });
     }
 }