Merge pull request #304 in DESIGN/design from release/10.0 to 10.0

* commit '15301428846d8313445cbc5d3e3576ca7aa11b43':
  REPORT-10258 10.0 事件编辑面板，无法正常添加/删除“引用JavaScript”
  REPORT-9953 &  REPORT-10231
  REPORT-9953 &  REPORT-10231
  CORE-113 执行时间和内存等的测量，需要同时提供给BI使用，因此移动到core里面
  REPORT-9221 10.0插件兼容-版本管理
  相应修改使用的地方
  #i18n
  修改了部分Java文件中的旧式引用
  Merge pull request #283 in DESIGN/design from ~JU/design:release/10.0 to release/10.0

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

@@ -93,7 +93,8 @@ public class SwitchExistEnv extends MenuDef {
             Workspace workspace;
             try {
                 workspace = DesignerWorkspaceGenerator.generate(selectedEnv);
-                if (workspace == null) {
+                boolean checkValid = workspace == null ? false : selectedEnv.checkValid();
+                if (!checkValid) {
                     JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Switch_Workspace_Failed"),
                             null, 0, UIManager.getIcon("OptionPane.errorIcon"));
                     return;

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

@@ -9,7 +9,6 @@ import com.fr.design.utils.DesignUtils;
 import com.fr.file.FILE;
 import com.fr.file.FileNodeFILE;
 import com.fr.general.GeneralUtils;
-
 import com.fr.general.web.ParameterConstants;
 import com.fr.stable.project.ProjectConstants;
 import com.fr.stable.web.AbstractWebletCreator;
@@ -82,27 +81,27 @@ public final class WebPreviewUtils {
             String path = currentTemplate.getPath();
             if (path.startsWith(ProjectConstants.REPORTLETS_NAME)) {
                 path = path.substring(ProjectConstants.REPORTLETS_NAME.length() + 1);
+            }
 
-                java.util.List<String> parameterNameList = new java.util.ArrayList<String>();
+            java.util.List<String> parameterNameList = new java.util.ArrayList<String>();
-                java.util.List<String> parameterValueList = new java.util.ArrayList<String>();
+            java.util.List<String> parameterValueList = new java.util.ArrayList<String>();
 
-                // 暂时屏蔽cptx直接访问
+            // 暂时屏蔽cptx直接访问
-                if (path.endsWith(FileExtension.CPTX.getSuffix())) {
+            if (path.endsWith(FileExtension.CPTX.getSuffix())) {
-                    path = path.substring(0, path.length() - 1);
+                path = path.substring(0, path.length() - 1);
-                    parameterNameList.add(AbstractWebletCreator.FORMAT);
+                parameterNameList.add(AbstractWebletCreator.FORMAT);
-                    parameterValueList.add(AbstractWebletCreator.X);
+                parameterValueList.add(AbstractWebletCreator.X);
-                }
+            }
 
-                parameterNameList.add(actionType);
+            parameterNameList.add(actionType);
-                parameterValueList.add(path);
+            parameterValueList.add(path);
-                if (map != null) {
+            if (map != null) {
-                    for (String key : map.keySet()) {
+                for (String key : map.keySet()) {
-                        parameterNameList.add(key);
+                    parameterNameList.add(key);
-                        parameterValueList.add(GeneralUtils.objectToString(map.get(key)));
+                    parameterValueList.add(GeneralUtils.objectToString(map.get(key)));
-                    }
                 }
-                DesignUtils.visitEnvServerByParameters(baseRoute, parameterNameList.toArray(new String[parameterNameList.size()]), parameterValueList.toArray(new String[parameterValueList.size()]));
             }
+            DesignUtils.visitEnvServerByParameters(baseRoute, parameterNameList.toArray(new String[parameterNameList.size()]), parameterValueList.toArray(new String[parameterValueList.size()]));
         } else {
             int selVal = JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Web_Preview_Message"),
                     com.fr.design.i18n.Toolkit.i18nText("Preview_ToolTips"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);

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

@@ -75,7 +75,7 @@ public abstract class OneListTableModel<T> extends UITableModelAdapter<T> {
 				if(!"js".equalsIgnoreCase(fileType)) {
 					return ;
 				}
-				String temp = file.getPath().substring(1);
+				String temp = file.getPath();
 				addRow((T) temp);
 				fireTableDataChanged();
 			}
@@ -101,7 +101,7 @@ public abstract class OneListTableModel<T> extends UITableModelAdapter<T> {
 				if(!"css".equalsIgnoreCase(fileType)) {
 					return ;
 				}
-				String temp = file.getPath().substring(1);
+				String temp = file.getPath();
 				addRow((T) temp);
 				fireTableDataChanged();
 			}

designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceInfo.java

@@ -11,4 +11,6 @@ public interface DesignerWorkspaceInfo extends XMLable {
     String getPath();
 
     WorkspaceConnection getConnection();
+
+    boolean checkValid();
 }

designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java

@@ -1,5 +1,7 @@
 package com.fr.design.env;
 
+import com.fr.base.EnvException;
+import com.fr.general.ComparatorUtils;
 import com.fr.general.NameObject;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
@@ -7,6 +9,8 @@ import com.fr.stable.xml.XMLPrintWriter;
 import com.fr.stable.xml.XMLableReader;
 import com.fr.workspace.connect.WorkspaceConnection;
 
+import java.io.File;
+
 /**
  * Created by juhaoyu on 2018/6/15.
  */
@@ -69,4 +73,14 @@ public class LocalDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
 
         return  object;
     }
+
+    @Override
+    public boolean checkValid(){
+        File file = new File(this.path);
+        if(!file.isDirectory() || !ComparatorUtils.equals(file.getName(), "WEB-INF")) {
+            return false;
+        }
+
+        return true;
+    }
 }

designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java

@@ -86,4 +86,11 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
         object.connection = (WorkspaceConnection) StableUtils.cloneObject(this.connection);
         return object;
     }
+
+
+    @Override
+    public boolean checkValid(){
+
+        return true;
+    }
 }

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

@@ -147,7 +147,8 @@ public class TemplatePane extends JPanel implements MouseListener {
         DesignerWorkspaceInfo selectedEnv = envManager.getWorkspaceInfo(selectedName);
         try {
             Workspace workspace = DesignerWorkspaceGenerator.generate(selectedEnv);
-            if (workspace == null) {
+            boolean checkValid = workspace == null ? false : selectedEnv.checkValid();
+            if (!checkValid) {
                 JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Switch_Workspace_Failed"),
                         null, 0, UIManager.getIcon("OptionPane.errorIcon"));
                 return false;

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

@@ -234,7 +234,7 @@ public abstract class ToolBarMenuDock {
         // 添加帮助菜单
         menuList.add(createHelpMenuDef());
 
-        if (GeneralContext.getLocale() == Locale.CHINA || GeneralContext.getLocale() == Locale.TAIWAN) {
+        if (GeneralContext.getLocale().equals(Locale.CHINA) || GeneralContext.getLocale().equals(Locale.TAIWAN)) {
             // 添加社区菜单
             addCommunityMenuDef(menuList);
         }

designer-base/src/main/java/com/fr/file/FileFILE.java

@@ -4,7 +4,7 @@ import com.fr.base.io.XMLEncryptUtils;
 import com.fr.design.gui.itree.filetree.FileComparator;
 import com.fr.design.gui.itree.filetree.FileTreeIcon;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.SessionLocalManager;
+import com.fr.web.session.SessionLocalManager;
 import com.fr.stable.StableUtils;
 import com.fr.stable.project.ProjectConstants;
 

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

@@ -48,7 +48,7 @@ public class LabelAxisPositionPane extends ConditionAttrSingleConditionPane<Data
 
     @Override
     public String nameForPopupMenuItem() {
-        return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Owner", "time(s)", "ChartF-Axis"});
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_MajorMinorAxis");
     }
 
     @Override

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

@@ -111,7 +111,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
 
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Arrow_Style")), switchStyleGroup, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Time_Interval")), timeInterval, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base-Time_Second"))},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), timeInterval, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base-Time_Second"))},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Background")),colorSelectBox4carousel, null}
         };
 

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

