From 62a9e14c4eafc1697b973c0a1bd576518504b21b Mon Sep 17 00:00:00 2001
From: hugh <hugh@finereport.com>
Date: Tue, 27 Sep 2016 15:47:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=BF=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=83=BD=E5=A4=9F=E8=AF=BB=E5=8F=96=E5=88=B0?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=B8=AD=E6=B7=BB=E5=8A=A0=E7=9A=84=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/webattr/WriteToolBarPane.java    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/designer/src/com/fr/design/webattr/WriteToolBarPane.java b/designer/src/com/fr/design/webattr/WriteToolBarPane.java
index 2e5f91f8b..0abc1049c 100644
--- a/designer/src/com/fr/design/webattr/WriteToolBarPane.java
+++ b/designer/src/com/fr/design/webattr/WriteToolBarPane.java
@@ -2,6 +2,7 @@ package com.fr.design.webattr;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.ConfigManager;
+import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.core.WidgetOption;
@@ -22,10 +23,12 @@ import com.fr.stable.Constants;
 import com.fr.web.attr.ReportWebAttr;
 
 import javax.swing.*;
+
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class WriteToolBarPane extends AbstractEditToolBarPane {
@@ -103,12 +106,12 @@ public class WriteToolBarPane extends AbstractEditToolBarPane {
         toolBarManager.setToolBarLocation(Location.createTopEmbedLocation());
         this.toolBarManagers = new ToolBarManager[]{toolBarManager};
     }
-
+    
     private ActionListener editBtnListener = new ActionListener() {
 
         public void actionPerformed(ActionEvent e) {
             final DragToolBarPane dragToolbarPane = new DragToolBarPane();
-            dragToolbarPane.setDefaultToolBar(ToolBarManager.createDefaultWriteToolBar(), ReportWebWidgetConstants.getWriteToolBarInstance());
+            dragToolbarPane.setDefaultToolBar(ToolBarManager.createDefaultWriteToolBar(), getToolBarInstance());
             dragToolbarPane.populateBean(WriteToolBarPane.this.toolBarManagers);
             BasicDialog toobarDialog = dragToolbarPane.showWindow(SwingUtilities.getWindowAncestor(WriteToolBarPane.this));
             toobarDialog.addDialogActionListener(new DialogActionAdapter() {
@@ -130,7 +133,12 @@ public class WriteToolBarPane extends AbstractEditToolBarPane {
 
     @Override
     protected WidgetOption[] getToolBarInstance() {
-        return ReportWebWidgetConstants.getWriteToolBarInstance();
+    	List<WidgetOption> defaultOptions = Arrays.asList(ReportWebWidgetConstants.getWriteToolBarInstance());
+        List<WidgetOption> extraOptions = Arrays.asList(ExtraDesignClassManager.getInstance().getWebWidgetOptions());
+        List<WidgetOption> options = new ArrayList<WidgetOption>();
+        options.addAll(defaultOptions);
+        options.addAll(extraOptions);
+        return options.toArray(new WidgetOption[options.size()]);
     }
 
     @Override

From 0de680847888a0ed999e5d472c686873ece1723d Mon Sep 17 00:00:00 2001
From: hugh <hugh@finereport.com>
Date: Tue, 27 Sep 2016 17:31:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/design/DesignerEnvManager.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/designer_base/src/com/fr/design/DesignerEnvManager.java b/designer_base/src/com/fr/design/DesignerEnvManager.java
index 524f4f96c..f0dc742c0 100644
--- a/designer_base/src/com/fr/design/DesignerEnvManager.java
+++ b/designer_base/src/com/fr/design/DesignerEnvManager.java
@@ -20,6 +20,7 @@ import com.fr.stable.xml.*;
 
 import javax.swing.*;
 import javax.swing.SwingWorker.StateValue;
+
 import java.awt.*;
 import java.io.*;
 import java.util.*;
@@ -28,6 +29,7 @@ import java.util.Map.Entry;
 import java.util.logging.FileHandler;
 import java.util.logging.Handler;
 import java.util.logging.Level;
+import java.util.logging.LogRecord;
 import java.util.logging.SimpleFormatter;
 
 /**
@@ -226,7 +228,8 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
                     StableUtils.makesureFileExist(new java.io.File(fileName));
                 }
                 Handler handler = new FileHandler(fileName, true);
-                handler.setFormatter(new SimpleFormatter());
+                
+                handler.setFormatter(new FRLogFormatter());
                 FRContext.getLogger().addLogHandler(handler);
             } catch (SecurityException e) {
                 FRContext.getLogger().error(e.getMessage(), e);
@@ -235,7 +238,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
             }
         }
     }
-
+    
     private File getDesignerEnvFile() {
         File envFile = getEnvFile();
         // james:FineReportEnv.xml文件没有必要做兼容，里面保存的主要是界面布局以及设计器激活的信息