Merge pull request #771 in DESIGN/design from ~JU/design:release/10.0 to feature/10.0

* commit '804d2fcf684185bf9247682629ca585ce2dd44e8':
  REPORT-14790  填报问题 1、修改算子关于当前格子位置的俩接口命名问题，提取出CalculatorLocator 2、不小心改大了，把所有的FRContext.getLogger都改了，赶紧传到release和feature。。
  REPORT-14790  填报问题 先重构一下，删了一些没用的分支和逻辑，把代码弄清晰明天再继续定位bug原因- -

designer-base/src/main/java/com/fr/design/DesignerEnvManager.java

@@ -4,7 +4,6 @@
 package com.fr.design;
 
 import com.fr.base.BaseXMLUtils;
-import com.fr.base.FRContext;
 import com.fr.base.Utils;
 import com.fr.design.actions.help.alphafine.AlphaFineConfigManager;
 import com.fr.design.constants.UIConstants;
@@ -179,7 +178,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
             try {
                 XMLTools.readFileXML(designerEnvManager, designerEnvManager.getDesignerEnvFile());
             } catch (Exception e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
 
             // james：如果没有env定义，要设置一个默认的
@@ -282,11 +281,11 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
                 Handler handler = new FileHandler(fileName, true);
 
                 handler.setFormatter(new FRLogFormatter());
-                FRContext.getLogger().addLogHandler(handler);
+                FineLoggerFactory.getLogger().addLogHandler(handler);
             } catch (SecurityException e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             } catch (IOException e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
     }
@@ -323,7 +322,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
             }
             fileWriter.close();
         } catch (IOException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }
 
@@ -345,7 +344,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         try {
             XMLTools.readFileXML(designerEnvManager, prevEnvFile);
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         // 清空前一个版本中的工作目录和最近打开
         nameEnvMap = new ListMap<String, DesignerWorkspaceInfo>();
@@ -626,7 +625,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
             fout.flush();
             fout.close();
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }
 

designer-base/src/main/java/com/fr/design/actions/community/UpAction.java

@@ -1,16 +1,15 @@
 package com.fr.design.actions.community;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.menu.MenuKeySet;
-
 import com.fr.general.CloudCenter;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JOptionPane;
+import javax.swing.KeyStroke;
+import java.awt.Desktop;
 import java.awt.event.ActionEvent;
 import java.io.IOException;
 import java.net.URI;
@@ -33,7 +32,7 @@ public class UpAction extends UpdateAction
 	{
 		 String url = CloudCenter.getInstance().acquireUrlByKind("bbs.update");
 	        if (StringUtils.isEmpty(url)) {
-	            FRContext.getLogger().info("The URL is empty!");
+                FineLoggerFactory.getLogger().info("The URL is empty!");
 	            return;
 	        }
 	        try {

designer-base/src/main/java/com/fr/design/actions/core/ActionFactory.java

@@ -1,6 +1,5 @@
 package com.fr.design.actions.core;
 
-import com.fr.base.FRContext;
 import com.fr.base.Utils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.file.HistoryTemplateListPane;
@@ -215,7 +214,7 @@ public class ActionFactory {
             c.setAccessible(true);
             return c.newInstance();
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return null;
     }
@@ -281,7 +280,7 @@ public class ActionFactory {
                     Constructor<? extends UpdateAction> c = (Constructor<? extends UpdateAction>) clazz.getConstructor(cls);
                     actions.add(c.newInstance(obj));
                 } catch (Exception e) {
-                    FRContext.getLogger().error(e.getMessage(), e);
+                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 }
             }
         }
@@ -301,7 +300,7 @@ public class ActionFactory {
                     Constructor<? extends UpdateAction> c = (Constructor<? extends UpdateAction>) clazz.getConstructor();
                     actionNames.add(c.newInstance().getMenuKeySet());
                 } catch (Exception e) {
-                    FRContext.getLogger().error(e.getMessage(), e);
+                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 }
             }
         }
@@ -336,7 +335,7 @@ public class ActionFactory {
                 Constructor<? extends UpdateAction> c = (Constructor<? extends UpdateAction>) clazz.getConstructor(cls);
                 actions.add(c.newInstance(obj));
             } catch (Exception e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
         return actions.toArray(new UpdateAction[actions.size()]);
@@ -355,7 +354,7 @@ public class ActionFactory {
                 constructor.setAccessible(true);
                 return constructor.newInstance();
             } catch (Exception e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
             return null;
         }

designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java

@@ -4,7 +4,6 @@
 
 package com.fr.design.actions.help;
 
-import com.fr.base.FRContext;
 import com.fr.base.FeedBackInfo;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.dialog.BasicDialog;
@@ -23,7 +22,12 @@ import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import javax.swing.SwingWorker;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.MatteBorder;
@@ -31,7 +35,12 @@ import javax.swing.plaf.ColorUIResource;
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.PlainDocument;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
@@ -299,7 +308,7 @@ public class FeedBackPane extends BasicPane {
                 } catch (Exception e) {
                     isSendSuccessful = false;
                     if (!(e instanceof CancellationException)) {
-                        FRContext.getLogger().error(e.getMessage(), e);
+                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
                     }
                 }
             }

designer-base/src/main/java/com/fr/design/actions/help/ForumAction.java

@@ -5,16 +5,15 @@
 package com.fr.design.actions.help;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.menu.MenuKeySet;
-
 import com.fr.general.CloudCenter;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JOptionPane;
+import javax.swing.KeyStroke;
+import java.awt.Desktop;
 import java.awt.event.ActionEvent;
 import java.io.IOException;
 import java.net.URI;