@@ -222,12 +222,12 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
         }
 
         protected JPanel initOtherPane() {
-            onlyPreData = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_OnlyUseBeforeRecords"));
+            onlyPreData = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OnlyUseBeforeRecords"));
             JPanel panel1 = new JPanel(new BorderLayout());
             JPanel panel2 = new JPanel(new BorderLayout());
             panel1.add(onlyPreData, BorderLayout.NORTH);
             preDataNum = new UITextField();
-            UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_RecordsNum"));
+            UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_RecordsNum"));
             combineOther = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_CombineOther"));
             combineOther.setSelected(true);
             double p = TableLayout.PREFERRED;
@@ -397,12 +397,12 @@ public class ChartDataFilterPane extends ThirdTabPane<ChartCollection> {
 
 
         protected JPanel initOtherPane() {
-            onlyPreData = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_OnlyUseBeforeRecords"));
+            onlyPreData = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OnlyUseBeforeRecords"));
             JPanel panel1 = new JPanel(new BorderLayout());
             JPanel panel2 = new JPanel(new BorderLayout());
             panel1.add(onlyPreData, BorderLayout.NORTH);
             preDataNum = new UITextField();
-            UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_RecordsNum"));
+            UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_RecordsNum"));
             combineOther = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_CombineOther"));
             combineOther.setSelected(true);
             double p = TableLayout.PREFERRED;

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

@@ -34,7 +34,7 @@ public class ChartSwitchPane extends AbstractAttrNoScrollPane{
 		JPanel pane = new JPanel();
 		pane.setLayout(new BorderLayout());
 		
-		changeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Switch"));
+		changeButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Switch"));
 		
 		pane.add(changeButton, BorderLayout.NORTH);
 		

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValueNoFormulaPane.java

@@ -41,6 +41,6 @@ public class ChartSecondValueNoFormulaPane extends ChartValueNoFormulaPane{
      * @return 第二值轴
      */
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Second", "Chart_F_Radar_Axis"});
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SecondValueAxis");
     }
 }

designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java

@@ -72,7 +72,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane {
     }
 
     private JPanel creatNorthPane() {
-        emptyData = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        emptyData = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
         emptyData.setSelectedIndex(0);
         emptyData.setPreferredSize(new Dimension(WIDTH, HEIGHT));
         emptyData.addActionListener(new ActionListener() {

designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java

@@ -82,7 +82,7 @@ public class ExtendedOtherPane extends AbstractChartAttrPane {
 
     private JPanel createRefreshPane() {
 
-        refreshEnabled = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        refreshEnabled = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
         refreshEnabled.addChangeListener(new ChangeListener() {
             @Override
             public void stateChanged(ChangeEvent e) {
@@ -97,7 +97,7 @@ public class ExtendedOtherPane extends AbstractChartAttrPane {
         double[] rowSize = {p};
 
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Time_Interval")), autoRefreshTime, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Time_Seconds"))},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), autoRefreshTime, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Time_Seconds"))},
         };
         contentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
 

designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java

@@ -26,9 +26,9 @@ public class VanChartBubblePane extends BasicBeanPane<VanChartAttrBubble> {
     public VanChartBubblePane(){
         minDiameter = new UISpinner(0,Double.MAX_VALUE,1,0);
         maxDiameter = new UISpinner(0,Double.MAX_VALUE,1,0);
-        shadow = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"),
+        shadow = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"),
                 com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
-        displayNegative = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"),
+        displayNegative = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"),
                 com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
 
 
@@ -51,7 +51,7 @@ public class VanChartBubblePane extends BasicBeanPane<VanChartAttrBubble> {
                 new Component[]{null, null},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MinDiameter")), minDiameter},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MaxDiameter")), maxDiameter},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Shadow")), shadow},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Shadow")), shadow},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_DisplayNegative")), displayNegative},
 
         };

designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java

@@ -70,12 +70,12 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane {
     }
 
     private JPanel createSeriesStylePane(double[] row, double[] col) {
-        isFixedWidth = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_YES"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NO")});
+        isFixedWidth = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_YES"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_NO")});
         columnWidth = new UISpinner(0,1000,1,0);
         columnWidth.setBorder(BorderFactory.createEmptyBorder(0, (int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH + TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0));
         seriesGap = new UINumberDragPane(-100, 100);
         categoryGap = new UINumberDragPane(0, 100);
-        isFillWithImage = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_YES"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NO")});
+        isFillWithImage = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_YES"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_NO")});
         imagePane = new ImageBackgroundQuickPane(false);
         imagePane.setBorder(BorderFactory.createEmptyBorder(0,(int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH + TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0));
 

designer-chart/src/main/java/com/fr/van/chart/column/VanChartCustomStackAndAxisConditionPane.java

@@ -63,8 +63,8 @@ public class VanChartCustomStackAndAxisConditionPane extends BasicBeanPane<Condi
     }
 
     private JPanel createDeployPane() {
-        isStacked = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_YES"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NO")});
+        isStacked = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_YES"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_NO")});
-        isPercentStacked = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_YES"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NO")});
+        isPercentStacked = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_YES"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_NO")});
         double p = TableLayout.PREFERRED;
         double[] columnSize = {p, p};
         double[] rowSize = {p, p, p, p};
@@ -77,7 +77,7 @@ public class VanChartCustomStackAndAxisConditionPane extends BasicBeanPane<Condi
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis")), XAxis},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis")), YAxis},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked")), isStacked},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_PercentStacked")), isPercentStacked},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PercentStacked")), isPercentStacked},
         };
 
         isStacked.addActionListener(new ActionListener() {

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

@@ -37,9 +37,9 @@ public class CustomPlotLocationPane extends BasicBeanPane<Plot>{
         yDirection = new UISpinner(0, 100, 1, 20);
 
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Position") + "(%):  " + com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_X_Direction"), SwingConstants.LEFT),xDirection},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Position") + "(%):  " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_X_Direction"), SwingConstants.LEFT),xDirection},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Y_Direction"), SwingConstants.RIGHT),yDirection},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Y_Direction"), SwingConstants.RIGHT),yDirection},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Radius") + "(px):   ",SwingConstants.LEFT),radius}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radius") + "(px):   ",SwingConstants.LEFT),radius}
 
         };
         JPanel panel = TableLayoutHelper.createTableLayoutPane(components, new double[]{-2, -2, -2}, new double[]{-2, -1});

designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomAxisTabPane.java

@@ -81,7 +81,7 @@ public class VanChartCustomAxisTabPane extends VanChartCustomPlotTabPane<VanChar
             JPanel pane = paneList.get(paneList.size() - 1);
 
             //获取点的tooltip作为标题
-            NameArray[paneList.size() - 1] = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Rectangular_Coordinate_System");
+            NameArray[paneList.size() - 1] = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Rectangular_Coordinate_System");
             centerPane.add(pane, NameArray[paneList.size() - 1]);
         }
     }

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartFloatPositionPane.java

