Merge remote-tracking branch 'origin/release/10.0' into release/10.0

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

@@ -40,7 +40,6 @@ import com.fr.stable.xml.XMLWriter;
 import com.fr.stable.xml.XMLableReader;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.WorkContextCallback;
-import com.fr.workspace.connect.AuthException;
 
 import javax.swing.*;
 import javax.swing.SwingWorker.StateValue;
@@ -483,19 +482,6 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         this.eastRegionContainerWidth = eastRegionContainerWidth;
     }
     
-
-    /**
-     * 判断当前环境是否为默认
-     *
-     * @return 是默认则返回true
-     */
-    public boolean isCurrentEnvDefault() {
-
-        DesignerWorkspaceInfo current = this.getWorkspaceInfo(curEnvName);
-        String defaultEnvPath = getDefaultenvPath(StableUtils.getInstallHome());
-        return ComparatorUtils.equals(defaultEnvPath, current.getPath());
-    }
-
     /**
      * 返回默认环境
      */
@@ -547,9 +533,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
      * 设置当前环境为默认
      */
     public void setCurrentEnv2Default() {
-        if (isCurrentEnvDefault()) {
-            return;
-        }
+
         try {
             final String envName = getDefaultEnvName();
             WorkContext.switchTo(DesignerWorkspaceGenerator.generate(getDefaultConfig()), new WorkContextCallback() {
@@ -565,7 +549,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
                     DesignTableDataManager.fireDSChanged(new HashMap<String, String>());
                 }
             });
-        } catch (AuthException e) {
+        } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
     }

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

@@ -123,11 +123,13 @@ public class LocalePane extends BasicPane {
     
         Map<Locale, String> supportLocaleMap = InterProviderFactory.getProvider().getSupportLocaleMap();
 
-        Map<String, String> map;
+        // richie:暂时去掉设计器中国际化键值对的显示
+        Map<String, String> map = new HashMap<>();
         List<String> sortKeys = new ArrayList<String>();
     
 
-        map = InterProviderFactory.getProvider().getLocalBundle(Locale.SIMPLIFIED_CHINESE).getMap();
+        //map = InterProviderFactory.getProvider().getLocalBundle(Locale.SIMPLIFIED_CHINESE).getMap();
+
         sortKeys.addAll(map.keySet());
         Collections.sort(sortKeys);
     

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

@@ -13,6 +13,8 @@ import com.fr.design.menu.KeySetUtils;
 import com.fr.design.menu.MenuDef;
 import com.fr.design.menu.SeparatorDef;
 import com.fr.design.utils.DesignUtils;
+import com.fr.license.exception.RegistEditionException;
+import com.fr.log.FineLoggerFactory;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.WorkContextCallback;
 import com.fr.workspace.Workspace;
@@ -111,8 +113,13 @@ public class SwitchExistEnv extends MenuDef {
                     }
                 });
             } catch (AuthException exception) {
-                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"),
+                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed"),
                         null, 0, UIManager.getIcon("OptionPane.errorIcon"));
+            } catch (RegistEditionException exception) {
+                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Lic_does_not_Support_Remote"),
+                        null, 0, UIManager.getIcon("OptionPane.errorIcon"));
+            } catch (Exception exception) {
+                FineLoggerFactory.getLogger().error(exception.getMessage(), exception);
             }
         }
     }

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

@@ -50,23 +50,23 @@ public class AboutPane extends JPanel {
                 getBuildTitle(),
                 GeneralUtils.readFullBuildNO(),
                 new String[]{
-                        com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Copy_Build_NO"),
-                        com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Copy_Build_NO_OK")
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy_Build_NO"),
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy_Build_NO_OK")
                 });
         contentPane.add(buildCopyPane);
 
         BoxCenterAligmentPane boxCenterAlignmentPane = new BoxCenterAligmentPane(getCopyRight());
         contentPane.add(boxCenterAlignmentPane);
 
-        boxCenterAlignmentPane = new BoxCenterAligmentPane(com.fr.design.i18n.Toolkit.i18nText("About-All_Rights_Reserved"));
+        boxCenterAlignmentPane = new BoxCenterAligmentPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About_All_Rights_Reserved"));
         contentPane.add(boxCenterAlignmentPane);
 
         contentPane.add(new BoxCenterAlignmentCopyablePane(
-                com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Activation_Key"),
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Activation_Key"),
                 DesignerEnvManager.getEnvManager().getActivationKey(),
                 new String[]{
-                        com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Copy_Activation_Key"),
-                        com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Activation_Key_Copy_OK")
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy_Activation_Key"),
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Activation_Key_Copy_OK")
                 }));
 
         addPhoneAndQQPane(contentPane);