@@ -42,7 +41,7 @@ public class ForumAction extends UpdateAction {
     public void actionPerformed(ActionEvent e) {
         String url = CloudCenter.getInstance().acquireUrlByKind("bbs");
         if (StringUtils.isEmpty(url)) {
-            FRContext.getLogger().info("The URL is empty!");
+            FineLoggerFactory.getLogger().info("The URL is empty!");
             return;
         }
         try {

designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java

@@ -1,13 +1,13 @@
 package com.fr.design.actions.help;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.base.Utils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.general.CloudCenter;
 import com.fr.general.GeneralContext;
 import com.fr.general.http.HttpToolbox;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.CommonUtils;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StableUtils;
@@ -38,11 +38,11 @@ public class TutorialAction extends UpdateAction {
     private void nativeExcuteMacInstallHomePrograms(String appName) {
         String installHome = StableUtils.getInstallHome();
         if(installHome == null) {
-            FRContext.getLogger().error("Can not find the install home, please check it.");
+            FineLoggerFactory.getLogger().error("Can not find the install home, please check it.");
         } else {
             String appPath = StableUtils.pathJoin(new String[]{installHome, "bin", appName});
             if(!(new File(appPath)).exists()) {
-                FRContext.getLogger().error(appPath + " can not be found.");
+                FineLoggerFactory.getLogger().error(appPath + " can not be found.");
             }
 
             String cmd = "open " + appPath;
@@ -51,7 +51,7 @@ public class TutorialAction extends UpdateAction {
             try {
                 runtime.exec(cmd);
             } catch (IOException e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
 
         }

designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java

@@ -1,16 +1,18 @@
 package com.fr.design.condition;
 
 
-import com.fr.base.FRContext;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.itoolbar.UIToolbar;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.menu.ToolBarDef;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.log.FineLoggerFactory;
 
-
-import javax.swing.*;
+import javax.swing.BoxLayout;
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 import java.awt.Dimension;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -88,9 +90,9 @@ public abstract class ConditionAttributesPane<T> extends BasicBeanPane<T> {
         try {
             return clazz.newInstance();
         } catch (InstantiationException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         } catch (IllegalAccessException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return null;
     }

designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java

@@ -1,7 +1,6 @@
 package com.fr.design.data;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.base.TableData;
 import com.fr.data.TableDataSource;
 import com.fr.data.api.StoreProcedureAssist;
@@ -28,14 +27,17 @@ import com.fr.design.menu.LineSeparator;
 import com.fr.design.menu.MenuDef;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.NameObject;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
 
-import javax.swing.*;
+import javax.swing.DefaultCellEditor;
+import javax.swing.Icon;
+import javax.swing.JTree;
 import javax.swing.event.CellEditorListener;
 import javax.swing.event.ChangeEvent;
 import javax.swing.tree.TreeCellEditor;
-import java.awt.*;
+import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
@@ -413,7 +415,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
                 }
 
             } catch (Exception ex) {
-                FRContext.getLogger().error(ex.getMessage(), ex);
+                FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
             }
 
         }

designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java

@@ -1,6 +1,5 @@
 package com.fr.design.data;
 
-import com.fr.base.FRContext;
 import com.fr.base.StoreProcedureParameter;
 import com.fr.base.TableData;
 import com.fr.data.TableDataSource;
@@ -30,6 +29,7 @@ import com.fr.file.TableDataConfig;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.data.DataModel;
 import com.fr.general.data.TableDataException;
+import com.fr.log.FineLoggerFactory;
 import com.fr.script.Calculator;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.ParameterProvider;
@@ -489,7 +489,7 @@ public abstract class DesignTableDataManager {
                 }
                 rs.release();
             } catch (Exception e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
 
         }

designer-base/src/main/java/com/fr/design/data/datapane/ChoosePane.java

@@ -1,7 +1,6 @@
 package com.fr.design.data.datapane;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.base.TableData;
 import com.fr.data.core.DataCoreUtils;
 import com.fr.data.core.db.DBUtils;
@@ -33,12 +32,15 @@ import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.file.ConnectionConfig;
 import com.fr.general.ComparatorUtils;
-
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
 
-import javax.swing.*;
+import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTree;
+import javax.swing.SwingWorker;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.PopupMenuEvent;
@@ -49,7 +51,9 @@ import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeCellRenderer;
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
 import java.awt.event.ItemEvent;
@@ -432,7 +436,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
                 tree.expandPath(path);
             }
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }
 
@@ -473,7 +477,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
                         DesignerEnvManager.getEnvManager().getMaxNumberOrPreviewRow());
             } catch (Exception e) {
                 failedToFindTable();
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
 
@@ -530,7 +534,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
             // daniel:增加参数
             colNames = DataOperator.getInstance().getColumns(selectedDSName, paras.getSchemaName(), selectedTableObject);
         } catch (Exception e2) {
-            FRContext.getLogger().error(e2.getMessage(), e2);
+            FineLoggerFactory.getLogger().error(e2.getMessage(), e2);
         }
 
         if (colNames == null) {

designer-base/src/main/java/com/fr/design/data/datapane/ChoosePaneSupportFormula.java

@@ -1,7 +1,6 @@
 package com.fr.design.data.datapane;
 
 import com.fr.base.BaseFormula;
-import com.fr.base.FRContext;
 import com.fr.base.Parameter;
 import com.fr.base.ParameterHelper;
 import com.fr.base.ParameterMapNameSpace;
@@ -15,9 +14,10 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.parameter.ParameterInputPane;
 import com.fr.general.ComparatorUtils;
+import com.fr.log.FineLoggerFactory;
 import com.fr.script.Calculator;
 
-import javax.swing.*;
+import javax.swing.JTree;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 import java.awt.event.ItemEvent;
@@ -113,7 +113,7 @@ public class ChoosePaneSupportFormula extends ChoosePane {
                 selectedDSName = Utils.objectToString(ca.eval(BaseFormula.createFormulaBuilder().build(item)));
 //				selectedDSName = ParameterHelper.analyzeCurrentContextTableData4Templatee(item, parameters);
             } catch (Exception e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         } else {
             selectedDSName = item;
@@ -156,7 +156,7 @@ public class ChoosePaneSupportFormula extends ChoosePane {
             dsName = dsItem.startsWith("=") ? Utils.objectToString(ca.eval(BaseFormula.createFormulaBuilder().build(dsItem))) : dsItem;
             tableName = tableItem.startsWith("=") ? Utils.objectToString(ca.eval(BaseFormula.createFormulaBuilder().build(tableItem))) : tableItem;
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         ori_ds_name = dsName;
         ori_table_name = tableName;

designer-base/src/main/java/com/fr/design/data/datapane/TableDataNameObjectCreator.java

@@ -1,21 +1,21 @@
 package com.fr.design.data.datapane;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.data.impl.DBTableData;
 import com.fr.design.actions.tabledata.TableDataAction;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.controlpane.NameObjectCreator;
 import com.fr.design.icon.WarningIcon;
 import com.fr.general.ComparatorUtils;
-
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.Icon;
+import java.awt.Image;
 import java.text.Collator;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -138,10 +138,10 @@ public class TableDataNameObjectCreator extends NameObjectCreator {
             try {
                 return clazzOfInitCase.newInstance();
             } catch (InstantiationException | IllegalAccessException e1) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         } catch (IllegalAccessException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return null;
     }

designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTableModel.java

@@ -1,14 +1,13 @@
 package com.fr.design.data.datapane.preview;
 
-import com.fr.base.FRContext;
 import com.fr.cache.list.IntList;
 import com.fr.data.AbstractDataModel;
 import com.fr.data.impl.EmbeddedTableData.EmbeddedTDDataModel;
 import com.fr.data.impl.storeproc.ProcedureDataModel;
 import com.fr.design.utils.DesignUtils;
-
 import com.fr.general.data.DataModel;
 import com.fr.general.data.TableDataException;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
 
@@ -35,7 +34,7 @@ public class PreviewTableModel extends AbstractTableModel {
                 this.dataModel = createRowDataModel(rs, maxRowCount);
             } catch (TableDataException e) {
                 // TODO Auto-generated catch block
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         } else {
             this.dataModel = sourceResultSet;
@@ -98,7 +97,7 @@ public class PreviewTableModel extends AbstractTableModel {
         try {
             return Integer.toString(column + 1) + ". " + dataModel.getColumnName(column) + checkType(column);
         } catch (TableDataException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             DesignUtils.errorMessage(e.getMessage());
             return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error");
         }
@@ -108,7 +107,7 @@ public class PreviewTableModel extends AbstractTableModel {
         try {
             return this.dataModel.getRowCount();
         } catch (TableDataException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             return 0;
         }
     }
@@ -120,7 +119,7 @@ public class PreviewTableModel extends AbstractTableModel {
             }
             return dataModel.getColumnCount();
         } catch (TableDataException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             DesignUtils.errorMessage(e.getMessage());
             return 0;
         }
@@ -130,7 +129,7 @@ public class PreviewTableModel extends AbstractTableModel {
         try {
             return dataModel.getValueAt(row, column);
         } catch (TableDataException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             DesignUtils.errorMessage(e.getMessage());
             return "";
         }

designer-base/src/main/java/com/fr/design/data/datapane/preview/PreviewTablePane.java

@@ -4,7 +4,6 @@
 package com.fr.design.data.datapane.preview;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.base.TableData;
 import com.fr.data.TableDataSource;
 import com.fr.data.impl.DBTableData;
@@ -308,7 +307,7 @@ public class PreviewTablePane extends BasicPane {
             int tatalColumn = Integer.parseInt(tatolColumnErrMessage.trim());
             columnErrMessage = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Preview_Warn_Text", choiceColumn + 1, tatalColumn);
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             return;
         }
         FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
@@ -402,7 +401,7 @@ public class PreviewTablePane extends BasicPane {
                     fireLoadedListener();
                 } catch (Exception e) {
                     if (!(e instanceof CancellationException)) {
-                        FRContext.getLogger().error(e.getMessage(), e);
+                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
                         JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage(),
                                 null, 0, UIManager.getIcon("OptionPane.errorIcon"));
                     }
@@ -447,7 +446,7 @@ public class PreviewTablePane extends BasicPane {
             }
 
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         previewTablePane.fireLoadedListener();
         previewTablePane.showWindow(DesignerContext.getDesignerFrame()).setVisible(true);
@@ -468,7 +467,7 @@ public class PreviewTablePane extends BasicPane {
             try {
                 previewTablePane.populateStoreDataSQL();
             } catch (Exception e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
             tabPreviewpane.addTab(storeProcedureDataModels[i].getName(), previewTablePane);
         }

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DecoratedTableDataPane.java

@@ -1,18 +1,17 @@
 package com.fr.design.data.tabledata.tabledatapane;
 
-import com.fr.base.FRContext;
 import com.fr.data.impl.DecoratedTableData;
 import com.fr.design.condition.DSColumnLiteConditionPane;
 import com.fr.design.gui.ilist.CheckBoxList;
 import com.fr.design.gui.ilist.CheckBoxList.CheckBoxListSelectionChangeListener;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.file.TableDataConfig;
-
 import com.fr.general.data.DataModel;
 import com.fr.general.data.TableDataException;
+import com.fr.log.FineLoggerFactory;
 import com.fr.script.Calculator;
 
-import java.awt.*;
+import java.awt.BorderLayout;
 
 public class DecoratedTableDataPane extends AbstractTableDataPane<DecoratedTableData> implements CheckBoxListSelectionChangeListener {
 	private CheckBoxList availableTableDataNameList;
@@ -85,7 +84,7 @@ public class DecoratedTableDataPane extends AbstractTableDataPane<DecoratedTable
 				columnList.add(model.getColumnName(i));
 			}
 		} catch (TableDataException e) {
-			FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
 			return;
 		}
 		

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataDefinedPane.java

@@ -1,11 +1,12 @@
 package com.fr.design.data.tabledata.tabledatapane;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.Date;
+import com.fr.data.impl.EmbeddedTableData;
+import com.fr.design.dialog.BasicPane;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.general.ComparatorUtils;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.DefaultCellEditor;
 import javax.swing.JPanel;
@@ -15,14 +16,12 @@ import javax.swing.table.AbstractTableModel;
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableColumn;
-
-import com.fr.base.FRContext;
-import com.fr.data.impl.EmbeddedTableData;
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.dialog.BasicPane;
-import com.fr.general.ComparatorUtils;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.Date;
 
 
 public class EmbeddedTableDataDefinedPane extends BasicPane{
@@ -180,7 +179,7 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{
 			localDefaultModel.fireTableDataChanged();
 			checkEnabled();
 		} catch (CloneNotSupportedException e) {
-			FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
 		}
 	}
 	
@@ -193,7 +192,7 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{
 		try {
 			tableData = (EmbeddedTableData)(localDefaultModel.getEditableTableData().clone());
 		} catch (CloneNotSupportedException e) {
-			FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
 		}
 		
 		return tableData;

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/EmbeddedTableDataPane.java

@@ -1,5 +1,25 @@
 package com.fr.design.data.tabledata.tabledatapane;
 
+import com.fr.data.impl.EmbeddedTableData;
+import com.fr.design.dialog.BasicDialog;
+import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.gui.date.UIDatePicker;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.ilable.UILabel;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.general.DateUtils;
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StringUtils;
+
+import javax.swing.BorderFactory;
+import javax.swing.DefaultCellEditor;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.table.DefaultTableCellRenderer;
+import javax.swing.table.TableCellEditor;
+import javax.swing.table.TableColumn;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -12,29 +32,6 @@ import java.awt.event.MouseEvent;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import javax.swing.BorderFactory;
-import javax.swing.DefaultCellEditor;
-
-import com.fr.design.gui.date.UIDatePicker;
-import com.fr.design.gui.ilable.UILabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTable;
-import javax.swing.table.DefaultTableCellRenderer;
-import javax.swing.table.TableCellEditor;
-import javax.swing.table.TableColumn;
-
-import com.fr.base.FRContext;
-import com.fr.data.impl.EmbeddedTableData;
-import com.fr.design.gui.ibutton.UIButton;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.dialog.BasicDialog;
-import com.fr.design.dialog.DialogActionAdapter;
-import com.fr.general.DateUtils;
-
-import com.fr.stable.StringUtils;
-
 
 public class EmbeddedTableDataPane extends AbstractTableDataPane<EmbeddedTableData> {
 	private JTable dataJTable ;
@@ -214,7 +211,7 @@ public class EmbeddedTableDataPane extends AbstractTableDataPane<EmbeddedTableDa
 		try {
 			return (EmbeddedTableData) localDefaultModel.getEditableTableData().clone();
 		} catch (CloneNotSupportedException e) {
-			FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
 			return new EmbeddedTableData();
 		}
 	}

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java

@@ -1,7 +1,6 @@
 package com.fr.design.data.tabledata.tabledatapane;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.base.Parameter;
 import com.fr.base.ParameterHelper;
 import com.fr.base.Utils;
@@ -38,6 +37,7 @@ import com.fr.file.FILEChooserPane;
 import com.fr.file.filter.ChooseFileFilter;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.data.DataSource;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.EncodeConstants;
 import com.fr.stable.ParameterProvider;
@@ -229,7 +229,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
             try {
                 in = url.getSourceStream(params);
             } catch (Throwable e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
             if (in == null) {
                 JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
@@ -907,7 +907,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
             if (localFileRadioButton.isSelected()) {
                 String localTextString = StringUtils.trimToNull(localText.getText());
                 if(StringUtils.isEmpty(localTextString)){
-                    FRContext.getLogger().info("The file path is empty.");
+                    FineLoggerFactory.getLogger().info("The file path is empty.");
                     loadedTreeModel();
                     return;
                 }
@@ -915,7 +915,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
             } else {
                 String urlTextString = StringUtils.trimToNull(urlText.getText());
                 if (StringUtils.isEmpty(urlTextString)){
-                    FRContext.getLogger().info("The url path is empty.");
+                    FineLoggerFactory.getLogger().info("The url path is empty.");
                     loadedTreeModel();
                     return;
                 }
@@ -932,13 +932,13 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                     if (xmlReader != null) {
                         xmlReader.readXMLObject(new XMLLayerReader(0));
                     } else {
-                        FRContext.getLogger().info("The file is wrong or bad, can not create the XMLReader.");
+                        FineLoggerFactory.getLogger().info("The file is wrong or bad, can not create the XMLReader.");
                         loadedTreeModel();
                     }
                     reader.close();
                 }
             } catch (Throwable e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 loadedTreeModel();
             }
             if(treeModel.getChildCount(treeModel.getRoot()) == 1){

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java

@@ -1,7 +1,6 @@
 package com.fr.design.data.tabledata.wrapper;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.base.TableData;
 import com.fr.data.impl.storeproc.ProcedureDataModel;
 import com.fr.data.impl.storeproc.StoreProcedure;
@@ -14,9 +13,11 @@ import com.fr.design.gui.iprogressbar.AutoProgressBar;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.general.ComparatorUtils;
+import com.fr.log.FineLoggerFactory;
 
-
-import javax.swing.*;
+import javax.swing.Icon;
+import javax.swing.JOptionPane;
+import javax.swing.SwingWorker;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -146,7 +147,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
             }
             return true;
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return false;
     }
@@ -217,7 +218,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
                     }
                 } catch (Exception e) {
                     if (!(e instanceof CancellationException)) {
-                        FRContext.getLogger().error(e.getMessage(), e);
+                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
                         JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage());
                     }
                     loadingBar.close();

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureNameWrapper.java

@@ -1,7 +1,6 @@
 package com.fr.design.data.tabledata.wrapper;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.base.TableData;
 import com.fr.data.impl.storeproc.ProcedureDataModel;
 import com.fr.data.impl.storeproc.StoreProcedure;
@@ -11,7 +10,7 @@ import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.log.FineLoggerFactory;
 import com.fr.workspace.WorkContext;
 
-import javax.swing.*;
+import javax.swing.Icon;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -77,7 +76,7 @@ public final class StoreProcedureNameWrapper implements TableDataWrapper {
         try {
             procedureDataModel = DesignTableDataManager.createLazyDataModel(storeProcedure, needLoadingBar)[0];
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }
 

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java

@@ -1,6 +1,5 @@
 package com.fr.design.data.tabledata.wrapper;
 
-import com.fr.base.FRContext;
 import com.fr.base.TableData;
 import com.fr.data.TableDataSource;
 import com.fr.data.impl.ClassTableData;
@@ -123,7 +122,7 @@ public abstract class TableDataFactory {
                 }
                 datapane.populateBean(tabledata); // August:不管tabledata是刚刚新建的还是原来的，一律populate进去，如果出错就是代码写的不好
             } catch (Exception e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
         return datapane;

designer-base/src/main/java/com/fr/design/dialog/UIDialog.java

@@ -1,14 +1,28 @@
 package com.fr.design.dialog;
 
-import com.fr.base.FRContext;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
-
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
+import com.fr.log.FineLoggerFactory;
+
+import javax.swing.AbstractAction;
+import javax.swing.ActionMap;
+import javax.swing.BorderFactory;
+import javax.swing.InputMap;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.KeyStroke;
+import java.awt.BorderLayout;
+import java.awt.Dialog;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.util.ArrayList;
 
 /**
@@ -173,7 +187,7 @@ public abstract class UIDialog extends JDialog {
                     l.doOk();
                 } catch (RuntimeException e) {
                     isDoOKSucceed = false;
-                    FRContext.getLogger().error(e.getMessage(), e);
+                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 }
             }
             if (isDoOKSucceed) {

designer-base/src/main/java/com/fr/design/editor/editor/DateEditor.java

@@ -3,13 +3,13 @@
  */
 package com.fr.design.editor.editor;
 
-import com.fr.base.FRContext;
 import com.fr.design.gui.date.UIDatePicker;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.general.GeneralContext;
+import com.fr.log.FineLoggerFactory;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JComponent;
+import java.awt.BorderLayout;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.text.ParseException;
@@ -113,7 +113,7 @@ public class DateEditor extends Editor<Date> {
 		try {
 			return this.uiDatePicker.getSelectedDate();
 		} catch (ParseException parseException) {
-			FRContext.getLogger().error(parseException.getMessage(), parseException);
+            FineLoggerFactory.getLogger().error(parseException.getMessage(), parseException);
 			return new Date();
 		}
 	}
@@ -132,7 +132,7 @@ public class DateEditor extends Editor<Date> {
 		try {
 			this.uiDatePicker.setSelectedDate(value);
 		} catch (ParseException parseException) {
-			FRContext.getLogger().error(parseException.getMessage(), parseException);
+            FineLoggerFactory.getLogger().error(parseException.getMessage(), parseException);
 		}
 	}
 

designer-base/src/main/java/com/fr/design/extra/PluginFromStorePane.java

@@ -1,11 +1,9 @@
 package com.fr.design.extra;
 
-import com.fr.base.FRContext;
 import com.fr.config.MarketConfig;
 import com.fr.design.extra.tradition.callback.UpdateOnlineCallback;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.gui.ilable.UILabel;
-
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginMarker;
@@ -15,7 +13,11 @@ import com.fr.plugin.manage.control.ProgressCallback;
 import com.fr.plugin.view.PluginView;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.JComponent;
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.File;
 import java.util.List;
@@ -206,7 +208,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
                 PluginMarker toPluginMarker = PluginMarker.create(id, latestPluginVersion);
                 PluginManager.getController().download(pluginMarker, new UpdateOnlineCallback(pluginMarker, toPluginMarker, pane));
             } catch (Exception e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
 
         }

designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java

@@ -1,6 +1,5 @@
 package com.fr.design.extra;
 
-import com.fr.base.FRContext;
 import com.fr.config.MarketConfig;
 import com.fr.design.extra.exe.callback.InstallFromDiskCallback;
 import com.fr.design.extra.exe.callback.InstallOnlineCallback;
@@ -10,7 +9,6 @@ import com.fr.design.extra.exe.callback.UninstallPluginCallback;
 import com.fr.design.extra.exe.callback.UpdateFromDiskCallback;
 import com.fr.design.extra.exe.callback.UpdateOnlineCallback;
 import com.fr.design.gui.ilable.UILabel;
-
 import com.fr.general.CloudCenter;
 import com.fr.general.http.HttpClient;
 import com.fr.json.JSONArray;
@@ -26,7 +24,8 @@ import com.fr.plugin.manage.control.PluginTaskResult;
 import com.fr.plugin.view.PluginView;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
 import java.io.File;
 import java.util.List;
 
@@ -63,7 +62,7 @@ public class PluginOperateUtils {
             PluginTask pluginTask = PluginTask.updateTask(currentMarker, toPluginMarker);
             PluginControllerHelper.updateOnline(currentMarker, toPluginMarker, new UpdateOnlineCallback(pluginTask, jsCallback));
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
 
     }

designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java

@@ -1,7 +1,8 @@
 package com.fr.design.extra;
 
-import com.fr.base.FRContext;
-import com.fr.general.*;
+import com.fr.general.CloudCenter;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
@@ -25,12 +26,17 @@ import javafx.scene.paint.Color;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebEvent;
 import javafx.scene.web.WebView;
-import javafx.stage.*;
+import javafx.stage.Modality;
+import javafx.stage.Screen;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
+import javafx.stage.WindowEvent;
 import javafx.util.Callback;
 import netscape.javascript.JSObject;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+import java.awt.Toolkit;
 
 /**
  * Created by zhaohehe on 16/7/28.
@@ -79,7 +85,7 @@ public class QQLoginWebPane extends JFXPanel {
                     primaryStage.setY(Screen.getPrimary().getBounds().getHeight() + DEFAULT_PRIMARYSTAGE_HEIGHT);
                     primaryStage.show();
                 } catch (Exception e) {
-                    FRContext.getLogger().info(e.getMessage());
+                    FineLoggerFactory.getLogger().info(e.getMessage());
                 }
                 webEngine.setConfirmHandler(new Callback<String, Boolean>() {
                     @Override

designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@@ -19,7 +19,6 @@ import com.fr.design.gui.syntax.ui.rsyntaxtextarea.SyntaxConstants;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.utils.gui.GUICoreUtils;
-
 import com.fr.log.FineLoggerFactory;
 import com.fr.parser.FRLexer;
 import com.fr.parser.FRParser;
@@ -28,7 +27,17 @@ import com.fr.stable.ProductConstants;
 import com.fr.stable.StringUtils;
 import com.fr.stable.script.Expression;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.DefaultListModel;
+import javax.swing.Icon;
+import javax.swing.JComponent;
+import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JTree;
+import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.event.TreeSelectionEvent;
@@ -38,7 +47,10 @@ import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.MutableTreeNode;
 import javax.swing.tree.TreePath;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
@@ -566,7 +578,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                 try {
                     expression = parser.parse();
                 } catch (Exception e) {
-                    FRContext.getLogger().error(e.getMessage(), e);
+                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
                     // alex:继续往下面走,expression为null时告知不合法公式
                 }
 
@@ -1035,6 +1047,6 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             buffer.append("|");
             buffer.append("\n");
         }
-        FRContext.getLogger().debug(buffer.toString());
+        FineLoggerFactory.getLogger().debug(buffer.toString());
     }
 }

designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java

@@ -1,6 +1,5 @@
 package com.fr.design.formula;
 
-import com.fr.base.FRContext;
 import com.fr.file.FunctionConfig;
 import com.fr.function.AVERAGE;
 import com.fr.function.CHAR;
@@ -78,9 +77,9 @@ public final class FunctionConstants {
 			try {
 				classFilePath = URLDecoder.decode(classFilePath, EncodeConstants.ENCODING_UTF_8);
 			} catch (UnsupportedEncodingException e1) {
-				FRContext.getLogger().error(e1.getMessage(), e1);
+                FineLoggerFactory.getLogger().error(e1.getMessage(), e1);
 			}
-			FRContext.getLogger().info("ClassFilePath:" + classFilePath);
+            FineLoggerFactory.getLogger().info("ClassFilePath:" + classFilePath);
 			if (isCustomFormulaPath(classFilePath)) {
 				continue;
 			}
@@ -193,7 +192,7 @@ public final class FunctionConstants {
 					classNameList.add(entryName.substring(classPath.length() + 1));
 				}
 			} catch (IOException e) {
-				FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
 			}
 		} else {
 			File dir = new File(filePath);

designer-base/src/main/java/com/fr/design/formula/JavaEditorPane.java

@@ -8,7 +8,6 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxTextArea;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.SyntaxConstants;
 import com.fr.design.layout.FRGUIPaneFactory;
-
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.EncodeConstants;
 import com.fr.stable.JavaCompileInfo;
@@ -17,8 +16,13 @@ import com.fr.stable.StringUtils;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.workspace.WorkContext;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.AbstractAction;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.SwingWorker;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.ByteArrayInputStream;
@@ -51,7 +55,7 @@ public class JavaEditorPane extends BasicPane {
                         try {
                             return StableUtils.inputStream2String(in, EncodeConstants.ENCODING_UTF_8);
                         } catch (IOException e) {
-                            FRContext.getLogger().error(e.getMessage(), e);
+                            FineLoggerFactory.getLogger().error(e.getMessage(), e);
                         }
                     }
                     return null;
@@ -115,7 +119,7 @@ public class JavaEditorPane extends BasicPane {
         try {
             return new ByteArrayInputStream(WorkContext.getWorkResource().readFully(StableUtils.pathJoin(ProjectConstants.CLASSES_NAME, javaPath)));
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return null;
     }

designer-base/src/main/java/com/fr/design/gui/controlpane/CommonShortCutHandlers.java

@@ -1,11 +1,11 @@
 package com.fr.design.gui.controlpane;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.design.gui.ilist.JNameEdList;
 import com.fr.design.gui.ilist.ListModelElement;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
 
@@ -71,7 +71,7 @@ public class CommonShortCutHandlers {
 
             listControlPane.addNameable(newNameable, listControlPane.getSelectedIndex() + 1);
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }
 

designer-base/src/main/java/com/fr/design/gui/core/CustomWidgetOption.java

@@ -1,9 +1,9 @@
 package com.fr.design.gui.core;
 
-import javax.swing.Icon;
-
-import com.fr.base.FRContext;
 import com.fr.form.ui.Widget;
+import com.fr.log.FineLoggerFactory;
+
+import javax.swing.Icon;
 
 public class CustomWidgetOption extends WidgetOption {
 	private static final long serialVersionUID = -8144214820100962842L;
@@ -23,9 +23,9 @@ public class CustomWidgetOption extends WidgetOption {
 			Widget ins = cls.newInstance();
 			return ins ;
 		} catch (InstantiationException e) {
-			FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
 		} catch (IllegalAccessException e) {
-			FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
 		}
 
 		return null;

designer-base/src/main/java/com/fr/design/gui/date/SingleObjectComboBoxModel.java

@@ -1,12 +1,11 @@
 package com.fr.design.gui.date;
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.AbstractListModel;
 import javax.swing.ComboBoxModel;
-
-import com.fr.base.FRContext;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 
 public class SingleObjectComboBoxModel extends AbstractListModel implements ComboBoxModel {
     private SimpleDateFormat dateFormat;
@@ -35,7 +34,7 @@ public class SingleObjectComboBoxModel extends AbstractListModel implements Comb
             try {
                 selectedDate = this.dateFormat.format((Date) anItem);
             } catch (Exception e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         } else {
             try {

designer-base/src/main/java/com/fr/design/gui/date/UIDatePicker.java

@@ -1,19 +1,26 @@
 package com.fr.design.gui.date;
 
-import com.fr.base.FRContext;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.UIComboBoxUI;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.general.ComparatorUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.ComparatorUtils;
+import com.fr.log.FineLoggerFactory;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.SwingConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.plaf.ComboBoxUI;
 import javax.swing.plaf.basic.BasicComboPopup;
 import javax.swing.plaf.basic.ComboPopup;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Cursor;
+import java.awt.LayoutManager;
 import java.awt.event.MouseEvent;
 import java.io.Serializable;
 import java.text.ParseException;
@@ -213,7 +220,7 @@ public class UIDatePicker extends UIComboBox implements Serializable {
                             calendarPanel.updateHMS();
                         }
 					} catch (Exception e) {
-						FRContext.getLogger().error(e.getMessage(), e);
+                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
 					}
 				} else if (ComparatorUtils.equals(oldValue, Boolean.TRUE)
 						&& ComparatorUtils.equals(newValue, Boolean.FALSE)) { //HIDE

designer-base/src/main/java/com/fr/design/gui/demo/LoadingPaneDemo.java

@@ -3,16 +3,15 @@
  */
 package com.fr.design.gui.demo;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JPanel;
-
-import com.fr.base.FRContext;
+import com.fr.design.dialog.BasicDialog;
 import com.fr.design.gui.frpane.LoadingBasicPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.dialog.BasicDialog;
+import com.fr.log.FineLoggerFactory;
+
+import javax.swing.JPanel;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 /**
  * Created by IntelliJ IDEA.
@@ -35,7 +34,7 @@ public class LoadingPaneDemo extends JPanel {
                             try {
                                 Thread.sleep(500);
                             } catch (InterruptedException e) {
-                                FRContext.getLogger().error(e.getMessage(), e);
+                                FineLoggerFactory.getLogger().error(e.getMessage(), e);
                             }
                             container.add(new UIButton(i + "adfadwdadawdwad"));
                         }

designer-base/src/main/java/com/fr/design/gui/frpane/LoadingBasicPaneTest.java

@@ -3,11 +3,11 @@
  */
 package com.fr.design.gui.frpane;
 
-import javax.swing.JPanel;
-
-import com.fr.base.FRContext;
-import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.dialog.BasicDialog;
+import com.fr.design.gui.ibutton.UIButton;
+import com.fr.log.FineLoggerFactory;
+
+import javax.swing.JPanel;
 
 
 /**
@@ -23,7 +23,7 @@ public class LoadingBasicPaneTest {
 					try {
 						Thread.sleep(500);
 					} catch (InterruptedException e) {
-						FRContext.getLogger().error(e.getMessage(), e);
+                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
 					}
 					container.add(new UIButton(i + "adfadwdadawdwad"));
 				}

designer-base/src/main/java/com/fr/design/gui/frpane/UIBubbleFloatPane.java

@@ -1,19 +1,32 @@
 package com.fr.design.gui.frpane;
 
-import java.awt.*;
-import java.awt.event.AWTEventListener;
-import java.awt.event.MouseEvent;
-
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import javax.swing.SwingUtilities;
-
-import com.fr.base.FRContext;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.dialog.UIDialog;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.Constants;
 import com.sun.awt.AWTUtilities;
 
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import java.awt.AWTEvent;
+import java.awt.BasicStroke;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dialog;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Polygon;
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.Stroke;
+import java.awt.Toolkit;
+import java.awt.Window;
+import java.awt.event.AWTEventListener;
+import java.awt.event.MouseEvent;
+
 /**
  * @author Jerry
  *         非模态悬浮对话框，气泡形状
@@ -300,7 +313,7 @@ public abstract class UIBubbleFloatPane<T> extends BasicBeanPane<T> {
 			try {
 				AWTUtilities.setWindowShape(CustomShapedDialog.this, this.getCustomShap());
 			} catch (UnsupportedOperationException e) {
-				FRContext.getLogger().info("Not support");
+                FineLoggerFactory.getLogger().info("Not support");
 			}
 			final JPanel contentPane = (JPanel) this.getContentPane();
 			this.setLayout(null);

designer-base/src/main/java/com/fr/design/gui/icombobox/ExtendedComboBoxTest.java

@@ -1,18 +1,17 @@
 package com.fr.design.gui.icombobox;
 
-import java.awt.BorderLayout;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.JFrame;
 import javax.swing.UIManager;
-
-import com.fr.base.FRContext;
+import java.awt.BorderLayout;
 
 public class ExtendedComboBoxTest {
 	public static void main(String[] args) {
 		try {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (Exception e) {
-			FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
 		}
 
 		final ExtendedComboBox cb = new ExtendedComboBox(

designer-base/src/main/java/com/fr/design/gui/icombobox/LazyComboBoxTest.java

@@ -3,19 +3,18 @@
  */
 package com.fr.design.gui.icombobox;
 
-import java.awt.BorderLayout;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
+import com.fr.design.gui.itextfield.UITextField;
+import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.log.FineLoggerFactory;
+import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
 
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
-
-import com.fr.base.FRContext;
-import com.fr.design.gui.itextfield.UITextField;
-import com.fr.design.layout.FRGUIPaneFactory;
-import com.sun.java.swing.plaf.windows.WindowsLookAndFeel;
+import java.awt.BorderLayout;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
 
 /**
  * @author richer
@@ -26,7 +25,7 @@ public class LazyComboBoxTest {
 		try {
 			UIManager.setLookAndFeel(new WindowsLookAndFeel());
 		} catch (UnsupportedLookAndFeelException e1) {
-			FRContext.getLogger().error(e1.getMessage(), e1);
+            FineLoggerFactory.getLogger().error(e1.getMessage(), e1);
 		}
 		JFrame f = new JFrame();
 		JPanel p = (JPanel) f.getContentPane();
@@ -40,7 +39,7 @@ public class LazyComboBoxTest {
 				try {
 					Thread.sleep(3000);
 				} catch (InterruptedException e) {
-					FRContext.getLogger().error(e.getMessage(), e);
+                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
 				}
 				return m;
 			}

designer-base/src/main/java/com/fr/design/gui/ilist/TableViewList.java

@@ -1,7 +1,6 @@
 package com.fr.design.gui.ilist;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.data.core.DataCoreUtils;
 import com.fr.data.core.db.TableProcedure;
 import com.fr.data.core.db.dialect.base.key.check.DataBaseDetail;
@@ -13,11 +12,17 @@ import com.fr.design.constants.UIConstants;
 import com.fr.design.mainframe.dnd.SerializableTransferable;
 import com.fr.file.ConnectionConfig;
 import com.fr.general.ComparatorUtils;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.DefaultListCellRenderer;
+import javax.swing.DefaultListModel;
+import javax.swing.Icon;
+import javax.swing.JList;
+import javax.swing.ListSelectionModel;
+import javax.swing.SwingWorker;
+import java.awt.Component;
 import java.awt.dnd.DnDConstants;
 import java.awt.dnd.DragGestureEvent;
 import java.awt.dnd.DragGestureListener;
@@ -111,7 +116,7 @@ public class TableViewList extends UIList {
                 } catch (Exception e) {
                     if (!(e instanceof InterruptedException) && !(e instanceof CancellationException)) {
                         TableViewList.this.setModel(failed);
-                        FRContext.getLogger().error(e.getMessage(), e);
+                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
                     }
                 }
             }

designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java

@@ -1,8 +1,8 @@
 package com.fr.design.gui.itableeditorpane;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.JOptionPane;
 import javax.swing.JTable;
@@ -166,7 +166,7 @@ public abstract class UITableModelAdapter<T extends Object> extends AbstractTabl
 			try {
 				table.getCellEditor().stopCellEditing();
 			} catch (Exception ee) {
-				FRContext.getLogger().error(ee.getMessage(), ee);
+                FineLoggerFactory.getLogger().error(ee.getMessage(), ee);
 			}
 		}
 	}
@@ -241,7 +241,7 @@ public abstract class UITableModelAdapter<T extends Object> extends AbstractTabl
 				try {
 					table.getCellEditor().stopCellEditing();
 				} catch (Exception ee) {
-					FRContext.getLogger().error(ee.getMessage(), ee);
+                    FineLoggerFactory.getLogger().error(ee.getMessage(), ee);
 				}
 			}
 			if (getRowCount() < 1 || selectedRow.length < 0) {

designer-base/src/main/java/com/fr/design/gui/itooltip/MultiLineToolTipUI.java

@@ -1,5 +1,12 @@
 package com.fr.design.gui.itooltip;
 
+import com.fr.base.GraphHelper;
+import com.fr.log.FineLoggerFactory;
+
+import javax.swing.JComponent;
+import javax.swing.JToolTip;
+import javax.swing.SwingUtilities;
+import javax.swing.plaf.ToolTipUI;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FontMetrics;
@@ -13,14 +20,6 @@ import java.io.StringReader;
 import java.util.Enumeration;
 import java.util.Vector;
 
-import javax.swing.JComponent;
-import javax.swing.JToolTip;
-import javax.swing.SwingUtilities;
-import javax.swing.plaf.ToolTipUI;
-
-import com.fr.base.FRContext;
-import com.fr.base.GraphHelper;
-
 public class MultiLineToolTipUI extends ToolTipUI {
 
     private String[] strs;
@@ -65,7 +64,7 @@ public class MultiLineToolTipUI extends ToolTipUI {
                 v.addElement(line);
             }
         } catch (IOException ex) {
-            FRContext.getLogger().error(ex.getMessage(), ex);
+            FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
         }
         int lines = v.size();
         if (lines < 1) {

designer-base/src/main/java/com/fr/design/gui/itooltip/UIToolTip.java

@@ -1,12 +1,22 @@
 package com.fr.design.gui.itooltip;
 
-import com.fr.base.FRContext;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.general.ComparatorUtils;
+import com.fr.log.FineLoggerFactory;
 
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+import javax.swing.JToolTip;
+import javax.swing.ToolTipManager;
+import java.awt.AWTException;
+import java.awt.Container;
+import java.awt.Point;
+import java.awt.Robot;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionAdapter;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
 
 /**
  * Created with IntelliJ IDEA.
@@ -39,7 +49,7 @@ public class UIToolTip extends JToolTip{
                 }
             });
         } catch (AWTException e) {
-            FRContext.getLogger().error(e.getMessage(),e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
 
         this.addMouseWheelListener(new MouseWheelListener() {

designer-base/src/main/java/com/fr/design/gui/itooltip/UIToolTipUI.java

@@ -1,11 +1,21 @@
 package com.fr.design.gui.itooltip;
 
-import com.fr.base.FRContext;
 import com.fr.base.GraphHelper;
+import com.fr.log.FineLoggerFactory;
 
-import javax.swing.*;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+import javax.swing.JComponent;
+import javax.swing.JToolTip;
+import javax.swing.SwingUtilities;
 import javax.swing.plaf.ToolTipUI;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FontMetrics;
+import java.awt.GradientPaint;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
 import java.awt.geom.GeneralPath;
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -98,7 +108,7 @@ public class UIToolTipUI extends ToolTipUI {
                 v.addElement(line);
             }
         } catch (IOException ex) {
-            FRContext.getLogger().error(ex.getMessage(), ex);
+            FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
         }
         int lines = v.size();
         if (lines < 1) {

designer-base/src/main/java/com/fr/design/icon/LockIcon.java

@@ -1,17 +1,16 @@
 package com.fr.design.icon;
 
+import com.fr.base.BaseUtils;
+import com.fr.log.FineLoggerFactory;
+
+import javax.swing.GrayFilter;
+import javax.swing.ImageIcon;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Image;
 import java.awt.MediaTracker;
 import java.awt.image.ImageObserver;
 
-import javax.swing.GrayFilter;
-import javax.swing.ImageIcon;
-
-import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
-
 public class LockIcon extends ImageIcon {
     private final static Image lockImage = BaseUtils.readImage("/com/fr/design/images/gui/locked.gif");
 
@@ -55,7 +54,7 @@ public class LockIcon extends ImageIcon {
             try {
                 tracker.waitForID(0, 0);
             } catch (InterruptedException e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
 
             loadStatus = tracker.statusID(0, false);

designer-base/src/main/java/com/fr/design/icon/WarningIcon.java

@@ -1,17 +1,16 @@
 package com.fr.design.icon;
 
+import com.fr.base.BaseUtils;
+import com.fr.log.FineLoggerFactory;
+
+import javax.swing.GrayFilter;
+import javax.swing.ImageIcon;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Image;
 import java.awt.MediaTracker;
 import java.awt.image.ImageObserver;
 
-import javax.swing.GrayFilter;
-import javax.swing.ImageIcon;
-
-import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
-
 /**
  * 警告图片
  * 
@@ -59,7 +58,7 @@ public class WarningIcon extends ImageIcon {
 			try {
 				tracker.waitForID(0, 0);
 			} catch (InterruptedException e) {
-				FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
 			}
 
 			tracker.statusID(0, false);

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -636,7 +636,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         try {
             file.mkfile();
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }
 
@@ -666,7 +666,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         try {
             this.getTarget().export(editingFILE.asOutputStream());
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage(), "Save Error", JOptionPane.ERROR_MESSAGE);
             return false;
         }

designer-base/src/main/java/com/fr/design/mainframe/dnd/ArrayListTransferHandler.java

@@ -3,18 +3,17 @@
  */
 package com.fr.design.mainframe.dnd;
 
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
-import java.awt.datatransfer.UnsupportedFlavorException;
-import java.io.IOException;
-import java.util.ArrayList;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.DefaultListModel;
 import javax.swing.JComponent;
 import javax.swing.JList;
 import javax.swing.TransferHandler;
-
-import com.fr.base.FRContext;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.IOException;
+import java.util.ArrayList;
 
 /**
  * Used for JList.
@@ -33,7 +32,7 @@ public class ArrayListTransferHandler extends TransferHandler {
         try {
             localArrayListFlavor = new DataFlavor(localArrayListType);
         } catch (ClassNotFoundException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
 
         serialArrayListFlavor = new DataFlavor(ArrayList.class, "ArrayList");
@@ -55,10 +54,10 @@ public class ArrayListTransferHandler extends TransferHandler {
                 return false;
             }
         } catch (UnsupportedFlavorException ufe) {
-            FRContext.getLogger().error(ufe.getMessage(), ufe);
+            FineLoggerFactory.getLogger().error(ufe.getMessage(), ufe);
             return false;
         } catch (IOException ioe) {
-            FRContext.getLogger().error(ioe.getMessage(), ioe);
+            FineLoggerFactory.getLogger().error(ioe.getMessage(), ioe);
             return false;
         }
 

designer-base/src/main/java/com/fr/design/mainframe/dnd/ArrayListTransferable.java

@@ -1,13 +1,13 @@
 package com.fr.design.mainframe.dnd;
 
+import com.fr.log.FineLoggerFactory;
+
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
 import java.awt.datatransfer.UnsupportedFlavorException;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.fr.base.FRContext;
-
 public class ArrayListTransferable implements Transferable {
     private DataFlavor localArrayListFlavor;
     private DataFlavor serialArrayListFlavor;
@@ -21,7 +21,7 @@ public class ArrayListTransferable implements Transferable {
         try {
             localArrayListFlavor = new DataFlavor(localArrayListType);
         } catch (ClassNotFoundException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         
         serialArrayListFlavor = new DataFlavor(ArrayList.class, "ArrayList");

designer-base/src/main/java/com/fr/design/mainframe/templateinfo/TemplateInfoCollector.java

@@ -7,10 +7,10 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mainframe.SiteCenterToken;
+import com.fr.general.CloudCenter;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralUtils;
 import com.fr.general.IOUtils;
-import com.fr.general.CloudCenter;
 import com.fr.general.http.HttpClient;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
@@ -132,11 +132,11 @@ public class TemplateInfoCollector<T extends BaseBook> implements Serializable,
             }
             xmlInputStream.close();
         } catch (FileNotFoundException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         } catch (IOException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         } catch (XMLStreamException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
 
     }

designer-base/src/main/java/com/fr/design/mainframe/widget/renderer/IconCellRenderer.java

@@ -1,11 +1,13 @@
 package com.fr.design.mainframe.widget.renderer;
 
-import java.awt.*;
-
-import com.fr.base.FRContext;
 import com.fr.base.Icon;
 import com.fr.base.IconManager;
 import com.fr.form.ui.WidgetInfoConfig;
+import com.fr.log.FineLoggerFactory;
+
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
 
 public class IconCellRenderer extends GenericCellRenderer {
 	private Image img;
@@ -22,7 +24,7 @@ public class IconCellRenderer extends GenericCellRenderer {
 			this.setImage(icon == null ? null : icon.getImage());
 		} catch (CloneNotSupportedException e) {
 			this.setImage(null);
-			FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
 		}
 	}
 

designer-base/src/main/java/com/fr/design/module/DesignModuleFactory.java

@@ -1,6 +1,5 @@
 package com.fr.design.module;
 
-import com.fr.base.FRContext;
 import com.fr.base.chart.BaseChartCollection;
 import com.fr.design.gui.chart.BaseChartPropertyPane;
 import com.fr.design.gui.chart.MiddleChartComponent;
@@ -15,9 +14,12 @@ import com.fr.design.parameter.HierarchyTreePane;
 import com.fr.design.parameter.ParameterDesignerProvider;
 import com.fr.design.parameter.ParameterReader;
 import com.fr.form.ui.Widget;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StableUtils;
 
-import java.awt.*;
+import java.awt.Dialog;
+import java.awt.Frame;
+import java.awt.Window;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 
@@ -122,7 +124,7 @@ public class DesignModuleFactory {
             try {
                 return instance.paraPropertyPane.newInstance();
             } catch (Exception e) {
-                FRContext.getLogger().error("Error in Para PropertyPane");
+                FineLoggerFactory.getLogger().error("Error in Para PropertyPane");
             }
         }
         return null;
@@ -137,7 +139,7 @@ public class DesignModuleFactory {
             try {
                 return (ParameterDesignerProvider) instance.formParaDesigner.newInstance();
             } catch (Exception e) {
-                FRContext.getLogger().error("error in form para designer");
+                FineLoggerFactory.getLogger().error("error in form para designer");
             }
         }
         return null;
@@ -172,9 +174,9 @@ public class DesignModuleFactory {
                 bcc = instance.chartComponentClass.newInstance();
                 bcc.populate(collection);
             } catch (InstantiationException e) {
-                FRContext.getLogger().error("Error in ChartComponent instant", e);
+                FineLoggerFactory.getLogger().error("Error in ChartComponent instant", e);
             } catch (IllegalAccessException e) {
-                FRContext.getLogger().error("Error in Access", e);
+                FineLoggerFactory.getLogger().error("Error in Access", e);
             }
         }
         return bcc;
@@ -195,7 +197,7 @@ public class DesignModuleFactory {
             }
             return c.newInstance(window);
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return null;
     }

designer-base/src/main/java/com/fr/design/style/BorderPane.java

@@ -5,7 +5,6 @@ package com.fr.design.style;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.CellBorderStyle;
-import com.fr.base.FRContext;
 import com.fr.base.GraphHelper;
 import com.fr.base.Style;
 import com.fr.design.dialog.BasicPane;
@@ -16,6 +15,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.VerticalFlowLayout;
 import com.fr.design.style.color.ColorSelectBox;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.Constants;
 import com.fr.stable.CoreConstants;
 
@@ -243,7 +243,7 @@ public class BorderPane extends BasicPane {
 				this.cellBorderStyle = (CellBorderStyle)cellBorderStyle.clone();
 			}
 		} catch (CloneNotSupportedException e) {
-			FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
 		}
 		this.insideMode = insideMode;
 		// ben 这里也有问题，CellBorderStyle的 linestyle和color很可能不止一种

designer-base/src/main/java/com/fr/design/utils/BrowseUtils.java

@@ -1,6 +1,5 @@
 package com.fr.design.utils;
 
-import com.fr.base.FRContext;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.OperatingSystem;
 import com.fr.stable.StringUtils;
@@ -43,7 +42,7 @@ public class BrowseUtils {
     public static void browser(String url) {
 
         if (StringUtils.isEmpty(url)) {
-            FRContext.getLogger().info("The URL is empty!");
+            FineLoggerFactory.getLogger().info("The URL is empty!");
             return;
         }
         try {

designer-base/src/main/java/com/fr/design/utils/DesignUtils.java

@@ -1,7 +1,6 @@
 package com.fr.design.utils;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.base.FeedBackInfo;
 import com.fr.base.ServerConfig;
 import com.fr.design.DesignerEnvManager;
@@ -22,8 +21,11 @@ import com.fr.stable.StringUtils;
 import com.fr.start.ServerStarter;
 import com.fr.workspace.WorkContext;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import java.awt.Desktop;
+import java.awt.Font;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -95,13 +97,13 @@ public class DesignUtils {
 
             writer.flush();
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         } finally {
             try {
                 writer.close();
                 socket.close();
             } catch (IOException e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
     }
@@ -237,7 +239,7 @@ public class DesignUtils {
                 //比如想在中文或英文系统里用韩文设计器
                 guiFRFont = getNamedFont("Dialog");
                 if (!guiFRFont.canDisplay(displayChar)) {
-                    FRContext.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_SimSun_Not_Found"));
+                    FineLoggerFactory.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_SimSun_Not_Found"));
                 }
             }
         }
@@ -284,7 +286,7 @@ public class DesignUtils {
                 String value = values[i].replaceAll("\\\\", "/");
                 segs[i] = URLEncoder.encode(CodeUtils.cjkEncode(names[i]), EncodeConstants.ENCODING_UTF_8) + "=" + URLEncoder.encode(CodeUtils.cjkEncode(value), "UTF-8");
             } catch (UnsupportedEncodingException e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
         String postfixOfUri = (segs.length > 0 ? "?" + StableUtils.join(segs, "&") : StringUtils.EMPTY);
@@ -294,7 +296,7 @@ public class DesignUtils {
                 String urlPath = getWebBrowserPath();
                 Desktop.getDesktop().browse(new URI(urlPath + baseRoute + postfixOfUri));
             } catch (Exception e) {
-                FRContext.getLogger().error("cannot open the url Successful", e);
+                FineLoggerFactory.getLogger().error("cannot open the url Successful", e);
             }
         } else {
             try {

designer-base/src/main/java/com/fr/design/widget/EventCreator.java

@@ -1,12 +1,12 @@
 package com.fr.design.widget;
 
-import com.fr.base.FRContext;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.controlpane.NameableSelfCreator;
 import com.fr.design.gui.controlpane.UnrepeatedNameHelper;
 import com.fr.design.gui.ilist.ListModelElement;
 import com.fr.form.event.Listener;
 import com.fr.general.NameObject;
+import com.fr.log.FineLoggerFactory;
 import com.fr.report.web.util.ReportEngineEventMapping;
 import com.fr.stable.Nameable;
 
@@ -43,7 +43,7 @@ public class EventCreator extends NameableSelfCreator {
             String localeKey = ReportEngineEventMapping.getLocaleName(eventName);
             return com.fr.design.i18n.Toolkit.i18nText(localeKey);
 		} catch (Exception e) {
-			FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
 			return eventName;
 		}
 	}

designer-base/src/main/java/com/fr/start/Demo.java

@@ -1,7 +1,7 @@
 package com.fr.start;
 
 
-import com.fr.base.FRContext;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.OperatingSystem;
 import com.fr.stable.StableUtils;
 
@@ -11,7 +11,7 @@ public class Demo {
     public static void main(String[] args) {
         String installHome = StableUtils.getInstallHome();
         if (installHome == null) {
-            FRContext.getLogger().error("Can not find the install home, please check it.");
+            FineLoggerFactory.getLogger().error("Can not find the install home, please check it.");
             return;
         }
 
@@ -29,7 +29,7 @@ public class Demo {
             try {
                 builder.start();
             } catch (IOException e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         } else {
             // ProcessBuilder这种方式在window下报错：系统找不到指定文件
@@ -37,7 +37,7 @@ public class Demo {
             try {
                 rt.exec(executorPath);
             } catch (IOException e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
 

designer-base/src/main/java/com/fr/start/StartDocURL.java

@@ -1,11 +1,11 @@
 package com.fr.start;
 
+import com.fr.log.FineLoggerFactory;
+import com.fr.stable.StableUtils;
+
 import java.awt.Desktop;
 import java.net.URI;
 
-import com.fr.base.FRContext;
-import com.fr.stable.StableUtils;
-
 
 /**
  * 从windows开始菜单点击exe文件启动html格式的帮助文档,
@@ -20,7 +20,7 @@ public class StartDocURL {
 	public static void main(String[] args) {
 		//p:必须有路径的URL存在
 		if(args == null || args.length < 1) {
-    		FRContext.getLogger().error(
+            FineLoggerFactory.getLogger().error(
 			"Can not find the install home, please check it.");
     		return;			
 		}
@@ -33,7 +33,7 @@ public class StartDocURL {
 			} else {
 	    		String iHome = StableUtils.getInstallHome();
 	        	if (iHome == null) {
-	        		FRContext.getLogger().error(
+                    FineLoggerFactory.getLogger().error(
 	        				"Can not find the install home, please check it.");
 	        		return;
 	        	}
@@ -42,7 +42,7 @@ public class StartDocURL {
 	    		Desktop.getDesktop().open(new java.io.File(iHome + args[0]));
 			}    		
     	} catch (Exception e) {
-    		FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
     	}
 	}
 }

designer-base/src/main/java/com/fr/start/server/ServerManageFrame.java

@@ -1,17 +1,20 @@
 package com.fr.start.server;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.log.FineLoggerFactory;
 
-
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -32,7 +35,7 @@ public class ServerManageFrame extends JFrame {
 		try {
 			serverManageFrame.checkButtonEnabled();
 		} catch(Exception exp) {
-            FRContext.getLogger().error(exp.getMessage());
+            FineLoggerFactory.getLogger().error(exp.getMessage());
 		}
 		
 		return serverManageFrame;
@@ -77,7 +80,7 @@ public class ServerManageFrame extends JFrame {
 					FineEmbedServer.start();
 					checkButtonEnabled();
 				} catch(Exception exp) {
-                    FRContext.getLogger().error(exp.getMessage());
+                    FineLoggerFactory.getLogger().error(exp.getMessage());
 				}
 			}
 		});
@@ -94,7 +97,7 @@ public class ServerManageFrame extends JFrame {
 					FineEmbedServer.stop();
 					checkButtonEnabled();
 				} catch(Exception exp) {
-                    FRContext.getLogger().error(exp.getMessage());
+                    FineLoggerFactory.getLogger().error(exp.getMessage());
 				}
 			}
 		});
@@ -120,7 +123,7 @@ public class ServerManageFrame extends JFrame {
 //				try {
 //					desktop.open();
 //				} catch(Exception exp) {
-//                    FRContext.getLogger().error(exp.getMessage());
+//                    FineLoggerFactory.getLogger().error(exp.getMessage());
 //				}
 //			}
 //		});

designer-base/src/main/java/com/fr/start/server/ServerTray.java

@@ -1,13 +1,17 @@
 package com.fr.start.server;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
 import com.fr.event.ListenerAdaptor;
-
-
-import java.awt.*;
+import com.fr.log.FineLoggerFactory;
+
+import java.awt.AWTException;
+import java.awt.Image;
+import java.awt.MenuItem;
+import java.awt.PopupMenu;
+import java.awt.SystemTray;
+import java.awt.TrayIcon;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
@@ -61,7 +65,7 @@ public class ServerTray {
                 try {
                     FineEmbedServer.start();
                 } catch (Exception exp) {
-                    FRContext.getLogger().error(exp.getMessage(), exp);
+                    FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
                 }
             }
         };
@@ -72,7 +76,7 @@ public class ServerTray {
                 try {
                     FineEmbedServer.stop();
                 } catch (Throwable exp) {
-                    FRContext.getLogger().error(exp.getMessage(), exp);
+                    FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
                 }
             }
         };
@@ -168,7 +172,7 @@ public class ServerTray {
                 serverManageFrame.repaint();
             }
         } catch (Exception exp) {
-            FRContext.getLogger().error(exp.getMessage(), exp);
+            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
         }
     }
 

designer-chart/src/main/java/com/fr/design/chart/ChartAxisFactory.java

@@ -1,12 +1,17 @@
 package com.fr.design.chart;
 
-import com.fr.base.FRContext;
 import com.fr.chart.chartattr.Axis;
 import com.fr.chart.chartattr.CategoryAxis;
 import com.fr.chart.chartattr.RadarAxis;
 import com.fr.chart.chartattr.ValueAxis;
-import com.fr.design.mainframe.chart.gui.style.axis.*;
+import com.fr.design.mainframe.chart.gui.style.axis.ChartAxisUsePane;
+import com.fr.design.mainframe.chart.gui.style.axis.ChartCategoryPane;
+import com.fr.design.mainframe.chart.gui.style.axis.ChartPercentValuePane;
+import com.fr.design.mainframe.chart.gui.style.axis.ChartRadarPane;
+import com.fr.design.mainframe.chart.gui.style.axis.ChartSecondValuePane;
+import com.fr.design.mainframe.chart.gui.style.axis.ChartValuePane;
 import com.fr.general.ComparatorUtils;
+import com.fr.log.FineLoggerFactory;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -45,10 +50,8 @@ public class ChartAxisFactory {
         Class<? extends ChartAxisUsePane> cls = map.get(clsName);
         try {
             return cls.newInstance();
-        } catch (InstantiationException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
-        } catch (IllegalAccessException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+        } catch (InstantiationException | IllegalAccessException e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return new ChartCategoryPane();
     }

designer-chart/src/main/java/com/fr/design/chart/ChartPlotFactory.java

@@ -1,10 +1,55 @@
 package com.fr.design.chart;
 
-import com.fr.base.FRContext;
-import com.fr.chart.chartattr.*;
-import com.fr.design.chart.axis.*;
-import com.fr.design.chart.series.SeriesCondition.dlp.*;
-import com.fr.design.mainframe.chart.gui.style.axis.*;
+import com.fr.chart.chartattr.Area3DPlot;
+import com.fr.chart.chartattr.AreaPlot;
+import com.fr.chart.chartattr.Bar2DPlot;
+import com.fr.chart.chartattr.Bar3DPlot;
+import com.fr.chart.chartattr.BubblePlot;
+import com.fr.chart.chartattr.CustomPlot;
+import com.fr.chart.chartattr.FunnelPlot;
+import com.fr.chart.chartattr.GanttPlot;
+import com.fr.chart.chartattr.LinePlot;
+import com.fr.chart.chartattr.MapPlot;
+import com.fr.chart.chartattr.MeterBluePlot;
+import com.fr.chart.chartattr.MeterPlot;
+import com.fr.chart.chartattr.Pie3DPlot;
+import com.fr.chart.chartattr.PiePlot;
+import com.fr.chart.chartattr.Plot;
+import com.fr.chart.chartattr.RadarPlot;
+import com.fr.chart.chartattr.RangePlot;
+import com.fr.chart.chartattr.StockPlot;
+import com.fr.chart.chartattr.XYScatterPlot;
+import com.fr.design.chart.axis.BinaryChartStyleAxisPane;
+import com.fr.design.chart.axis.ChartStyleAxisPane;
+import com.fr.design.chart.axis.CustomChartStyleAxisPane;
+import com.fr.design.chart.axis.GanntChartStyleAxisPane;
+import com.fr.design.chart.axis.RadarChartStyleAxisPane;
+import com.fr.design.chart.axis.TernaryChartStyleAxisPane;
+import com.fr.design.chart.axis.ValueChartStyleAxisPane;
+import com.fr.design.chart.axis.XYChartStyleAxisPane;
+import com.fr.design.chart.series.SeriesCondition.dlp.AreaDataLabelPane;
+import com.fr.design.chart.series.SeriesCondition.dlp.Bar2DDataLabelPane;
+import com.fr.design.chart.series.SeriesCondition.dlp.BubbleDataLabelPane;
+import com.fr.design.chart.series.SeriesCondition.dlp.DataLabelPane;
+import com.fr.design.chart.series.SeriesCondition.dlp.FunnelDataLabelPane;
+import com.fr.design.chart.series.SeriesCondition.dlp.LineDataLabelPane;
+import com.fr.design.chart.series.SeriesCondition.dlp.MapDataLabelPane;
+import com.fr.design.chart.series.SeriesCondition.dlp.MeterDataLabelPane;
+import com.fr.design.chart.series.SeriesCondition.dlp.PieDataLabelPane;
+import com.fr.design.chart.series.SeriesCondition.dlp.RadarDataLabelPane;
+import com.fr.design.chart.series.SeriesCondition.dlp.RangeDataLabelPane;
+import com.fr.design.chart.series.SeriesCondition.dlp.StockDataLabelPane;
+import com.fr.design.chart.series.SeriesCondition.dlp.XYDataLabelPane;
+import com.fr.design.mainframe.chart.gui.style.axis.ChartAxisUsePane;
+import com.fr.design.mainframe.chart.gui.style.axis.ChartCategoryNoFormulaPane;
+import com.fr.design.mainframe.chart.gui.style.axis.ChartCategoryPane;
+import com.fr.design.mainframe.chart.gui.style.axis.ChartPercentValueNoFormulaPane;
+import com.fr.design.mainframe.chart.gui.style.axis.ChartPercentValuePane;
+import com.fr.design.mainframe.chart.gui.style.axis.ChartSecondValueNoFormulaPane;
+import com.fr.design.mainframe.chart.gui.style.axis.ChartSecondValuePane;
+import com.fr.design.mainframe.chart.gui.style.axis.ChartValueNoFormulaPane;
+import com.fr.design.mainframe.chart.gui.style.axis.ChartValuePane;
+import com.fr.log.FineLoggerFactory;
 
 import java.lang.reflect.Constructor;
 import java.util.HashMap;
@@ -91,7 +136,7 @@ public class ChartPlotFactory {
                 Constructor<? extends ChartStyleAxisPane> c = factoryObject.getAxisPaneClass().getConstructor(Plot.class);
                 return c.newInstance(plot);
             } catch (Exception e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
         return new BinaryChartStyleAxisPane(plot);
@@ -109,7 +154,7 @@ public class ChartPlotFactory {
                 Constructor c = factoryObject.getDataLabelPaneClass().getConstructor();
                 return (DataLabelPane) c.newInstance();
             } catch (Exception e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
         return new DataLabelPane();
@@ -122,7 +167,7 @@ public class ChartPlotFactory {
                 Constructor c = aClass.getConstructor();
                 return (ChartAxisUsePane) c.newInstance();
             }catch (Exception e){
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
 

designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java

@@ -4,7 +4,6 @@ package com.fr.design.chart;
  *
  */
 
-import com.fr.base.FRContext;
 import com.fr.chart.base.ChartInternationalNameContentBean;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
@@ -17,6 +16,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.license.exception.RegistEditionException;
 import com.fr.license.function.VT4FR;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.BorderFactory;
 import javax.swing.DefaultListCellRenderer;
@@ -51,7 +51,7 @@ public class ChartTypePane extends ChartCommonWizardPane {
                         charts4Icon[i][j].getPlot().setLegend(null);
                     }
                 } catch (CloneNotSupportedException e) {
-                    FRContext.getLogger().error(e.getMessage(), e);
+                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 }
             }
         }
@@ -172,7 +172,7 @@ public class ChartTypePane extends ChartCommonWizardPane {
                 try {
                     oldChart.changePlotInNewType((Plot) chart.getPlot().clone());
                 } catch (CloneNotSupportedException e) {
-                    FRContext.getLogger().error(e.getMessage(), e);
+                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
                 }
             }
         }