@@ -38,8 +38,8 @@ public class VanChartFloatPositionPane extends BasicBeanPane<Chart> {
         double[] columnSize = {p, f};
         double[] rowSize = {p,p};
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_positionX")+": "),floatPosition_x},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_positionX")+": "),floatPosition_x},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_positionY")+": "),floatPosition_y}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_positionY")+": "),floatPosition_y}
         };
 
         return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineTypePane.java

@@ -31,7 +31,7 @@ public class VanChartLineTypePane extends BasicPane {
 
         createLineStyle();
 
-        nullValueBreak = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        nullValueBreak = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
 
         this.setLayout(new BorderLayout());
         double p = TableLayout.PREFERRED;
@@ -40,8 +40,8 @@ public class VanChartLineTypePane extends BasicPane {
     }
 
     protected void createLineStyle() {
-        String[] textArray = new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NormalLine"),
+        String[] textArray = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_NormalLine"),
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_StepLine"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CurveLine")};
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_StepLine"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CurveLine")};
         lineStyle = new UIButtonGroup<LineStyle>(textArray, LineStyle.values());
     }
 
@@ -54,7 +54,7 @@ public class VanChartLineTypePane extends BasicPane {
                 new Component[]{null,null},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle")),lineWidth},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present")),lineStyle},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Null_Value_Break")),nullValueBreak},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Break")),nullValueBreak},
         };
 
         return TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartLineWidthPane.java

@@ -22,7 +22,7 @@ public class VanChartLineWidthPane extends VanChartLineTypePane {
         Component[][] components = new Component[][]{
                 new Component[]{null,null},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle")), lineWidth},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Null_Value_Break")), nullValueBreak},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Break")), nullValueBreak},
         };
 
         return TableLayoutHelper.createTableLayoutPane(components, row, col);

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartMarkerPane.java

@@ -32,7 +32,7 @@ public class VanChartMarkerPane extends BasicPane {
     public VanChartMarkerPane() {
         this.setLayout(new BorderLayout(0, 4));
 
-        String[] array = new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Rule"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")};
+        String[] array = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Rule"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom")};
         commonORCustom = new UIButtonGroup<String>(array, array);
 
         commonORCustom.addChangeListener(new ChangeListener() {
@@ -57,7 +57,7 @@ public class VanChartMarkerPane extends BasicPane {
                 }
             }
         };
-        centerPane.add(commonMarkerPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Rule"));
+        centerPane.add(commonMarkerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Rule"));
         centerPane.add(imageMarkerPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Custom"));
 
         layoutComponents();
@@ -86,7 +86,7 @@ public class VanChartMarkerPane extends BasicPane {
     }
 
     protected void layoutComponents() {
-        this.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Point_Style"), commonORCustom), BorderLayout.NORTH);
+        this.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Point_Style"), commonORCustom), BorderLayout.NORTH);
         this.add(centerPane, BorderLayout.CENTER);
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTrendLinePane.java

@@ -59,12 +59,12 @@ public class VanChartTrendLinePane extends BasicPane{
         };
         JPanel periodPane = TableLayoutHelper.createTableLayoutPane(periodComps, r, c);
 
-        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Period"));
+        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Period"));
         label.setVerticalAlignment(SwingConstants.TOP);
 
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Name")), trendLineName},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Name")), trendLineName},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LineStyle")), trendLineStyle},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), trendLineColor},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")), trendLineType},

designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPane.java

@@ -95,14 +95,14 @@ public class VanChartBackgroundPane extends BasicPane {
     }
 
     protected Component[][] getPaneComponents() {
-        shadow = new UIButtonGroup<Boolean>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_On"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Off")}, new Boolean[]{true, false});
+        shadow = new UIButtonGroup<Boolean>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_On"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Off")}, new Boolean[]{true, false});
 
         return  new Component[][]{
                 new Component[]{null, null},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill")), typeComboBox},
                 new Component[]{null, centerPane},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Alpha")), transparent},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Shadow")), shadow},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Shadow")), shadow},
         };
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartMarkerBackgroundPane.java

@@ -42,7 +42,7 @@ public class VanChartMarkerBackgroundPane extends VanChartBackgroundPane {
         paneList.add(new NullBackgroundQuickPane(){
             @Override
             public String title4PopupWindow() {
-                return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_SeriesColor");
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SeriesColor");
             }
 
         });

designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartCommonMarkerPane.java

@@ -132,14 +132,14 @@ public class VanChartCommonMarkerPane extends BasicBeanPane<VanChartAttrMarker>
         return  new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")), markerPane},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_FillColor")), markerFillColor},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Radius")), radius},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radius")), radius},
         };
     }
 
     protected Component[][] getUseComponentWithOutFillColor() {
         return  new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")), markerPane},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Radius")), radius},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radius")), radius},
         };
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/component/marker/VanChartImageMarkerPane.java

@@ -1,6 +1,5 @@
 package com.fr.van.chart.designer.component.marker;
 
-import com.fr.base.background.ImageBackground;
 import com.fr.base.background.ImageFileBackground;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ilable.UILabel;
@@ -40,7 +39,7 @@ public class VanChartImageMarkerPane extends BasicBeanPane<VanChartAttrMarker> {
         double[] col = {p, f};
 
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Width")), width},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Width")), width},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Height")), height},
         };
 

designer-chart/src/main/java/com/fr/van/chart/designer/other/AutoRefreshPane.java

@@ -58,7 +58,7 @@ public class AutoRefreshPane extends BasicBeanPane<RefreshMoreLabel> {
 
     protected JPanel createContentPane() {
         JPanel content = new JPanel(new BorderLayout(0, 6));
-        moreLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        moreLabel = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
         moreLabel.addChangeListener(new ChangeListener() {
             @Override
             public void stateChanged(ChangeEvent e) {
@@ -108,7 +108,7 @@ public class AutoRefreshPane extends BasicBeanPane<RefreshMoreLabel> {
     protected Component[][] initComponent(JPanel autoTooltipPane){
 
         return new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Time_Interval")), autoRefreshTime, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Time_Seconds"))},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Interval")), autoRefreshTime, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Time_Seconds"))},
                 new Component[]{autoTooltip,null, tooltipSet},
         };
 

designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java

@@ -114,20 +114,20 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
         if (!plot.isSupportZoomDirection()) {
             return null;
         }
-        zoomWidget = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        zoomWidget = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
-        zoomResize = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Change"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Non_Adjustment")});
+        zoomResize = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Change"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Non_Adjustment")});
         from = new TinyFormulaPane();
         to = new TinyFormulaPane();
         zoomType = new UIButtonGroup(getNameArray(), getValueArray());
-        zoomGesture = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        zoomGesture = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
 
         JPanel zoomWidgetPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ZoomWidget"), zoomWidget);
-        JPanel zoomGesturePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ZoomGesture"), zoomGesture);
+        JPanel zoomGesturePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ZoomGesture"), zoomGesture);
 
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_WidgetBoundary")), zoomResize},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_From")), from},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_To")), to},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_To")), to},
         };
 
         double f = TableLayout.FILL;
@@ -165,7 +165,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
         if (!(plot.getAxisPlotType() == AxisPlotType.RECTANGLE)){
             return null;
         }
