Merge pull request #57 in DESIGN/design from ~RICHIE/design:feature/10.0 to feature/10.0

* commit '643b69ea58ccfc46202bbb333d6602fff013e96b':
  无JIRA任务 Log整理

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

@@ -16,10 +16,10 @@ import com.fr.env.SignIn;
 import com.fr.file.FILEFactory;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogFormatter;
-import com.fr.general.FRLogger;
 import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.Constants;
 import com.fr.stable.EnvChangedListener;
 import com.fr.stable.ListMap;
@@ -34,10 +34,9 @@ import com.fr.stable.xml.XMLTools;
 import com.fr.stable.xml.XMLWriter;
 import com.fr.stable.xml.XMLableReader;
 
-import javax.swing.SwingWorker;
+import javax.swing.*;
 import javax.swing.SwingWorker.StateValue;
-import java.awt.Color;
+import java.awt.*;
-import java.awt.Rectangle;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileReader;
@@ -228,7 +227,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
                 try {
                     Thread.sleep(5000);
                 } catch (InterruptedException e) {
-                    FRLogger.getLogger().error("Map Save Error");
+                    FineLoggerFactory.getLogger().error("Map Save Error");
                 }
             }
         }

designer-base/src/com/fr/design/ExtraDesignClassManager.java

@@ -18,9 +18,9 @@ import com.fr.design.gui.core.WidgetOptionFactory;
 import com.fr.design.menu.ShortCut;
 import com.fr.design.widget.Appearance;
 import com.fr.form.ui.Widget;
-import com.fr.general.FRLogger;
 import com.fr.general.GeneralUtils;
 import com.fr.general.IOUtils;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.AbstractExtraClassManager;
 import com.fr.plugin.injectable.PluginModule;
 import com.fr.plugin.injectable.PluginSingleInjection;
@@ -208,7 +208,7 @@ public class ExtraDesignClassManager extends AbstractExtraClassManager implement
                 return (Feedback) clazz.newInstance();
             }
         } catch (Exception e) {
-            FRLogger.getLogger().info("no feed back support");
+            FineLoggerFactory.getLogger().info("no feed back support");
         }
         return Feedback.EMPTY;
     }

designer-base/src/com/fr/design/RestartHelper.java

@@ -2,11 +2,18 @@ package com.fr.design;
 
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
 import com.fr.general.GeneralUtils;
-import com.fr.stable.*;
+import com.fr.log.FineLoggerFactory;
-
+import com.fr.stable.ArrayUtils;
-import java.io.*;
+import com.fr.stable.OperatingSystem;
+import com.fr.stable.StableUtils;
+import com.fr.stable.StringUtils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.RandomAccessFile;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileLock;
 import java.util.ArrayList;
@@ -39,7 +46,7 @@ public class RestartHelper {
                 properties.load(file2DeleteInputStream);
                 file2DeleteInputStream.close();
             } catch (IOException e) {
-                FRLogger.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
         if (ArrayUtils.getLength(files) != 0) {
@@ -53,7 +60,7 @@ public class RestartHelper {
             properties.store(file2DeleteOutputStream, "save");
             file2DeleteOutputStream.close();
         } catch (IOException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }
 
@@ -71,7 +78,7 @@ public class RestartHelper {
                 properties.load(file2MoveInputStream);
                 file2MoveInputStream.close();
             } catch (IOException e) {
-                FRLogger.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         }
         if (!map.isEmpty()) {
@@ -84,7 +91,7 @@ public class RestartHelper {
             properties.store(file2MoveOutputStream, "save");
             file2MoveOutputStream.close();
         } catch (IOException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }
 
@@ -156,10 +163,10 @@ public class RestartHelper {
                 FileChannel restartLockFC = randomAccessFile.getChannel();
                 FileLock restartLock = restartLockFC.tryLock();
                 if(restartLock == null) {
-                    FRLogger.getLogger().error("restart lock null!");
+                    FineLoggerFactory.getLogger().error("restart lock null!");
                 }
             }catch (Exception e){
-                FRLogger.getLogger().error(e.getMessage());
+                FineLoggerFactory.getLogger().error(e.getMessage());
             }
             if (OperatingSystem.isMacOS()) {
                 restartInMacOS(installHome, filesToBeDelete);
@@ -167,7 +174,7 @@ public class RestartHelper {
                 restartInWindows(installHome, filesToBeDelete);
             }
         } catch (Exception e) {
-            FRLogger.getLogger().error(e.getMessage());
+            FineLoggerFactory.getLogger().error(e.getMessage());
         } finally {
             DesignerContext.getDesignerFrame().exit();
         }

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

@@ -1,22 +1,21 @@
 package com.fr.design.actions.community;
 
-import java.awt.Desktop;
-import java.awt.event.ActionEvent;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import javax.swing.JOptionPane;
-import javax.swing.KeyStroke;
-
 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.Inter;
 import com.fr.general.SiteCenter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
 public class BBSAction extends UpdateAction
 {
 	
@@ -46,12 +45,12 @@ public class BBSAction extends UpdateAction
 	            Desktop.getDesktop().browse(new URI(url));
 	        } catch (IOException exp) {
 	            JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser"));
-	            FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
 	        } catch (URISyntaxException exp) {
-	            FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
 	        } catch (Exception exp) {
-	            FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
-	            FRContext.getLogger().error("Can not open the browser for URL:  " + url);
+	            FineLoggerFactory.getLogger().error("Can not open the browser for URL:  " + url);
 	        }
 	}
 	  public static final MenuKeySet BBS = new MenuKeySet() {

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

@@ -1,22 +1,21 @@
 package com.fr.design.actions.community;
 
-import java.awt.Desktop;
-import java.awt.event.ActionEvent;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import javax.swing.JOptionPane;
-import javax.swing.KeyStroke;
-
 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.Inter;
 import com.fr.general.SiteCenter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
 public class BugAction extends UpdateAction
 {
 
@@ -40,12 +39,12 @@ public void actionPerformed(ActionEvent arg0)
          Desktop.getDesktop().browse(new URI(url));
      } catch (IOException exp) {
          JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser"));
-         FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+         FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
      } catch (URISyntaxException exp) {
-         FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+         FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
      } catch (Exception exp) {
-         FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+         FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
-         FRContext.getLogger().error("Can not open the browser for URL:  " + url);
+         FineLoggerFactory.getLogger().error("Can not open the browser for URL:  " + url);
      }
 
 }

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

@@ -1,22 +1,21 @@
 package com.fr.design.actions.community;
 
-import java.awt.Desktop;
-import java.awt.event.ActionEvent;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import javax.swing.JOptionPane;
-import javax.swing.KeyStroke;
-
 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.Inter;
 import com.fr.general.SiteCenter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
 public class NeedAction extends UpdateAction
 {
 
@@ -41,12 +40,12 @@ public class NeedAction extends UpdateAction
 	            Desktop.getDesktop().browse(new URI(url));
 	        } catch (IOException exp) {
 	            JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser"));
-	            FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
 	        } catch (URISyntaxException exp) {
-	            FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
 	        } catch (Exception exp) {
-	            FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
-	            FRContext.getLogger().error("Can not open the browser for URL:  " + url);
+	            FineLoggerFactory.getLogger().error("Can not open the browser for URL:  " + url);
 	        }
 
 	}

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

@@ -1,22 +1,21 @@
 package com.fr.design.actions.community;
 
-import java.awt.Desktop;
-import java.awt.event.ActionEvent;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import javax.swing.JOptionPane;
-import javax.swing.KeyStroke;
-
 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.Inter;
 import com.fr.general.SiteCenter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
 public class QuestionAction extends UpdateAction
 {
 
@@ -40,12 +39,12 @@ public void actionPerformed(ActionEvent arg0)
            Desktop.getDesktop().browse(new URI(url));
        } catch (IOException exp) {
            JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser"));
-           FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+           FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
        } catch (URISyntaxException exp) {
-           FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+           FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
        } catch (Exception exp) {
-           FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+           FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
-           FRContext.getLogger().error("Can not open the browser for URL:  " + url);
+           FineLoggerFactory.getLogger().error("Can not open the browser for URL:  " + url);
        }
 
 }

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

@@ -1,22 +1,21 @@
 package com.fr.design.actions.community;
 
-import java.awt.Desktop;
-import java.awt.event.ActionEvent;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import javax.swing.JOptionPane;
-import javax.swing.KeyStroke;
-
 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.Inter;
 import com.fr.general.SiteCenter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
 public class SignAction extends UpdateAction
 {
 
@@ -41,12 +40,12 @@ public class SignAction extends UpdateAction
 	            Desktop.getDesktop().browse(new URI(url));
 	        } catch (IOException exp) {
 	            JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser"));
-	            FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
 	        } catch (URISyntaxException exp) {
-	            FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
 	        } catch (Exception exp) {
-	            FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
-	            FRContext.getLogger().error("Can not open the browser for URL:  " + url);
+	            FineLoggerFactory.getLogger().error("Can not open the browser for URL:  " + url);
 	        }
 
 	}

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

@@ -1,22 +1,21 @@
 package com.fr.design.actions.community;
 
-import java.awt.Desktop;
-import java.awt.event.ActionEvent;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import javax.swing.JOptionPane;
-import javax.swing.KeyStroke;
-
 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.Inter;
 import com.fr.general.SiteCenter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
 public class UpAction extends UpdateAction
 {
 
@@ -41,12 +40,12 @@ public class UpAction extends UpdateAction
 	            Desktop.getDesktop().browse(new URI(url));
 	        } catch (IOException exp) {
 	            JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser"));
-	            FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
 	        } catch (URISyntaxException exp) {
-	            FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
 	        } catch (Exception exp) {
-	            FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+	            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
-	            FRContext.getLogger().error("Can not open the browser for URL:  " + url);
+	            FineLoggerFactory.getLogger().error("Can not open the browser for URL:  " + url);
 	        }
 
 	}

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

@@ -1,23 +1,22 @@
 package com.fr.design.actions.community;
 
-import java.awt.Desktop;
-import java.awt.event.ActionEvent;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Locale;
-
-import javax.swing.JOptionPane;
-import javax.swing.KeyStroke;
-
 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.Inter;
 import com.fr.general.SiteCenter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Locale;
+
 public class VideoAction extends UpdateAction
 {
 
@@ -47,12 +46,12 @@ public class VideoAction extends UpdateAction
 			Desktop.getDesktop().browse(new URI(url));
 		} catch (IOException exp) {
 			JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer_Set_default_browser"));
-			FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+			FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
 		} catch (URISyntaxException exp) {
-			FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+			FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
 		} catch (Exception exp) {
-			FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+			FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
-			FRContext.getLogger().error("Can not open the browser for URL:  " + url);
+			FineLoggerFactory.getLogger().error("Can not open the browser for URL:  " + url);
 		}
 
 	}

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