@@ -195,7 +195,7 @@ public class ChartTypePane extends ChartCommonWizardPane {
                 chart4Update = (Chart)chart.clone();
                 cc.addChart(chart4Update);
             }catch (CloneNotSupportedException ex){
-                FRContext.getLogger().error(ex.getMessage(), ex);
+                FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
             }
         }
 

designer-chart/src/main/java/com/fr/design/chart/gui/ChartComponent.java

@@ -1,6 +1,5 @@
 package com.fr.design.chart.gui;
 
-import com.fr.base.FRContext;
 import com.fr.base.ScreenResolution;
 import com.fr.base.chart.BaseChart;
 import com.fr.base.chart.BaseChartCollection;
@@ -15,10 +14,19 @@ import com.fr.design.chart.gui.active.ActiveGlyph;
 import com.fr.design.chart.gui.active.ChartActiveGlyph;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.chart.MiddleChartComponent;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.core.PropertyChangeListener;
 
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Cursor;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Paint;
+import java.awt.Point;
+import java.awt.RenderingHints;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
@@ -122,7 +130,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
     		this.chartCollection4Design = (ChartCollection)cc;
 //    		this.chartCollection4Design = (ChartCollection)cc.clone();
 		} catch (Exception e) {
-			FRContext.getLogger().error("ChartCollection clone is Error");
+            FineLoggerFactory.getLogger().error("ChartCollection clone is Error");
 		}
         reset();
     }