-        axisRotation = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"),
+        axisRotation = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"),
                 com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
         axisRotation.addChangeListener(new ChangeListener() {
             @Override
@@ -175,7 +175,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
         });
         Component[][] components = new Component[][]{
                 new Component[]{null,null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Reversal")),axisRotation}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Reversal")),axisRotation}
         };
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Axis"), panel);
@@ -205,7 +205,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
     }
 
     protected JPanel createToolBarPane(double[] row, double[] col){
-        isSort = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Sort"));
+        isSort = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sort"));
         exportImages = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ExportImage"));
         fullScreenDisplay = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_FullScreenDisplay"));
         collapse = new UIToggleButton(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Collapse"));
@@ -240,7 +240,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
 
 
     protected JPanel createAnimationPane(){
-        isChartAnimation = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        isChartAnimation = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Animation_Effects"), isChartAnimation);
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Animation"), panel);
     }

designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartStructureNodeConditionPane.java

@@ -17,7 +17,7 @@ public class VanChartStructureNodeConditionPane extends AbstractNormalMultiLineC
 
     @Override
     protected String getItemLabelString() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Node");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Node");
     }
 
     @Override
@@ -35,7 +35,7 @@ public class VanChartStructureNodeConditionPane extends AbstractNormalMultiLineC
      * @return item的名称
      */
     public String nameForPopupMenuItem() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Node");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Node");
     }
 
     @Override

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

@@ -231,7 +231,7 @@ public class VanChartPlotLegendPane extends BasicPane {
 
     protected JPanel createDisplayStrategy(){
         maxProportion = new UISpinner(0,100,1,30);
-        limitSize = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Limit"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NotLimit")});
+        limitSize = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Limit"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_NotLimit")});
         limitSizeTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MaxProportion"));
 
 
@@ -252,7 +252,7 @@ public class VanChartPlotLegendPane extends BasicPane {
     }
 
     private JPanel createHighlightPane(){
-        highlightButton = new UIButtonGroup<Boolean>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_On"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Off")}, new Boolean[]{true, false});
+        highlightButton = new UIButtonGroup<Boolean>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_On"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Off")}, new Boolean[]{true, false});
 
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;

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

@@ -169,7 +169,7 @@ public class VanChartTitlePane extends AbstractVanChartScrollPane<VanChart> {
 
     private JPanel createDisplayStrategy(){
         maxProportion = new UISpinner(0,100,1,30);
-        limitSize = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Limit"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NotLimit")});
+        limitSize = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Limit"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_NotLimit")});
 
         JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AreaSize"),limitSize);
         maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MaxProportion"),maxProportion, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);

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

@@ -134,9 +134,9 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
                 new Component[]{null,null},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Content")),titleContent},
                 new Component[]{null,titleUseHtml},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Position")),titleAlignPane},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Position")),titleAlignPane},
                 new Component[]{titleTextAttrPane,null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_TextRotation")),titleTextRotation},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TextRotation")),titleTextRotation},
         };
 
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
@@ -168,7 +168,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
         labelGapStyle = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Automatic"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Fixed")});
         labelGapValue = new UITextField();
         Component[][] gapComponents = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_TextRotation")), labelTextRotation},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TextRotation")), labelTextRotation},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ChartF-Label_Interval")), labelGapStyle},
         };
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(gapComponents, row, col);
@@ -222,7 +222,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
     protected JPanel createLineStylePane(double[] row, double[] col){
         axisLineStyle = createLineComboBox();
         axisLineColor = new ColorSelectBox(100);
-        String[] strings = new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")};
+        String[] strings = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")};
         AxisTickLineType[] values = new AxisTickLineType[]{AxisTickLineType.TICK_LINE_OUTSIDE, AxisTickLineType.TICK_LINE_NONE};
         mainTick = new UIButtonGroup<AxisTickLineType>(strings, values);
         secondTick = new UIButtonGroup<AxisTickLineType>(strings, values);
@@ -241,13 +241,13 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_type")),axisLineStyle} ,
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),axisLineColor},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MainGraduationLine")),mainTick},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_SecondGraduationLine")),secondTick},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SecondGraduationLine")),secondTick},
         };
     }
 
     protected JPanel createAxisPositionPane(double[] row, double[] col, boolean isXAxis){
         position = new UIButtonGroup<Integer>(getAxisPositionNameArray(isXAxis), getAxisPositionValueArray(isXAxis));
-        reversed = new UIButtonGroup<Boolean>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_On"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Off")}, new Boolean[]{true, false});
+        reversed = new UIButtonGroup<Boolean>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_On"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Off")}, new Boolean[]{true, false});
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AxisLabel_Position")),position},
@@ -276,7 +276,7 @@ public class VanChartBaseAxisPane extends FurtherBasicBeanPane<VanChartAxis> {
 
     protected JPanel createDisplayStrategy(double[] row, double[] col){
         maxProportion = new UISpinner(0,100,1,30);
-        axisLimitSize = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Limit"),com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NotLimit")});
+        axisLimitSize = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Limit"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_NotLimit")});
 
         JPanel limitSizePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AreaSize"),axisLimitSize);
         maxProportionPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MaxProportion"),maxProportion, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);

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

@@ -120,7 +120,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
      */
     @Override
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_TimeAxis");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TimeAxis");
     }
 
     private class TimeMinMaxValuePane extends JPanel{
@@ -168,7 +168,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
             minPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Min"),minValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
             maxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Max"),maxValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
             mainPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MainType"),mainTickPane, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
-            secPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_SecType"),secTickPane, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
+            secPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SecType"),secTickPane, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
 
             minPane.setBorder(BorderFactory.createEmptyBorder(0,TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0));
             maxPane.setBorder(BorderFactory.createEmptyBorder(0,TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0));

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

@@ -63,7 +63,7 @@ public class VanChartMinMaxValuePane extends MinMaxValuePane {
         minPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Min"),minValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
         maxPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Data_Max"),maxValueField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
         mainPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MainType"),mainUnitField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
-        secPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_SecType"),secUnitField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
+        secPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SecType"),secUnitField, TableLayout4VanChartHelper.SECOND_EDIT_AREA_WIDTH);
 
         minPane.setBorder(BorderFactory.createEmptyBorder(0,COMPONENT_INTERVAL,0,0));
         maxPane.setBorder(BorderFactory.createEmptyBorder(0,COMPONENT_INTERVAL,0,0));

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

@@ -116,10 +116,10 @@ public class VanChartGaugeDetailAxisPane extends VanChartValueAxisPane {
         secTickColor = new ColorSelectBox(100);
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_MainGraduationLine")), mainTickColor},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_SecondGraduationLine")), secTickColor},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SecondGraduationLine")), secTickColor},
         };
         JPanel panel = TableLayoutHelper.createTableLayoutPane(components, row, col);
-        JPanel jPanel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_TickColor"), panel);
+        JPanel jPanel = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_TickColor"), panel);
         panel.setBorder(BorderFactory.createEmptyBorder(10,10,0,15));
         return jPanel;
     }

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

