Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~tommy/design into feature/10.0

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

@@ -15,21 +15,19 @@ import com.fr.design.env.DesignerWorkspaceType;
 import com.fr.design.env.LocalDesignerWorkspaceInfo;
 import com.fr.design.env.RemoteDesignerWorkspaceInfo;
 import com.fr.design.file.HistoryTemplateListPane;
-import com.fr.design.fun.DesignerPortProvider;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.locale.impl.ProductImproveMark;
 import com.fr.design.mainframe.reuse.ComponentReuseNotificationInfo;
 import com.fr.design.mainframe.vcs.VcsConfigManager;
 import com.fr.design.notification.SnapChatConfig;
 import com.fr.design.port.DesignerPortContext;
-import com.fr.design.update.push.DesignerPushUpdateConfigManager;
 import com.fr.design.style.color.ColorSelectConfigManager;
+import com.fr.design.update.push.DesignerPushUpdateConfigManager;
 import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.DesignerPort;
 import com.fr.exit.DesignerExiter;
 import com.fr.file.FILEFactory;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.FRLogFormatter;
 import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 import com.fr.general.SupportLocale;
@@ -37,15 +35,14 @@ import com.fr.general.locale.LocaleCenter;
 import com.fr.general.locale.LocaleMark;
 import com.fr.general.xml.GeneralXMLTools;
 import com.fr.log.FineLoggerFactory;
+import com.fr.log.LogHandler;
 import com.fr.stable.CommonUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.CoreConstants;
-import com.fr.stable.EnvChangedListener;
 import com.fr.stable.ListMap;
 import com.fr.stable.ProductConstants;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
-import com.fr.stable.bridge.StableFactory;
 import com.fr.stable.core.UUID;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.stable.xml.XMLPrintWriter;
@@ -53,6 +50,7 @@ import com.fr.stable.xml.XMLReadable;
 import com.fr.stable.xml.XMLTools;
 import com.fr.stable.xml.XMLWriter;
 import com.fr.stable.xml.XMLableReader;
+import com.fr.third.apache.log4j.FileAppender;
 import com.fr.third.org.apache.commons.io.FilenameUtils;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.WorkContextCallback;
@@ -79,8 +77,6 @@ import java.util.ListIterator;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.logging.FileHandler;
-import java.util.logging.Handler;
 
 /**
  * The manager of Designer GUI.
@@ -309,14 +305,23 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
                 calender.setTimeInMillis(System.currentTimeMillis());
                 String today = calender.get(Calendar.YEAR) + "-" + (calender.get(Calendar.MONTH) + 1) + "-" + calender.get(Calendar.DAY_OF_MONTH);
 
-                String fileName = StableUtils.pathJoin(logLocation, "fr_" + today + "_%g.log");
+                final String fileName = StableUtils.pathJoin(logLocation, "fr_" + today + "_%g.log");
                 if (!new File(fileName).exists()) {
                     StableUtils.makesureFileExist(new File(fileName));
                 }
-                Handler handler = new FileHandler(fileName, true);
+                LogHandler handler = new LogHandler<FileAppender>() {
+                    final FileAppender appender = new FileAppender(
+                        new com.fr.third.apache.log4j.PatternLayout("%d{HH:mm:ss} %t %p [%c] %m%n"),
+                        fileName
+                    );
+
+                    @Override
+                    public FileAppender getHandler() {
+                        return appender;
+                    }
+                };
 
-                handler.setFormatter(new FRLogFormatter());
-                FineLoggerFactory.getLogger().addLogHandler(handler);
+                FineLoggerFactory.getLogger().addLogAppender(handler);
             } catch (SecurityException e) {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             } catch (IOException e) {

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

@@ -177,7 +177,7 @@ public class ReuseTriggerPointManager {
     private JPanel createReusePrompt(JForm jForm) {
         JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         jPanel.add(new UILabel(Toolkit.i18nText("Fine-Design_Component_Reuse_Try_Prompt")), BorderLayout.WEST);
-        UILabel reuseLabel = new UILabel(Toolkit.i18nText("Fine-Design_Component_Reuse"));
+        UILabel reuseLabel = new UILabel(Toolkit.i18nText("Fine-Design_Share_Component"));
         reuseLabel.addMouseListener(new MouseListener() {
             @Override
             public void mouseClicked(MouseEvent e) {