@@ -7,10 +7,9 @@ import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.design.selection.QuickEditor;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 
-import javax.swing.Action;
+import javax.swing.*;
-import javax.swing.KeyStroke;
 import java.awt.event.KeyEvent;
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
@@ -350,7 +349,7 @@ public class ActionFactory {
         if (c == null) {
             Class<? extends QuickEditor> cClazz = findQuickEditorClass(clazz, editorClassMap);
             if (cClazz == null) {
-                FRLogger.getLogger().error("No Such Editor");
+                FineLoggerFactory.getLogger().error("No Such Editor");
                 return null;
             }
             try {

designer-base/src/com/fr/design/actions/file/LocalePane.java

@@ -4,33 +4,40 @@
 
 package com.fr.design.actions.file;
 
-import java.awt.BorderLayout;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.*;
-
-import javax.swing.JTable;
-import javax.swing.RowFilter;
-import javax.swing.SwingWorker;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableRowSorter;
-
 import com.fr.base.Env;
 import com.fr.base.FRContext;
+import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.frpane.UITabbedPane;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.itextfield.UITextField;
-import com.fr.design.dialog.BasicPane;
 import com.fr.file.filetree.FileNode;
-import com.fr.general.*;
+import com.fr.general.GeneralUtils;
+import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
-import com.fr.stable.StringUtils;
 import com.fr.stable.bridge.StableFactory;
 import com.fr.stable.project.ProjectConstants;
 
+import javax.swing.*;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableRowSorter;
+import java.awt.*;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.Vector;
+
 /**
  * @author : richie
  * @since : 8.0
@@ -235,7 +242,7 @@ public class LocalePane extends BasicPane {
                 out.flush();
                 out.close();
             } catch (Exception e) {
-                FRLogger.getLogger().info(e.getMessage());
+                FineLoggerFactory.getLogger().info(e.getMessage());
             }
         }
     }

designer-base/src/com/fr/design/actions/file/PreferencePane.java

@@ -1,7 +1,6 @@
 package com.fr.design.actions.file;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.ServerConfig;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.RestartHelper;
 import com.fr.design.dialog.BasicDialog;
@@ -23,8 +22,9 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
-import com.fr.general.FRLevel;
 import com.fr.general.Inter;
+import com.fr.general.log.Log4jConfig;
+import com.fr.third.apache.log4j.Level;
 
 import javax.swing.*;
 import java.awt.*;
@@ -81,7 +81,7 @@ public class PreferencePane extends BasicPane {
     private static final String MINUS = "MINUS";
     private static final String DISPLAY_MINUS = "-";
 
-    private static final FRLevel[] LOG = {FRLevel.SEVERE, FRLevel.WARNING, FRLevel.INFO, FRLevel.DEBUG};
+    private static final Level[] LOG = {Level.FATAL, Level.ERROR, Level.WARN, Level.INFO, Level.DEBUG};
     private static java.util.List<String> LANGUAGE = new ArrayList<>();
 
     private static int designerEnvLanguageIndex; // 打开设置对话框时，设计器使用的语言
@@ -125,7 +125,7 @@ public class PreferencePane extends BasicPane {
         LANGUAGE.clear();
         Map<Locale, String> map = Inter.getSupportLocaleMap();
         LANGUAGE.add(Inter.getLocText("FR-Designer_Language_Default"));
-        for(Locale locale : map.keySet()){
+        for (Locale locale : map.keySet()) {
             LANGUAGE.add(getLocaledLanguage(map.get(locale), locale));
         }
     }
@@ -177,7 +177,7 @@ public class PreferencePane extends BasicPane {
         advancePane.add(spaceUpPane);
     }
 
-    private static String getLocaledLanguage(String key, Locale locale){
+    private static String getLocaledLanguage(String key, Locale locale) {
         StringBuilder sb = new StringBuilder();
         sb.append(Inter.getLocText(key)).append("(");
         sb.append(Inter.getLocText(key, locale)).append(")");
@@ -362,8 +362,8 @@ public class PreferencePane extends BasicPane {
         logLevelPane.add(logLevelComboBox);
         logLevelComboBox.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent e) {
-    
+
-                ServerConfig.getInstance().setServerLogLevel(((FRLevel) logLevelComboBox.getSelectedItem()).getLevel());
+                Log4jConfig.getInstance().setRootLevel((Level) logLevelComboBox.getSelectedItem());
             }
         });
     }
@@ -380,7 +380,7 @@ public class PreferencePane extends BasicPane {
         languageLabel.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
-                final  LocalePane localePane = new LocalePane();
+                final LocalePane localePane = new LocalePane();
                 BasicDialog dlg = localePane.showLargeWindow(SwingUtilities.getWindowAncestor(PreferencePane.this), new DialogActionAdapter() {
                     @Override
                     public void doOk() {
@@ -542,8 +542,8 @@ public class PreferencePane extends BasicPane {
         paginationLineColorTBButton.setColor(designerEnvManager.getPaginationLineColor());
 
         this.logExportDirectoryField.setText(designerEnvManager.getLogLocation());
-    
+
-        this.logLevelComboBox.setSelectedItem(FRLevel.getByLevel(ServerConfig.getInstance().getServerLogLevel()));
+        this.logLevelComboBox.setSelectedItem(Log4jConfig.getInstance().getRootLevel());
 
         this.languageComboBox.setSelectedItem(LANGUAGE.get(designerEnvManager.getLanguage()));
         designerEnvLanguageIndex = designerEnvManager.getLanguage();
@@ -622,8 +622,8 @@ public class PreferencePane extends BasicPane {
         if (maxUndoLimit.getSelectedIndex() == SELECTED_INDEX_5) {
             designerEnvManager.setUndoLimit(MAX_UNDO_LIMIT_50);
         }
-    
+
-        ServerConfig.getInstance().setServerLogLevel(((FRLevel) logLevelComboBox.getSelectedItem()).getLevel());
+        Log4jConfig.getInstance().setRootLevel(((Level) logLevelComboBox.getSelectedItem()));
 
     }
 

designer-base/src/com/fr/design/actions/file/SwitchExistEnv.java

@@ -1,14 +1,14 @@
 package com.fr.design.actions.file;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.Env;
 import com.fr.base.FRContext;
-import com.fr.base.env.resource.LocalEnvConfig;
+import com.fr.dav.LocalEnv;
-import com.fr.base.env.resource.RemoteEnvConfig;
-import com.fr.core.env.EnvConfig;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.tabledata.ResponseDataSourceChange;
+import com.fr.design.dialog.InformationWarnPane;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
@@ -18,11 +18,15 @@ import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.SeparatorDef;
 import com.fr.env.RemoteEnv;
 import com.fr.env.SignIn;
+import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.EnvChangedListener;
+import com.fr.stable.ProductConstants;
+import com.fr.stable.StringUtils;
 
-import javax.swing.JOptionPane;
+import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -66,10 +70,10 @@ public class SwitchExistEnv extends MenuDef {
 
         public GetExistEnvAction(String envName) {
             this.setName(envName);
-            EnvConfig env = DesignerEnvManager.getEnvManager().getEnv(envName);
+            Env env = DesignerEnvManager.getEnvManager().getEnv(envName);
-            if (env instanceof LocalEnvConfig) {
+            if (env instanceof LocalEnv) {
                 this.setSmallIcon(BaseUtils.readIcon("com/fr/design/images/data/bind/localconnect.png"));
-            } else if (env instanceof RemoteEnvConfig) {
+            } else if (env instanceof RemoteEnv) {
                 this.setSmallIcon(BaseUtils.readIcon("com/fr/design/images/data/bind/distanceconnect.png"));
             }
         }
@@ -97,12 +101,20 @@ public class SwitchExistEnv extends MenuDef {
          */
         public void actionPerformed(ActionEvent e) {
             DesignerEnvManager envManager = DesignerEnvManager.getEnvManager();
-            EnvConfig selectedEnv = envManager.getEnv(this.getName());
+            Env selectedEnv = envManager.getEnv(this.getName());
             try {
                 if (selectedEnv instanceof RemoteEnv && !((RemoteEnv) selectedEnv).testServerConnection()) {
                     JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Inter.getLocText(new String[]{"M-SwitchWorkspace", "Failed"}));
                     return;
                 }
+                String remoteVersion = selectedEnv.getDesignerVersion();
+                if (StringUtils.isBlank(remoteVersion) || ComparatorUtils.compare(remoteVersion, ProductConstants.DESIGNER_VERSION) < 0) {
+                    String infor = Inter.getLocText("Server-version-tip");
+                    String moreInfo = Inter.getLocText("Server-version-tip-moreInfo");
+                    FineLoggerFactory.getLogger().error(infor);
+                    new InformationWarnPane(infor, moreInfo, Inter.getLocText("Tooltips")).show();
+                    return;
+                }
                 SignIn.signIn(selectedEnv);
                 HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().refreshToolArea();
                 fireDSChanged();

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

@@ -7,6 +7,8 @@ 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;
+import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilable.UILabel;
@@ -16,13 +18,11 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.DesignerContext;
-import com.fr.design.dialog.BasicDialog;
+import com.fr.design.utils.DesignUtils;
-import com.fr.design.dialog.BasicPane;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
-import com.fr.design.utils.DesignUtils;
 
 import javax.swing.*;
 import javax.swing.border.Border;
@@ -33,7 +33,12 @@ import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.PlainDocument;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.util.Date;
 import java.util.concurrent.CancellationException;
 
@@ -275,7 +280,7 @@ public class FeedBackPane extends BasicPane {
                 try {
                     return DesignUtils.sendFeedBack(feedBackInfo);
                 } catch (Exception e) {
-                    FRLogger.getLogger().error(e.getMessage());
+                    FineLoggerFactory.getLogger().error(e.getMessage());
                     return false;
                 }
             }

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

@@ -10,6 +10,7 @@ import com.fr.design.actions.UpdateAction;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.general.Inter;
 import com.fr.general.SiteCenter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
@@ -48,12 +49,12 @@ public class ForumAction extends UpdateAction {
             Desktop.getDesktop().browse(new URI(url));
         } catch (IOException exp) {
             JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser"));
-            FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
         } catch (URISyntaxException exp) {
-            FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
         } catch (Exception exp) {
-            FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
-            FRContext.getLogger().error("Can not open the browser for URL:  " + url);
+            FineLoggerFactory.getLogger().error("Can not open the browser for URL:  " + url);
         }
     }
 

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

@@ -5,10 +5,10 @@
 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.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ProductConstants;
 
 import javax.swing.*;
@@ -38,9 +38,9 @@ public class SupportQQAction extends UpdateAction {
             Desktop.getDesktop().browse(new URI(ProductConstants.SUPPORT_QQ));
         } catch (IOException exp) {
             JOptionPane.showMessageDialog(null, Inter.getLocText("Set_default_browser"));
-            FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
         } catch (URISyntaxException exp) {
-            FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+            FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
         }
     }
 

designer-base/src/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java

@@ -8,12 +8,17 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.general.FRLogger;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 
 /**
  * Created by XiaXiang on 2017/4/6.
@@ -202,7 +207,7 @@ public class AlphaFineConfigPane extends BasicPane {
             DesignerEnvManager.loadLogSetting();
             DesignerEnvManager.getEnvManager().saveXMLFile();
         } catch (Exception e) {
-            FRLogger.getLogger().error(e.getMessage());
+            FineLoggerFactory.getLogger().error(e.getMessage());
         }
 
 

designer-base/src/com/fr/design/condition/LiteConditionPane.java

@@ -3,7 +3,11 @@ package com.fr.design.condition;
 import com.fr.base.BaseFormula;
 import com.fr.base.BaseUtils;
 import com.fr.data.DataConstants;
-import com.fr.data.condition.*;
+import com.fr.data.condition.CommonCondition;
+import com.fr.data.condition.FormulaCondition;
+import com.fr.data.condition.JoinCondition;
+import com.fr.data.condition.ListCondition;
+import com.fr.data.condition.ObjectCondition;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.formula.FormulaFactory;
@@ -18,9 +22,9 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.scrollruler.ModLineBorder;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
 import com.fr.general.Inter;
 import com.fr.general.data.Condition;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
 import javax.swing.*;
@@ -960,7 +964,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
             try{
                 newCondition = (Condition)joinCondition.getCondition().clone();
             }catch (CloneNotSupportedException e){
-                FRLogger.getLogger().error(e.getMessage());
+                FineLoggerFactory.getLogger().error(e.getMessage());
             }
             return newCondition;
         }

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

@@ -33,15 +33,11 @@ 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.general.FRLogger;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
-import javax.swing.JList;
+import javax.swing.*;
-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;
@@ -52,9 +48,7 @@ import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeCellRenderer;
 import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
-import java.awt.BorderLayout;
+import java.awt.*;
-import java.awt.Component;
-import java.awt.Dimension;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
 import java.awt.event.ItemEvent;
@@ -283,7 +277,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
                         schemaBox.setSelectedIndex(index);
                     }
                 } catch (Exception e) {
-                    FRLogger.getLogger().error(e.getMessage());
+                    FineLoggerFactory.getLogger().error(e.getMessage());
                 }
                 schemaBox.setRefreshingModel(false);
                 schemaBox.removePopupMenuListener(listener);

designer-base/src/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java

@@ -12,9 +12,10 @@ import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.scrollruler.ModLineBorder;
+import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.EncodeConstants;
-import com.fr.design.utils.gui.GUICoreUtils;
 
 import javax.swing.*;
 import java.awt.*;
@@ -121,7 +122,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
                         okButton.setEnabled(true);
                         message.setText(database.connectMessage(connect));
                     } catch (Exception exp) {
-                        FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+                        FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
                     }
                     return null;
                 }

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

@@ -26,6 +26,7 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.function.TIME;
 import com.fr.general.FRFont;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.*;
 import javax.swing.table.DefaultTableCellRenderer;
@@ -298,7 +299,7 @@ public class PreviewTablePane extends BasicPane {
             FRContext.getLogger().error(e.getMessage(), e);
             return;
         }
-        FRContext.getLogger().errorWithServerLevel(exp.getMessage(), exp);
+        FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
         JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), columnErrMessage, Inter.getLocText("FR-Designer_Error"), JOptionPane.ERROR_MESSAGE);
     }
 

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

@@ -4,12 +4,13 @@ import com.fr.base.BaseUtils;
 import com.fr.base.Env;
 import com.fr.base.FRContext;
 import com.fr.base.TableData;
-import com.fr.design.data.DesignTableDataManager;
 import com.fr.data.impl.storeproc.ProcedureDataModel;
 import com.fr.data.impl.storeproc.StoreProcedure;
+import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.preview.PreviewTablePane;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.env.RemoteEnv;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.*;
 import java.util.ArrayList;
@@ -99,7 +100,7 @@ public final class StoreProcedureNameWrapper implements TableDataWrapper {
                 createStore(false);
                 columnNameList = Arrays.asList(procedureDataModel.getColumnName());
             } catch (Exception e) {
-                FRContext.getLogger().errorWithServerLevel(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
 
         } else {

designer-base/src/com/fr/design/extra/PluginDetailPane.java

@@ -1,8 +1,8 @@
 package com.fr.design.extra;
 
 import com.fr.design.dialog.BasicPane;
-import com.fr.general.FRLogger;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.view.PluginView;
 import com.fr.stable.StringUtils;
 
@@ -44,7 +44,7 @@ public class PluginDetailPane extends BasicPane {
                     try {
                         Desktop.getDesktop().browse(linkUrl.toURI());
                     } catch (IOException | URISyntaxException e1) {
-                        FRLogger.getLogger().error(e1.getMessage());
+                        FineLoggerFactory.getLogger().error(e1.getMessage());
                     }
                 }
             }

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

@@ -5,9 +5,9 @@ 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.general.FRLogger;
 import com.fr.general.Inter;
 import com.fr.json.JSONObject;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.manage.PluginManager;
 import com.fr.plugin.manage.control.PluginTaskResult;
@@ -15,11 +15,7 @@ import com.fr.plugin.manage.control.ProgressCallback;
 import com.fr.plugin.view.PluginView;
 import com.fr.stable.StringUtils;
 
-import javax.swing.JComponent;
+import javax.swing.*;
-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;
@@ -180,7 +176,7 @@ public class PluginFromStorePane extends PluginAbstractLoadingViewPane<List<Plug
                 @Override
                 public void done(PluginTaskResult result) {
                     if (result.isSuccess()) {
-                        FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Install_Success"));
+                        FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Install_Success"));
                         JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Install_Successful"));
                     } else {
                         JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);

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

@@ -10,12 +10,12 @@ 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.FRLogger;
 import com.fr.general.Inter;
 import com.fr.general.SiteCenter;
 import com.fr.general.http.HttpClient;
 import com.fr.json.JSONArray;
 import com.fr.json.JSONObject;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.manage.PluginManager;
@@ -26,8 +26,7 @@ import com.fr.plugin.manage.control.PluginTaskResult;
 import com.fr.plugin.view.PluginView;
 import com.fr.stable.StringUtils;
 
-import javax.swing.JOptionPane;
+import javax.swing.*;
-import javax.swing.SwingUtilities;
 import java.io.File;
 import java.util.List;
 
@@ -117,7 +116,7 @@ public class PluginOperateUtils {
             JSONArray jsonArray = new JSONArray(result);
             resultArray = PluginUtils.filterPluginsFromVersion(jsonArray);
         } catch (Exception e) {
-            FRLogger.getLogger().error(e.getMessage());
+            FineLoggerFactory.getLogger().error(e.getMessage());
         }
         return resultArray.toString();
     }

designer-base/src/com/fr/design/extra/PluginUpdatePane.java

@@ -4,9 +4,9 @@ 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.general.FRLogger;
 import com.fr.general.Inter;
 import com.fr.json.JSONObject;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.manage.PluginManager;
 import com.fr.plugin.manage.control.PluginTaskResult;
@@ -14,12 +14,7 @@ import com.fr.plugin.manage.control.ProgressCallback;
 import com.fr.plugin.view.PluginView;
 import com.fr.stable.StringUtils;
 
-import javax.swing.JComponent;
+import javax.swing.*;
-import javax.swing.JFileChooser;
-import javax.swing.JLabel;
-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;
@@ -203,7 +198,7 @@ public class PluginUpdatePane extends PluginAbstractLoadingViewPane<List<PluginV
             @Override
             public void done(PluginTaskResult result) {
                 if (result.isSuccess()) {
-                    FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Update_Success"));
+                    FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Update_Success"));
                     JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Install_Successful"));
                 } else {
                     JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);

designer-base/src/com/fr/design/extra/PluginUtils.java

@@ -1,17 +1,16 @@
 package com.fr.design.extra;
 
 import com.fr.base.TemplateUtils;
-import com.fr.general.FRLogger;
 import com.fr.general.Inter;
 import com.fr.general.SiteCenter;
 import com.fr.general.http.HttpClient;
 import com.fr.json.JSONArray;
 import com.fr.json.JSONObject;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.basic.version.Version;
 import com.fr.plugin.basic.version.VersionIntervalFactory;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.context.PluginMarker;
-
 import com.fr.plugin.error.PluginErrorCode;
 import com.fr.plugin.manage.PluginManager;
 import com.fr.plugin.view.PluginView;
@@ -57,7 +56,7 @@ public class PluginUtils {
                 httpClient.asGet();
                 result = httpClient.getResponseText();
             } catch (Exception e) {
-                FRLogger.getLogger().error(e.getMessage());
+                FineLoggerFactory.getLogger().error(e.getMessage());
             }
         } else {
             result = PluginConstants.CONNECTION_404;

designer-base/src/com/fr/design/extra/PluginWebBridge.java

@@ -14,11 +14,11 @@ import com.fr.design.extra.exe.SearchOnlineExecutor;
 import com.fr.design.extra.exe.callback.JSCallback;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.utils.concurrent.ThreadFactoryBuilder;
-import com.fr.general.FRLogger;
 import com.fr.general.Inter;
 import com.fr.general.SiteCenter;
 import com.fr.json.JSONException;
 import com.fr.json.JSONObject;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.manage.PluginManager;
@@ -30,10 +30,8 @@ import javafx.stage.FileChooser;
 import javafx.stage.Stage;
 import netscape.javascript.JSObject;
 
-import javax.swing.JDialog;
+import javax.swing.*;
-import javax.swing.JOptionPane;
+import java.awt.*;
-import javax.swing.SwingUtilities;
-import java.awt.Desktop;
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
@@ -354,7 +352,7 @@ public class PluginWebBridge {
             Task<Void> task = new PluginTask<>(webEngine, callback, new GetPluginFromStoreExecutor(new JSONObject(info)));
             threadPoolExecutor.submit(task);
         } catch (JSONException e) {
-            FRLogger.getLogger().error(e.getMessage());
+            FineLoggerFactory.getLogger().error(e.getMessage());
         }
     }
 
@@ -490,10 +488,10 @@ public class PluginWebBridge {
                 }
             } catch (NullPointerException e) {
                 //此为uri为空时抛出异常
-                FRLogger.getLogger().error(e.getMessage());
+                FineLoggerFactory.getLogger().error(e.getMessage());
             } catch (IOException e) {
                 //此为无法获取系统默认浏览器
-                FRLogger.getLogger().error(e.getMessage());
+                FineLoggerFactory.getLogger().error(e.getMessage());
             }
         }
     }
@@ -505,7 +503,7 @@ public class PluginWebBridge {
         try {
             Desktop.getDesktop().browse(new URI(SiteCenter.getInstance().acquireUrlByKind("bbs.register")));
         } catch (Exception e) {
-            FRContext.getLogger().info(e.getMessage());
+            FineLoggerFactory.getLogger().info(e.getMessage());
         }
     }
 

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

@@ -2,6 +2,7 @@ package com.fr.design.extra;
 
 import com.fr.base.FRContext;
 import com.fr.general.*;
+import com.fr.log.FineLoggerFactory;
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
@@ -148,7 +149,7 @@ public class QQLoginWebPane extends JFXPanel {
                 }
             });
         } catch (Exception e) {
-            FRLogger.getLogger().error(e.getMessage());
+            FineLoggerFactory.getLogger().error(e.getMessage());
         }
     }
 

designer-base/src/com/fr/design/extra/exe/GetPluginFromStoreExecutor.java

@@ -4,11 +4,11 @@ import com.fr.design.extra.PluginConstants;
 import com.fr.design.extra.PluginOperateUtils;
 import com.fr.design.extra.PluginUtils;
 import com.fr.design.extra.Process;
-import com.fr.general.FRLogger;
 import com.fr.general.SiteCenter;
 import com.fr.general.http.HttpClient;
 import com.fr.json.JSONArray;
 import com.fr.json.JSONObject;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
 /**
@@ -72,7 +72,7 @@ public class GetPluginFromStoreExecutor implements Executor {
                                 JSONArray resultJSONArray = PluginUtils.filterPluginsFromVersion(resultArr);
                                 result = resultJSONArray.toString();
                             } catch (Exception e) {
-                                FRLogger.getLogger().error(e.getMessage());
+                                FineLoggerFactory.getLogger().error(e.getMessage());
                             }
                         } else {
                             result = PluginConstants.CONNECTION_404;

designer-base/src/com/fr/design/extra/exe/ReadUpdateOnlineExecutor.java

@@ -2,9 +2,9 @@ package com.fr.design.extra.exe;
 
 import com.fr.design.extra.PluginsReaderFromStore;
 import com.fr.design.extra.Process;
-import com.fr.general.FRLogger;
 import com.fr.json.JSONArray;
 import com.fr.json.JSONObject;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.view.PluginView;
 import com.fr.stable.StringUtils;
 
@@ -42,7 +42,7 @@ public class ReadUpdateOnlineExecutor implements Executor {
                             }
                             result = jsonArray.toString();
                         } catch (Exception e) {
-                            FRLogger.getLogger().error(e.getMessage());
+                            FineLoggerFactory.getLogger().error(e.getMessage());
                         }
                     }
                 }

designer-base/src/com/fr/design/extra/exe/SearchOnlineExecutor.java

@@ -3,11 +3,11 @@ package com.fr.design.extra.exe;
 import com.fr.design.extra.PluginOperateUtils;
 import com.fr.design.extra.PluginUtils;
 import com.fr.design.extra.Process;
-import com.fr.general.FRLogger;
 import com.fr.general.SiteCenter;
 import com.fr.general.http.HttpClient;
 import com.fr.json.JSONArray;
 import com.fr.json.JSONObject;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
 /**
@@ -50,7 +50,7 @@ public class SearchOnlineExecutor implements Executor {
                             JSONArray resultJSONArray = PluginUtils.filterPluginsFromVersion(jsonArray);
                             result = resultJSONArray.toString();
                         } catch (Exception e) {
-                            FRLogger.getLogger().error(e.getMessage());
+                            FineLoggerFactory.getLogger().error(e.getMessage());
                         }
                     }
                 }

designer-base/src/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java

@@ -2,8 +2,8 @@ package com.fr.design.extra.exe.callback;
 
 import com.fr.design.extra.PluginOperateUtils;
 import com.fr.design.extra.PluginUtils;
-import com.fr.general.FRLogger;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.error.PluginErrorCode;
 import com.fr.plugin.manage.PluginManager;
@@ -37,7 +37,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
     public void done(PluginTaskResult result) {
         if (result.isSuccess()) {
             jsCallback.execute("success");
-            FRLogger.getLogger().info(Inter.getLocText("FR-Plugin_Install_Success"));
+            FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Plugin_Install_Success"));
             JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Plugin_Install_Success"));
         } else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) {
             int rv = JOptionPane.showOptionDialog(
@@ -76,7 +76,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
             PluginOperateUtils.updatePluginFromDisk(zipFile, jsCallback);
         }else {
             jsCallback.execute("failed");
-            FRLogger.getLogger().info(Inter.getLocText("FR-Plugin_Install_Failed"));
+            FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Plugin_Install_Failed"));
             JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Plugin_Install_Failed"), JOptionPane.ERROR_MESSAGE);
         }
     }

designer-base/src/com/fr/design/extra/exe/callback/InstallOnlineCallback.java

@@ -1,8 +1,8 @@
 package com.fr.design.extra.exe.callback;
 
 import com.fr.design.extra.PluginOperateUtils;
-import com.fr.general.FRLogger;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.error.PluginErrorCode;
 import com.fr.plugin.manage.control.AbstractDealPreTaskCallback;
@@ -35,7 +35,7 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback {
         String pluginInfo = PluginOperateUtils.getSuccessInfo(result);
         if (result.isSuccess()) {
             jsCallback.execute("success");
-            FRLogger.getLogger().info(pluginInfo + Inter.getLocText("FR-Plugin_Install_Success"));
+            FineLoggerFactory.getLogger().info(pluginInfo + Inter.getLocText("FR-Plugin_Install_Success"));
             JOptionPane.showMessageDialog(null, pluginInfo + Inter.getLocText("FR-Plugin_Install_Success"));
         } else if(result.errorCode() == PluginErrorCode.HasLowerPluginWhenInstall){
             int rv = JOptionPane.showOptionDialog(
@@ -55,7 +55,7 @@ public class InstallOnlineCallback extends AbstractDealPreTaskCallback {
             PluginOperateUtils.updatePluginOnline(pluginMarker, jsCallback);
         }else {
             jsCallback.execute("failed");
-            FRLogger.getLogger().info(Inter.getLocText("FR-Plugin_Install_Failed"));
+            FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Plugin_Install_Failed"));
             JOptionPane.showMessageDialog(null, pluginInfo, Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }

designer-base/src/com/fr/design/extra/exe/callback/UninstallPluginCallback.java

@@ -1,8 +1,8 @@
 package com.fr.design.extra.exe.callback;
 
 import com.fr.design.extra.PluginUtils;
-import com.fr.general.FRLogger;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.error.PluginErrorCode;
 import com.fr.plugin.manage.PluginManager;
@@ -25,7 +25,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback {
     public void done(PluginTaskResult result) {
         if (result.isSuccess()) {
             jsCallback.execute("success");
-            FRLogger.getLogger().info(Inter.getLocText("FR-Plugin_Delete_Success"));
+            FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Plugin_Delete_Success"));
             JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Plugin_Delete_Success"));
         }else if (result.errorCode() == PluginErrorCode.NeedUninstallDependingPluginFirst) {
             int rv = JOptionPane.showOptionDialog(
@@ -44,7 +44,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback {
             PluginManager.getController().uninstall(pluginMarker, true, new UninstallPluginCallback(pluginMarker, jsCallback));
         } else {
             jsCallback.execute("failed");
-            FRLogger.getLogger().info(Inter.getLocText("FR-Plugin_Delete_Failed"));
+            FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Plugin_Delete_Failed"));
             JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }

designer-base/src/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java

@@ -2,8 +2,8 @@ package com.fr.design.extra.exe.callback;
 
 import com.fr.design.extra.PluginOperateUtils;
 import com.fr.design.extra.PluginUtils;
-import com.fr.general.FRLogger;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.error.PluginErrorCode;
 import com.fr.plugin.manage.PluginManager;
@@ -37,7 +37,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
     public void done(PluginTaskResult result) {
         if (result.isSuccess()) {
             jsCallback.execute("success");
-            FRLogger.getLogger().info(Inter.getLocText("FR-Plugin_Update_Success"));
+            FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Plugin_Update_Success"));
             JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Plugin_Update_Success"));
         } else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) {
             int rv = JOptionPane.showOptionDialog(
@@ -76,7 +76,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
             PluginOperateUtils.installPluginFromDisk(zipFile, jsCallback);
         }else {
             jsCallback.execute("failed");
-            FRLogger.getLogger().info(Inter.getLocText("FR-Plugin_Update_Failed"));
+            FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Plugin_Update_Failed"));
             JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }

designer-base/src/com/fr/design/extra/exe/callback/UpdateOnlineCallback.java

@@ -1,9 +1,8 @@
 package com.fr.design.extra.exe.callback;
 
-import com.fr.design.extra.PluginUtils;
 import com.fr.design.extra.PluginOperateUtils;
-import com.fr.general.FRLogger;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.manage.control.AbstractDealPreTaskCallback;
 import com.fr.plugin.manage.control.PluginTask;
 import com.fr.plugin.manage.control.PluginTaskResult;
@@ -32,11 +31,11 @@ public class UpdateOnlineCallback extends AbstractDealPreTaskCallback {
         String pluginInfo = PluginOperateUtils.getSuccessInfo(result);
         if (result.isSuccess()) {
             jsCallback.execute("success");
-            FRLogger.getLogger().info(pluginInfo + Inter.getLocText("FR-Plugin_Update_Success"));
+            FineLoggerFactory.getLogger().info(pluginInfo + Inter.getLocText("FR-Plugin_Update_Success"));
             JOptionPane.showMessageDialog(null,pluginInfo + Inter.getLocText("FR-Plugin_Update_Success"));
         } else {
             jsCallback.execute("failed");
-            FRLogger.getLogger().info(Inter.getLocText("FR-Plugin_Update_Failed"));
+            FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Plugin_Update_Failed"));
             JOptionPane.showMessageDialog(null, pluginInfo, Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }

designer-base/src/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java

@@ -2,8 +2,8 @@ package com.fr.design.extra.tradition.callback;
 
 import com.fr.design.extra.PluginStatusCheckCompletePane;
 import com.fr.design.extra.PluginUtils;
-import com.fr.general.FRLogger;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginMarker;
 import com.fr.plugin.error.PluginErrorCode;
 import com.fr.plugin.manage.PluginManager;
@@ -31,7 +31,7 @@ public class UpdateOnlineCallback implements ProgressCallback {
 
     public void done(PluginTaskResult result){
         if (result.isSuccess()) {
-            FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Update_Success"));
+            FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Update_Success"));
             JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer-Plugin_Install_Successful"));
         } else if (result.errorCode() == PluginErrorCode.OperationNotSupport) {
             int rv = JOptionPane.showOptionDialog(
@@ -49,7 +49,7 @@ public class UpdateOnlineCallback implements ProgressCallback {
             }
             PluginManager.getController().update(pluginMarker, toPluginMarker, new UpdateOnlineCallback(pluginMarker, toPluginMarker, pane));
         } else {
-            FRLogger.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Delete_Failed"));
+            FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Designer-Plugin_Delete_Failed"));
             JOptionPane.showMessageDialog(null, PluginUtils.getMessageByErrorCode(result.errorCode()), Inter.getLocText("FR-Designer-Plugin_Warning"), JOptionPane.ERROR_MESSAGE);
         }
     }

designer-base/src/com/fr/design/file/HistoryTemplateListPane.java

@@ -1,40 +1,37 @@
 package com.fr.design.file;
 
-import java.awt.*;
+import com.fr.base.FRContext;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.*;
-import java.util.List;
-import java.util.logging.Level;
-
-import javax.swing.*;
-
 import com.fr.base.chart.chartdata.CallbackEvent;
-import com.fr.design.constants.UIConstants;
+import com.fr.dav.LocalEnv;
+import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignerEnvManager;
+import com.fr.design.constants.UIConstants;
 import com.fr.design.data.DesignTableDataManager;
-import com.fr.design.gui.ilable.UILabel;
-
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-
-import com.fr.base.FRContext;
 import com.fr.design.data.datapane.TableDataTreePane;
-import com.fr.dav.LocalEnv;
-import com.fr.design.DesignModelAdapter;
 import com.fr.design.gui.icontainer.UIScrollPane;
+import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ilist.UIList;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.module.DesignModuleFactory;
+import com.fr.design.utils.gui.GUIPaintUtils;
 import com.fr.file.filetree.FileNode;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.Constants;
 import com.fr.stable.project.ProjectConstants;
-import com.fr.design.utils.gui.GUIPaintUtils;
+
+import javax.swing.*;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import java.awt.*;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 public class HistoryTemplateListPane extends JPanel implements FileOperations, CallbackEvent {
     //最大保存内存中面板数,为0时关闭优化内存
@@ -120,7 +117,7 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations, C
         try {
             historyList.remove(contains(selected));
             selected.getEditingFILE().closeTemplate();
-            FRLogger.getLogger().log(Level.INFO, Inter.getLocText(new String[]{"Template", "alraedy_close"}, new String[]{selected.getEditingFILE().getName(), "."}));
+            FineLoggerFactory.getLogger().info(Inter.getLocText(new String[]{"Template", "alraedy_close"}, new String[]{selected.getEditingFILE().getName(), "."}));
             MutilTempalteTabPane.getInstance().refreshOpenedTemplate(historyList);
         } catch (Exception e) {
             FRContext.getLogger().error(e.getMessage(), e);

designer-base/src/com/fr/design/file/MutilTempalteTabPane.java

@@ -8,14 +8,13 @@ import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.gui.imenu.UIScrollPopUpMenu;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
-import com.fr.design.mainframe.JVirtualTemplate;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.utils.gui.GUIPaintUtils;
 import com.fr.file.FILE;
 import com.fr.file.FileNodeFILE;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.Constants;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.project.ProjectConstants;
@@ -23,10 +22,18 @@ import com.fr.stable.project.ProjectConstants;
 import javax.swing.*;
 import javax.swing.plaf.basic.BasicMenuItemUI;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.AWTEventListener;
-import java.awt.geom.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.awt.geom.Arc2D;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.Line2D;
+import java.awt.geom.Path2D;
+import java.awt.geom.RoundRectangle2D;
 import java.io.File;
-import java.util.logging.Level;
 
 /**
  * Author : daisy
@@ -710,7 +717,7 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M
                     ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (returnVal == JOptionPane.YES_OPTION && specifiedTemplate.saveTemplate()) {
                 specifiedTemplate.saveTemplate();
-                FRLogger.getLogger().log(Level.INFO, Inter.getLocText(new String[]{"Template", "already-saved"}, new String[]{specifiedTemplate.getEditingFILE().getName(), "."}));
+                FineLoggerFactory.getLogger().info(Inter.getLocText(new String[]{"Template", "already-saved"}, new String[]{specifiedTemplate.getEditingFILE().getName(), "."}));
             }
         }
         HistoryTemplateListPane.getInstance().closeSelectedReport(specifiedTemplate);

designer-base/src/com/fr/design/file/TemplateTreePane.java

@@ -15,8 +15,8 @@ import com.fr.file.FileNodeFILE;
 import com.fr.file.filetree.FileNode;
 import com.fr.file.filetree.IOFileNodeFilter;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.CoreConstants;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StableUtils;
@@ -34,7 +34,6 @@ import java.awt.event.MouseListener;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.logging.Level;
 
 public class TemplateTreePane extends JPanel implements FileOperations {
 
@@ -157,7 +156,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
      */
     public void refresh() {
         reportletsTree.refresh();
-        FRLogger.getLogger().log(Level.INFO, Inter.getLocText(new String[]{"File-tree", "Refresh_Successfully"}) + "!");
+        FineLoggerFactory.getLogger().info(Inter.getLocText(new String[]{"File-tree", "Refresh_Successfully"}) + "!");
     }
 
     /**
@@ -297,11 +296,11 @@ public class TemplateTreePane extends JPanel implements FileOperations {
                 //todo 走下这个流程，否则集群下其它节点无法同步删除
                 FRContext.getCurrentEnv().deleteFile(nodeFile.getPath());
             } catch (IOException e) {
-                FRLogger.getLogger().info(e.getMessage());
+                FineLoggerFactory.getLogger().info(e.getMessage());
                 FRContext.getCurrentEnv().deleteFile(nodeFile.getPath());
             }
         } else {
-            FRLogger.getLogger().info("No Trash Available");
+            FineLoggerFactory.getLogger().info("No Trash Available");
             FRContext.getCurrentEnv().deleteFile(nodeFile.getPath());
         }
     }

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

@@ -9,7 +9,7 @@ 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.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.stable.EncodeConstants;
 import com.fr.stable.JavaCompileInfo;
@@ -65,7 +65,7 @@ public class JavaEditorPane extends BasicPane {
                             javaText.setText("//Didn't find java source match the class");
                         }
                     } catch (Exception e) {
-                        FRLogger.getLogger().error(e.getMessage(), e);
+                        FineLoggerFactory.getLogger().error(e.getMessage(), e);
                         javaText.setText("//Loading source code from server error");
                     }
                 }
@@ -162,7 +162,7 @@ public class JavaEditorPane extends BasicPane {
             JOptionPane.showMessageDialog(null, Inter.getLocText(new String[]{"Save", "Successfully"}) + "！");
             fireSaveActionListener();
         } catch (Exception e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             JOptionPane.showMessageDialog(null, Inter.getLocText(new String[]{"Save", "Failed"}) + "！");
         }
 
@@ -191,9 +191,9 @@ public class JavaEditorPane extends BasicPane {
                         }
                         JOptionPane.showMessageDialog(null, message);
                     } catch (InterruptedException e1) {
-                        FRLogger.getLogger().error(e1.getMessage(), e1);
+                        FineLoggerFactory.getLogger().error(e1.getMessage(), e1);
                     } catch (ExecutionException e1) {
-                        FRLogger.getLogger().error(e1.getMessage(), e1);
+                        FineLoggerFactory.getLogger().error(e1.getMessage(), e1);
                     }
                 }
             }.execute();

designer-base/src/com/fr/design/gui/UILookAndFeel.java

@@ -29,7 +29,7 @@ import com.fr.design.gui.itoolbar.UIToolBarBorder;
 import com.fr.design.gui.itoolbar.UIToolBarSeparatorUI;
 import com.fr.design.gui.itooltip.UIToolTipBorder;
 import com.fr.design.gui.itree.UITreeUI;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.IOUtils;
 
 import javax.swing.ImageIcon;
@@ -195,7 +195,7 @@ public class UILookAndFeel extends MetalLookAndFeel {
                     "com/fr/design/images/lookandfeel/" + fileName, UILookAndFeel.class);
 
             if (url == null) {
-                FRLogger.getLogger().error("Icon directory could not be resolved.");
+                FineLoggerFactory.getLogger().error("Icon directory could not be resolved.");
                 return null;
             }
         }

designer-base/src/com/fr/design/gui/autocomplete/AutoCompletePopupWindow.java

@@ -10,7 +10,7 @@
 package com.fr.design.gui.autocomplete;
 
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.PopupWindowDecorator;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.*;
 import javax.swing.event.CaretEvent;
@@ -303,7 +303,7 @@ class AutoCompletePopupWindow extends JWindow implements CaretListener,
     private void installKeyBindings() {
 
         if (AutoCompletion.isDebug()) {
-            FRLogger.getLogger().debug("PopupWindow: Installing keybindings");
+            FineLoggerFactory.getLogger().debug("PopupWindow: Installing keybindings");
         }
 
         if (escapeKap == null) { // Lazily create actions.
@@ -711,7 +711,7 @@ class AutoCompletePopupWindow extends JWindow implements CaretListener,
     private void uninstallKeyBindings() {
 
         if (AutoCompletion.isDebug()) {
-            FRLogger.getLogger().debug("PopupWindow: Removing keybindings");
+            FineLoggerFactory.getLogger().debug("PopupWindow: Removing keybindings");
         }
 
         JTextComponent comp = ac.getTextComponent();

designer-base/src/com/fr/design/gui/autocomplete/ParameterizedCompletionContext.java

@@ -14,7 +14,7 @@ import com.fr.design.gui.autocomplete.ParameterizedCompletionInsertionInfo.Repla
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.DocumentRange;
 import com.fr.design.gui.syntax.ui.rsyntaxtextarea.RSyntaxTextArea;
 import com.fr.design.gui.syntax.ui.rtextarea.ChangeableHighlightPainter;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.*;
 import javax.swing.event.CaretEvent;
@@ -440,7 +440,7 @@ class ParameterizedCompletionContext {
      */
     private void installKeyBindings() {
         if (AutoCompletion.isDebug()) {
-            FRLogger.getLogger().debug("CompletionContext: Installing keybindings");
+            FineLoggerFactory.getLogger().debug("CompletionContext: Installing keybindings");
         }
         JTextComponent tc = ac.getTextComponent();
         InputMap im = tc.getInputMap();
@@ -739,7 +739,7 @@ class ParameterizedCompletionContext {
     private void uninstallKeyBindings() {
 
         if (AutoCompletion.isDebug()) {
-            FRLogger.getLogger().debug("CompletionContext Uninstalling keybindings");
+            FineLoggerFactory.getLogger().debug("CompletionContext Uninstalling keybindings");
         }
 
         JTextComponent tc = ac.getTextComponent();

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

@@ -2,7 +2,7 @@ package com.fr.design.gui.frpane;
 
 import com.fr.base.BaseUtils;
 import com.fr.design.constants.UIConstants;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.GeneralUtils;
 
 import javax.swing.*;
@@ -129,7 +129,7 @@ public class UITabbedPaneUI extends BasicTabbedPaneUI {
                     tabPane.addTab(tabName,
                             (Component) GeneralUtils.classForName(classpath).newInstance());
                 } catch (Exception ex) {
-                    FRLogger.getLogger().error(ex.getMessage(), ex);
+                    FineLoggerFactory.getLogger().error(ex.getMessage(), ex);
                 }
             }
         }

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

@@ -3,7 +3,7 @@
  */
 package com.fr.design.gui.icombobox;
 
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 
 import javax.swing.DefaultComboBoxModel;
@@ -83,7 +83,7 @@ public abstract class LazyComboBox extends UIComboBox implements PopupMenuListen
                 try {
                     LazyComboBox.this.loadList(get());
                 } catch (InterruptedException | ExecutionException exception) {
-                    FRLogger.getLogger().debug(exception.getMessage());
+                    FineLoggerFactory.getLogger().debug(exception.getMessage());
                 }
                 LazyComboBox.this.showPopup();
             }

designer-base/src/com/fr/design/gui/imenu/UIBasicMenuUI.java

@@ -6,7 +6,7 @@ package com.fr.design.gui.imenu;
 
 
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.*;
 import javax.swing.event.*;
@@ -504,7 +504,7 @@ public class UIBasicMenuUI extends UIBasicMenuItemUI {
             }
 
             if (DEBUG) {
-                FRLogger.getLogger().info("in TinyMenuUI.menuKeyTyped for " + menuItem.getText());
+                FineLoggerFactory.getLogger().info("in TinyMenuUI.menuKeyTyped for " + menuItem.getText());
             }
 
             if (!crossMenuMnemonic) {
@@ -544,7 +544,7 @@ public class UIBasicMenuUI extends UIBasicMenuItemUI {
                 return;
             }
             if (DEBUG) {
-                FRLogger.getLogger().info("in TinyMenuUI.menuKeyPressed for " + menuItem.getText());
+                FineLoggerFactory.getLogger().info("in TinyMenuUI.menuKeyPressed for " + menuItem.getText());
             }
             char keyChar = e.getKeyChar();
             if (!Character.isLetterOrDigit(keyChar)){

designer-base/src/com/fr/design/gui/imenutable/UIMenuNameableCreator.java

@@ -1,7 +1,7 @@
 package com.fr.design.gui.imenutable;
 
 import com.fr.design.beans.BasicBeanPane;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.Nameable;
 
 public class UIMenuNameableCreator implements Nameable{
@@ -46,9 +46,9 @@ public class UIMenuNameableCreator implements Nameable{
 		try {
 			cloneObj = obj.getClass().newInstance();
 		} catch (InstantiationException e) {
-			FRLogger.getLogger().error("UIMenuNameableCreator InstantiationException");
+			FineLoggerFactory.getLogger().error("UIMenuNameableCreator InstantiationException");
 		} catch (IllegalAccessException e) {
-			FRLogger.getLogger().error("UIMenuNameableCreator IllegalAccessException");
+			FineLoggerFactory.getLogger().error("UIMenuNameableCreator IllegalAccessException");
 		}
 		return new UIMenuNameableCreator(name, cloneObj, this.paneClazz);
 		

designer-base/src/com/fr/design/gui/style/NumberDragBar.java

@@ -1,7 +1,7 @@
 package com.fr.design.gui.style;
 
 import com.fr.design.constants.UIConstants;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
@@ -126,7 +126,7 @@ public class NumberDragBar extends JComponent {
 					repaint();
 					revalidate();
 				} catch (InterruptedException e) {
-                    FRLogger.getLogger().error(e.toString());
+                    FineLoggerFactory.getLogger().error(e.toString());
 				}
 			}
 		});

designer-base/src/com/fr/design/javascript/beautify/JavaScriptFormatHelper.java

@@ -1,7 +1,7 @@
 package com.fr.design.javascript.beautify;
 
 
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.IOUtils;
 import com.fr.script.ScriptFactory;
 
@@ -42,7 +42,7 @@ public class JavaScriptFormatHelper {
             Invocable invocable = (Invocable) scriptEngine;
             result = (String) invocable.invokeFunction("js_beautify", jsCode, option.toFormatArgument());
         } catch (ScriptException | NoSuchMethodException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return result;
     }

designer-base/src/com/fr/design/mainframe/DesignerContext.java

@@ -6,7 +6,7 @@ package com.fr.design.mainframe;
 import com.fr.base.Style;
 import com.fr.design.designer.TargetComponent;
 import com.fr.design.dialog.BasicDialog;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StableUtils;
 
 import javax.swing.*;
@@ -73,14 +73,14 @@ public class DesignerContext {
 
 				return (Clipboard) clipMethod.invoke(transferAction, new Object[]{comp});
 			} catch (Exception securityException) {
-				FRLogger.getLogger().error(securityException.getMessage(), securityException);
+				FineLoggerFactory.getLogger().error(securityException.getMessage(), securityException);
 				//用反射机制，获得TransferHandler的getClipboard
 				//这样可以保证和TextField直接的copy paste
 				try {
 					//控件的Clipboard.
 					DesignerContext.clipboard = comp.getToolkit().getSystemClipboard();
 				} catch (Exception exp) {
-					FRLogger.getLogger().error(exp.getMessage(), exp);
+					FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
 					DesignerContext.clipboard = new Clipboard("FR");
 				}
 			}

designer-base/src/com/fr/design/mainframe/DesignerFrame.java

@@ -40,10 +40,11 @@ import com.fr.file.FILEFactory;
 import com.fr.file.FileFILE;
 import com.fr.file.FileNodeFILE;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
 import com.fr.general.env.EnvContext;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.injectable.PluginModule;
 import com.fr.plugin.manage.PluginFilter;
@@ -56,23 +57,9 @@ import com.fr.stable.StableUtils;
 import com.fr.stable.image4j.codec.ico.ICODecoder;
 import com.fr.stable.project.ProjectConstants;
 
-import javax.swing.Icon;
+import javax.swing.*;
-import javax.swing.JComponent;
-import javax.swing.JFrame;
-import javax.swing.JLayeredPane;
-import javax.swing.JMenuBar;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.WindowConstants;
 import javax.swing.border.MatteBorder;
-import java.awt.BorderLayout;
+import java.awt.*;
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Graphics;
-import java.awt.Insets;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.Toolkit;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.Transferable;
 import java.awt.dnd.DnDConstants;
@@ -95,7 +82,6 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import java.util.logging.Level;
 
 public class DesignerFrame extends JFrame implements JTemplateActionListener, TargetModifiedListener {
     public static final String DESIGNER_FRAME_NAME = "designer_frame";
@@ -736,18 +722,14 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
                         JOptionPane.QUESTION_MESSAGE);
                 if (returnVal == JOptionPane.YES_OPTION && editingTemplate.saveTemplate()) {
                     editingTemplate.saveTemplate();
-                    FRLogger.getLogger().log(
+                    FineLoggerFactory.getLogger().info(Inter.getLocText(new String[]{"Template", "already-saved"}, new String[]{
-                            Level.INFO,
+                            editingTemplate.getEditingFILE().getName(), "."}));
-                            Inter.getLocText(new String[]{"Template", "already-saved"}, new String[]{
-                                    editingTemplate.getEditingFILE().getName(), "."}));
                 }
             } else {
                 if (editingTemplate.saveTemplate()) {
                     editingTemplate.saveTemplate();
-                    FRLogger.getLogger().log(
+                    FineLoggerFactory.getLogger().info(Inter.getLocText(new String[]{"Template", "already-saved"}, new String[]{
-                            Level.INFO,
+                            editingTemplate.getEditingFILE().getName(), "."}));
-                            Inter.getLocText(new String[]{"Template", "already-saved"}, new String[]{
-                                    editingTemplate.getEditingFILE().getName(), "."}));
                 }
             }
         }
@@ -846,7 +828,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
                 return;
             }
         } catch (Exception e) {
-            FRLogger.getLogger().error(e.getMessage());
+            FineLoggerFactory.getLogger().error(e.getMessage());
         }
 
         // p:判断一下，如何文件为空或者文件不存在，直接返回.