@@ -60,15 +60,15 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane {
         double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
         double[] columnSize = {f, e};
 
-        valueStyle = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UnifiedComputing"),
+        valueStyle = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_UnifiedComputing"),
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_RespectivelySpecified")});
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_RespectivelySpecified")});
 
         JPanel commenPane = createCommenValuePane(new double[]{p, p, p}, columnSize);
         tableDataPane = new RadarTableDataPane();
 
         centerPane = new JPanel(new CardLayout());
-        centerPane.add(commenPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UnifiedComputing"));
+        centerPane.add(commenPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_UnifiedComputing"));
-        centerPane.add(tableDataPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_RespectivelySpecified"));
+        centerPane.add(tableDataPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_RespectivelySpecified"));
 
         JPanel contentPane = new JPanel(new BorderLayout());
         contentPane.add(valueStyle, BorderLayout.NORTH);
@@ -101,9 +101,9 @@ public class VanChartRadarYAxisPane extends VanChartValueAxisPane {
         if (centerPane != null && valueStyle != null) {
             CardLayout cardLayout = (CardLayout) centerPane.getLayout();
             if (valueStyle.getSelectedIndex() == 0) {
-                cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UnifiedComputing"));
+                cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_UnifiedComputing"));
             } else {
-                cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_RespectivelySpecified"));
+                cardLayout.show(centerPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_RespectivelySpecified"));
             }
         }
     }

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

@@ -64,7 +64,7 @@ public class VanChartCustomIntervalBackgroundPane extends BasicBeanPane<VanChart
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_TopValue")),topValue},
         };
         JPanel temp = TableLayoutHelper.createTableLayoutPane(rangeComponents, rowSize, columnSize);
-        JPanel rangePane = TableLayout4VanChartHelper.createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Range"), temp);
+        JPanel rangePane = TableLayout4VanChartHelper.createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Range"), temp);
 
         Component[][] styleComponents = new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),color},

designer-chart/src/main/java/com/fr/van/chart/designer/style/datasheet/VanChartDataSheetPane.java

@@ -50,7 +50,7 @@ public class VanChartDataSheetPane extends AbstractVanChartScrollPane<Chart> {
         }
 
         private void initComponents() {
-            isShowDataSheet = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Show_Data_Sheet"));
+            isShowDataSheet = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Show_Data_Sheet"));
             dataSheetPane = createDataSheetPane();
 
             double p = TableLayout.PREFERRED;

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugePlotLabelPane.java

@@ -28,7 +28,7 @@ public class VanChartGaugePlotLabelPane extends VanChartPlotLabelPane {
         labelDetailPane = new VanChartGaugeCateOrPercentLabelDetailPane(this.plot, this.parent);
         gaugeValueLabelPane = new VanChartGaugeValueLabelDetailPane(this.plot, this.parent);
         GaugeStyle gaugeStyle = ((VanChartGaugePlot)this.plot).getGaugeStyle();
-        String cateTitle, valueTitle = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ValueLabel");
+        String cateTitle, valueTitle = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ValueLabel");
         switch (gaugeStyle){
             case POINTER:
                 cateTitle = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CategoryLabel");
@@ -37,7 +37,7 @@ public class VanChartGaugePlotLabelPane extends VanChartPlotLabelPane {
                 cateTitle = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CategoryLabel");
                 break;
             default:
-                cateTitle = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_PercentLabel");
+                cateTitle = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PercentLabel");
                 break;
         }
         JPanel cateOrPercentPane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(cateTitle, labelDetailPane);

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java

@@ -118,7 +118,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
             }
 
             position = new UIButtonGroup<Integer>(names, values);
-            autoAdjust = new UIButtonGroup<Boolean>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_On"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Off")}, new Boolean[]{true, false});
+            autoAdjust = new UIButtonGroup<Boolean>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_On"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Off")}, new Boolean[]{true, false});
 
 
             Component[][] comps = new Component[2][2];

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

@@ -164,7 +164,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
     //半径界面
     protected JPanel createRadiusPane() {
         radiusPane = initRadiusPane();
-        radiusPaneWithTitle = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Radius_Set"), radiusPane);
+        radiusPaneWithTitle = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Radius_Set"), radiusPane);
         return ((VanChartPlot)plot).isInCustom() ? null : radiusPaneWithTitle;
     }
 
@@ -235,7 +235,7 @@ public abstract class VanChartAbstractPlotSeriesPane extends AbstractPlotSeriesP
     }
 
     protected UIButtonGroup<DataProcessor> createLargeDataModelGroup() {
-        String[] strings = new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")};
+        String[] strings = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")};
         DataProcessor[] values = new DataProcessor[]{new LargeDataModel(), new NormalDataModel()};
         return new UIButtonGroup<DataProcessor>(strings, values);
     }

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

@@ -28,7 +28,7 @@ public class VanChartEffectPane extends BasicBeanPane<AttrEffect> {
     }
 
     public VanChartEffectPane(boolean hasEnabledChoose){
-        enabledButton = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        enabledButton = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
 
         enabledButton.addChangeListener(new ChangeListener() {
             @Override

designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotRefreshTooltipPane.java

@@ -100,7 +100,7 @@ public class VanChartPlotRefreshTooltipPane extends VanChartPlotTooltipNoCheckPa
         };
 
         JPanel temp = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Time"), temp);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time"), temp);
 
     }
 

designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java

@@ -141,7 +141,7 @@ public class VanChartPlotTooltipPane extends BasicPane {
     protected JPanel createDisplayStrategy(Plot plot) {
         showAllSeries = new UICheckBox(getShowAllSeriesLabelText());
         followMouse = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_FollowMouse"),
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NotFollowMouse")});
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_NotFollowMouse")});
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
         double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;
@@ -149,7 +149,7 @@ public class VanChartPlotTooltipPane extends BasicPane {
         double[] rowSize = { p,p,p};
         Component[][] components = new Component[3][2];
         components[0] = new Component[]{null,null};
-        components[1] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Prompt_Box")),followMouse};
+        components[1] = new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Prompt_Box")),followMouse};
 
         if(plot.isSupportTooltipSeriesType() && hasTooltipSeriesType()){
             components[2] = new Component[]{showAllSeries,null};
@@ -159,7 +159,7 @@ public class VanChartPlotTooltipPane extends BasicPane {
     }
 
     protected String getShowAllSeriesLabelText() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ShowAllSeries");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ShowAllSeries");
     };
 
     protected boolean hasTooltipSeriesType() {

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

@@ -47,7 +47,7 @@ public abstract class AbstractVanChartTypePane extends AbstractChartTypePane{
     }
 
     protected Component[][] getComponentsWithLargeData(JPanel typePane){
-        largeModelCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_OpenLargeDataModel"));
+        largeModelCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OpenLargeDataModel"));
         MultilineLabel prompt = new MultilineLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_LargeDataModelPrompt"));
         prompt.setForeground(Color.red);
         JPanel largeDataPane = new JPanel(new BorderLayout());

designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapLayerPane.java

@@ -97,7 +97,7 @@ public class DrillMapLayerPane extends BasicScrollPane<ChartCollection> {
         rowSize[0] = p;
         detailComps[0] = new Component[]{
                 new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Descriptor")),
-                new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Zoom_Layer")),
+                new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Zoom_Layer")),
                 new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Layer_Map_Type"))
         };
         for (int i = 0; i < depth; i++) {

designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java

@@ -51,7 +51,7 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith
     }
 
     private JPanel createDrillToolsPane() {
-        openOrClose = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        openOrClose = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
         JPanel openOrClosePane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Drill_Dir"), openOrClose);
         textAttrPane = new ChartTextAttrPane(){
 
@@ -85,7 +85,7 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith
                 new Component[]{null},
                 new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), textAttrPane)},
                 new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Background"), backgroundPane)},
-                new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Select_Color"), selectBackgroundPane)},
+                new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Select_Color"), selectBackgroundPane)},
                 new Component[]{catalogSuperLink}
         };
         drillPane = TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);

designer-chart/src/main/java/com/fr/van/chart/funnel/designer/style/VanChartFunnelSeriesPane.java

@@ -50,8 +50,8 @@ public class VanChartFunnelSeriesPane extends VanChartAbstractPlotSeriesPane {
     }
 
     private JPanel createFunnelStylePane() {
-        useSameSlantAngle = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseSameSlantAngle"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseDiffSlantAngle")});
+        useSameSlantAngle = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_UseSameSlantAngle"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_UseDiffSlantAngle")});
-        sort = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AutoSort"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Origin")});
+        sort = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_AutoSort"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Origin")});
 
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
@@ -61,7 +61,7 @@ public class VanChartFunnelSeriesPane extends VanChartAbstractPlotSeriesPane {
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Continuity")), useSameSlantAngle},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Sort")), sort},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Sort")), sort},
         };
 
         JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);

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