@@ -118,7 +118,7 @@ public class AboutPane extends JPanel {
     }
 
     private JPanel getRemarkPane() {
-        String remark = com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_About_Remark_Info", PRESIDENT_PHONE);
+        String remark = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About_Remark_Info", PRESIDENT_PHONE);
         UILabel label = new UILabel();
         label.setSize(new Dimension(580, 30));
 

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

@@ -179,11 +179,11 @@ public class FeedBackPane extends BasicPane {
 
     private JPanel initDetailPane() {
         double p = TableLayout.PREFERRED;
-        UILabel info = new UILabel(com.fr.design.i18n.Toolkit.i18nText("detail_description") + ":");
+        UILabel info = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Detail_Description") + ":");
         info.setBorder(INNER_LEFT_BORDER);
         JPanel contactPane = getContactPane();
         contactPane.setBorder(INNER_LEFT_BORDER);
-        UILabel contact = new UILabel(com.fr.design.i18n.Toolkit.i18nText("contact_info") + ":");
+        UILabel contact = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Contact_Info") + ":");
         contact.setBorder(INNER_LEFT_BORDER);
         JPanel jPanel = new JPanel();
         jPanel.add(detailField);

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

@@ -108,7 +108,7 @@ public class AlphaFineConfigPane extends BasicPane {
         initFieldListener();
         northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Open") + ":"));
         northPane.add(shortcutsField);
-        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-AlphaFine_SetShortcuts"));
+        UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_SetShortcuts"));
         label.setForeground(Color.RED);
         northPane.add(label);
         contentPane.add(northPane);

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

@@ -67,7 +67,7 @@ public class RemindPane extends JPanel {
 
             }
         });
-        noRemindLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Alphafine_No_Remind"));
+        noRemindLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alphafine_No_Remind"));
         noRemindLabel.setFont(MEDIUM_FONT);
         noRemindLabel.setForeground(Color.WHITE);
         checkLabel = new UILabel();

designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java

@@ -21,7 +21,6 @@ import com.fr.design.menu.MenuKeySet;
 import com.fr.file.ProcedureConfig;
 import com.fr.file.TableDataConfig;
 
-import com.fr.locale.InterProviderFactory;
 import com.fr.transaction.CallBackAdaptor;
 import com.fr.transaction.Configurations;
 import com.fr.transaction.Worker;
@@ -53,7 +52,7 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS
 
         @Override
         public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData");
         }
 
         @Override

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

@@ -1,41 +1,38 @@
 package com.fr.design.condition;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Dimension;
-
-import javax.swing.DefaultComboBoxModel;
-
-import com.fr.design.file.HistoryTemplateListPane;
-import com.fr.design.gui.ilable.UILabel;
-import javax.swing.JList;
-import javax.swing.JPanel;
-import javax.swing.tree.TreePath;
-
 import com.fr.data.condition.CommonCondition;
-import com.fr.design.mainframe.JTemplate;
-import com.fr.general.ComparatorUtils;
-import com.fr.general.data.Condition;
 import com.fr.data.condition.JoinCondition;
 import com.fr.data.core.Compare;
 import com.fr.design.beans.BasicBeanPane;
+import com.fr.design.editor.ValueEditorPane;
+import com.fr.design.editor.ValueEditorPaneFactory;
+import com.fr.design.editor.editor.ColumnIndexEditor;
+import com.fr.design.editor.editor.ColumnNameEditor;
+import com.fr.design.editor.editor.Editor;
+import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.formula.CustomVariableResolver;
 import com.fr.design.formula.VariableResolver;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.icombobox.UIComboBoxRenderer;
+import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
-import com.fr.design.editor.ValueEditorPane;
-import com.fr.design.editor.ValueEditorPaneFactory;
-import com.fr.design.editor.editor.ColumnIndexEditor;
-import com.fr.design.editor.editor.ColumnNameEditor;
-import com.fr.design.editor.editor.Editor;
-
+import com.fr.design.mainframe.JTemplate;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.data.Condition;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StringUtils;
 
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.tree.TreePath;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
+
 public class DSColumnLiteConditionPane extends LiteConditionPane<CommonCondition> {
 	/**
 	 * 
@@ -121,7 +118,7 @@ public class DSColumnLiteConditionPane extends LiteConditionPane<CommonCondition
 			keyColumnPane.setPreferredSize(new Dimension(175, keyColumnPane.getPreferredSize().height));
 			conditionOPComboBox.setPreferredSize(new Dimension(80, 20));
 			Component[][] components = {
-					{ new UILabel(com.fr.design.i18n.Toolkit.i18nText("Utils-Available_Columns") + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-ConditionB_Operator") + ":"),
+					{ new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Available_Columns") + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ConditionB_Operator") + ":"),
 							new UILabel() }, { keyColumnPane, conditionOPComboBox, conditionValuePane } };
 
 			double p = TableLayout.PREFERRED;

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

@@ -124,7 +124,7 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
             boolean result = isExistedInParentTreeNode(parentTreeNode, newJoinCondition);
             if (result) {
                 JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this),
-                        com.fr.design.i18n.Toolkit.i18nText("BindColumn-This_Condition_has_been_existed"));
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BindColumn_This_Condition_Has_Been_Existed"));
                 return;
             }
 
@@ -464,13 +464,13 @@ public abstract class LiteConditionPane<T extends Condition> extends BasicBeanPa
         moveDownButton.addActionListener(actionListener5);
 
         // peter:加括号
-        bracketButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("ConditionB-Add_bracket"));
+        bracketButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConditionB_Add_bracket"));
         buttonPane.add(bracketButton);
         bracketButton.setIcon(BaseUtils.readIcon("com/fr/design/images/condition/bracket.png"));
         bracketButton.addActionListener(actionListener6);
 
         // peter:去掉括号
-        unBracketButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("ConditionB-Remove_bracket"));
+        unBracketButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConditionB_Remove_bracket"));
         buttonPane.add(unBracketButton);
         unBracketButton.setIcon(BaseUtils.readIcon("com/fr/design/images/condition/unBracket.png"));
         unBracketButton.addActionListener(actionListener7);

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

@@ -26,7 +26,7 @@ public abstract class SingleConditionPane<T> extends BasicPane {
 			
 			if(cancel == null) {
 				cancel  = new UIButton(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png"));
-				cancel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Remove"));
+				cancel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Remove"));
 				cancel.addActionListener(cancleListener);
 				cancel.setMargin(new Insets(0, 0, 0, 0));
 			}

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

@@ -1,12 +1,11 @@
 package com.fr.design.data.datapane;
 
-import java.awt.Cursor;
-
-import com.fr.design.gui.ilable.UILabel;
-import javax.swing.JPanel;
-
 import com.fr.base.BaseUtils;
 import com.fr.design.data.datapane.FlashLookLabelMouseAdapter.ReleaseAction;
+import com.fr.design.gui.ilable.UILabel;
+
+import javax.swing.JPanel;
+import java.awt.Cursor;
 
 
 
@@ -16,7 +15,7 @@ public class EditOrNewLabel extends UILabel {
 	
 	public EditOrNewLabel(Editable editable, JPanel editPane) {
 		super(BaseUtils.readIcon("/com/fr/design/images/m_file/edit.png"));
-		this.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Edit"));
+		this.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
 		this.setCursor(new Cursor(Cursor.HAND_CURSOR));
 		this.editable = editable;
 		this.editTablePane = editPane;

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

@@ -36,7 +36,7 @@ public class ReportTableDataPane extends LoadingBasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("DS-Report_TableData");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Report_TableData");
     }
 
     public void populate(TableDataSource tds) {

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

@@ -31,7 +31,7 @@ public class TableDataCreatorProducer {
     }
 
     public TableDataNameObjectCreator[] createReportTableDataCreator() {
-        TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("DS-Database_Query"),
+        TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Database_Query"),
                 "ds",
                 "/com/fr/design/images/data/database.png", DBTableData.class, DBTableDataPane.class);
         TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"),

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

@@ -106,7 +106,7 @@ public class TableDataSourceOP implements UserObjectOP<TableDataWrapper> {
     }
 
     private ExpandMutableTreeNode initServerDataNode(Map<String, TableDataWrapper> serverDataMap) {
-        ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData"), SERVER_TABLE_DATA), false);
+        ExpandMutableTreeNode templateNode = new ExpandMutableTreeNode(new NameObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData"), SERVER_TABLE_DATA), false);
         templateNode.addChildTreeNodes(getNodeArrayFromMap(serverDataMap));
         return templateNode;
     }

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

@@ -84,7 +84,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         ToolTipManager.sharedInstance().registerComponent(dataTree);
         ToolTipManager.sharedInstance().setDismissDelay(3000);
         ToolTipManager.sharedInstance().setInitialDelay(0);
-        addMenuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add"));
+        addMenuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add"));
         addMenuDef.setIconPath(IconPathConstants.ADD_POPMENU_ICON_PATH);
 
         createAddMenuDef();
@@ -162,7 +162,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
     protected void initbuttonGroup() {
 //        Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/data/datasource.png"), BaseUtils.readIcon("/com/fr/design/images/data/dock/serverdatabase.png")};
         final Integer[] modeArray = {TEMPLATE_TABLE_DATA, SERVER_TABLE_DATA};
-        String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Source_Type_Template"), com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData")};
+        String[] textArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Source_Type_Template"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData")};
         buttonGroup = new UIHeadGroup(textArray) {
             public void tabChanged(int index) {
                 if (op != null) {

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

@@ -70,11 +70,11 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
             northPane.add(chartSetPane);
             chartSetPane.setBorder(BorderFactory.createTitledBorder(
                     new ModLineBorder(ModLineBorder.TOP),
-                    com.fr.design.i18n.Toolkit.i18nText("Datasource-Convert_Charset")
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Convert_Charset")
             ));
 
-            chartSetPane.add(GUICoreUtils.createNamedPane(originalCharSetComboBox, com.fr.design.i18n.Toolkit.i18nText("Datasource-Original_Charset") + ":"));
-            chartSetPane.add(GUICoreUtils.createNamedPane(newCharSetComboBox, com.fr.design.i18n.Toolkit.i18nText("Datasource-New_Charset") + ":"));
+            chartSetPane.add(GUICoreUtils.createNamedPane(originalCharSetComboBox, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Original_Charset") + ":"));
+            chartSetPane.add(GUICoreUtils.createNamedPane(newCharSetComboBox, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_New_Charset") + ":"));
         }
     }
 

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

@@ -104,7 +104,7 @@ public class JDBCDefPane extends JPanel {
 		userNameTextField.setName(USER_NAME);
 		passwordTextField = new UIPassWordField(15);
 		dbtypeButton = new UIButton(".");
-		dbtypeButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Click-Get_Default_URL"));
+		dbtypeButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Click_Get_Default_URL"));
 		dbtypeButton.addActionListener(dbtypeButtonActionListener);
 
 		double p = TableLayout.PREFERRED;
@@ -148,7 +148,7 @@ public class JDBCDefPane extends JPanel {
 		JPanel southPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		innerthis.add(southPanel);
 		southPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 4, 20));
-		ActionLabel actionLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("ConnectionPool_Attr"));
+		ActionLabel actionLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr"));
 		southPanel.add(actionLabel, BorderLayout.EAST);
 		actionLabel.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
@@ -331,18 +331,18 @@ public class JDBCDefPane extends JPanel {
 			double[] rowSize = {f, f, f, f, f, f, f, f, f, f, f, f};
 			double[] columnSize = {f, f};
 			Component[][] comps = {
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_INITIAL_SIZE") + ":", SwingConstants.RIGHT), DBCP_INITIAL_SIZE},
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_MAX_ACTIVE") + ":", SwingConstants.RIGHT), DBCP_MAX_ACTIVE},
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_MAX_IDLE") + ":", SwingConstants.RIGHT), DBCP_MAX_IDLE},
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_MIN_IDLE") + ":", SwingConstants.RIGHT), DBCP_MIN_IDLE},
+					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Initial_Size") + ":", SwingConstants.RIGHT), DBCP_INITIAL_SIZE},
+					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Active") + ":", SwingConstants.RIGHT), DBCP_MAX_ACTIVE},
+					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Max_Idle") + ":", SwingConstants.RIGHT), DBCP_MAX_IDLE},
+					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Min_Idle") + ":", SwingConstants.RIGHT), DBCP_MIN_IDLE},
 					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Max_Wait_Time") + ":" , SwingConstants.RIGHT), DBCP_MAX_WAIT},
 					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_VALIDATION_QUERY") + ":", SwingConstants.RIGHT), DBCP_VALIDATION_QUERY},
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_TEST_ON_BORROW") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW},
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_TEST_ON_RETURN") + ":", SwingConstants.RIGHT), DBCP_TESTONRETURN},
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_TEST_WHILE_IDLE") + ":", SwingConstants.RIGHT), DBCP_TESTWHILEIDLE},
+					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Borrow") + ":", SwingConstants.RIGHT), DBCP_TESTONBORROW},
+					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_On_Return") + ":", SwingConstants.RIGHT), DBCP_TESTONRETURN},
+					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Test_While_Idle") + ":", SwingConstants.RIGHT), DBCP_TESTWHILEIDLE},
 					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Evictionruns_millis") + ":", SwingConstants.RIGHT),
 							DBCP_TIMEBETWEENEVICTIONRUNSMILLS},
-					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DBCP_NUM_TEST_PER_EVCTION_RUN") + ":", SwingConstants.RIGHT), DBCP_NUMTESTSPEREVICTIONRUN},
+					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dbcp_Num_Test_Per_Evction_Run") + ":", SwingConstants.RIGHT), DBCP_NUMTESTSPEREVICTIONRUN},
 					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Mix_Evictable_Idle_Time_Millis") + ":" , SwingConstants.RIGHT),
 							DBCP_MINEVICTABLEIDLETIMEMILLIS}};
 
@@ -353,7 +353,7 @@ public class JDBCDefPane extends JPanel {
 
 		@Override
 		protected String title4PopupWindow() {
-			return com.fr.design.i18n.Toolkit.i18nText("ConnectionPool_Attr");
+			return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr");
 		}
 	}
 

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

@@ -73,12 +73,12 @@ public class JNDIDefPane extends JPanel {
 		// NorthPane
 		JPanel nContentPane = FRGUIPaneFactory.createNormalFlowInnerContainer_M_Pane();
 		innerthis.add(nContentPane);
-		nContentPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Datasource-JNDI_Name") + ":"));
+		nContentPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_JNDI_Name") + ":"));
 		jndiNameTextField = new UITextField(20);
 		nContentPane.add(jndiNameTextField, BorderLayout.NORTH);
 
 		// CenterPane
-		JPanel outcenterPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Datasource-Context"));
+		JPanel outcenterPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Context"));
 		innerthis.add(outcenterPane);
 		JPanel centerPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane();
 		outcenterPane.add(centerPane);
@@ -105,7 +105,7 @@ public class JNDIDefPane extends JPanel {
 		centerPane.add(actionPane);
 		actionPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 4, 6));
 
-		ActionLabel actionLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("Datasource-Other_Attributes"));
+		ActionLabel actionLabel = new ActionLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Other_Attributes"));
 		actionPane.add(actionLabel, BorderLayout.EAST);
 		actionLabel.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent evt) {
@@ -115,7 +115,7 @@ public class JNDIDefPane extends JPanel {
 		});
 
 		// South Description
-		UILabel explainLabe11l = new FRExplainLabel(com.fr.design.i18n.Toolkit.i18nText("Datasource-JNDI_DES"));
+		UILabel explainLabe11l = new FRExplainLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_JNDI_DES"));
 		innerthis.add(new JScrollPane(explainLabe11l));
 	}
 
@@ -235,7 +235,7 @@ public class JNDIDefPane extends JPanel {
 
 		@Override
 		protected String title4PopupWindow() {
-			return com.fr.design.i18n.Toolkit.i18nText("Datasource-Other_Attributes");
+			return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Other_Attributes");
 		}
 	}
 

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

@@ -88,7 +88,7 @@ public class PreviewTablePane extends BasicPane {
 
         JPanel maxPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
         previewNumberPanel.add(maxPanel);
-        maxPanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Datasource-Maximum_Number_of_Preview_Rows") + ":"));
+        maxPanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Maximum_Number_of_Preview_Rows") + ":"));
 
         maxPreviewNumberField = new UINumberField();
         maxPanel.add(maxPreviewNumberField);

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

@@ -63,7 +63,7 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
                 dlg.setVisible(true);
             }
         });
-        UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Edit"));
+        UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
         editButton.setPreferredSize(new Dimension(
                 editButton.getPreferredSize().width,
                 classNameTextField.getPreferredSize().height));
@@ -89,7 +89,7 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
         });
 
         Component[][] components = {
-        		{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DS-Class_Name") + ":"), reportletNamePane},
+        		{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name") + ":"), reportletNamePane},
         		{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Function-The_class_must_implement_the_interface") + "\"com.fr.data.Tabledata\"")},
         		{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Example") + ":\"com.fr.data.impl.ArrayTableData\"")},
                 {null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Location_Description", StableUtils.pathJoin(ProjectConstants.WEBINF_NAME, ProjectConstants.CLASSES_NAME)))}
@@ -154,7 +154,7 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
 
     @Override
     protected String title4PopupWindow() {
-    	return com.fr.design.i18n.Toolkit.i18nText("DS-Class_TableData");
+    	return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_TableData");
     }
 
     @Override

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

@@ -68,7 +68,7 @@ public class DecoratedTableDataPane extends AbstractTableDataPane<DecoratedTable
 
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("DS-Relation_TableData");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Relation_TableData");
 	}
 	
     /**

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

@@ -157,7 +157,7 @@ public class EmbeddedTableDataPane extends AbstractTableDataPane<EmbeddedTableDa
 
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("DS-Embedded_TableData");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Embedded_TableData");
 	}
 
 

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

@@ -224,7 +224,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                 JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
                         null, 0, UIManager.getIcon("OptionPane.errorIcon"));
             } else {
-                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Connection_successfully"));
+                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Connection_Successfully"));
                 try {
                     in.close();
                 } catch (IOException e) {

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

@@ -190,7 +190,7 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("DS-Relation_TableData");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Relation_TableData");
     }
 
     @Override
@@ -307,7 +307,7 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
             formulaButton.setEnabled(false);
             formulaButton.setPreferredSize(new Dimension(25, 23));
             formulaButton.addActionListener(getFormulaActionListener());
-            rightPanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Conditions_formula") + " ="));
+            rightPanel.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Conditions_Formula") + " ="));
             rightPanel.add(formulaContentTextField);
             rightPanel.add(formulaButton);
 

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

@@ -75,7 +75,7 @@ public class StoreProcedureParameterPane extends BasicPane {
 		nameField = new UITextField(10);
 		namePane.add(nameField, BorderLayout.CENTER);
 		namePane.add(new UILabel("     "), BorderLayout.EAST);
-		valuePane.add(new UILabel("   " + com.fr.design.i18n.Toolkit.i18nText("CellWrite-InsertRow_DEFAULT") + ":"), BorderLayout.WEST);
+		valuePane.add(new UILabel("   " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CellWrite_InsertRow_Default") + ":"), BorderLayout.WEST);
 		valuePane.add(valueEditPane, BorderLayout.CENTER);
 		valuePane.add(new UILabel("     "), BorderLayout.EAST);
 		Component[][] components = {{null},

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

@@ -6,8 +6,6 @@ import com.fr.design.data.datapane.TableDataPaneController;
 import com.fr.design.data.datapane.TableDataPaneListPane;
 import com.fr.design.fun.TableDataPaneProcessor;
 import com.fr.design.gui.frpane.LoadingBasicPane;
-import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.file.TableDataConfig;
 
@@ -62,7 +60,7 @@ public class TableDataManagerPane extends LoadingBasicPane {
 	
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("DS-Server_TableData");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Server_TableData");
 	}
 
 	public void populate(TableDataConfig tableDataConfig) {

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

@@ -97,7 +97,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
             @Override
             public void stateChanged(ChangeEvent e) {
                 if (globalNameListener != null) {
-                    globalNameListener.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("CellWrite-InsertRow_Policy"));
+                    globalNameListener.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CellWrite_InsertRow_Policy"));
                 }
                 Object oldValue = currentEditor.getValue();
                 setCurrentEditor(upButton.getSelectedIndex());
@@ -164,7 +164,7 @@ public class DoubleDeckValueEditorPane extends BasicPane implements UIObserver,
             item.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
                     if (globalNameListener != null) {
-                        globalNameListener.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("CellWrite-InsertRow_Policy"));
+                        globalNameListener.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CellWrite_InsertRow_Policy"));
                     }
                     Object oldValue = currentEditor.getValue();
                     setCurrentEditor(j);

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

@@ -153,7 +153,7 @@ public class ValueEditorPane extends BasicPane implements UIObserver, GlobalName
             item.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {
                     if (globalNameListener != null) {
-                        globalNameListener.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("CellWrite-InsertRow_Policy"));
+                        globalNameListener.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_CellWrite_InsertRow_Policy"));
                     }
                     Object oldValue = currentEditor.getValue();
                     setCurrentEditor(j);

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

@@ -26,7 +26,7 @@ public class ColumnIndexEditor extends Editor<Object> {
      * @param value
      */
     public ColumnIndexEditor(int value) {
-        this(value, com.fr.design.i18n.Toolkit.i18nText("Datasource-Column_Index"));
+        this(value, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Column_Index"));
     }
 
     public ColumnIndexEditor(int value, String name) {

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

@@ -51,7 +51,7 @@ public class OldColumnIndexEditor extends Editor {
 	}
 
 	protected void initComponents() {
-		indexCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Datasource-Column_Index"));
+		indexCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Column_Index"));
 		nameCheckBox = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("ColumnName"));
 		indexCheckBox.addActionListener(actionListener);
 		nameCheckBox.addActionListener(actionListener);

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

@@ -2,7 +2,6 @@ package com.fr.design.env;
 
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.Workspace;
-import com.fr.workspace.connect.AuthException;
 import com.fr.workspace.connect.WorkspaceClient;
 
 /**
@@ -10,7 +9,7 @@ import com.fr.workspace.connect.WorkspaceClient;
  */
 public class DesignerWorkspaceGenerator {
 
-    public static Workspace generate(DesignerWorkspaceInfo config) throws AuthException {
+    public static Workspace generate(DesignerWorkspaceInfo config) throws Exception {
 
         if (config == null || config.getType() == null) {
             return null;

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

@@ -124,7 +124,7 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
                 null,
                 new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Restart_Designer"),
                         com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Restart_Designer_Later"),
-                        com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Cancel")
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel")
                 },
                 null
         );

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

@@ -169,7 +169,7 @@ public class PluginOperateUtils {
         String username = MarketConfig.getInstance().getBbsUsername();
         if (StringUtils.isEmpty(username)) {
             jsCallback.execute(StringUtils.EMPTY);
-            uiLabel.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Base_UnSignIn"));
+            uiLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_UnSignIn"));
         } else {
             uiLabel.setText(username);
             String result = username;

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

@@ -556,7 +556,7 @@ public class PluginWebBridge {
     public void clearUserInfo() {
         MarketConfig.getInstance().setInShowBBsName(StringUtils.EMPTY);
         BBSLoginUtils.bbsLogout();
-        uiLabel.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Base_UnSignIn"));
+        uiLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_UnSignIn"));
     }
 
     public void getPackInfo(final JSObject callback){

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

@@ -168,7 +168,7 @@ public class QQLoginWebPane extends JFXPanel {
                 new Scene(
                         HBoxBuilder.create().styleClass("modal-dialog").children(
                                 LabelBuilder.create().text(msg).build(),
-                                ButtonBuilder.create().text(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-BBSLogin_Switch-Account")).defaultButton(true).onAction(new EventHandler<ActionEvent>() {
+                                ButtonBuilder.create().text(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Switch_Account")).defaultButton(true).onAction(new EventHandler<ActionEvent>() {
                                     @Override
                                     public void handle(ActionEvent actionEvent) {
                                         // take action and close the dialog.

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

@@ -81,7 +81,7 @@ public class WebViewDlgHelper {
             } else {
                 int rv = JOptionPane.showConfirmDialog(
                         null,
-                        com.fr.design.i18n.Toolkit.i18nText("Fine-Plugin_Shop_Need_Install_Version"),
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install_Version"),
                         com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
                         JOptionPane.OK_CANCEL_OPTION,
                         JOptionPane.INFORMATION_MESSAGE

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

@@ -168,7 +168,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
         if (reportPaths.length == 0) {
             return;
         }
-        if (JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Confirm-Delete-File")) != JOptionPane.OK_OPTION) {
+        if (JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Confirm_Delete-File")) != JOptionPane.OK_OPTION) {
             return;
         }
         for (String reportPath : reportPaths) {

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

@@ -78,7 +78,7 @@ public abstract class FunctionConstants {
     public static FunctionGroup PLUGIN = new FunctionGroup() {
         @Override
         public String getGroupName() {
-            return com.fr.design.i18n.Toolkit.i18nText("FR-Base_Formula_Plugin");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Formula_Plugin");
         }
 
         @Override

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

@@ -142,7 +142,7 @@ public class FunctionManagerPane extends BasicPane {
             editorButton.setPreferredSize(new Dimension(editorButton.getPreferredSize().width, classNameTextField.getPreferredSize().height));
             reportletNamePane.add(editorButton);
             editorButton.addActionListener(createEditorButtonActionListener());
-            northPane.add(GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("DS-Class_Name") + ":"),
+            northPane.add(GUICoreUtils.createFlowPane(new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Class_Name") + ":"),
                     reportletNamePane}, FlowLayout.LEFT));
             DescriptionTextArea descriptionArea = new DescriptionTextArea();
             descriptionArea.setWrapStyleWord(true);

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

@@ -185,7 +185,7 @@ public class JavaEditorPane extends BasicPane {
                         className = info.getIntactClassName();
                         String message = info.getCompileMessage();
                         if (StringUtils.isEmpty(message)) {
-                            message = com.fr.design.i18n.Toolkit.i18nText("Compile_Success") + "!";
+                            message = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Compile_Success") + "!";
                         }
                         JOptionPane.showMessageDialog(null, message);
                     } catch (InterruptedException e1) {

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

@@ -35,7 +35,7 @@ public class TinyFormulaPane extends BasicBeanPane<String> implements UIObserver
 	protected void initComponents() {
 
 		formulaTextField = new UITextField();
-		formulaTextField.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("ExpandD-Sort_After_Expand"));
+		formulaTextField.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ExpandD_Sort_After_Expand"));
 
 		// 添加一公式编辑器按钮
 		formulaTextFieldButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/m_insert/formula.png"));

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

@@ -9,12 +9,10 @@ import com.fr.design.data.tabledata.tabledatapane.GlobalTreeTableDataPane;
 import com.fr.design.data.tabledata.tabledatapane.MultiTDTableDataPane;
 import com.fr.design.data.tabledata.tabledatapane.TreeTableDataPane;
 import com.fr.design.gui.HyperlinkFilterHelper;
-import com.fr.design.gui.NameInspector;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilist.JNameEdList;
 import com.fr.design.gui.ilist.ListModelElement;
 import com.fr.design.gui.ilist.ModNameActionListener;
-import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.menu.LineSeparator;
 import com.fr.design.menu.MenuDef;
@@ -357,7 +355,7 @@ public abstract class JListControlPane extends JControlPane {
 
         public AddItemUpdateAction(NameableCreator[] creators) {
             this.creator = creators[0];
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add"));
             this.setMnemonic('A');
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
         }
@@ -375,7 +373,7 @@ public abstract class JListControlPane extends JControlPane {
      */
     protected class AddItemMenuDef extends MenuDef {
         public AddItemMenuDef(NameableCreator[] creators) {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add"));
             this.setMnemonic('A');
             this.setIconPath("/com/fr/design/images/control/addPopup.png");
             wrapActionListener(creators);
@@ -387,7 +385,7 @@ public abstract class JListControlPane extends JControlPane {
                     continue;
                 }
                 boolean isTrue = ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure")) ||
-                        ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("DS-Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("DS-Multi_Dimensional_Database"));
+                        ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Multi_Dimensional_Database"));
                 if (isTrue) {
                     this.addShortCut(new LineSeparator());
                 }
@@ -420,7 +418,7 @@ public abstract class JListControlPane extends JControlPane {
      */
     private class RemoveItemAction extends UpdateAction {
         public RemoveItemAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Remove"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Remove"));
             this.setMnemonic('R');
             this.setSmallIcon(BaseUtils
                     .readIcon("/com/fr/base/images/cell/control/remove.png"));
@@ -448,7 +446,7 @@ public abstract class JListControlPane extends JControlPane {
      */
     private class CopyItemAction extends UpdateAction {
         public CopyItemAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Copy"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Copy"));
             this.setMnemonic('C');
             this.setSmallIcon(BaseUtils
                     .readIcon("/com/fr/design/images/m_edit/copy.png"));
@@ -547,7 +545,7 @@ public abstract class JListControlPane extends JControlPane {
         private boolean isAtoZ = false;
 
         public SortItemAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Sort"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Sort"));
             this.setMnemonic('S');
             this.setSmallIcon(BaseUtils
                     .readIcon("/com/fr/design/images/control/sortAsc.png"));

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

@@ -15,7 +15,6 @@ import com.fr.design.gui.HyperlinkFilterHelper;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.gui.ilist.ListModelElement;
-import com.fr.design.gui.ilist.ModNameActionListener;
 import com.fr.design.gui.ilist.UINameEdList;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
@@ -29,7 +28,6 @@ import com.fr.general.ComparatorUtils;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
-import com.fr.stable.core.PropertyChangeAdapter;
 
 import javax.swing.*;
 import javax.swing.event.ListDataEvent;
@@ -387,7 +385,7 @@ public abstract class UIListControlPane extends UIControlPane {
 
         public AddItemUpdateAction(NameableCreator[] creators) {
             this.creator = creators[0];
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add"));
             this.setMnemonic('A');
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
         }
@@ -443,7 +441,7 @@ public abstract class UIListControlPane extends UIControlPane {
     protected class AddItemMenuDef extends MenuDef {
         public AddItemMenuDef(NameableCreator[] creators) {
             super(true);
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add"));
             this.setMnemonic('A');
             this.setIconPath("/com/fr/design/images/control/addPopup.png");
             wrapActionListener(creators);
@@ -470,7 +468,7 @@ public abstract class UIListControlPane extends UIControlPane {
                     continue;
                 }
                 boolean isTrue = ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Datasource-Stored_Procedure")) ||
-                        ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("DS-Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("DS-Multi_Dimensional_Database"));
+                        ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Relation_TableData")) || ComparatorUtils.equals(creator.menuName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Multi_Dimensional_Database"));
                 if (isTrue) {
                     this.addShortCut(new LineSeparator());
                 }
@@ -507,7 +505,7 @@ public abstract class UIListControlPane extends UIControlPane {
      */
     private class RemoveItemAction extends UpdateAction {
         public RemoveItemAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Remove"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Remove"));
             this.setMnemonic('R');
             this.setSmallIcon(BaseUtils
                     .readIcon("/com/fr/base/images/cell/control/remove.png"));
@@ -536,7 +534,7 @@ public abstract class UIListControlPane extends UIControlPane {
      */
     private class CopyItemAction extends UpdateAction {
         public CopyItemAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Copy"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Copy"));
             this.setMnemonic('C');
             this.setSmallIcon(BaseUtils
                     .readIcon("/com/fr/design/images/m_edit/copy.png"));
@@ -635,7 +633,7 @@ public abstract class UIListControlPane extends UIControlPane {
         private boolean isAtoZ = false;
 
         public SortItemAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Sort"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Sort"));
             this.setMnemonic('S');
             this.setSmallIcon(BaseUtils
                     .readIcon("/com/fr/design/images/control/sortAsc.png"));

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

@@ -292,7 +292,7 @@ public class UISimpleListControlPane extends BasicPane {
         private boolean isAtoZ = false;
 
         public SortItemAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Sort"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Sort"));
             this.setMnemonic('S');
             this.setSmallIcon(BaseUtils
                     .readIcon("/com/fr/design/images/control/sortAsc.png"));

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

@@ -129,7 +129,7 @@ public abstract class EditingStringListPane extends BasicBeanPane<List<String>>
 						setAddEnabled(false);
 					}
 				} else {
-					JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), newvalue + com.fr.design.i18n.Toolkit.i18nText("Already_exists_not_add_repeat")+"!");
+					JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), newvalue + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Already_Exists_Not_Add_Repeat")+"!");
 				}
 			}
 		});

designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java

@@ -48,7 +48,7 @@ public class ProgressDialog extends UIDialog {
         progressBar.setOpaque(false);
         progressBar.setBorder(null);
         panel.add(progressBar, BorderLayout.CENTER);
-        text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Loading_Project"), JLabel.CENTER);
+        text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_Project"), JLabel.CENTER);
         FRFont font = FRFont.getInstance().applySize(14).applyForeground(new ColorUIResource(333334));
         text.setFont(font);
         panel.add(text, BorderLayout.SOUTH);

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

@@ -1,10 +1,8 @@
 package com.fr.design.gui.itableeditorpane;
 
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import com.fr.base.BaseUtils;
+import com.fr.base.FRContext;
+import com.fr.design.mainframe.DesignerContext;
 
 import javax.swing.JOptionPane;
 import javax.swing.JTable;
@@ -12,10 +10,11 @@ import javax.swing.ListSelectionModel;
 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableCellRenderer;
-
-import com.fr.base.BaseUtils;
-import com.fr.base.FRContext;
-import com.fr.design.mainframe.DesignerContext;
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 
 /**
@@ -200,7 +199,7 @@ public abstract class UITableModelAdapter<T extends Object> extends AbstractTabl
 	protected abstract class EditAction extends UITableEditAction {
 
 		public EditAction() {
-			this.setName(com.fr.design.i18n.Toolkit.i18nText("Edit"));
+			this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
 			this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/edit.png"));
 		}
 

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

@@ -16,7 +16,6 @@ import com.fr.design.gui.ibutton.UIColorButton;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.gui.icombobox.LineComboBox;
 import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.utils.gui.GUICoreUtils;
@@ -140,7 +139,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
         if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Style"))) {
             frFont = frFont.applyStyle(fontSizeStyleComboBox.getSelectedIndex());
         }
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Size"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size"))) {
             frFont = frFont.applySize(Float.parseFloat(fontSizeComboBox.getSelectedItem().toString()));
         }
         if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Foreground"))) {
@@ -154,7 +153,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
 
         }
 
-        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Line_Style"))) {
+        if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Line_Style"))) {
             frFont = frFont.applyUnderline(this.underlineCombo.getSelectedLineStyle());
         }
 
@@ -267,12 +266,12 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
     private void initAllNames() {
         fontSizeStyleComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Style"));
         fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name"));
-        fontSizeComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Size"));
+        fontSizeComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size"));
         colorSelectPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Foreground"));
         italic.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_italic"));
         bold.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_bold"));
         underline.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Underline"));
-        underlineCombo.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Line_Style"));
+        underlineCombo.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Line_Style"));
         isStrikethroughCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Strikethrough"));
         isShadowCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Shadow"));
         superPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Superscript"));

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

@@ -136,7 +136,7 @@ public class FormatPane extends AbstractBasicStylePane  implements GlobalNameObs
     protected Component[][] getComponent (JPanel fontPane, JPanel centerPane, JPanel typePane) {
         return new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Format"), SwingConstants.LEFT), typePane},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format"), SwingConstants.LEFT), typePane},
                 new Component[]{centerPane, null},
                 new Component[]{fontPane, frFontPane},
         };
@@ -158,7 +158,7 @@ public class FormatPane extends AbstractBasicStylePane  implements GlobalNameObs
     private void iniSampleLable() {
         Border innterborder = new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 4);
         Font tmpFont = null;
-        Border border = BorderFactory.createTitledBorder(innterborder, com.fr.design.i18n.Toolkit.i18nText("FR-Base_StyleFormat_Sample"), TitledBorder.LEFT, 0, tmpFont, UIConstants.LINE_COLOR);
+        Border border = BorderFactory.createTitledBorder(innterborder, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_StyleFormat_Sample"), TitledBorder.LEFT, 0, tmpFont, UIConstants.LINE_COLOR);
         sampleLabel = new UILabel(FormatField.getInstance().getFormatValue()) {
 
             @Override

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/RSyntaxTextArea.java

@@ -33,7 +33,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.ResourceBundle;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
 import javax.swing.JPopupMenu;
@@ -474,7 +473,7 @@ private boolean fractionalFontMetricsEnabled;
 	 */
 	protected void appendFoldingMenu(JPopupMenu popup) {
 		popup.addSeparator();
-		foldingMenu = new JMenu(com.fr.design.i18n.Toolkit.i18nText("ContextMenu.Folding"));
+		foldingMenu = new JMenu(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Context_Menu_Folding"));
 		foldingMenu.add(createPopupMenuItem(toggleCurrentFoldAction));
 		foldingMenu.add(createPopupMenuItem(collapseAllCommentFoldsAction));
 		foldingMenu.add(createPopupMenuItem(collapseAllFoldsAction));

designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/RUndoManager.java

@@ -10,7 +10,6 @@ package com.fr.design.gui.syntax.ui.rtextarea;
 
 
 
-import java.util.ResourceBundle;
 import javax.swing.Action;
 import javax.swing.UIManager;
 import javax.swing.event.UndoableEditEvent;
@@ -49,8 +48,8 @@ public class RUndoManager extends UndoManager {
 	 */
 	public RUndoManager(RTextArea textArea) {
 		this.textArea = textArea;
-		cantUndoText = com.fr.design.i18n.Toolkit.i18nText("Action.CantUndo.Name");
-		cantRedoText = com.fr.design.i18n.Toolkit.i18nText("Action.CantRedo.Name");
+		cantUndoText = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Cant_Undo_Name");
+		cantRedoText = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Cant_Redo_Name");
 	}
 
 

designer-base/src/main/java/com/fr/design/i18n/Toolkit.java

@@ -1,48 +1,57 @@
 package com.fr.design.i18n;
 
+import com.fr.general.GeneralContext;
 import com.fr.general.log.MessageFormatter;
 import com.fr.locale.InterProviderFactory;
+import com.fr.locale.LocaleManager;
+import com.fr.locale.impl.FineLocaleManager;
 
 /**
  * 设计器国际化类，后面会不再依赖InterProviderFactory
  */
 public class Toolkit {
 
+    private static LocaleManager localeManager = FineLocaleManager.create();
+
+    static {
+        addResource("com/fr/design/i18n/main");
+    }
+
+    public static void addResource(String path) {
+
+        localeManager.addResource(path);
+    }
+
     /**
      * 设计器国际化方法
+     *
      * @param key 国际化键
      * @return 国际化值
      */
     public static String i18nText(String key) {
-        return InterProviderFactory.getProvider().getLocText(key);
+        return localeManager.getLocalBundle(GeneralContext.getLocale()).getText(localeManager, key);
     }
 
     /**
      * 带格式化内容的国际化方法
      * Toolkit.i18nText("Fine-Design_xxx", 1, 2)，假设Fine-Design_xxx的中文值为：我来计算{}+{}，输出结果为：我来计算1+2
-     * @param key 格式化文本
+     *
+     * @param key  格式化文本
      * @param args 格式化参数
      * @return 国际化值
      */
     public static String i18nText(String key, Object... args) {
         String format = InterProviderFactory.getProvider().getLocText(key);
         MessageFormatter.FormattingTuple tuple = MessageFormatter.arrayFormat(format, args);
-        return tuple.getMessage();
+        return localeManager.getLocalBundle(GeneralContext.getLocale()).getText(localeManager, tuple.getMessage());
     }
 
     /**
      * 太鸡儿多了，改不完，先加上慢慢改
+     *
      * @deprecated
      */
     public static String i18nTextArray(String[] keys) {
         return InterProviderFactory.getProvider().getLocText(keys);
     }
-
-    /**
-     * 太鸡儿多了，改不完，先加上慢慢改
-     * @deprecated
-     */
-    public static String i18nTextArray(String[] keys, String[] delimiter) {
-        return InterProviderFactory.getProvider().getLocText(keys, delimiter);
-    }
 }

designer-base/src/main/java/com/fr/design/javascript/EmailPane.java

@@ -61,7 +61,7 @@ public class EmailPane extends FurtherBasicBeanPane<EmailJavaScript> {
     protected void initCenterPane(UILabel mainTextLabel, JScrollPane scrollPane, double fill, double preferred) {
     	double[] rowSize = { preferred, preferred, preferred, preferred, preferred, fill, preferred, preferred, preferred };
 		double[] columnSize = { preferred, fill};
-		showTplContent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Email-Can_Preview_Report_Content"));
+		showTplContent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email_Can_Preview_Report_Content"));
     	centerPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{
                 {new UILabel(), tipsPane1},
                 createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()),

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

@@ -33,7 +33,7 @@ public class DecodeDialog {
 		
 		jd = new JDialog();
 		jd.setLayout(null);
-		UILabel newNameLable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("ECP_input_pwd"));
+		UILabel newNameLable = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ECP_Input_Pwd"));
 		newNameLable.setBounds(20, 10, 130, 30);
 		jt = new UITextField(StringUtils.EMPTY);
 		jt.selectAll();
@@ -57,7 +57,7 @@ public class DecodeDialog {
 					DesignerEnvManager.getEnvManager().setEncryptionKey(CodeUtils.passwordEncode(key));
 				}else{
 					isPwdRight = false;
-					hintsLabel.setText(com.fr.design.i18n.Toolkit.i18nText("ECP_re_input"));
+					hintsLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ECP_Re_Input"));
 					hintsLabel.setVisible(true);
 				}
 			}
@@ -76,7 +76,7 @@ public class DecodeDialog {
 		jd.add(hintsLabel);
 		jd.setSize(340, 180);
 		jd.setModal(true);
-		jd.setTitle(com.fr.design.i18n.Toolkit.i18nText("ECP_decode"));
+		jd.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ECP_Decode"));
 		jd.setResizable(false);
 		jd.setAlwaysOnTop(true);
 		jd.setIconImage(BaseUtils.readImage("/com/fr/base/images/oem/logo.png"));

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

@@ -15,6 +15,8 @@ import com.fr.design.utils.DesignUtils;
 import com.fr.env.EnvListPane;
 import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
+import com.fr.license.exception.RegistEditionException;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.EnvChangedListener;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.WorkContextCallback;
@@ -106,7 +108,7 @@ public class TemplatePane extends JPanel implements MouseListener {
         editButton.setBorder(BorderFactory.createEmptyBorder(2, 0, 0, 10));
         editButton.setMargin(null);
         editButton.setCursor(new Cursor(Cursor.HAND_CURSOR));
-        editButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Env-Configure_Workspace"));
+        editButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Env_Configure_Workspace"));
         this.add(new UILabel("   "), BorderLayout.WEST);
         this.add(editButton, BorderLayout.EAST);
         editButton.addActionListener(new ActionListener() {
@@ -164,9 +166,14 @@ public class TemplatePane extends JPanel implements MouseListener {
             }
             setJLabel(selectedName);
         } catch (AuthException e) {
-            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"),
+            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed"),
                     null, 0, UIManager.getIcon("OptionPane.errorIcon"));
             return false;
+        } catch (RegistEditionException e) {
+            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Lic_does_not_Support_Remote"),
+                    null, 0, UIManager.getIcon("OptionPane.errorIcon"));
+        } catch (Exception exception) {
+            FineLoggerFactory.getLogger().error(exception.getMessage(), exception);
         }
         TemplateTreePane.getInstance().refreshDockingView();
         DesignModelAdapter<?, ?> model = DesignModelAdapter.getCurrentModelAdapter();

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

@@ -45,7 +45,7 @@ public class ImageBackgroundQuickPane extends BackgroundQuickPane {
 
     public ImageBackgroundQuickPane(boolean hasImageLayout) {
         this.setLayout(new BorderLayout(0, 4));
-        String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("FR-Background_Image_Default"), com.fr.design.i18n.Toolkit.i18nText("FR-Background_Image_Titled"), com.fr.design.i18n.Toolkit.i18nText("FR-Background_Image_Extend"), com.fr.design.i18n.Toolkit.i18nText("FR-Background_Image_Adjust")};
+        String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image_Default"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image_Titled"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image_Extend"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image_Adjust")};
         Byte[] valueArray = {Constants.IMAGE_CENTER, Constants.IMAGE_TILED, Constants.IMAGE_EXTEND, Constants.IMAGE_ADJUST};
         imageLayoutPane = new UIButtonGroup<Byte>(nameArray, valueArray);
         imageLayoutPane.setSelectedIndex(0);
@@ -174,7 +174,7 @@ public class ImageBackgroundQuickPane extends BackgroundQuickPane {
      */
     @Override
     public String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("FR-Background_Image");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image");
     }
 
     @Override

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

@@ -48,7 +48,7 @@ public class NullBackgroundQuickPane extends BackgroundQuickPane {
      * @return     名称
      */
 	public String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Background-Null");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Null");
 	}
 
 	@Override

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

@@ -150,15 +150,15 @@ public class TextureBackgroundQuickPane extends BackgroundQuickPane {
 			TextureBackground.WOVEN_MAT_TEXTURE_PAINT, TextureBackground.WATER_DROPLETS_TEXTURE_PAINT, TextureBackground.PAPER_BAG_TEXTURE_PAINT, TextureBackground.FISH_FOSSIL_TEXTURE_PAINT,
 			TextureBackground.SAND_TEXTURE_PAINT, TextureBackground.CORK_TEXTURE_PAINT, TextureBackground.WALNUT_TEXTURE_PAINT, TextureBackground.OAK_TEXTURE_PAINT,
 			TextureBackground.MEDIUM_WOOD_TEXTURE_PAINT};
-	private static final String[] EMBED_TEXTURE_PAINT_DES_ARRAY = new String[]{com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Newsprint"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-RecycledPaper"),
-			com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Parchment"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Stationery"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-GreenMarble"),
-			com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WhiteMarble"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-BrownMarble"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Granite"),
-			com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-BlueTissuePaper"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PinkTissuePaper"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PurpleMesh"),
-			com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Bouquet"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Papyrus"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Canvas"),
-			com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Denim"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WovenMat"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WaterDroplets"),
-			com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PaperBag"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-FishFossil"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Sand"),
-			com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Cork"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Walnut"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Oak"),
-			com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-MediumWood")};
+	private static final String[] EMBED_TEXTURE_PAINT_DES_ARRAY = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Newsprint"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Recycled_Paper"),
+			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Parchment"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Stationery"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Green_Marble"),
+			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_White_Marble"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Brown_Marble"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Granite"),
+			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Blue_Tissue_Paper"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Pink_Tissue_Paper"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Purple_Mesh"),
+			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Bouquet"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Papyrus"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Canvas"),
+			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Denim"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Woven_Mat"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Water_Droplets"),
+			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_PaperBag"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_FishFossil"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Sand"),
+			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Cork"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Walnut"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Oak"),
+			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Medium_Wood")};
 
 	@Override
 	public boolean accept(Background background) {
@@ -167,7 +167,7 @@ public class TextureBackgroundQuickPane extends BackgroundQuickPane {
 
 	@Override
 	public String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Background-Texture");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture");
 	}
 
 	@Override

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

@@ -3,7 +3,6 @@
  */
 package com.fr.design.mainframe.toolbar;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignState;
@@ -564,7 +563,7 @@ public abstract class ToolBarMenuDock {
         };
         UILabel uiLabel = new UILabel(text);
         uiLabel.setHorizontalAlignment(SwingConstants.CENTER);
-        uiLabel.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-All_MSBold"), 0, 14));
+        uiLabel.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_All_MSBold"), 0, 14));
         uiLabel.setForeground(new Color(150, 150, 150));
         panel.add(uiLabel, BorderLayout.CENTER);
         return panel;

designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java

@@ -27,15 +27,15 @@ public class BackgroundWrapper implements Encoder, Decoder {
         if (v instanceof ColorBackground) {
             return com.fr.design.i18n.Toolkit.i18nText("Color");
         } else if (v instanceof TextureBackground) {
-            return com.fr.design.i18n.Toolkit.i18nText("Background-Texture");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture");
         } else if (v instanceof PatternBackground) {
-            return com.fr.design.i18n.Toolkit.i18nText("Background-Pattern");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern");
         } else if (v instanceof ImageFileBackground) {
             return com.fr.design.i18n.Toolkit.i18nText("Image");
         } else if (v instanceof GradientBackground) {
             return com.fr.design.i18n.Toolkit.i18nText("Gradient-Color");
         } else {
-            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None");
+            return com.fr.design.i18n.Toolkit.i18nText("None");
         }
     }
 

designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java

@@ -415,7 +415,7 @@ public class KeySetUtils {
 
         @Override
         public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("DS-Report_TableData");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Report_TableData");
         }
 
         @Override
@@ -536,7 +536,7 @@ public class KeySetUtils {
 
         @Override
         public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Report_Background");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Background");
         }
 
         @Override

designer-base/src/main/java/com/fr/design/present/dict/CustomDictPane.java

@@ -8,7 +8,6 @@ import javax.swing.event.ChangeEvent;
 
 import com.fr.data.impl.CustomDictionary;
 import com.fr.design.beans.FurtherBasicBeanPane;
-import com.fr.design.gui.frpane.UICorrelationPane;
 import com.fr.design.gui.icontainer.UIScrollPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 
@@ -72,7 +71,7 @@ public class CustomDictPane extends FurtherBasicBeanPane<CustomDictionary> {
 
 	@Override
 	public String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Datasource-User_Defined");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_User_Defined");
 	}
 
 	@Override

designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java

@@ -21,7 +21,7 @@ public class RemoteDesignAuthorityManagerAction extends UpdateAction {
 
 
     public RemoteDesignAuthorityManagerAction() {
-        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Remote_Design_Authority_Manager"));
+        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Authority_Manager"));
         this.setSmallIcon(BaseUtils.readIcon("com/fr/design/remote/images/icon_Remote_Design_Permission_Manager_normal@1x.png"));
     }
 

designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java

@@ -31,7 +31,7 @@ public class AuthorityEditorPane extends BasicBeanPane<DesignAuthority> {
                 BorderFactory.createCompoundBorder(
                         new EmptyBorder(6, 0, 6, 6),
                         UITitledBorder.createBorderWithTitle(
-                                com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Remote_Design_Template_Authority_Config")
+                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Template_Authority_Config")
                         )
                 )
         );
@@ -45,7 +45,7 @@ public class AuthorityEditorPane extends BasicBeanPane<DesignAuthority> {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Remote_Design_Configure_Authority");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Configure_Authority");
     }
 
     @Override

designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java

@@ -78,7 +78,7 @@ public class AuthorityListControlPane extends BasicPane {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.authorityCreators = new RemoteDesignAuthorityCreator[]{
                 new RemoteDesignAuthorityCreator(
-                        com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Remote_Design_User"),
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Design_User"),
                         BaseUtils.readIcon("com/fr/design/remote/images/icon_Member_normal@1x.png"),
                         DesignAuthority.class,
                         AuthorityEditorPane.class)
@@ -470,7 +470,7 @@ public class AuthorityListControlPane extends BasicPane {
     private class AddItemUpdateAction extends UpdateAction {
 
         AddItemUpdateAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add"));
             this.setMnemonic('A');
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
         }
@@ -511,7 +511,7 @@ public class AuthorityListControlPane extends BasicPane {
      */
     private class RemoveItemAction extends UpdateAction {
         RemoveItemAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Remove"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Remove"));
             this.setMnemonic('R');
             this.setSmallIcon(BaseUtils
                     .readIcon(IconPathConstants.TD_REMOVE_ICON_PATH));

designer-base/src/main/java/com/fr/design/remote/ui/AuthorityManagerPane.java

@@ -23,7 +23,7 @@ public class AuthorityManagerPane extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Remote_Design_Authority_Manager");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Authority_Manager");
     }
 
     public void populate(DesignAuthority[] authorities) {

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

@@ -359,7 +359,7 @@ public class FormatPane extends BasicPane {
         		SimpleDateFormat simpleDateFormat = new SimpleDateFormat(text);
         		String sample = simpleDateFormat.format(new Date());
         		if (!ArrayUtils.contains(FormatField.getInstance().getDateFormatArray(), text)) {
-        			sample += " " + com.fr.design.i18n.Toolkit.i18nText("DateFormat-Custom_Warning");
+        			sample += " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DateFormat_Custom_Warning");
         			c = Color.red;
         		}
         		this.sampleLabel.setText(sample);

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

@@ -38,7 +38,7 @@ public class BackgroundPreviewLabel extends UILabel {
                     this.getSize().getWidth(), this.getSize().getHeight()));
             this.setText("");
         } else {
-            this.setText(com.fr.design.i18n.Toolkit.i18nText("Background-Background_is_NULL") + "...");
+            this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Background_Is_Null") + "...");
         }
     }
 

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

@@ -42,7 +42,7 @@ public abstract class BackgroundSelectPane extends BasicPane {
 		
 		this.add(backgroundPane, BorderLayout.CENTER);
 		
-		UIButton button = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Choose_None"));
+		UIButton button = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Choose_None"));
 		this.add(button, BorderLayout.SOUTH);
 		button.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {

designer-base/src/main/java/com/fr/design/style/background/impl/NullBackgroundPane.java

@@ -19,7 +19,7 @@ public class NullBackgroundPane extends BackgroundDetailPane {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
 
         UILabel centerLabel = new UILabel(
-            com.fr.design.i18n.Toolkit.i18nText("Background-Background_is_NULL") + "...");
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Background_Is_Null") + "...");
         this.add(centerLabel);
         centerLabel.setHorizontalAlignment(SwingConstants.CENTER);
         centerLabel.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor()));

designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java

@@ -45,7 +45,7 @@ public class PatternBackgroundPane extends BPane {
     }
 
     protected String titleOfTypePane() {
-        return com.fr.design.i18n.Toolkit.i18nText("Background-Pattern");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern");
     }
     protected LayoutManager layoutOfTypePane(int nColumn) {
         return FRGUIPaneFactory.createNColumnGridLayout(nColumn);

designer-base/src/main/java/com/fr/design/style/background/impl/TextureBackgroundPane.java

@@ -47,30 +47,30 @@ public class TextureBackgroundPane extends BPane {
         TextureBackground.MEDIUM_WOOD_TEXTURE_PAINT};
 
     private static final String[] EMBED_TEXTURE_PAINT_DES_ARRAY = new String[]{
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Newsprint"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-RecycledPaper"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Parchment"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Stationery"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-GreenMarble"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WhiteMarble"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-BrownMarble"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Granite"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-BlueTissuePaper"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PinkTissuePaper"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PurpleMesh"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Bouquet"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Papyrus"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Canvas"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Denim"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WovenMat"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WaterDroplets"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PaperBag"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-FishFossil"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Sand"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Cork"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Walnut"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Oak"),
-            com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-MediumWood")
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Newsprint"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Recycled_Paper"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Parchment"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Stationery"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Green_Marble"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_White_Marble"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Brown_Marble"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Granite"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Blue_Tissue_Paper"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Pink_Tissue_Paper"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Purple_Mesh"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Bouquet"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Papyrus"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Canvas"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Denim"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Woven_Mat"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Water_Droplets"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_PaperBag"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_FishFossil"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Sand"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Cork"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Walnut"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Oak"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture_Medium_Wood")
     };
 
     private TexturePaint texturePaint;
@@ -89,7 +89,7 @@ public class TextureBackgroundPane extends BPane {
     }
 
     protected String titleOfTypePane() {
-        return com.fr.design.i18n.Toolkit.i18nText("Background-Texture");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture");
     }
     protected void setChildrenOfTypePane(JPanel typePane2) {
         ButtonGroup patternButtonGroup = new ButtonGroup();

designer-base/src/main/java/com/fr/design/style/background/pattern/PatternSelectPane.java

@@ -28,7 +28,7 @@ public class PatternSelectPane extends BackgroundSelectPane {
 
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Background-Pattern");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Pattern");
 	}
 
 }

designer-base/src/main/java/com/fr/design/style/background/texture/TextureSelectPane.java

@@ -27,6 +27,6 @@ public class TextureSelectPane extends BackgroundSelectPane {
 	
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Background-Texture");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Texture");
 	}
 }

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

@@ -80,7 +80,7 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable
 
         centerPane.add(Box.createVerticalStrut(1));
 
-        UIButton customButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_More_Color"));
+        UIButton customButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_More_Color"));
 
         customButton.addMouseListener(new MouseAdapter() {
             @Override

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

@@ -94,7 +94,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
         centerPane.add(Box.createVerticalStrut(1));
 
         // mod by anchore 16/11/16
-        UIButton customButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_More_Color"));
+        UIButton customButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_More_Color"));
 
         customButton.addMouseListener(new MouseAdapter() {
             @Override

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

@@ -237,7 +237,7 @@ public class DesignUtils {
                 //比如想在中文或英文系统里用韩文设计器
                 guiFRFont = getNamedFont("Dialog");
                 if (!guiFRFont.canDisplay(displayChar)) {
-                    FRContext.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("FR-Base_SimSun_Not_Found"));
+                    FRContext.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_SimSun_Not_Found"));
                 }
             }
         }

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

@@ -36,8 +36,8 @@ public class CheckBoxDictPane extends JPanel {
 		endComboBox.setEditable(true);
 		Component[][] components = new Component[][]{
 				new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Form-Delimiter")), delimiterComboBox},
-				new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-Start_Symbol")),startComboBox},
-				new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("ComboCheckBox-End_Symbol")),endComboBox}
+				new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol")),startComboBox},
+				new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_End_Symbol")),endComboBox}
 		};
 		returnStringPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W2, IntervalConstants.INTERVAL_L1);
 

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

@@ -53,11 +53,11 @@ public class NumberEditorValidatePane extends JPanel {
 
     private void initComponent() {
         initListeners();
-        this.allowDecimalsCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Allow_Decimals"));
+        this.allowDecimalsCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Allow_Decimals"));
         allowDecimalsCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         this.allowDecimalsCheckBox.addActionListener(allowDecimalsListener);
         this.decimalLength = new UISpinner(0, Integer.MAX_VALUE, 1, 16);
-        this.allowNegativeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Allow_Negative"));
+        this.allowNegativeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Allow_Negative"));
         this.allowNegativeCheckBox.addActionListener(allowNegativeListener);
         allowNegativeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         this.setMaxValueCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Need_Max_Value"), false);

designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

@@ -134,7 +134,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 		northPane.add(typePane, BorderLayout.NORTH);
 
 		chooseTable = new ChoosePaneSupportFormula();
-		chooseTable.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("FR-Base_Table")));
+		chooseTable.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Table")));
 		chooseTable.setTableNameComboBoxPopSize(160, 320);
 
 		northPane.add(chooseTable, BorderLayout.CENTER);
@@ -142,7 +142,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 		// peter:编辑的TablePane
 		JPanel editTablePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		this.add(editTablePane, BorderLayout.CENTER);
-		editTablePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("FR-Base_Value")));
+		editTablePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Value")));
 
 		keyColumnValuesTable = new KeyColumnNameValueTable();
 		editTablePane.add(new JScrollPane(this.keyColumnValuesTable), BorderLayout.CENTER);
@@ -183,11 +183,11 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 
             UpdateCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("RWA-NotChange_Unmodified"));
             UIButton  helpButton = new UIButton(HEIP_ICON);
-            helpButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Help"));
+            helpButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Help"));
             helpButton.addActionListener(new ActionListener() {
                 @Override
                 public void actionPerformed(ActionEvent e) {
-                    FormatExplanationPane formatExplanation = new FormatExplanationPane(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Help"),com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RWA-Help"), 12f);
+                    FormatExplanationPane formatExplanation = new FormatExplanationPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Help"),com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RWA-Help"), 12f);
                     BasicDialog dlg = formatExplanation.showMediumWindow(SwingUtilities.getWindowAncestor(DBManipulationPane.this),
                             new DialogActionAdapter(){});
                     dlg.setVisible(true);
@@ -309,7 +309,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
     protected void setBorderAndLayout(JPanel jPanel){
         jPanel.setLayout(FRGUIPaneFactory.createBorderLayout());
         jPanel.setBorder(BorderFactory.createTitledBorder(
-				new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Submit_Condition")));
+				new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Submit_Condition")));
     }
 
     protected void addComponent(JPanel mainPane,JScrollPane addPane){
@@ -475,7 +475,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
             }
             for (int j = 0; j < keyColumnNameValueList.size(); j++) {
                 if (ComparatorUtils.equals(selected[i], keyColumnNameValueList.get(j).cn)) {
-                    Object[] options = { com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Covered_All"), com.fr.design.i18n.Toolkit.i18nText("FR-Base_Yes"), com.fr.design.i18n.Toolkit.i18nText("FR-Base_No"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cover_None") };
+                    Object[] options = { com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Covered_All"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Yes"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_No"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cover_None") };
                     returnValue = JOptionPane.showOptionDialog(DBManipulationPane.this,
 							com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cover_Tips", keyColumnNameValueList.get(j).cn.name),
                             "", JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, null, options, options[0]);
@@ -580,7 +580,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 			}
 
 			int returnVal = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(DBManipulationPane.this),
-					com.fr.design.i18n.Toolkit.i18nText("FR-Base_sure_remove_item") + "?", com.fr.design.i18n.Toolkit.i18nText("FR-Base_Remove"), JOptionPane.OK_CANCEL_OPTION,
+					com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_sure_remove_item") + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Remove"), JOptionPane.OK_CANCEL_OPTION,
 					JOptionPane.QUESTION_MESSAGE);
 			if (returnVal == JOptionPane.OK_OPTION) {
 				KeyColumnTableModel keyColumnNameValueTableModel = (KeyColumnTableModel)keyColumnValuesTable.getModel();
@@ -944,9 +944,9 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 	}
 
 	protected abstract static class KeyColumnTableModel extends AbstractTableModel {
-        public static final String RAW_KEY = com.fr.design.i18n.Toolkit.i18nText("FR-Base_RWA-Key");
-        public static final String COLUMN = com.fr.design.i18n.Toolkit.i18nText("FR-Base_Column");
-        public static final String VALUE = com.fr.design.i18n.Toolkit.i18nText("FR-Base_Value");
+        public static final String RAW_KEY = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_RWA-Key");
+        public static final String COLUMN = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Column");
+        public static final String VALUE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Value");
 
         public static final String[] COLUMN_NAMES = new String[]{RAW_KEY, COLUMN, VALUE};
 

designer-base/src/main/java/com/fr/env/EnvListPane.java

@@ -55,14 +55,14 @@ public class EnvListPane extends JListControlPane {
     public NameableCreator[] createNameableCreators() {
         NameableCreator local = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("FR-Engine-Local_Workspace"), "com/fr/design/images/data/bind/localconnect.png",
                 LocalDesignerWorkspaceInfo.class, LocalEnvPane.class);
-        NameableCreator remote = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Env-Remote_Server"), "com/fr/design/images/data/bind/distanceconnect.png",
+        NameableCreator remote = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Env_Remote_Server"), "com/fr/design/images/data/bind/distanceconnect.png",
                 RemoteDesignerWorkspaceInfo.class, RemoteEnvPane.class);
         return new NameableCreator[]{local, remote};
     }
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Env-Configure_Workspace");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Env_Configure_Workspace");
     }
 
     /**

designer-base/src/main/java/com/fr/env/LocalEnvPane.java

@@ -60,7 +60,7 @@ public class LocalEnvPane extends BasicBeanPane<LocalDesignerWorkspaceInfo> {
 
         UITextArea description = new UITextArea();
         centerPane.add(description, BorderLayout.SOUTH);
-        description.setText(com.fr.design.i18n.Toolkit.i18nText("Env-Des1"));
+        description.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Env_Des1"));
         description.setEditable(false);
     }
 

designer-base/src/main/java/com/fr/env/RemoteEnvPane.java

@@ -464,7 +464,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
             @Override
             public void mouseEntered(MouseEvent e) {
                 if (java.awt.Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK)) {
-                    passwordInput.setToolTipText(Toolkit.i18nText("CapsLock"));
+                    passwordInput.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_CapsLock"));
                 } else {
                     passwordInput.setToolTipText(null);
                 }
@@ -534,20 +534,20 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
                 try {
                     Boolean result = get();
                     if (result == null) {
-                        message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"));
+                        message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed"));
                         uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
                     } else {
                         if (result) {
-                            message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Successful"));
+                            message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Successful"));
                             uiLabel.setIcon(UIManager.getIcon("OptionPane.informationIcon"));
                         } else {
-                            message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Failed"));
+                            message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Failed"));
                             uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
                         }
                     }
                 } catch (InterruptedException | ExecutionException e) {
                     FineLoggerFactory.getLogger().error(e, e.getMessage());
-                    message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Failed"));
+                    message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Failed"));
                     uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
                 }
                 dialogDownPane.remove(cancelButton);
@@ -583,7 +583,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
     }
 
     private void initMessageDialog() {
-        message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Env_Try") + "...");
+        message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Try") + "...");
         message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0));
         okButton.setEnabled(false);
 

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

@@ -255,7 +255,7 @@ public class FILEChooserPane extends BasicPane {
         centerRightPane.add(fileNamePane, BorderLayout.SOUTH);
 
         Component[][] outComponents = new Component[][]{
-                new Component[]{GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-App-File_Lookup_range") + ":"), BorderLayout.WEST), locationPane},
+                new Component[]{GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_File_Lookup_range") + ":"), BorderLayout.WEST), locationPane},
                 new Component[]{centerLeftPanel, centerRightPane}};
         JPanel contentPane = TableLayoutHelper.createTableLayoutPane(outComponents, new double[]{TableLayout.PREFERRED, TableLayout.FILL},
                 new double[]{TableLayout.PREFERRED, TableLayout.FILL});
@@ -546,19 +546,19 @@ public class FILEChooserPane extends BasicPane {
             EnumSet<FileExtension> fileExtensions = EnumSet.of(FileExtension.CPT, FileExtension.CPTX, FileExtension.FRM, FileExtension.FRMX, FileExtension.CHT);
             if (type == JFileChooser.OPEN_DIALOG) {
                 if (WorkContext.getCurrent().isLocal()) { //本地连接
-                    this.addChooseFILEFilter(new ChooseFileFilter(fileSuffix_local, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File")));
+                    this.addChooseFILEFilter(new ChooseFileFilter(fileSuffix_local, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File")));
                 } else {
-                    this.addChooseFILEFilter(new ChooseFileFilter(fileExtensions, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File")));
+                    this.addChooseFILEFilter(new ChooseFileFilter(fileExtensions, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File")));
                 }
             }
 
             // ben:filefilter设置初值为cpt过滤
-            this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CPT, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File")));
-            this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CPTX, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File")));
+            this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CPT, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File")));
+            this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CPTX, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File")));
 
             // richer:form文件 daniel 改成三个字
-            this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRM, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File")));
-            this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRMX, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File")));
+            this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRM, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File")));
+            this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRMX, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File")));
         } else {
             if (type == JFileChooser.OPEN_DIALOG) {
                 this.addChooseFILEFilter(new ChooseFileFilter(EnumSet.of(FileExtension.XLS, FileExtension.XLSX), com.fr.design.i18n.Toolkit.i18nText("Import-Excel_Source")));
@@ -571,7 +571,7 @@ public class FILEChooserPane extends BasicPane {
             this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.XLSX, com.fr.design.i18n.Toolkit.i18nText("Import-Excel2007_Source")));
         }
         if (FileExtension.PNG.matchExtension(suffix)) {
-            this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.PNG, com.fr.design.i18n.Toolkit.i18nText("FR-App-Export_png")));
+            this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.PNG, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_Export_png")));
         }
         if (type == JFileChooser.SAVE_DIALOG) {
             this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.PDF, com.fr.design.i18n.Toolkit.i18nText("FR-Import-Export_PDF")));
@@ -647,7 +647,7 @@ public class FILEChooserPane extends BasicPane {
                     saveDictionary();
                     dialogExit();
                 } else {
-                    JOptionPane.showMessageDialog(this, com.fr.design.i18n.Toolkit.i18nText("FR-App-Template_Report_Not_Exist"));
+                    JOptionPane.showMessageDialog(this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_Template_Report_Not_Exist"));
                     return;
                 }
             }
@@ -688,7 +688,7 @@ public class FILEChooserPane extends BasicPane {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         if (!access) {
-            JOptionPane.showMessageDialog(FILEChooserPane.this, com.fr.design.i18n.Toolkit.i18nText("FR-App-Privilege_No") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-App-File_Message"), JOptionPane.WARNING_MESSAGE);
+            JOptionPane.showMessageDialog(FILEChooserPane.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_Privilege_No") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_File_Message"), JOptionPane.WARNING_MESSAGE);
             return;
         }
         if (selectedFile.exists()) {
@@ -741,7 +741,7 @@ public class FILEChooserPane extends BasicPane {
      * dialog的名字
      */
     private String dialogName() {
-        return type == JFileChooser.OPEN_DIALOG ? com.fr.design.i18n.Toolkit.i18nText("Utils-Design-File_Open") : com.fr.design.i18n.Toolkit.i18nText("FR-App-Template_Save");
+        return type == JFileChooser.OPEN_DIALOG ? com.fr.design.i18n.Toolkit.i18nText("Utils-Design-File_Open") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_Template_Save");
     }
 
     /*
@@ -1406,7 +1406,7 @@ public class FILEChooserPane extends BasicPane {
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
             if (!access) {
-                JOptionPane.showMessageDialog(FILEChooserPane.this, com.fr.design.i18n.Toolkit.i18nText("FR-App-Privilege_No") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-App-File_Message"), JOptionPane.WARNING_MESSAGE);
+                JOptionPane.showMessageDialog(FILEChooserPane.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_Privilege_No") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_File_Message"), JOptionPane.WARNING_MESSAGE);
                 return;
             }
 

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

@@ -11,7 +11,11 @@ import com.fr.design.module.ChartHyperlinkGroup;
 import com.fr.design.module.ChartPreStyleAction;
 import com.fr.design.module.DesignModuleFactory;
 import com.fr.form.ui.ChartEditor;
+import com.fr.locale.InterMutableKey;
+import com.fr.locale.LocaleMarker;
+import com.fr.locale.LocaleScope;
 import com.fr.module.Activator;
+import com.fr.module.extension.Prepare;
 import com.fr.plugin.chart.vanchart.imgevent.design.DesignImageEvent;
 import com.fr.stable.bridge.StableFactory;
 import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider;
@@ -21,7 +25,7 @@ import com.fr.van.chart.map.server.ChartMapEditorAction;
 /**
  * Created by juhaoyu on 2018/6/27.
  */
-public class ChartDesignerActivator extends Activator {
+public class ChartDesignerActivator extends Activator implements Prepare {
     
     @Override
     public void start() {
@@ -50,6 +54,11 @@ public class ChartDesignerActivator extends Activator {
         DesignImageEvent.registerDownloadSourcesEvent(new DownloadOnlineSourcesHelper());
     }
 
+    @Override
+    public void prepare() {
+        addMutable(InterMutableKey.Path, LocaleMarker.create("com/fr/design/i18n/chart", LocaleScope.DESIGN));
+    }
+
     @Override
     public void stop() {
     

designer-chart/src/main/java/com/fr/design/chart/javascript/ChartEmailPane.java

@@ -32,7 +32,7 @@ public class ChartEmailPane extends EmailPane{
 		JPanel contentPane;
 		if (supportExport) {
 			double[] rSizes = { preferred, preferred, preferred, preferred, preferred, fill, preferred, preferred};
-			showTplContent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Email-Can_Preview_Report_Content"));
+			showTplContent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Email_Can_Preview_Report_Content"));
 			contentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{
 					{new UILabel(), tipsPane1},
 					createLinePane(com.fr.design.i18n.Toolkit.i18nText("HJS-Mail_to"), maitoEditor = new UITextField()),

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

@@ -16,7 +16,6 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.Inter;
 import com.fr.plugin.chart.type.ConditionKeyType;
 import com.fr.stable.StringUtils;
 
@@ -84,7 +83,7 @@ public class ChartConditionPane extends LiteConditionPane<CommonCondition> {
             conditionKeyComboBox.setPreferredSize(new Dimension(175, conditionKeyComboBox.getPreferredSize().height));
             conditionOPComboBox.setPreferredSize(new Dimension(80, 20));
             Component[][] components = {
-                    {new UILabel(Inter.getLocText("Utils-Available_Columns") + ":"), new UILabel(Inter.getLocText("FR-ConditionB_Operator") + ":"),
+                    {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Available_Columns") + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ConditionB_Operator") + ":"),
                             new UILabel()}, {conditionKeyComboBox, conditionOPComboBox, conditionValuePane}};
 
             double p = TableLayout.PREFERRED;

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

@@ -25,7 +25,7 @@ public class Bar2DDataLabelPane extends DataLabelPane {
     private UIRadioButton outSideButton;
 
     protected JPanel createJPanel4Position() {
-        centerButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Center"));
+        centerButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_StyleAlignment_Center"));
         insideButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_DataLabelInside"));
         outSideButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_DataLabelOutSide"));
 

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

@@ -71,7 +71,7 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane {
 		double[] rowSize = { p,p,p,p,p,p};
 
         Component[][] components = new Component[][]{
-                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title") + ":", SwingConstants.RIGHT), titleField},
+                new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title") + ":", SwingConstants.RIGHT), titleField},
                 new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Width") + ":", SwingConstants.RIGHT), widthField},
                 new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Height") + ":", SwingConstants.RIGHT), heightField},
         };

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

@@ -92,7 +92,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{
         orientationBar = new NumberDragBar(-NUM90, NUM90);
         orientationSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, -NUM90, NUM90, 1));
 
-        String[] sampleType = {com.fr.design.i18n.Toolkit.i18nText("FR-App-All_Auto"), com.fr.design.i18n.Toolkit.i18nText("FR-App-All_Custom")};
+        String[] sampleType = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_App_All_Auto"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_App_All_Custom")};
         labelSampleChoose = new UIComboBox(sampleType);
         customLabelSamleTime = new UITextField();
         checkCustomSampleField();

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

@@ -35,7 +35,6 @@ public class ChartAxisLineStylePane extends BasicPane{
 		
 
 		String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Inner"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None")};
-
 		Integer[] valueArray = {Constants.TICK_MARK_OUTSIDE, Constants.TICK_MARK_INSIDE, Constants.TICK_MARK_CROSS, Constants.TICK_MARK_NONE};
         Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/external.png"),
                 BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/inside.png"),

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java

@@ -44,7 +44,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class UIColorPickerPane extends BasicPane implements UIObserver {
-	private static final int MARGIN_TOP = 10;
+	private static final int MARGIN_TOP = 7;
 	private static final int MARGIN_LEFT = 5;
 	private static final int COLORGROUP_MARGIN_LEFT = 20;
 	private static final int OFF_HEIGHT = 6;

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

@@ -117,7 +117,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane {
         selectFilePane.setBorder(BorderFactory.createEmptyBorder(TEN, FIVE, 0, THIRTY));
 
         defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DEFAULT"));
-        customRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Custom"));
+        customRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Custom"));
         ButtonGroup buttonGroup = new ButtonGroup();
         defaultRadioButton.setSelected(true);
         buttonGroup.add(defaultRadioButton);

designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java

@@ -79,7 +79,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent {
 
     public void installOnline() {
 
-        int choose = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Download_Online_Sources"), null, JOptionPane.YES_NO_OPTION);
+        int choose = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Download_Online_Sources"), null, JOptionPane.YES_NO_OPTION);
 
         if (choose == JOptionPane.OK_OPTION) {
             initDialog();
@@ -174,7 +174,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent {
         setProgress(0);
 
         dialog = new JDialog();
-        dialog.setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Dependence_Install_Online"));
+        dialog.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Dependence_Install_Online"));
 
         JPanel contentPane = new JPanel(new BorderLayout());
         contentPane.add(label, BorderLayout.CENTER);
@@ -208,7 +208,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent {
                 RestartHelper.restart();
             }
         } else {
-            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Dependence_Install_Failed"));
+            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Dependence_Install_Failed"));
         }
     }
 

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

@@ -32,7 +32,7 @@ public class FormatPaneWithOutFont extends FormatPane {
         typePane.setBorder(BorderFactory.createEmptyBorder());
         return new Component[][]{
                 new Component[]{null, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Format"), SwingConstants.LEFT), typePane},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format"), SwingConstants.LEFT), typePane},
                 new Component[]{null, centerPane},
         };
     }

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

@@ -119,7 +119,7 @@ public class VanChartAlertValuePane extends BasicBeanPane<VanChartAlertValue> {
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")),alertTextPosition},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")),alertText},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font")),fontName},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Size")),fontSize},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size")),fontSize},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),fontColor},
         };
 

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

@@ -94,7 +94,7 @@ public class VanChartDataSheetPane extends AbstractVanChartScrollPane<Chart> {
         double[] columnSize = {d, e};
         double[] rowSize = {p,p,p};
         Component[][] components = new Component[][]{
-                new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Format"),formatPane),null},
+                new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format"),formatPane),null},
                 new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"),textAttrPane),null},
                 new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border"),borderPane),null},
         };

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

@@ -58,7 +58,7 @@ public class StructureNodeStylePane extends BasicBeanPane<AttrNode> {
                 new Component[]{null, null},
                 new Component[]{jPanel, null},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Width")), nodeBorderWidth},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Border_Color")), nodeBorderColor},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Border_Color")), nodeBorderColor},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), nodeOpacity}
 
         };

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

@@ -76,7 +76,7 @@ public class VanChartStructureSeriesPane extends VanChartAbstractPlotSeriesPane
         double[] rowSize = {p,p,p,p};
 
         JPanel jPanel = new JPanel(new BorderLayout());
-        jPanel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Width")+"   ", linkWidthType), BorderLayout.NORTH);
+        jPanel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Width")+"   ", linkWidthType), BorderLayout.NORTH);
         linkWidthPane = TableLayout4VanChartHelper.createGapTableLayoutPane("         ", linkWidth);
         jPanel.add(linkWidthPane, BorderLayout.CENTER);