designer-chart/src/main/java/com/fr/design/chart/gui/ChartWidgetOption.java

@@ -1,11 +1,11 @@
 package com.fr.design.chart.gui;
 
-import com.fr.base.FRContext;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.charttypes.ChartTypeManager;
 import com.fr.design.gui.core.WidgetOption;
 import com.fr.form.ui.ChartEditor;
 import com.fr.form.ui.Widget;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.Icon;
 
@@ -42,11 +42,11 @@ public class ChartWidgetOption extends WidgetOption {
 			widget.addChart((Chart) chart.clone());
 			return widget;
 		} catch (InstantiationException e) {
-			FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
 		} catch (IllegalAccessException e) {
-			FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
 		} catch (CloneNotSupportedException e) {
-			FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
 		}
 
 		return null;

designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapCustomPane.java

@@ -1,6 +1,5 @@
 package com.fr.design.chart.series.PlotSeries;
 
-import com.fr.base.FRContext;
 import com.fr.base.TableData;
 import com.fr.base.Utils;
 import com.fr.chart.base.MapSvgAttr;
@@ -16,13 +15,17 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.chart.gui.data.DatabaseTableDataPane;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralUtils;
-
 import com.fr.general.data.DataModel;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import org.apache.batik.swing.svg.SVGFileFilter;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JFileChooser;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