@@ -50,7 +50,7 @@ public class VanChartGanttDataAndLinkPane extends MultiTabPane<ChartCollection>
 
             @Override
             public String title4PopupWindow() {
-                return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Task_Link");
+                return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Task_Link");
             }
         };
 

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

@@ -58,7 +58,7 @@ public class GanttTableDataContentPane extends AbstractTableDataContentPane{
 
         taskIDComboBox = new UIComboBox();
         taskIDComboBox.addItem(NONE);
-        taskIDComboBox.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Task_ID_Tooltip"));
+        taskIDComboBox.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Task_ID_Tooltip"));
     }
 
     private JPanel getContentPane(){

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

@@ -33,7 +33,7 @@ public class GanttLinkReportDataContentPane extends AbstractReportDataContentPan
         this.add(panel, BorderLayout.CENTER);    }
 
     private void initAllComponent() {
-        startTaskID = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Start_Task_ID"));
+        startTaskID = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Task_ID"));
 
         endTaskID = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_End_Task_ID"));
 

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

@@ -53,7 +53,7 @@ public class GanttLinkTableDataContentPane extends AbstractTableDataContentPane
         double[] col = {p,f};
 
         Component[][] components = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Start_Task_ID")), startTaskIDComboBox},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_Task_ID")), startTaskIDComboBox},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_End_Task_ID")), endTaskIDComboBox},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Link_Type")), linkTypeComboBox}
         };

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

@@ -68,7 +68,7 @@ public class GanttProcessAxisPane extends AbstractVanChartScrollPane<VanChart> {
     private Component createVerticalHeaderPane() {
         verticalHeaderPane = new GanttAxisStylePane();
 
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Vertical_Table"), verticalHeaderPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Vertical_Table"), verticalHeaderPane);
     }
 
     private Component createHorizontalProportionPane() {
@@ -134,6 +134,6 @@ public class GanttProcessAxisPane extends AbstractVanChartScrollPane<VanChart> {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Project_Axis");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Project_Axis");
     }
 }

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

@@ -63,13 +63,13 @@ public class GanttTimeAxisPane extends AbstractVanChartScrollPane<VanChart> {
     private Component createUpHeadPane() {
         upHeadPane = new GanttAxisStylePane();
 
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Up_Head_Table"),upHeadPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Up_Head_Table"),upHeadPane);
     }
 
     private Component createConditionConfigPane() {
-        timeZoom = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        timeZoom = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
         initialLevel = new UIComboBox(ZOOM_LEVELS);
-        weekendTooltip = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        weekendTooltip = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
 
         double p = TableLayout.PREFERRED;
         double f = TableLayout.FILL;
@@ -79,9 +79,9 @@ public class GanttTimeAxisPane extends AbstractVanChartScrollPane<VanChart> {
 
         Component[][] components = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Time_Zoom")), timeZoom},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Zoom")), timeZoom},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Initial_Level")), initialLevel},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Weekend_Tooltip")), weekendTooltip}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Weekend_Tooltip")), weekendTooltip}
         };
 
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);
@@ -118,6 +118,6 @@ public class GanttTimeAxisPane extends AbstractVanChartScrollPane<VanChart> {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Time_Axis");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Time_Axis");
     }
 }

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttCommonMarkerPane.java

@@ -27,7 +27,7 @@ public class VanChartGanttCommonMarkerPane extends VanChartCommonMarkerPane {
         colorSelect = new ColorSelectBoxWithOutTransparent(100);
 
         return new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Shape")), getMarkerPane()},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Shape")), getMarkerPane()},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), colorSelect}
         };
     }

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java

@@ -51,9 +51,9 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane {
     }
 
     private JPanel createGanntStylePane(){
-        seriesNewLine = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
+        seriesNewLine = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
-        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Series_New_Line"),seriesNewLine);
+        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_New_Line"),seriesNewLine);
-        JPanel ganntStylePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Style"), panel);
+        JPanel ganntStylePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style"), panel);
         return ganntStylePane;
     }
 

designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java

@@ -104,7 +104,7 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {
         JPanel centerPanel = TableLayoutHelper.createTableLayoutPane(getDiffComponentsWithGaugeStyle(), row, col);
         panel.add(centerPanel, BorderLayout.CENTER);
         if(rotate != null){
-            JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Rotation_Direction"), rotate);
+            JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Rotation_Direction"), rotate);
             panel.add(panel1, BorderLayout.NORTH);
         }
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel);
@@ -159,17 +159,17 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {
 
     private Component[] getNeedleColor() {
         needleColor = new ColorSelectBox(120);
-        return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Needle")),needleColor};
+        return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Needle")),needleColor};
     }
 
     private Component[] getPaneBackgroundColor() {
         paneBackgroundColor = new ColorSelectBox(120);
-        return  new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_PaneBackground")),paneBackgroundColor};
+        return  new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PaneBackground")),paneBackgroundColor};
     }
 
     private Component[] getSlotBackgroundColor() {
         slotBackgroundColor = new ColorSelectBox(120);
-        return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_SlotBackground")),slotBackgroundColor};
+        return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SlotBackground")),slotBackgroundColor};
     }
 
     private void initRotate() {
@@ -183,7 +183,7 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {
 
     private JPanel createGaugeBandsPane() {
         colorPickerPane = new ColorPickerPaneWithFormula(parentPane, "meterString");
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Range"), colorPickerPane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Range"), colorPickerPane);
     }
 
 

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

@@ -182,7 +182,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
     protected JPanel createNullValueColorPane() {
         nullValueColorBox = new ColorSelectBox(80);
 
-        return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NULL_Value_Color"), nullValueColorBox);
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_NULL_Value_Color"), nullValueColorBox);
     }
 
     private JPanel createPointPane() {
@@ -292,7 +292,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane {
             }
         });
 
-        JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Point_Style"), markerTypeCom);
+        JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Point_Style"), markerTypeCom);
         JPanel markerPane = new JPanel(new BorderLayout(0, 6));
         markerPane.add(northPane, BorderLayout.NORTH);
         markerPane.add(cardPane, BorderLayout.CENTER);

designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LineMapAreaPane.java