@@ -860,7 +842,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         try {
             openFile(tplFile);
         } catch (Throwable t) {
-            FRLogger.getLogger().error(t.getMessage(), t);
+            FineLoggerFactory.getLogger().error(t.getMessage(), t);
             addAndActivateJTemplate();
         }
 
@@ -964,7 +946,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
         try {
             thread.join();
         } catch (InterruptedException e) {
-            FRLogger.getLogger().error("Map Thread Error");
+            FineLoggerFactory.getLogger().error("Map Thread Error");
         }
 
         DesignerEnvManager.getEnvManager().setLastOpenFile(

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

@@ -45,7 +45,7 @@ import com.fr.file.MemFILE;
 import com.fr.form.ui.NoneWidget;
 import com.fr.form.ui.Widget;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.report.cell.Elem;
 import com.fr.report.cell.cellattr.CellImage;
@@ -531,7 +531,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
                 return false;
             }
         } catch (Exception e) {
-            FRLogger.getLogger().error(e.getMessage());
+            FineLoggerFactory.getLogger().error(e.getMessage());
         }
 
 

designer-base/src/com/fr/design/mainframe/loghandler/DesignerLogHandler.java

@@ -7,11 +7,10 @@ import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogLevel;
-import com.fr.general.FRLogger;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
-import com.fr.general.LogRecordTime;
+import com.fr.general.log.Log4jConfig;
+import com.fr.log.FineLoggerFactory;
 import com.fr.log.LogHandler;
 import com.fr.stable.EnvChangedListener;
 import com.fr.stable.xml.LogRecordTimeProvider;