@@ -143,7 +146,7 @@ refreshAreaNameBox();
 		try {
 			embeddedTableData = DesignTableDataManager.previewTableDataNotNeedInputParameters(tableDataWrappe.getTableData(), TableData.RESULT_ALL, false);
 		} catch (Exception ee) {
-			FRContext.getLogger().error(ee.getMessage(), ee);
+            FineLoggerFactory.getLogger().error(ee.getMessage(), ee);
 		}
 
 		if(embeddedTableData == null){

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java

@@ -1,29 +1,27 @@
 package com.fr.design.chart.series.SeriesCondition;
 
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.text.ParseException;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.SpinnerNumberModel;
-
-import com.fr.base.FRContext;
 import com.fr.base.Utils;
 import com.fr.chart.base.ChartEquationType;
 import com.fr.chart.base.ConditionTrendLine;
-import com.fr.design.chart.comp.BorderAttriPane;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.chart.comp.BorderAttriPane;
 import com.fr.design.gui.ibutton.UIRadioButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UIBasicSpinner;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
-
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.log.FineLoggerFactory;
+
+import javax.swing.ButtonGroup;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.SpinnerNumberModel;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.text.ParseException;
 
 public class ConditionTrendLinePane extends BasicBeanPane<ConditionTrendLine> {
 	private static final long serialVersionUID = 3867164332100351117L;
@@ -197,7 +195,7 @@ public class ConditionTrendLinePane extends BasicBeanPane<ConditionTrendLine> {
     	try {
 			maSpinner.commitEdit();
 		} catch (ParseException e) {
-			FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
 		}
 
 		trendLine.getLine().setTrendLineName(nameLabel.getText());

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java

@@ -1,6 +1,5 @@
 package com.fr.design.chart.series.SeriesCondition;
 
-import com.fr.base.FRContext;
 import com.fr.chart.base.AttrAlpha;
 import com.fr.chart.base.AttrBackground;
 import com.fr.chart.base.AttrContents;
@@ -12,10 +11,12 @@ import com.fr.data.condition.ListCondition;
 import com.fr.design.condition.ConditionAttrSingleConditionPane;
 import com.fr.design.condition.ConditionAttributesPane;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.log.FineLoggerFactory;
 
-
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
 import java.util.Iterator;
 
 /**
@@ -114,9 +115,9 @@ public class DataSeriesConditionPane extends ConditionAttributesPane<ConditionAt
         try {
             return clazz.newInstance();
         } catch (InstantiationException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         } catch (IllegalAccessException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return null;
     }

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java

@@ -1,6 +1,5 @@
 package com.fr.design.mainframe.chart.gui;
 
-import com.fr.base.FRContext;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.Plot;
@@ -18,6 +17,7 @@ import com.fr.design.mainframe.chart.gui.item.FlexibleComboBox;
 import com.fr.design.mainframe.chart.gui.item.ItemEventType;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.general.ComparatorUtils;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
 import javax.swing.JPanel;
@@ -160,7 +160,7 @@ public class ChartTypePane extends AbstractChartAttrPane{
                     chart = newDefaultChart;
                 }
             }catch (CloneNotSupportedException e){
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
 
 			//这一步会替换plot

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/DatabaseTableDataPane.java

@@ -1,7 +1,6 @@
 package com.fr.design.mainframe.chart.gui.data;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.base.TableData;
 import com.fr.data.impl.NameTableData;
 import com.fr.design.constants.LayoutConstants;
@@ -13,6 +12,7 @@ import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.utils.gui.UIComponentUtils;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
@@ -106,7 +106,7 @@ public class DatabaseTableDataPane extends BasicPane{
 					try {
 						tableDataWrappe.previewData();
 					} catch (Exception e1) {
-						FRContext.getLogger().error(e1.getMessage(), e1);
+                        FineLoggerFactory.getLogger().error(e1.getMessage(), e1);
 					}
 				}
 				super.mouseReleased(e);

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/Factory4TableDataContentPane.java

@@ -1,9 +1,17 @@
 package com.fr.design.mainframe.chart.gui.data.table;
 
-import com.fr.base.FRContext;
-import com.fr.chart.chartattr.*;
+import com.fr.chart.chartattr.BubblePlot;
+import com.fr.chart.chartattr.GanttPlot;
+import com.fr.chart.chartattr.MeterBluePlot;
+import com.fr.chart.chartattr.MeterPlot;
+import com.fr.chart.chartattr.Pie3DPlot;
+import com.fr.chart.chartattr.PiePlot;
+import com.fr.chart.chartattr.Plot;
+import com.fr.chart.chartattr.SimpleMeterPlot;
+import com.fr.chart.chartattr.StockPlot;
+import com.fr.chart.chartattr.XYScatterPlot;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
-import com.fr.design.mainframe.chart.gui.style.axis.*;
+import com.fr.log.FineLoggerFactory;
 
 import java.lang.reflect.Constructor;
 import java.util.HashMap;
@@ -50,10 +58,8 @@ public class Factory4TableDataContentPane {
             }else{
                 return new CategoryPlotTableDataContentPane(parentPane);
             }
-        } catch (InstantiationException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return new CategoryPlotTableDataContentPane(parentPane);
     }

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AbstractChartTypePane.java

@@ -2,7 +2,6 @@ package com.fr.design.mainframe.chart.gui.type;
 
 import com.fr.base.ChartColorMatching;
 import com.fr.base.ChartPreStyleConfig;
-import com.fr.base.FRContext;
 import com.fr.base.background.ColorBackground;
 import com.fr.chart.base.AttrContents;
 import com.fr.chart.base.AttrFillStyle;
@@ -26,7 +25,6 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
-
 import com.fr.js.NameJavaScriptGroup;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.Constants;
@@ -309,7 +307,7 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane<Chart>{
                 try {
                     newPlot.setHotHyperLink((NameJavaScriptGroup)hotHyper.clone());
                 } catch (CloneNotSupportedException e) {
-                    FRContext.getLogger().error("Error in Hyperlink, Please Check it.", e);
+                    FineLoggerFactory.getLogger().error("Error in Hyperlink, Please Check it.", e);
                 }
             }
             newPlot.setConditionCollection(oldPlot.getConditionCollection());

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/MapPlotPane.java

@@ -1,6 +1,5 @@
 package com.fr.design.mainframe.chart.gui.type;
 
-import com.fr.base.FRContext;
 import com.fr.chart.base.ChartConstants;
 import com.fr.chart.base.ChartEnumDefinitions;
 import com.fr.chart.chartattr.Chart;
@@ -11,10 +10,10 @@ import com.fr.chart.charttypes.MapIndependentChart;
 import com.fr.design.chart.series.PlotSeries.MapGroupExtensionPane;
 import com.fr.design.chart.series.PlotStyle.ChartSelectDemoPane;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.log.FineLoggerFactory;
 
-
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
 
 public class MapPlotPane extends AbstractChartTypePane {
 
@@ -88,7 +87,7 @@ public class MapPlotPane extends AbstractChartTypePane {
             try{
                 plot = (MapPlot)chart.getPlot().clone();
             } catch (CloneNotSupportedException e){
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
 		plot.setMapName(groupExtensionPane.updateBean(plot));// 名字问题

designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/AxisPaneFactory.java

@@ -1,6 +1,6 @@
 package com.fr.van.chart.designer.style.axis;
 
-import com.fr.base.FRContext;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.area.VanChartAreaPlot;
 import com.fr.plugin.chart.attr.plot.VanChartAxisPlot;
 import com.fr.plugin.chart.column.VanChartColumnPlot;
@@ -64,7 +64,7 @@ public class AxisPaneFactory {
         try {
             return paneClass.newInstance();
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             return null;
         }
     }

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/VanChartGanttDataAndLinkPane.java

@@ -1,6 +1,5 @@
 package com.fr.van.chart.gantt.designer.data;
 
-import com.fr.base.FRContext;
 import com.fr.base.chart.chartdata.TopDefinitionProvider;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
@@ -11,7 +10,7 @@ import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.NormalChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.ReportDataPane;
 import com.fr.design.mainframe.chart.gui.data.TableDataPane;
-
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.gantt.data.VanGanttDefinition;
 import com.fr.van.chart.gantt.designer.data.link.GanttLinkReportDataPane;
 import com.fr.van.chart.gantt.designer.data.link.GanttLinkTableDataPane;
@@ -116,7 +115,7 @@ public class VanChartGanttDataAndLinkPane extends MultiTabPane<ChartCollection>
 
             return cloneCollection;
         } catch (Exception e){
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             return collection;
         }
     }
@@ -133,7 +132,7 @@ public class VanChartGanttDataAndLinkPane extends MultiTabPane<ChartCollection>
 
             return cloneCollection;
         } catch (Exception e){
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             return collection;
         }
     }

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataProjectPane.java

@@ -1,13 +1,12 @@
 package com.fr.van.chart.gantt.designer.data.data.component;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartdata.TopDefinition;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
-
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.gantt.data.VanGanttTableDefinition;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
@@ -247,7 +246,7 @@ public class GanttTableDataProjectPane extends AbstractTableDataContentPane impl
             try {
                 comboBoxList.add(StableUtils.cloneObject(columnNameList.get(i)));
             } catch (CloneNotSupportedException e) {
-                FRContext.getLogger().info(e.getMessage());
+                FineLoggerFactory.getLogger().info(e.getMessage());
             }
         }
     }

designer-chart/src/main/java/com/fr/van/chart/map/designer/data/MapDataPaneHelper.java

@@ -1,10 +1,10 @@
 package com.fr.van.chart.map.designer.data;
 
-import com.fr.base.FRContext;
 import com.fr.base.chart.chartdata.TopDefinitionProvider;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.Plot;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.drillmap.VanChartDrillMapPlot;
 import com.fr.plugin.chart.drillmap.data.DrillMapDefinition;
 import com.fr.plugin.chart.map.VanChartMapPlot;
@@ -33,7 +33,7 @@ public class MapDataPaneHelper {
             }
             return cloneCollection;
         } catch (Exception e){
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             return chartCollection;
         }
     }
@@ -54,7 +54,7 @@ public class MapDataPaneHelper {
             }
             return cloneCollection;
         } catch (Exception e){
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             return chartCollection;
         }
     }
@@ -76,7 +76,7 @@ public class MapDataPaneHelper {
             }
             return cloneCollection;
         } catch (Exception e){
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             return chartCollection;
         }
     }
@@ -99,7 +99,7 @@ public class MapDataPaneHelper {
             }
             return cloneCollection;
         } catch (Exception e){
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             return chartCollection;
         }
     }
@@ -126,7 +126,7 @@ public class MapDataPaneHelper {
             }
             return cloneCollection;
         } catch (Exception e){
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             return chartCollection;
         }
     }

designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java

@@ -1,6 +1,5 @@
 package com.fr.van.chart.map.designer.type;
 
-import com.fr.base.FRContext;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
@@ -67,7 +66,7 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane {
         try {
             sourceChoosePane = createSourceChoosePane();
         } catch (Exception e){
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return new Component[][]{
                 new Component[]{typePane},

designer-form/src/main/java/com/fr/design/designer/beans/adapters/component/CompositeComponentAdapter.java

@@ -1,6 +1,5 @@
 package com.fr.design.designer.beans.adapters.component;
 
-import com.fr.base.FRContext;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.beans.GroupModel;
 import com.fr.design.designer.beans.ComponentAdapter;
@@ -17,11 +16,18 @@ import com.fr.design.utils.ComponentUtils;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.form.ui.Button;
 import com.fr.form.ui.Widget;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.Action;
+import javax.swing.JComponent;
+import javax.swing.JPopupMenu;
+import java.awt.AlphaComposite;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
 import java.awt.event.MouseEvent;
 import java.beans.IntrospectionException;
 import java.util.ArrayList;
@@ -176,7 +182,7 @@ public class CompositeComponentAdapter implements ComponentAdapter {
 		try {
 			return xCreator.getPropertyDescriptorCreator().supportedDescriptor();
 		} catch (IntrospectionException ex) {
-			FRContext.getLogger().error(ex.getMessage(), ex);
+            FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
 			return new CRPropertyDescriptor[0];
 		}
 	}

designer-form/src/main/java/com/fr/design/designer/creator/CRPropertyDescriptorPane.java

@@ -1,6 +1,5 @@
 package com.fr.design.designer.creator;
 
-import com.fr.base.FRContext;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.gui.icheckbox.UICheckBox;
@@ -13,6 +12,8 @@ import com.fr.design.mainframe.widget.editors.ExtendedPropertyEditor;
 import com.fr.design.mainframe.widget.editors.StringEditor;
 import com.fr.form.ui.Widget;
 import com.fr.general.ComparatorUtils;
+import com.fr.log.FineLoggerFactory;
+
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import java.awt.Component;
@@ -103,7 +104,7 @@ public class CRPropertyDescriptorPane {
                 }
             });
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return component;
     }
@@ -115,7 +116,7 @@ public class CRPropertyDescriptorPane {
             propertyEditor.setValue(value);
             isPopulate = false;
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
 
     }
@@ -126,7 +127,7 @@ public class CRPropertyDescriptorPane {
             Object value = m.invoke(widget);
             return value;
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             return null;
         }
     }

designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java

@@ -3,7 +3,6 @@
  */
 package com.fr.design.designer.creator;
 
-import com.fr.base.FRContext;
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.form.layout.FRLayoutManager;
 import com.fr.design.form.util.XCreatorConstants;
@@ -15,11 +14,14 @@ import com.fr.design.parameter.ParameterBridge;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WLayout;
 import com.fr.general.Background;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JComponent;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.LayoutManager;
 import java.awt.event.ContainerEvent;
 import java.awt.event.ContainerListener;
 import java.beans.IntrospectionException;
@@ -298,7 +300,7 @@ public abstract class XLayoutContainer extends XBorderStyleWidgetCreator impleme
         if (layout instanceof FRLayoutManager) {
             return (FRLayoutManager) layout;
         }
-        FRContext.getLogger().error("FRLayoutManager isn't exsit!");
+        FineLoggerFactory.getLogger().error("FRLayoutManager isn't exsit!");
         return null;
     }
 

designer-form/src/main/java/com/fr/design/designer/creator/XWidgetCreator.java

@@ -4,16 +4,27 @@
 package com.fr.design.designer.creator;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.form.ui.Widget;
-
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.core.PropertyChangeAdapter;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.GraphicsConfiguration;
+import java.awt.Image;
+import java.awt.MediaTracker;
+import java.awt.Transparency;
 import java.beans.IntrospectionException;
 
 /**
@@ -139,7 +150,7 @@ public abstract class XWidgetCreator extends XCreator {
                 this.setRolloverIcon(new ImageIcon(image1));
                 this.setPressedIcon(new ImageIcon(image));//按下去的图标
             } catch (Exception e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
 

designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyAppRelayoutTable.java

@@ -1,18 +1,19 @@
 package com.fr.design.designer.properties.mobile;
 
-import java.awt.event.MouseEvent;
-import java.beans.IntrospectionException;
-import java.util.ArrayList;
-
-import com.fr.base.FRContext;
 import com.fr.design.designer.beans.events.DesignerEvent;
-import com.fr.design.designer.creator.*;
+import com.fr.design.designer.creator.CRPropertyDescriptor;
+import com.fr.design.designer.creator.XCreator;
 import com.fr.design.gui.itable.AbstractPropertyTable;
 import com.fr.design.gui.itable.PropertyGroup;
 import com.fr.design.gui.xtable.ReportAppPropertyGroupModel;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.mainframe.widget.editors.InChangeBooleanEditor;
+import com.fr.log.FineLoggerFactory;
+
+import java.awt.event.MouseEvent;
+import java.beans.IntrospectionException;
+import java.util.ArrayList;
 
 
 /**
@@ -50,7 +51,7 @@ public class BodyAppRelayoutTable extends AbstractPropertyTable {
 		try {
 			propertyTableEditor = supportedDescriptor();
 		}catch (IntrospectionException e) {
-			FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
 		}
 
 		groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Properties_Mobile"), xCreator, propertyTableEditor, designer)));

designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java

@@ -1,6 +1,5 @@
 package com.fr.design.designer.properties.mobile;
 
-import com.fr.base.FRContext;
 import com.fr.base.mobile.MobileFitAttrState;
 import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.creator.CRPropertyDescriptor;
@@ -14,7 +13,7 @@ import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.design.mainframe.widget.editors.InChangeBooleanEditor;
 import com.fr.design.mainframe.widget.editors.RefinedDoubleEditor;
 import com.fr.form.ui.ElementCaseEditor;
-
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.table.TableModel;
 import java.beans.IntrospectionException;
@@ -92,7 +91,7 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{
         try {
             propertyTableEditor = supportedDescriptor();
         } catch (IntrospectionException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
 
 

designer-form/src/main/java/com/fr/design/designer/treeview/ComponentTreeModel.java

@@ -1,6 +1,5 @@
 package com.fr.design.designer.treeview;
 
-import com.fr.base.FRContext;
 import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XLayoutContainer;
@@ -9,6 +8,7 @@ import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.designer.creator.XWidgetCreator;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.form.ui.Widget;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.event.TreeModelEvent;
 import javax.swing.event.TreeModelListener;
@@ -142,7 +142,7 @@ public class ComponentTreeModel implements TreeModel {
                 m.invoke(listener, evt);
             }
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }
 

designer-form/src/main/java/com/fr/design/gui/xtable/AbstractPropertyGroupModel.java

@@ -3,18 +3,17 @@
  */
 package com.fr.design.gui.xtable;
 
-import java.beans.PropertyEditor;
+import com.fr.design.beans.GroupModel;
+import com.fr.design.designer.creator.CRPropertyDescriptor;
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.mainframe.widget.editors.PropertyCellEditor;
+import com.fr.design.mainframe.widget.renderer.PropertyCellRenderer;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableCellRenderer;
-
-import com.fr.base.FRContext;
-import com.fr.design.beans.GroupModel;
-import com.fr.design.mainframe.widget.editors.PropertyCellEditor;
-import com.fr.design.mainframe.widget.renderer.PropertyCellRenderer;
-import com.fr.design.designer.creator.CRPropertyDescriptor;
-import com.fr.design.designer.creator.XCreator;
+import java.beans.PropertyEditor;
 
 /**
  * @author richer
@@ -53,7 +52,7 @@ public abstract class AbstractPropertyGroupModel implements GroupModel, Comparab
             try {
                 initRenderer(row);
             } catch (Exception e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
         return renderers[row];
@@ -65,7 +64,7 @@ public abstract class AbstractPropertyGroupModel implements GroupModel, Comparab
             try {
                 initEditor(row);
             } catch (Exception ex) {
-                FRContext.getLogger().error(ex.getMessage(), ex);
+                FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
             }
         }
         return editors[row];

designer-form/src/main/java/com/fr/design/gui/xtable/PropertyGroupModel.java

@@ -1,6 +1,5 @@
 package com.fr.design.gui.xtable;
 
-import com.fr.base.FRContext;
 import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.creator.CRPropertyDescriptor;
 import com.fr.design.designer.creator.XCreator;
@@ -8,7 +7,7 @@ import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.widget.editors.ExtendedPropertyEditor;
 import com.fr.design.mainframe.widget.editors.PropertyCellEditor;
 import com.fr.general.ComparatorUtils;
-
+import com.fr.log.FineLoggerFactory;
 import com.fr.report.stable.FormConstants;
 
 import java.beans.PropertyChangeEvent;
@@ -35,7 +34,7 @@ public class PropertyGroupModel extends AbstractPropertyGroupModel {
             Method m = properties[row].getReadMethod();
             return m.invoke(dealCreatorData());
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             return null;
         }
     }
@@ -59,7 +58,7 @@ public class PropertyGroupModel extends AbstractPropertyGroupModel {
             properties[row].firePropertyChanged();
             return true;
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             return false;
         }
     }

designer-form/src/main/java/com/fr/design/gui/xtable/ReportAppPropertyGroupModel.java

@@ -1,10 +1,10 @@
 package com.fr.design.gui.xtable;
 
-import com.fr.base.FRContext;
 import com.fr.design.designer.creator.CRPropertyDescriptor;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.general.ComparatorUtils;
+import com.fr.log.FineLoggerFactory;
 import com.fr.report.stable.FormConstants;
 
 import javax.swing.JOptionPane;
@@ -47,7 +47,7 @@ public class ReportAppPropertyGroupModel extends PropertyGroupModel {
             properties[row].firePropertyChanged();
             return true;
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             return false;
         }
     }

designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

@@ -1,6 +1,5 @@
 package com.fr.design.mainframe;
 
-import com.fr.base.FRContext;
 import com.fr.base.Parameter;
 import com.fr.base.ScreenResolution;
 import com.fr.base.vcs.DesignerMode;
@@ -63,6 +62,7 @@ import com.fr.form.ui.container.WBorderLayout;
 import com.fr.form.ui.container.WFitLayout;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.bridge.StableFactory;
 import com.fr.third.javax.annotation.Nullable;
@@ -1208,7 +1208,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
                 }
             }
         } catch (Exception e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }
 

designer-form/src/main/java/com/fr/design/mainframe/FormDesignerDropTarget.java

@@ -1,5 +1,14 @@
 package com.fr.design.mainframe;
 
+import com.fr.design.designer.creator.XCreator;
+import com.fr.form.data.DataBinding;
+import com.fr.form.ui.DataControl;
+import com.fr.form.ui.IframeEditor;
+import com.fr.form.ui.Widget;
+import com.fr.form.ui.WidgetValue;
+import com.fr.general.ComparatorUtils;
+import com.fr.log.FineLoggerFactory;
+
 import java.awt.Point;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
@@ -11,15 +20,6 @@ import java.awt.dnd.DropTargetDragEvent;
 import java.awt.dnd.DropTargetDropEvent;
 import java.io.IOException;
 
-import com.fr.base.FRContext;
-import com.fr.design.designer.creator.XCreator;
-import com.fr.form.data.DataBinding;
-import com.fr.form.ui.DataControl;
-import com.fr.form.ui.IframeEditor;
-import com.fr.form.ui.Widget;
-import com.fr.form.ui.WidgetValue;
-import com.fr.general.ComparatorUtils;
-
 public class FormDesignerDropTarget extends DropTargetAdapter {
 
     private FormDesigner designer;
@@ -84,9 +84,9 @@ public class FormDesignerDropTarget extends DropTargetAdapter {
             creator.rebuid();
             designer.getSelectionModel().setSelectedCreator(creator);
         } catch (UnsupportedFlavorException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         } catch (IOException e) {
-            FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }
 

designer-form/src/main/java/com/fr/design/mainframe/FormSelection.java

@@ -1,10 +1,5 @@
 package com.fr.design.mainframe;
 
-import java.awt.LayoutManager;
-import java.awt.Rectangle;
-import java.util.ArrayList;
-
-import com.fr.base.FRContext;
 import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.location.Direction;
@@ -16,9 +11,14 @@ import com.fr.design.designer.creator.XWAbsoluteLayout;
 import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.designer.creator.XWParameterLayout;
 import com.fr.design.designer.creator.cardlayout.XWCardTagLayout;
-import com.fr.form.ui.Widget;
 import com.fr.design.utils.ComponentUtils;
 import com.fr.design.utils.gui.LayoutUtils;
+import com.fr.form.ui.Widget;
+import com.fr.log.FineLoggerFactory;
+
+import java.awt.LayoutManager;
+import java.awt.Rectangle;
+import java.util.ArrayList;
 
 public class FormSelection {
 
@@ -322,7 +322,7 @@ public class FormSelection {
                 creator.setBounds(root.getBounds());
                 clipBoard.selection.add(creator);
             } catch (CloneNotSupportedException e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
     }

designer-form/src/main/java/com/fr/design/mainframe/FormSelectionUtils.java

@@ -1,6 +1,5 @@
 package com.fr.design.mainframe;
 
-import com.fr.base.FRContext;
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.AbstractLayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.FRTabFitLayoutAdapter;
@@ -19,6 +18,7 @@ import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WTitleLayout;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
+
 import java.awt.Component;
 import java.awt.Point;
 import java.awt.Rectangle;
@@ -112,7 +112,7 @@ public class FormSelectionUtils {
                     designer.getSelectionModel().getSelection().addSelectedCreator(copiedCreator);
                 }
             } catch (CloneNotSupportedException e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
         rebuildSelection(designer);

designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java

@@ -1,7 +1,6 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icontainer.UIScrollPane;
@@ -304,7 +303,7 @@ public class FormWidgetDetailPane extends FormDockView{
             public void actionPerformed(ActionEvent e) {
                 String url = CloudCenter.getInstance().acquireUrlByKind("reuse.url");
                 if (StringUtils.isEmpty(url)) {
-                    FRContext.getLogger().info("The URL is empty!");
+                    FineLoggerFactory.getLogger().info("The URL is empty!");
                     return;
                 }
                 try {

designer-form/src/main/java/com/fr/design/mainframe/TreeTransferHandler.java

@@ -1,22 +1,21 @@
 package com.fr.design.mainframe;
 
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.datatransfer.DataFlavor;
-
-import javax.swing.JComponent;
-import javax.swing.SwingUtilities;
-import javax.swing.TransferHandler;
-import javax.swing.tree.TreePath;
-
-import com.fr.base.FRContext;
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XCreatorUtils;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.utils.gui.LayoutUtils;
+import com.fr.log.FineLoggerFactory;
+
+import javax.swing.JComponent;
+import javax.swing.SwingUtilities;
+import javax.swing.TransferHandler;
+import javax.swing.tree.TreePath;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.datatransfer.DataFlavor;
 
 public class TreeTransferHandler extends TransferHandler {
 
@@ -59,7 +58,7 @@ public class TreeTransferHandler extends TransferHandler {
                     return canPathAccept(tree, newpath, draggedComponent, p);
                 }
             } catch (Exception ex) {
-                FRContext.getLogger().error(ex.getMessage(), ex);
+                FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
                 return false;
             }
         } else {
@@ -131,7 +130,7 @@ public class TreeTransferHandler extends TransferHandler {
 
                 return true;
             } catch (Exception ex) {
-                FRContext.getLogger().error(ex.getMessage(), ex);
+                FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
 
                 return false;
             }

designer-form/src/main/java/com/fr/design/parameter/FormParameterReader.java

@@ -1,9 +1,9 @@
 package com.fr.design.parameter;
 
-import com.fr.base.FRContext;
 import com.fr.base.Parameter;
 import com.fr.form.main.Form;
 import com.fr.form.main.FormIO;
+import com.fr.log.FineLoggerFactory;
 
 /**
  * @author richie
@@ -20,7 +20,7 @@ public class FormParameterReader extends AbstractParameterReader {
                 Form form = FormIO.readForm(tplPath);
                 return form.getParameters();
             } catch (Exception e1) {
-                FRContext.getLogger().error(e1.getMessage(), e1);
+                FineLoggerFactory.getLogger().error(e1.getMessage(), e1);
             }
             return new Parameter[0];
         }

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

@@ -3,24 +3,23 @@
  */
 package com.fr.design.actions.report;
 
-import java.util.Hashtable;
-
-import javax.swing.SwingUtilities;
-
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
-import com.fr.design.menu.KeySetUtils;
-import com.fr.page.ReportSettingsProvider;
 import com.fr.design.actions.ReportComponentAction;
+import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.headerfooter.EditFooterPane;
 import com.fr.design.mainframe.ReportComponent;
-import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.menu.KeySetUtils;
+import com.fr.log.FineLoggerFactory;
+import com.fr.page.ReportSettingsProvider;
 import com.fr.report.core.ReportHF;
 import com.fr.report.core.ReportUtils;
 import com.fr.report.report.Report;
 import com.fr.report.report.TemplateReport;
 import com.fr.report.stable.ReportConstants;
 
+import javax.swing.SwingUtilities;
+import java.util.Hashtable;
+
 /**
  * Footer action.
  */
@@ -85,7 +84,7 @@ public class ReportFooterAction extends ReportComponentAction<ReportComponent> {
             try {
                 reportHFHash.put(new Integer(reportHFType), report.getFooter(reportHFType).clone());
             } catch (Exception e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
     }

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

@@ -3,24 +3,23 @@
  */
 package com.fr.design.actions.report;
 
-import java.util.Hashtable;
-
-import javax.swing.SwingUtilities;
-
 import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
-import com.fr.design.menu.KeySetUtils;
-import com.fr.page.ReportSettingsProvider;
 import com.fr.design.actions.ReportComponentAction;
+import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.headerfooter.EditHeaderPane;
 import com.fr.design.mainframe.ReportComponent;
-import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.menu.KeySetUtils;
+import com.fr.log.FineLoggerFactory;
+import com.fr.page.ReportSettingsProvider;
 import com.fr.report.core.ReportHF;
 import com.fr.report.core.ReportUtils;
 import com.fr.report.report.Report;
 import com.fr.report.report.TemplateReport;
 import com.fr.report.stable.ReportConstants;
 
+import javax.swing.SwingUtilities;
+import java.util.Hashtable;
+
 /**
  * Header action.
  */
@@ -87,7 +86,7 @@ public class ReportHeaderAction extends ReportComponentAction<ReportComponent> {
             try {
                 reportHFHash.put(new Integer(reportHFType), report.getHeader(reportHFType).clone());
             } catch (Exception e) {
-                FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
     }

designer-realize/src/main/java/com/fr/design/cell/clipboard/CellElementsClip.java

@@ -3,8 +3,8 @@
  */
 package com.fr.design.cell.clipboard;
 
-import com.fr.base.FRContext;
 import com.fr.grid.selection.CellSelection;
+import com.fr.log.FineLoggerFactory;
 import com.fr.report.cell.CellElement;
 import com.fr.report.cell.CellElementComparator;
 import com.fr.report.cell.TemplateCellElement;
@@ -126,7 +126,7 @@ public class CellElementsClip implements Cloneable, java.io.Serializable {
     		try {
     			cellElement = (TemplateCellElement) clips[i].clone();
     		} catch (CloneNotSupportedException e) {
-    			FRContext.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
     			return null;
     		}
 

designer-realize/src/main/java/com/fr/design/cell/clipboard/FloatElementsClip.java

@@ -3,18 +3,18 @@
  */
 package com.fr.design.cell.clipboard;
 
-import java.util.Iterator;
-
-import com.fr.base.FRContext;
 import com.fr.design.cell.FloatElementsProvider;
 import com.fr.general.ComparatorUtils;
 import com.fr.grid.selection.FloatSelection;
+import com.fr.log.FineLoggerFactory;
 import com.fr.report.cell.FloatElement;
 import com.fr.report.elementcase.ElementCase;
 import com.fr.report.elementcase.TemplateElementCase;
 import com.fr.stable.unit.FU;
 import com.fr.stable.unit.OLDPIX;
 
+import java.util.Iterator;
+
 /**
  * The clip of Float Element.
  */
@@ -39,7 +39,7 @@ public class FloatElementsClip implements Cloneable, java.io.Serializable,FloatE
 		try {
 			ret = (FloatElement)this.floatEl.clone();
 		} catch (CloneNotSupportedException e) {
-			FRContext.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
 			return null;
 		}
 		

designer-realize/src/main/java/com/fr/design/cell/editor/DSColumnCellEditor.java

@@ -1,17 +1,12 @@
 package com.fr.design.cell.editor;
 
-import java.awt.Component;
-
-import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
-
-import com.fr.base.FRContext;
 import com.fr.design.data.DesignTableDataManager;
-import com.fr.design.dscolumn.DSColumnPane;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionListener;
+import com.fr.design.dscolumn.DSColumnPane;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.grid.Grid;
+import com.fr.log.FineLoggerFactory;
 import com.fr.report.cell.TemplateCellElement;
 import com.fr.report.core.SheetUtils;
 import com.fr.report.elementcase.TemplateElementCase;
@@ -19,6 +14,10 @@ import com.fr.report.poly.PolyECBlock;
 import com.fr.report.worksheet.WorkSheet;
 import com.fr.stable.ProductConstants;
 
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+import java.awt.Component;
+
 /**
  * CellEditor used to edit BindValuePainter object.
  */
@@ -74,7 +73,7 @@ public class DSColumnCellEditor extends AbstractCellEditor implements DialogActi
 		} catch (Exception exp) {
 			JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(grid), exp.getMessage(),
 					ProductConstants.APP_NAME, JOptionPane.ERROR_MESSAGE);
-			FRContext.getLogger().error(exp.getMessage(), exp);
+            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
 		}
 
 		return dsColumnDialog;