@@ -40,7 +40,7 @@ public class LineMapAreaPane extends PointMapAreaPane {
         areaPane =new AreaPane(){
             protected Component[][] getComponent () {
                 return new Component[][]{
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_Start", "FR-Chart-Area_Name"})), areaName}
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Fine-Design_Chart_Start", "FR-Chart-Area_Name"})), areaName}
                 };
             }
         };

designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LineMapLongLatAreaPane.java

@@ -27,9 +27,9 @@ public class LineMapLongLatAreaPane extends LineMapAreaPane {
         areaPane = new LongLatAreaPane(){
             protected Component[][] getComponent () {
                 return new Component[][]{
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_Start", "Plugin-ChartF_Longitude"})), longitude},
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Fine-Design_Chart_Start", "Plugin-ChartF_Longitude"})), longitude},
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_Start", "Plugin-ChartF_Latitude"})), latitude},
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Fine-Design_Chart_Start", "Plugin-ChartF_Latitude"})), latitude},
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_Start", "FR-Chart-Area_Name"})), areaName}
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Fine-Design_Chart_Start", "FR-Chart-Area_Name"})), areaName}
                 };
             }
         };

designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LineMapAreaPane.java

@@ -35,7 +35,7 @@ public class LineMapAreaPane extends PointMapAreaPane {
         areaPane = new AreaPane(parentPane){
             protected Component[][] getComponent () {
                 return new Component[][]{
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_Start", "FR-Chart-Area_Name"})), areaNameCom}
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Fine-Design_Chart_Start", "FR-Chart-Area_Name"})), areaNameCom}
                 };
             }
         };

designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LineMapLongLatAreaPane.java

@@ -32,9 +32,9 @@ public class LineMapLongLatAreaPane extends LineMapAreaPane {
         areaPane = new LongLatAreaPane(parentPane){
             protected Component[][] getComponent () {
                 return new Component[][]{
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_Start", "Plugin-ChartF_Longitude"})), longitudeCom},
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Fine-Design_Chart_Start", "Plugin-ChartF_Longitude"})), longitudeCom},
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_Start", "Plugin-ChartF_Latitude"})), latitudeCom},
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Fine-Design_Chart_Start", "Plugin-ChartF_Latitude"})), latitudeCom},
-                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-ChartF_Start", "FR-Chart-Area_Name"})), areaNameCom}
+                        new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Fine-Design_Chart_Start", "FR-Chart-Area_Name"})), areaNameCom}
                 };
             }
         };

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

@@ -447,7 +447,7 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
         wmsLayerPane.removeAll();
         for(int i =0; i < size; i++){
             rowSize[i] = TableLayout.PREFERRED;
-            comps[i][0] = i == 0 ? new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_WMS_Layers"), SwingConstants.RIGHT) : null;
+            comps[i][0] = i == 0 ? new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_WMS_Layers"), SwingConstants.RIGHT) : null;
             WMSLayer layer = wmsLayers.get(i);
             UICheckBox checkBox = new UICheckBox(layer.getLayer());
             checkBox.registerChangeListener(listener);
@@ -479,8 +479,8 @@ public class VanChartMapSourceChoosePane extends JPanel implements UIObserver {
 
         Component[][] comps = new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Zoom_Layer")), zoomLevel},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Zoom_Layer")), zoomLevel},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_View_Center")), viewCenterCom},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_View_Center")), viewCenterCom},
         };
         final JPanel northPane = TableLayout4VanChartHelper.createGapTableLayoutPane(comps,rowSize,columnSize);
 

designer-chart/src/main/java/com/fr/van/chart/map/line/StartAndEndNameFormatPaneWithCheckBox.java

@@ -16,7 +16,7 @@ public class StartAndEndNameFormatPaneWithCheckBox extends CategoryNameFormatPan
 
     @Override
     protected String getCheckBoxText() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Start_And_End");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Start_And_End");
     }
 
 

designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPiePlotTooltipPane.java

@@ -17,6 +17,6 @@ public class VanChartMultiPiePlotTooltipPane extends VanChartPlotTooltipPane {
 
     @Override
     protected String getShowAllSeriesLabelText() {
-        return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_ShowAllLevel");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_ShowAllLevel");
     }
 }

designer-chart/src/main/java/com/fr/van/chart/multilayer/style/VanChartMultiPieSeriesPane.java

@@ -47,19 +47,19 @@ public class VanChartMultiPieSeriesPane extends VanChartPieSeriesPane {
         startAngle = new UISpinner(MIN_ANGLE, MAX_ANGLE, 1, 0);
         endAngle = new UISpinner(MIN_ANGLE, MAX_ANGLE, 1, 0);
         innerRadius = new UISpinner(0, 100, 1, 0);
-        supportRotation = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"),
+        supportRotation = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"),
                 com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
-        supportDrill = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"),
+        supportDrill = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"),
                 com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
 
         Component[][] components = new Component[][]{
                 new Component[]{null,null},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Gradual_Level") ),gradualLevel},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_StartAngle") ),startAngle},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_StartAngle") ),startAngle},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_EndAngle")),endAngle},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_InnerRadius")),innerRadius},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Drill")),supportDrill},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Rotation")),supportRotation}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Rotation")),supportRotation}
 
         };
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col);

designer-chart/src/main/java/com/fr/van/chart/pie/VanChartPieSeriesPane.java

@@ -53,16 +53,16 @@ public class VanChartPieSeriesPane extends VanChartAbstractPlotSeriesPane {
         startAngle = new UISpinner(MIN_ANGLE, MAX_ANGLE, 1, 0);
         endAngle = new UISpinner(MIN_ANGLE, MAX_ANGLE, 1, 0);
         innerRadius = new UISpinner(0, 100, 1, 0);
-        supportRotation = new UIButtonGroup<Boolean>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_On"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Off")}, new Boolean[]{true, false});
+        supportRotation = new UIButtonGroup<Boolean>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_On"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Off")}, new Boolean[]{true, false});
 
 
         Component[][] components = new Component[][]{
                 new Component[]{null,null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_StartAngle")),startAngle},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_StartAngle")),startAngle},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_EndAngle")),endAngle},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_InnerRadius")),innerRadius},
                 new Component[]{createRadiusPane(),null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Rotation")),supportRotation}
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Rotation")),supportRotation}
         };
 
 

designer-chart/src/main/java/com/fr/van/chart/radar/VanChartRadarSeriesPane.java

@@ -63,9 +63,9 @@ public class VanChartRadarSeriesPane extends VanChartAbstractPlotSeriesPane {
     }
 
     private JPanel createRadarTypePane() {
-        radarType = new UIButtonGroup<String>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Circle"), com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Polygonal")},
+        radarType = new UIButtonGroup<String>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Circle"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Polygonal")},
                 new String[]{RadarType.CIRCLE.getType(), RadarType.POLYGON.getType()});
-        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Shape"), radarType);
+        JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Shape"), radarType);
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Style_Present"), panel);
     }
 

designer-chart/src/main/java/com/fr/van/chart/range/component/GradualLegendPane.java

@@ -27,7 +27,7 @@ public class GradualLegendPane extends JPanel{
     }
     private void initComponents() {
         intervalConfigPane = createGradualIntervalConfigPane();
-        JPanel intervalConfigPaneWithTitle = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Section_Config"),intervalConfigPane);
+        JPanel intervalConfigPaneWithTitle = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Section_Config"),intervalConfigPane);
         labelFormPane = new LegendLabelFormatPane();
 
         double p = TableLayout.PREFERRED;

designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPane.java

@@ -30,7 +30,7 @@ public class SectionIntervalConfigPane extends MapColorPickerPaneWithFormula {
                 new Component[]{null,null},
                 new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Chart-Color_Subject", "FR-Chart-Color_Color"})), getFillStyleCombox()},
                 new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")), getRegionNumPane()},
-                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_RangeNum")),getDesignTypeButtonGroup()},
+                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_RangeNum")),getDesignTypeButtonGroup()},
 
         };
     }

designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPaneWithOutNum.java

@@ -53,7 +53,7 @@ public class SectionIntervalConfigPaneWithOutNum extends MapColorPickerPaneWithF
         setRegionVisible(false);
 
         return new Component[][]{
-                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_RangeNum")),getDesignTypeButtonGroup()},
+                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_RangeNum")),getDesignTypeButtonGroup()},
                 new Component[]{numLabel, getRegionNumPane()},
         };
     }

designer-chart/src/main/java/com/fr/van/chart/range/component/SectionLegendPane.java