@@ -38,9 +37,9 @@ import java.util.logging.LogRecord;
 import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
 
 public class DesignerLogHandler {
-    protected static final int INFO_INT = FRLogLevel.INFO.intValue();
+    protected static final int INFO_INT = com.fr.third.apache.log4j.Level.INFO.toInt();
-    protected static final int ERRO_INT = FRLogLevel.ERROR.intValue();
+    protected static final int ERROR_INT = com.fr.third.apache.log4j.Level.ERROR.toInt();
-    protected static final int SERVER_INT = FRLogLevel.SEVERE.intValue();
+    protected static final int WARN_INT = com.fr.third.apache.log4j.Level.WARN.toInt();
     private static final int GAP_X = -150;
     private static final int INFO_GAP_Y = -60;
     private static final int ERRO_GAP_Y = -40;
@@ -51,7 +50,7 @@ public class DesignerLogHandler {
             @Override
             public void envChanged() {
                 // envchange后需要重新读取webinf里的log4j配置, 重新添加appender
-                FRLogger.getLogger().addLogAppender(new LogHandler<DesignerLogAppender>() {
+                FineLoggerFactory.getLogger().addLogAppender(new LogHandler<DesignerLogAppender>() {
                     @Override
                     public DesignerLogAppender getHandler() {
                         return new DesignerLogAppender();
@@ -119,20 +118,20 @@ public class DesignerLogHandler {
 
             @Override
             public void actionPerformed(ActionEvent e) {
-                JPopupMenu showsetPopup = new JPopupMenu();
+                JPopupMenu jPopupMenu = new JPopupMenu();
-                int logLevelvalue = ServerConfig.getInstance().getServerLogLevel().intValue();
+                int logLevelInt = Log4jConfig.getInstance().getRootLevel().toInt();
-                if (logLevelvalue <= INFO_INT) {
+                if (logLevelInt <= INFO_INT) {
-                    showsetPopup.add(showInfo);
+                    jPopupMenu.add(showInfo);
-                    showsetPopup.add(showError);
+                    jPopupMenu.add(showError);
-                    showsetPopup.add(showServer);
+                    jPopupMenu.add(showServer);
-                    showsetPopup.show(caption, caption.getWidth() + GAP_X, INFO_GAP_Y);
+                    jPopupMenu.show(caption, caption.getWidth() + GAP_X, INFO_GAP_Y);
-                } else if (logLevelvalue == ERRO_INT) {
+                } else if (logLevelInt == ERROR_INT) {
-                    showsetPopup.add(showError);
+                    jPopupMenu.add(showError);
-                    showsetPopup.add(showServer);
+                    jPopupMenu.add(showServer);
-                    showsetPopup.show(caption, caption.getWidth() + GAP_X, ERRO_GAP_Y);
+                    jPopupMenu.show(caption, caption.getWidth() + GAP_X, ERRO_GAP_Y);
                 } else {
-                    showsetPopup.add(showServer);
+                    jPopupMenu.add(showServer);
-                    showsetPopup.show(caption, caption.getWidth() + GAP_X, SERVER_GAP_Y);
+                    jPopupMenu.show(caption, caption.getWidth() + GAP_X, SERVER_GAP_Y);
                 }
             }
         });
@@ -150,10 +149,6 @@ public class DesignerLogHandler {
         logHandlerArea.printStackTrace(message, level, date);
     }
 
-    public void printRemoteLog(LogRecordTime logRecordTime) {
-        logHandlerArea.printStackTrace(logRecordTime);
-    }
-
     private class LogHandlerArea extends JPanel {
 
         private static final long serialVersionUID = 8215630927304621660L;
@@ -227,9 +222,9 @@ public class DesignerLogHandler {
             int logLevelvalue = logRecord.getLevel().intValue();
             if (logLevelvalue == INFO_INT && showInfo.isSelected()) {
                 printMessage(logRecord.getMessage(), logLevelvalue, date, logRecord.getThrown());
-            } else if (logLevelvalue == ERRO_INT && showError.isSelected()) {
+            } else if (logLevelvalue == ERROR_INT && showError.isSelected()) {
                 printMessage(logRecord.getMessage(), logLevelvalue, date, logRecord.getThrown());
-            } else if (logLevelvalue == SERVER_INT && showServer.isSelected()) {
+            } else if (logLevelvalue == WARN_INT && showServer.isSelected()) {
                 printMessage(logRecord.getMessage(), logLevelvalue, date, logRecord.getThrown());
             }
 
@@ -239,9 +234,9 @@ public class DesignerLogHandler {
             int logLevelvalue = level.intValue();
             if (logLevelvalue == INFO_INT && showInfo.isSelected()) {
                 printMessage(message, logLevelvalue, date);
-            } else if (logLevelvalue == ERRO_INT && showError.isSelected()) {
+            } else if (logLevelvalue == ERROR_INT && showError.isSelected()) {
                 printMessage(message, logLevelvalue, date);
-            } else if (logLevelvalue == SERVER_INT && showServer.isSelected()) {
+            } else if (logLevelvalue == WARN_INT && showServer.isSelected()) {
                 printMessage(message, logLevelvalue, date);
             }
 
@@ -269,10 +264,10 @@ public class DesignerLogHandler {
 
         private void log(String str, int style) {
             SimpleAttributeSet attrSet = new SimpleAttributeSet();
-            if (style == ERRO_INT) {
+            if (style == ERROR_INT) {
                 StyleConstants.setForeground(attrSet, new Color(247, 148, 29));
                 StyleConstants.setBold(attrSet, true);
-            } else if (style == SERVER_INT) {
+            } else if (style == WARN_INT) {
                 StyleConstants.setForeground(attrSet, Color.red);
                 StyleConstants.setBold(attrSet, true);
             } else if (style == INFO_INT) {
@@ -291,9 +286,9 @@ public class DesignerLogHandler {
         }
 
         private String swithInter(String str, int style) {
-            if (style == ERRO_INT) {
+            if (style == ERROR_INT) {
                 str = Inter.getLocText("FR-Designer_Alert") + ":" + str + "\n";
-            } else if (style == SERVER_INT) {
+            } else if (style == WARN_INT) {
                 str = Inter.getLocText("FR-Designer_Seriously") + ":" + str + "\n";
             } else {
                 str = Inter.getLocText("FR-Designer_Normal") + ":" + str + "\n";
@@ -305,9 +300,9 @@ public class DesignerLogHandler {
             LogMessageBar.getInstance().setMessage(message);
             if (level == DesignerLogHandler.INFO_INT && showInfo.isSelected()) {
                 caption.infoAdd();
-            } else if (level == DesignerLogHandler.ERRO_INT && showError.isSelected()) {
+            } else if (level == DesignerLogHandler.ERROR_INT && showError.isSelected()) {
                 caption.errorAdd();
-            } else if (level == DesignerLogHandler.SERVER_INT && showServer.isSelected()) {
+            } else if (level == DesignerLogHandler.WARN_INT && showServer.isSelected()) {
                 caption.serverAdd();
             }
         }

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

@@ -9,7 +9,7 @@ import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mainframe.SiteCenterToken;
 import com.fr.env.RemoteEnv;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.GeneralUtils;
 import com.fr.general.IOUtils;
 import com.fr.general.SiteCenter;
@@ -207,7 +207,7 @@ public class TemplateInfoCollector<T extends BaseBook> implements Serializable,
             FileOutputStream out = new FileOutputStream(getInfoFile());
             XMLTools.writeOutputStreamXML(this, out);
         } catch (Exception ex) {
-            FRLogger.getLogger().error(ex.getMessage());
+            FineLoggerFactory.getLogger().error(ex.getMessage());
         }
     }
 

designer-base/src/com/fr/design/style/background/BackgroundPane.java

@@ -17,7 +17,7 @@ import javax.swing.event.EventListenerList;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.dialog.BasicPane;
 import com.fr.general.Background;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 
 public class BackgroundPane extends BasicPane {
@@ -139,7 +139,7 @@ public class BackgroundPane extends BasicPane {
         try {
             return quickPane.update();
         } catch (Exception e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return null;
     }

designer-base/src/com/fr/design/style/color/ColorPicker.java

@@ -5,7 +5,7 @@ package com.fr.design.style.color;
  */
 
 import com.fr.base.BaseUtils;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.*;
 import java.awt.*;
@@ -73,7 +73,7 @@ public class ColorPicker extends JDialog implements ActionListener
             try {
                 Thread.sleep(100);  // 等待弹窗关闭
             } catch (InterruptedException e) {
-                FRLogger.getLogger().error(e.getMessage());
+                FineLoggerFactory.getLogger().error(e.getMessage());
             }
             colorPickerPanel.captureScreen();
         }

designer-base/src/com/fr/design/style/color/ColorSelectConfigManager.java

@@ -3,7 +3,7 @@ package com.fr.design.style.color;
 import com.fr.base.FRContext;
 import com.fr.file.XMLFileManager;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.GeneralContext;
 import com.fr.stable.EnvChangedListener;
 import com.fr.stable.xml.XMLPrintWriter;
@@ -99,7 +99,7 @@ public class ColorSelectConfigManager extends XMLFileManager implements ColorSel
         try {
             FRContext.getCurrentEnv().writeResource(manager);
         } catch (Exception e) {
-            FRLogger.getLogger().error(e.getMessage());
+            FineLoggerFactory.getLogger().error(e.getMessage());
         }
     }
 

designer-base/src/com/fr/design/style/color/CustomChooserPanel.java

@@ -28,7 +28,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.islider.UISlider;
 import com.fr.design.gui.ispinner.UIBasicSpinner;
 import com.fr.design.gui.itextfield.UITextField;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 
 /**
@@ -241,7 +241,7 @@ class CustomChooserPanel extends AbstractColorChooserPanel implements ColorSelec
                 }
 
             } catch (BadLocationException e1) {
-                FRLogger.getLogger().error(e1.getMessage());
+                FineLoggerFactory.getLogger().error(e1.getMessage());
             }
         }
     }

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

@@ -19,10 +19,10 @@ import com.fr.env.RemoteEnv;
 import com.fr.file.FileFILE;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
-import com.fr.general.FRLogger;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
 import com.fr.general.http.HttpClient;
+import com.fr.log.FineLoggerFactory;
 import com.fr.security.JwtUtils;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.CodeUtils;
@@ -31,11 +31,8 @@ import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.start.StartServer;
 
-import javax.swing.JOptionPane;
+import javax.swing.*;
-import javax.swing.SwingUtilities;
+import java.awt.*;
-import javax.swing.UIManager;
-import java.awt.Desktop;
-import java.awt.Font;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
@@ -55,7 +52,6 @@ import java.net.URLEncoder;
 import java.util.Calendar;
 import java.util.Enumeration;
 import java.util.Locale;
-import java.util.logging.Level;
 
 
 /**
@@ -137,7 +133,7 @@ public class DesignUtils {
                 try {
                     serverSocket = new ServerSocket(startPort);
                 } catch (IOException e1) {
-                    FRLogger.getLogger().log(Level.WARNING, "Cannot create server socket on" + port);
+                    FineLoggerFactory.getLogger().error("Cannot create server socket on" + port);
                 }
                 while (true) {
                     try {
@@ -248,7 +244,7 @@ public class DesignUtils {
         try {
             UIManager.setLookAndFeel(UILookAndFeel.class.getName());
         } catch (Exception e) {
-            FRLogger.getLogger().log(Level.WARNING, "Substance Raven Graphite failed to initialize");
+            FineLoggerFactory.getLogger().error("Substance Raven Graphite failed to initialize");
         }
         //获取当前系统语言下设计器用的默认字体
         FRFont guiFRFont = getCurrentLocaleFont();

designer-base/src/com/fr/design/utils/DrawRoutines.java

@@ -1,7 +1,7 @@
 package com.fr.design.utils;
 
 import com.fr.design.utils.ColorRoutines;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.*;
 import java.awt.*;
@@ -205,11 +205,11 @@ public class DrawRoutines {
         try {
             grabber.grabPixels();
         } catch (InterruptedException e) {
-            FRLogger.getLogger().error("PixelGrabber interrupted waiting for pixels");
+            FineLoggerFactory.getLogger().error("PixelGrabber interrupted waiting for pixels");
         }
 
         if ((grabber.getStatus() & ImageObserver.ABORT) != 0) {
-            FRLogger.getLogger().info("Image fetch aborted or errored.");
+            FineLoggerFactory.getLogger().info("Image fetch aborted or errored.");
         } else {
             for (int y = 0; y < h; y++) {
                 for (int x = 0; x < w; x++) {

designer-base/src/com/fr/start/BaseDesigner.java

@@ -17,7 +17,7 @@ import com.fr.file.FILE;
 import com.fr.file.FILEFactory;
 import com.fr.file.FileFILE;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.OperatingSystem;
 
 import java.awt.*;
@@ -94,7 +94,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
             }
             isException = openFile(df, isException, file);
         } catch (Exception e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             if (!isException) {
                 showDesignerFrame(args, df, true);
             } else {
@@ -147,7 +147,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
                     Window.class, boolean.class});
             method.invoke(null, window, true);
         } catch (Throwable t) {
-            FRLogger.getLogger().error("Full screen mode is not supported");
+            FineLoggerFactory.getLogger().error("Full screen mode is not supported");
         }
     }
 

designer-base/src/com/fr/start/StartServer.java

@@ -1,7 +1,7 @@
 package com.fr.start;
 
-import com.fr.base.ServerConfig;
 import com.fr.base.FRContext;
+import com.fr.base.ServerConfig;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.data.datapane.TableDataTreePane;
@@ -15,12 +15,12 @@ import com.fr.env.SignIn;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.EnvChangedListener;
 import com.fr.stable.OperatingSystem;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
-import com.fr.stable.project.ProjectConstants;
 import com.fr.start.server.TomcatHost;
 
 import javax.swing.*;
@@ -69,7 +69,7 @@ public class StartServer {
                         TemplateTreePane.getInstance().refreshDockingView();
                         TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter());
                     } catch (Exception e) {
-                        FRContext.getLogger().errorWithServerLevel(e.getMessage());
+                        FineLoggerFactory.getLogger().error(e.getMessage());
                     }
                     initDemoServerAndBrowser();
                 }
@@ -98,7 +98,7 @@ public class StartServer {
                 tomcatHost.start();
             }
         } catch (Exception e) {
-            FRContext.getLogger().errorWithServerLevel(e.getMessage());
+            FineLoggerFactory.getLogger().error(e.getMessage());
         } finally {
             //先访问Demo, 后访问报表, 不需要重置服务器.
             NEED_LOAD_ENV = false;
@@ -126,9 +126,9 @@ public class StartServer {
                 tomcatHost.start();
             }
         } catch (InterruptedException e) {
-            FRContext.getLogger().errorWithServerLevel(e.getMessage());
+            FineLoggerFactory.getLogger().error(e.getMessage());
         } catch (Exception e) {
-            FRContext.getLogger().errorWithServerLevel(e.getMessage());
+            FineLoggerFactory.getLogger().error(e.getMessage());
         } finally {
             NEED_LOAD_ENV = false;
         }
@@ -169,10 +169,10 @@ public class StartServer {
         } catch (IOException e) {
             startBrowserFromCommand(uri, e);
         } catch (URISyntaxException e) {
-            FRContext.getLogger().errorWithServerLevel(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         } catch (Exception e) {
-            FRContext.getLogger().errorWithServerLevel(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            FRContext.getLogger().error("Can not open the browser for URL:  " + uri);
+            FineLoggerFactory.getLogger().error("Can not open the browser for URL:  " + uri);
         }
     }
 
@@ -183,10 +183,10 @@ public class StartServer {
                 Runtime.getRuntime().exec("rundll32 url.dll,FileProtocolHandler " + uri);
             } catch (IOException ee) {
                 JOptionPane.showMessageDialog(null, Inter.getLocText("FR-Designer_Set_default_browser"));
-                FRContext.getLogger().errorWithServerLevel(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
         } else {
-            FRContext.getLogger().errorWithServerLevel(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }
 

designer-chart/src/com/fr/design/chart/report/MapCubeLayerPane.java

@@ -11,7 +11,7 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.UIDialog;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StringUtils;
@@ -275,7 +275,7 @@ public class MapCubeLayerPane extends BasicBeanPane<String>{
 
             @Override
 			protected void done() {
-				FRLogger.getLogger().info("Map Save End");
+				FineLoggerFactory.getLogger().info("Map Save End");
 			}
 			
 		};

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

@@ -22,7 +22,7 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.DesignerFrame;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.stable.CoreConstants;
 import com.fr.stable.StableUtils;
@@ -367,7 +367,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver {
 								StableUtils.pathJoin(new String[]{MapSvgXMLHelper.relativeCustomMapPath(),oldName+SvgProvider.EXTENSION}));
 						refresh();
 					}catch (Exception exp){
-						FRLogger.getLogger().error(exp.getMessage());
+						FineLoggerFactory.getLogger().error(exp.getMessage());
 					}
 				}
 			}
@@ -399,7 +399,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver {
 
 			@Override
 			protected void done() {
-				FRLogger.getLogger().info(Inter.getLocText("FR-Chart-Map_Saved")); // 地图已经保存.
+				FineLoggerFactory.getLogger().info(Inter.getLocText("FR-Chart-Map_Saved")); // 地图已经保存.
 			}
 
 		};

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

@@ -19,7 +19,7 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.GeneralUtils;
 import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
@@ -477,7 +477,7 @@ public class UIGroupExtensionPane extends BasicPane {
                 try {
                     list.setSelectedIndices(null);
                 } catch (Exception e) {
-                    FRLogger.getLogger().error(e.getMessage());
+                    FineLoggerFactory.getLogger().error(e.getMessage());
                 }
             }
         }

designer-chart/src/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java

@@ -13,7 +13,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.chart.ChartHyperEditPane;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 
 import java.awt.*;
@@ -71,7 +71,7 @@ public class ChartHyperPoplinkPane extends AbstractHyperLinkPane<ChartHyperPopli
             try {
                 cc.addChart((Chart) chart.clone());
             } catch (CloneNotSupportedException e) {
-                FRLogger.getLogger().error(e.getMessage(), e);
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
 
         } else {

designer-chart/src/com/fr/design/mainframe/chart/ChartEditPane.java

@@ -19,7 +19,7 @@ import com.fr.design.mainframe.chart.gui.ChartOtherPane;
 import com.fr.design.mainframe.chart.gui.ChartStylePane;
 import com.fr.design.mainframe.chart.gui.ChartTypePane;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 
 import javax.swing.JPanel;
@@ -117,7 +117,7 @@ public class ChartEditPane extends BasicPane implements AttributeChange,Prepare4
                 try {
                     lastCollection = (ChartCollection) collection.clone();
                 } catch (CloneNotSupportedException e) {
-                    FRLogger.getLogger().error("error in clone ChartEditPane");
+                    FineLoggerFactory.getLogger().error("error in clone ChartEditPane");
                 }
                 if(ComparatorUtils.equals(selectedPane.title4PopupWindow(),PaneTitleConstants.CHART_STYLE_TITLE)){
                     dealWithStyleChange();

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

@@ -18,7 +18,7 @@ import com.fr.design.gui.imenutable.UIMenuNameableCreator;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.mainframe.chart.gui.ChartTypePane.ComboBoxPane;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.stable.StringUtils;
 
@@ -142,7 +142,7 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
                     editingCollection.addNamedChart(name, newChart);
                     editingCollection.addFunctionRecord(newChart);
                 } catch (CloneNotSupportedException e1) {
-                    FRLogger.getLogger().error("Error in Clone");
+                    FineLoggerFactory.getLogger().error("Error in Clone");
                 }
                 checkoutChange();
             }

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

@@ -9,7 +9,7 @@ import com.fr.data.util.function.NoneFunction;
 import com.fr.data.util.function.SumFunction;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 
 /**
@@ -56,10 +56,10 @@ public class CalculateComboBox extends UIComboBox{
 				return (AbstractDataFunction)CLASS_ARRAY[selectIndex].newInstance();
 			}
 		} catch (InstantiationException e) {
-			FRLogger.getLogger().error("Function Error");
+			FineLoggerFactory.getLogger().error("Function Error");
 			return null;
 		} catch (IllegalAccessException e) {
-			FRLogger.getLogger().error("Function Error");
+			FineLoggerFactory.getLogger().error("Function Error");
 			return null;
 		}
 		

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

@@ -19,7 +19,7 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.data.CalculateComboBox;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.stable.StringUtils;
 
@@ -265,9 +265,9 @@ public class SeriesNameUseFieldNamePane extends FurtherBasicBeanPane<ChartCollec
         try {
             return (DataFunction) CalculateComboBox.CLASS_ARRAY[index].newInstance();
         } catch (InstantiationException e) {
-            FRLogger.getLogger().error("Function Error");
+            FineLoggerFactory.getLogger().error("Function Error");
         } catch (IllegalAccessException e) {
-            FRLogger.getLogger().error("Function Error");
+            FineLoggerFactory.getLogger().error("Function Error");
         }
         return new NoneFunction();
     }

designer-chart/src/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java

@@ -22,7 +22,7 @@ import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.style.FormatBox;
 import com.fr.general.DateUtils;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.stable.StringUtils;
 
@@ -358,7 +358,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
 			String tmp = DateUtils.getDate2LStr(toDate);
 			toDate = DateUtils.DATETIMEFORMAT2.parse(tmp);
 		} catch (ParseException e) {
-			FRLogger.getLogger().error(Inter.getLocText("Cannot_Get_Date"));
+			FineLoggerFactory.getLogger().error(Inter.getLocText("Cannot_Get_Date"));
 		}
 		return toDate;
 	}

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

@@ -26,7 +26,7 @@ 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.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.js.NameJavaScriptGroup;
 import com.fr.stable.Constants;
@@ -351,7 +351,7 @@ public abstract class AbstractChartTypePane extends FurtherBasicBeanPane<Chart>{
         try {
             chart.switchPlot((Plot)plot.clone());
         } catch (CloneNotSupportedException e) {
-            FRLogger.getLogger().error("Error in change plot");
+            FineLoggerFactory.getLogger().error("Error in change plot");
         }
     }
 

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

@@ -6,7 +6,7 @@ import com.fr.chart.chartattr.BarPlot;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.chart.charttypes.BarIndependentChart;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 
 /**
@@ -98,7 +98,7 @@ public class BarPlotPane extends AbstractBarPane{
         try {
             cloned = (Plot)newPlot.clone();
         } catch (CloneNotSupportedException e) {
-            FRLogger.getLogger().error("Error In ColumnChart");
+            FineLoggerFactory.getLogger().error("Error In ColumnChart");
         }
         return cloned;
     }

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

@@ -5,7 +5,7 @@ import com.fr.chart.chartattr.BarPlot;
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.chart.charttypes.ColumnIndependentChart;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 
 /**
@@ -95,7 +95,7 @@ public class ColumnPlotPane extends AbstractBarPane{
         try {
             cloned = (Plot)newPlot.clone();
         } catch (CloneNotSupportedException e) {
-            FRLogger.getLogger().error("Error In ColumnChart");
+            FineLoggerFactory.getLogger().error("Error In ColumnChart");
         }
         return cloned;
     }

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

@@ -11,7 +11,7 @@ import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 
 import javax.swing.*;
@@ -118,7 +118,7 @@ public class GisMapPlotPane extends AbstractChartTypePane{
 		try {
 			chart.switchPlot((Plot)plot.clone());
 		} catch (CloneNotSupportedException e) {
-			FRLogger.getLogger().error("Error In LineChart");
+			FineLoggerFactory.getLogger().error("Error In LineChart");
 			chart.switchPlot(new GisMapPlot());
 		}
 		

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

@@ -5,7 +5,7 @@ import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.LinePlot;
 import com.fr.chart.chartattr.Plot;
 import com.fr.chart.charttypes.LineIndependentChart;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 
 public class LinePlotPane extends AbstractChartTypePane{
@@ -68,7 +68,7 @@ public class LinePlotPane extends AbstractChartTypePane{
 		try {
 			chart.switchPlot((Plot)plot.clone());
 		} catch (CloneNotSupportedException e) {
-			FRLogger.getLogger().error("Error In LineChart");
+			FineLoggerFactory.getLogger().error("Error In LineChart");
 			chart.switchPlot(new LinePlot());
 		}
 	}

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

@@ -6,7 +6,7 @@ import com.fr.chart.chartattr.MeterPlot;
 import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartglyph.MeterStyle;
 import com.fr.chart.charttypes.MeterIndependentChart;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 
 /**
@@ -67,7 +67,7 @@ public class MeterPlotPane extends AbstractChartTypePane {
         try {
             cloned = (Plot)newPlot.clone();
         } catch (CloneNotSupportedException e) {
-            FRLogger.getLogger().error("Error In ColumnChart");
+            FineLoggerFactory.getLogger().error("Error In ColumnChart");
         }
         return cloned;
     }

designer-chart/src/com/fr/van/chart/area/VanChartAreaPlotPane.java

@@ -2,7 +2,7 @@ package com.fr.van.chart.area;
 
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.plugin.chart.area.AreaIndependentVanChart;
 import com.fr.plugin.chart.area.VanChartAreaPlot;
@@ -71,7 +71,7 @@ public class VanChartAreaPlotPane extends AbstractVanChartTypePane {
         try {
             cloned = (Plot) newPlot.clone();
         } catch (CloneNotSupportedException e) {
-            FRLogger.getLogger().error("Error In AreaChart");
+            FineLoggerFactory.getLogger().error("Error In AreaChart");
         }
         return cloned;
     }

designer-chart/src/com/fr/van/chart/bar/VanChartBarPlotPane.java

@@ -2,7 +2,7 @@ package com.fr.van.chart.bar;
 
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.plugin.chart.bar.BarIndependentVanChart;
 import com.fr.plugin.chart.column.VanChartColumnPlot;
@@ -70,7 +70,7 @@ public class VanChartBarPlotPane extends AbstractVanChartTypePane {
         try {
             cloned = (Plot)newPlot.clone();
         } catch (CloneNotSupportedException e) {
-            FRLogger.getLogger().error("Error In ColumnChart");
+            FineLoggerFactory.getLogger().error("Error In ColumnChart");
         }
         return cloned;
     }

designer-chart/src/com/fr/van/chart/bubble/VanChartBubblePlotPane.java

@@ -6,7 +6,7 @@ import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
 import com.fr.chart.chartglyph.ConditionAttr;
 import com.fr.chart.chartglyph.ConditionCollection;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.base.VanChartZoom;
@@ -82,7 +82,7 @@ public class VanChartBubblePlotPane extends AbstractVanChartTypePane {
         try {
             cloned = (Plot)newPlot.clone();
         } catch (CloneNotSupportedException e) {
-            FRLogger.getLogger().error("Error In BubbleChart");
+            FineLoggerFactory.getLogger().error("Error In BubbleChart");
         }
         return cloned;
     }

designer-chart/src/com/fr/van/chart/column/VanChartColumnPlotPane.java

@@ -2,7 +2,7 @@ package com.fr.van.chart.column;
 
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.plugin.chart.column.ColumnIndependentVanChart;
 import com.fr.plugin.chart.column.VanChartColumnPlot;
@@ -71,7 +71,7 @@ public class VanChartColumnPlotPane extends AbstractVanChartTypePane {
         try {
             cloned = (Plot)newPlot.clone();
         } catch (CloneNotSupportedException e) {
-            FRLogger.getLogger().error("Error In ColumnChart");
+            FineLoggerFactory.getLogger().error("Error In ColumnChart");
         }
         return cloned;
     }

designer-chart/src/com/fr/van/chart/custom/CustomPlotDesignerPaneFactory.java

@@ -5,7 +5,7 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.mainframe.chart.gui.ChartDataPane;
 import com.fr.design.mainframe.chart.gui.data.table.AbstractTableDataContentPane;
 import com.fr.design.mainframe.chart.gui.data.table.CategoryPlotTableDataContentPane;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.chart.PiePlot4VanChart;
 import com.fr.plugin.chart.attr.plot.VanChartAxisPlot;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
@@ -59,7 +59,7 @@ public class CustomPlotDesignerPaneFactory {
                 Constructor<? extends BasicBeanPane<Plot> > constructor = cl.getConstructor();
                 return constructor.newInstance();
             } catch (Exception e){
-                FRLogger.getLogger().error(e.getMessage());
+                FineLoggerFactory.getLogger().error(e.getMessage());
             }
         }
         return null;
@@ -89,7 +89,7 @@ public class CustomPlotDesignerPaneFactory {
                 Constructor<? extends AbstractTableDataContentPane > constructor = cl.getConstructor(ChartDataPane.class);
                 return constructor.newInstance(parent);
             } catch (Exception e){
-                FRLogger.getLogger().error(e.getMessage());
+                FineLoggerFactory.getLogger().error(e.getMessage());
             }
         }
         return new CategoryPlotTableDataContentPane(parent);
@@ -125,7 +125,7 @@ public class CustomPlotDesignerPaneFactory {
                     return constructor.newInstance(plot, parent);
                 }
             } catch (Exception e){
-                FRLogger.getLogger().error(e.getMessage());
+                FineLoggerFactory.getLogger().error(e.getMessage());
             }
         }
         return new VanChartAxisPane(plot,parent);

designer-chart/src/com/fr/van/chart/custom/VanChartCustomPlotPane.java

@@ -9,7 +9,7 @@ import com.fr.chart.chartglyph.ConditionCollection;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.plugin.chart.base.VanChartAttrLine;
 import com.fr.plugin.chart.base.VanChartTools;
@@ -263,7 +263,7 @@ public class VanChartCustomPlotPane extends AbstractVanChartTypePane {
         try {
             cloned = (Plot) newPlot.clone();
         } catch (CloneNotSupportedException e) {
-            FRLogger.getLogger().error("Error In ScatterChart");
+            FineLoggerFactory.getLogger().error("Error In ScatterChart");
         }
         return cloned;
     }

designer-chart/src/com/fr/van/chart/custom/component/VanChartCustomPlotSelectPane.java

@@ -4,7 +4,7 @@ import com.fr.chart.chartattr.Chart;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
 import com.fr.plugin.chart.attr.plot.VanChartRectanglePlot;
@@ -250,7 +250,7 @@ public class VanChartCustomPlotSelectPane extends BasicBeanPane<Chart> {
                 }
             }
         } catch (CloneNotSupportedException e) {
-            FRLogger.getLogger().error(e.getMessage());
+            FineLoggerFactory.getLogger().error(e.getMessage());
         }
 
 

designer-chart/src/com/fr/van/chart/custom/component/VanChartHyperLinkPane.java

@@ -23,7 +23,7 @@ import com.fr.design.hyperlink.WebHyperlinkPane;
 import com.fr.design.javascript.JavaScriptImplPane;
 import com.fr.design.javascript.ParameterJavaScriptPane;
 import com.fr.design.module.DesignModuleFactory;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.general.NameObject;
 import com.fr.js.EmailJavaScript;
@@ -81,13 +81,13 @@ public class VanChartHyperLinkPane extends VanChartUIListControlPane {
             return constructor.newInstance(getHyperLinkEditorMap(), false);
 
         } catch (InstantiationException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         } catch (IllegalAccessException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         } catch (NoSuchMethodException e) {
             return super.createPaneByCreators(creator);
         } catch (InvocationTargetException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return null;
     }

designer-chart/src/com/fr/van/chart/designer/PlotFactory.java

@@ -6,7 +6,7 @@ import com.fr.data.core.FormatField;
 import com.fr.design.gui.icombobox.UIComboBoxRenderer;
 import com.fr.design.gui.style.FormatPane;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.plugin.chart.area.VanChartAreaPlot;
 import com.fr.plugin.chart.bubble.VanChartBubblePlot;
@@ -198,7 +198,7 @@ public class PlotFactory {
                 Constructor<? extends VanChartPlotLabelPane > constructor = cl.getConstructor(Plot.class, VanChartStylePane.class);
                 return constructor.newInstance(plot, stylePane);
             } catch (Exception e){
-                FRLogger.getLogger().error(e.getMessage());
+                FineLoggerFactory.getLogger().error(e.getMessage());
             }
         }
         return new VanChartPlotLabelPane(plot, stylePane);
@@ -218,7 +218,7 @@ public class PlotFactory {
                 Constructor<? extends VanChartPlotLegendPane > constructor = cl.getConstructor(VanChartStylePane.class);
                 return constructor.newInstance(stylePane);
             } catch (Exception e){
-                FRLogger.getLogger().error(e.getMessage());
+                FineLoggerFactory.getLogger().error(e.getMessage());
             }
         }
         return new VanChartPlotLegendPane(stylePane);
@@ -238,7 +238,7 @@ public class PlotFactory {
                 Constructor<? extends VanChartPlotTooltipPane > constructor = cl.getConstructor(Plot.class, VanChartStylePane.class);
                 return constructor.newInstance(plot, stylePane);
             } catch (Exception e){
-                FRLogger.getLogger().error(e.getMessage());
+                FineLoggerFactory.getLogger().error(e.getMessage());
             }
         }
         return new VanChartPlotTooltipPane(plot, stylePane);
@@ -259,7 +259,7 @@ public class PlotFactory {
                 Constructor<? extends VanChartTooltipContentPane > constructor = cl.getConstructor(VanChartStylePane.class, JPanel.class);
                 return constructor.newInstance(parent, showOnPane);
             } catch (Exception e){
-                FRLogger.getLogger().error(e.getMessage());
+                FineLoggerFactory.getLogger().error(e.getMessage());
             }
         }
         return new VanChartLabelContentPane(parent, showOnPane);
@@ -280,7 +280,7 @@ public class PlotFactory {
                 Constructor<? extends VanChartTooltipContentPane > constructor = cl.getConstructor(VanChartStylePane.class, JPanel.class);
                 return constructor.newInstance(parent, showOnPane);
             } catch (Exception e){
-                FRLogger.getLogger().error(e.getMessage());
+                FineLoggerFactory.getLogger().error(e.getMessage());
             }
         }
         return new VanChartTooltipContentPane(parent, showOnPane);
@@ -301,7 +301,7 @@ public class PlotFactory {
                 Constructor<? extends VanChartPlotTooltipPane > constructor = cl.getConstructor(Plot.class);
                 return constructor.newInstance(plot);
             } catch (Exception e){
-                FRLogger.getLogger().error(e.getMessage());
+                FineLoggerFactory.getLogger().error(e.getMessage());
             }
         }
         return new VanChartPlotRefreshTooltipPane(plot);
@@ -321,7 +321,7 @@ public class PlotFactory {
                 Constructor<? extends VanChartTooltipContentPane > constructor = cl.getConstructor(VanChartStylePane.class, JPanel.class);
                 return constructor.newInstance(parent, showOnPane);
             } catch (Exception e){
-                FRLogger.getLogger().error(e.getMessage());
+                FineLoggerFactory.getLogger().error(e.getMessage());
             }
         }
         return new VanChartRefreshTooltipContentPane(parent, showOnPane);

designer-chart/src/com/fr/van/chart/designer/component/ChartUIMenuNameableCreator.java

@@ -2,7 +2,7 @@ package com.fr.van.chart.designer.component;
 
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.imenutable.UIMenuNameableCreator;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 
 import java.lang.reflect.Constructor;
 import java.util.HashMap;
@@ -23,9 +23,9 @@ public class ChartUIMenuNameableCreator extends UIMenuNameableCreator {
         try {
             cloneObj = obj.getClass().newInstance();
         } catch (InstantiationException e) {
-            FRLogger.getLogger().error("UIMenuNameableCreator InstantiationException");
+            FineLoggerFactory.getLogger().error("UIMenuNameableCreator InstantiationException");
         } catch (IllegalAccessException e) {
-            FRLogger.getLogger().error("UIMenuNameableCreator IllegalAccessException");
+            FineLoggerFactory.getLogger().error("UIMenuNameableCreator IllegalAccessException");
         }
         return new ChartUIMenuNameableCreator(hyperLinkEditorMap, name, cloneObj, (Class<? extends BasicBeanPane>) this.paneClazz);
 

designer-chart/src/com/fr/van/chart/designer/component/VanChartUIMenuNameableCreator.java

@@ -2,7 +2,7 @@ package com.fr.van.chart.designer.component;
 
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.imenutable.UIMenuNameableCreator;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.FCloneable;
 
 /**
@@ -20,7 +20,7 @@ public class VanChartUIMenuNameableCreator extends UIMenuNameableCreator {
         try {
             cloneObj = ((FCloneable)obj).clone();
         } catch (CloneNotSupportedException e){
-            FRLogger.getLogger().error("VanChartUIMenuNameableCreator CloneNotSupportedException");
+            FineLoggerFactory.getLogger().error("VanChartUIMenuNameableCreator CloneNotSupportedException");
         }
         return new UIMenuNameableCreator(name, cloneObj, this.paneClazz);
 

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

@@ -16,7 +16,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.general.DateUtils;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.plugin.chart.attr.axis.VanChartAxis;
 import com.fr.plugin.chart.attr.axis.VanChartTimeAxis;
@@ -379,7 +379,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
                 String tmp = DateUtils.getDate2LStr(toDate);
                 toDate = DateUtils.DATETIMEFORMAT2.parse(tmp);
             } catch (ParseException e) {
-                FRLogger.getLogger().error("cannot get date");
+                FineLoggerFactory.getLogger().error("cannot get date");
             }
             return toDate;
         }

designer-chart/src/com/fr/van/chart/designer/style/background/BackgroundNameObjectCreator.java

@@ -2,7 +2,7 @@ package com.fr.van.chart.designer.style.background;
 
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.controlpane.UnrepeatedNameHelper;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.NameObject;
 import com.fr.plugin.chart.attr.axis.VanChartCustomIntervalBackground;
 import com.fr.stable.Nameable;
@@ -34,13 +34,13 @@ public class BackgroundNameObjectCreator extends ChartNameObjectCreator {
             return new NameObject(helper.createUnrepeatedName(this.menuName()), vanChartCustomIntervalBackground);
 
         } catch (NoSuchMethodException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         } catch (IllegalAccessException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         } catch (InstantiationException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         } catch (InvocationTargetException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return null;
     }

designer-chart/src/com/fr/van/chart/designer/style/background/ChartNameObjectCreator.java

@@ -3,7 +3,7 @@ package com.fr.van.chart.designer.style.background;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.controlpane.NameObjectCreator;
 import com.fr.design.gui.controlpane.UnrepeatedNameHelper;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.NameObject;
 import com.fr.plugin.chart.attr.axis.VanChartAlertValue;
 import com.fr.stable.Nameable;
@@ -40,13 +40,13 @@ public class ChartNameObjectCreator extends NameObjectCreator {
             return new NameObject(helper.createUnrepeatedName(this.menuName()), vanChartAlertValue);
 
         } catch (NoSuchMethodException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         } catch (IllegalAccessException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         } catch (InstantiationException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         } catch (InvocationTargetException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return null;
     }

designer-chart/src/com/fr/van/chart/designer/style/series/StackedAndAxisNameObjectCreator.java

@@ -3,7 +3,7 @@ package com.fr.van.chart.designer.style.series;
 import com.fr.chart.chartglyph.ConditionAttr;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.controlpane.UnrepeatedNameHelper;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.NameObject;
 import com.fr.plugin.chart.base.AttrSeriesStackAndAxis;
 import com.fr.stable.Nameable;
@@ -36,13 +36,13 @@ public class StackedAndAxisNameObjectCreator extends ChartNameObjectCreator {
             return new NameObject(helper.createUnrepeatedName(this.menuName()), conditionAttr);
 
         } catch (NoSuchMethodException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         } catch (IllegalAccessException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         } catch (InstantiationException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         } catch (InvocationTargetException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return null;
     }

designer-chart/src/com/fr/van/chart/designer/type/AbstractVanChartTypePane.java

@@ -12,7 +12,7 @@ import com.fr.design.gui.ilable.MultilineLabel;
 import com.fr.design.mainframe.chart.gui.type.AbstractChartTypePane;
 import com.fr.design.mainframe.chart.gui.type.ChartImagePane;
 import com.fr.general.Background;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.js.NameJavaScriptGroup;
 import com.fr.plugin.chart.attr.plot.VanChartPlot;
@@ -168,7 +168,7 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane{
             ((VanChartPlot)newPlot).setCategoryNum( ((VanChartPlot)oldPlot).getCategoryNum());
 
         } catch (CloneNotSupportedException e) {
-            FRLogger.getLogger().error("Error in change plot");
+            FineLoggerFactory.getLogger().error("Error in change plot");
         }
     }
 

designer-chart/src/com/fr/van/chart/funnel/designer/type/VanChartFunnelTypePane.java

@@ -2,7 +2,7 @@ package com.fr.van.chart.funnel.designer.type;
 
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.funnel.FunnelIndependentVanChart;
@@ -57,7 +57,7 @@ public class VanChartFunnelTypePane extends AbstractVanChartTypePane {
         try {
             cloned = (Plot)newPlot.clone();
         } catch (CloneNotSupportedException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return cloned;
     }

designer-chart/src/com/fr/van/chart/gantt/designer/type/VanChartGanttPlotPane.java

@@ -2,7 +2,7 @@ package com.fr.van.chart.gantt.designer.type;
 
 import com.fr.chart.chartattr.Chart;
 import com.fr.chart.chartattr.Plot;
-import com.fr.general.FRLogger;
+import com.fr.log.FineLoggerFactory;
 import com.fr.general.Inter;
 import com.fr.plugin.chart.gantt.GanttIndependentVanChart;
 import com.fr.plugin.chart.gantt.VanChartGanttPlot;
@@ -51,7 +51,7 @@ public class VanChartGanttPlotPane extends AbstractVanChartTypePane {
         try {
             cloned = (Plot)newPlot.clone();
         } catch (CloneNotSupportedException e) {
-            FRLogger.getLogger().error(e.getMessage(), e);
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         return cloned;
     }