@@ -26,7 +26,7 @@ public class SectionLegendPane extends JPanel{
 
     private void initComponents() {
         intervalConfigPane = createSectionIntervalConfigPane(this.parent);
-        JPanel intervalConfigPaneWithTitle = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Section_Config"), intervalConfigPane);
+        JPanel intervalConfigPaneWithTitle = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Section_Config"), intervalConfigPane);
         labelFormPane = new LegendLabelFormatPane(){
             @Override
             protected void checkCustomLabelText() {

designer-chart/src/main/java/com/fr/van/chart/scatter/component/VanChartScatterLineTypePane.java

@@ -20,7 +20,7 @@ public class VanChartScatterLineTypePane extends VanChartLineTypePane {
 
     @Override
     protected void createLineStyle() {
-        String[] textArray = new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NormalLine"),
+        String[] textArray = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_NormalLine"),
                                             com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_CurveLine")};
         lineStyle = new UIButtonGroup<LineStyle>(textArray, new LineStyle[]{LineStyle.NORMAL, LineStyle.CURVE});
     }

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java

@@ -50,7 +50,7 @@ public class StructureNodeStylePane extends BasicBeanPane<AttrNode> {
         nodeOpacity = new UINumberDragPane(0,100);
 
         JPanel jPanel = new JPanel(new BorderLayout());
-        jPanel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Node_Radius"), nodeRadiusType), BorderLayout.NORTH);
+        jPanel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Node_Radius"), nodeRadiusType), BorderLayout.NORTH);
         nodeRadiusPane = TableLayout4VanChartHelper.createGapTableLayoutPane("", nodeRadius);
         jPanel.add(nodeRadiusPane, BorderLayout.CENTER);
 
@@ -64,8 +64,8 @@ public class StructureNodeStylePane extends BasicBeanPane<AttrNode> {
         };
         JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(components1, rowSize, columnSize);
 
-        useImage = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_YES"),
+        useImage = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_YES"),
-                com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NO")});
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_NO")});
         imagePane = new ImageBackgroundQuickPane(false);
         imagePane.setBorder(BorderFactory.createEmptyBorder(0,(int)TableLayout4VanChartHelper.DESCRIPTION_AREA_WIDTH + TableLayout4VanChartHelper.COMPONENT_INTERVAL,0,0));
         Component[][] components = new Component[][]{

designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java

@@ -94,7 +94,7 @@ public class VanChartStructureSeriesPane extends VanChartAbstractPlotSeriesPane
 
     private JPanel createNodePane() {
         nodeStylePane = new StructureNodeStylePane();
-        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Node"), nodeStylePane);
+        return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Node"), nodeStylePane);
     }
 
     private void checkWidth() {

designer-chart/src/main/java/com/fr/van/chart/treemap/style/VanChartTreeMapSeriesPane.java

@@ -20,7 +20,7 @@ public class VanChartTreeMapSeriesPane extends VanChartMultiPieSeriesPane {
     }
 
     protected JPanel createSeriesStylePane(double[] row, double[] col) {
-        supportDrill = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Open"),
+        supportDrill = new UIButtonGroup<Integer>(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"),
                 com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Close")});
         JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Drill"), supportDrill);
         return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"), panel);

designer-chart/src/main/java/com/fr/van/chart/wordcloud/designer/style/VanChartWordCloudSeriesPane.java

@@ -86,7 +86,7 @@ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane
         maxRotation = new
                 UISpinner(-MAX_ROTATION,MAX_ROTATION,1,0);
         Component[][] centerComps = new Component[][]{
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Rotation_Angle")), minRotation,
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Rotation_Angle")), minRotation,
                         new UILabel("-"), maxRotation},
         };
         JPanel centerPanel = TableLayout4VanChartHelper.createGapTableLayoutPane(centerComps,centerR,centerC);
@@ -163,7 +163,7 @@ public class VanChartWordCloudSeriesPane extends VanChartAbstractPlotSeriesPane
             }
         });
 
-        return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Shape"), panel);
+        return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Shape"), panel);
     }
 
     private void checkImagePane() {

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java

@@ -87,6 +87,8 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
         unavailableTipLabel.setText("<html>" + tipText + "<html>");
         unavailableTipLabel.setForeground(Color.gray);
         panel.add(unavailableTipLabel, BorderLayout.NORTH);
+        allowFullCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Allow_Full_Screen"));
+        panel.add(allowFullCheckBox);
         return panel;
     }
 
@@ -150,19 +152,20 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
     public void populate(FormDesigner designer) {
         this.designer = designer;
 
+        BaseChartEditor chartEditor = (BaseChartEditor)xCreator.toData();
+        boolean allowFullScreen = chartEditor.getMobileAttr().isAllowFullScreen();
+        this.allowFullCheckBox.setSelected(allowFullScreen);
+        this.bindListeners2Widgets();
+        this.addAttributeChangeListener(changeListener);
+
         if (!isAppRelayout() || isInAbsoluteLayout()) {
             return;
         }
 
-        BaseChartEditor chartEditor = (BaseChartEditor)xCreator.toData();
         ChartMobileFitAttrStateProvider zoomOutAttr = chartEditor.getMobileAttr().getZoomOutAttr();
         this.zoomOutComboBox.setSelectedItem(new Item(zoomOutAttr.description(), zoomOutAttr));
         updateTipLabel();
-        boolean allowFullScreen = chartEditor.getMobileAttr().isAllowFullScreen();
-        this.allowFullCheckBox.setSelected(allowFullScreen);
 
-        // 数据 populate 完成后，再设置监听
-        this.bindListeners2Widgets();
         this.zoomOutComboBox.addItemListener(new ItemListener() {
             @Override
             public void itemStateChanged(ItemEvent e) {
@@ -171,21 +174,24 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
                     return;
                 }
                 updateTipLabel();
-                ChartMobileFitAttrState selectedAttr = (ChartMobileFitAttrState)((Item)e.getItem()).getValue();
+                ChartMobileFitAttrState selectedAttr = (ChartMobileFitAttrState) ((Item) e.getItem()).getValue();
                 if (selectedAttr.getState() != ChartMobileFitAttrState.AUTO.getState()) {
 
                 }
             }
         });
-        this.addAttributeChangeListener(changeListener);
     }
 
     @Override
     public void update() {
         ChartMobileAttrProvider mobileAttr = ((BaseChartEditor)xCreator.toData()).getMobileAttr();
-        mobileAttr.setZoomInAttr(ChartMobileFitAttrState.PROPORTION);
+        if(zoomOutComboBox != null) {
-        mobileAttr.setZoomOutAttr((ChartMobileFitAttrState)((Item)zoomOutComboBox.getSelectedItem()).getValue());
+            mobileAttr.setZoomInAttr(ChartMobileFitAttrState.PROPORTION);
-        mobileAttr.setAllowFullScreen(allowFullCheckBox.isSelected());
+            mobileAttr.setZoomOutAttr((ChartMobileFitAttrState) ((Item) zoomOutComboBox.getSelectedItem()).getValue());
+            mobileAttr.setAllowFullScreen(allowFullCheckBox.isSelected());
+        }else {
+            mobileAttr.setAllowFullScreen(allowFullCheckBox.isSelected());
+        }
         DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); // 触发设计器保存按钮亮起来
     }
 }

designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java

@@ -4,7 +4,7 @@ import com.fr.base.io.IOFile;
 import com.fr.base.io.XMLReadHelper;
 import com.fr.config.MarketConfig;
 import com.fr.design.DesignerEnvManager;
-import com.fr.general.SessionLocalManager;
+import com.fr.web.session.SessionLocalManager;
 
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;