Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~ju/design into release/10.0

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

@@ -511,7 +511,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
                 return env;
             }
         }
-        String name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Workspace_Default");
+        String name = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Default");
         LocalDesignerWorkspaceInfo newDefaultEnv = LocalDesignerWorkspaceInfo.create(name, defaultenvPath);
         this.putEnv(name, newDefaultEnv);
         return newDefaultEnv;
@@ -534,7 +534,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
                 }
             }
         }
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Workspace_Default");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Default");
     }
 
 

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

@@ -18,7 +18,7 @@ public class ExitAuthorityEditAction extends TemplateComponentAction {
 
 	public ExitAuthorityEditAction(TargetComponent t) {
 		super(t);
-		this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Authority_Edit_Status_Exit"));
+		this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Authority_Edit_Status_Exit"));
 		this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/exit_authority_edit.png"));
 	}
 

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

@@ -154,7 +154,7 @@ public class PreferencePane extends BasicPane {
         createJdkHomePane(advancePane);
 
         JPanel oraclePane = FRGUIPaneFactory.createTitledBorderPane("Oracle" + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Oracle_All_Tables"));
-        oracleSpace = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Show_All_Oracle_Tables"));
+        oracleSpace = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Show_All_Oracle_Tables"));
         oraclePane.add(oracleSpace);
 
         JPanel improvePane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Product_improve"));
@@ -198,11 +198,11 @@ public class PreferencePane extends BasicPane {
 
     private void createEditPane(JPanel generalPane) {
         //samuel:编辑器设置
-        JPanel editPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Editor_Preference"));
+        JPanel editPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Editor_Preference"));
         generalPane.add(editPane);
 
         //设置是否支持将字符串编辑为公式
-        supportStringToFormulaBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Support_String_To_Formula"));
+        supportStringToFormulaBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Support_String_To_Formula"));
         editPane.add(supportStringToFormulaBox);
 
         //是否默认转化

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

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

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

@@ -1,13 +1,10 @@
 package com.fr.design.actions.help;
 
-import java.awt.BorderLayout;
+import com.fr.design.gui.frpane.UITabbedPane;
-import java.awt.Dimension;
+import com.fr.design.gui.ibutton.UIButton;
-import java.awt.Frame;
+import com.fr.design.layout.FRGUIPaneFactory;
-import java.awt.event.ActionEvent;
+import com.fr.design.utils.gui.GUICoreUtils;
-import java.awt.event.ActionListener;
+import com.fr.stable.ProductConstants;
-import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 
 import javax.swing.AbstractAction;
 import javax.swing.ActionMap;
@@ -16,13 +13,14 @@ import javax.swing.JComponent;
 import javax.swing.JDialog;
 import javax.swing.JPanel;
 import javax.swing.KeyStroke;
-
+import java.awt.BorderLayout;
-import com.fr.design.gui.frpane.UITabbedPane;
+import java.awt.Dimension;
-import com.fr.design.gui.ibutton.UIButton;
+import java.awt.Frame;
-import com.fr.design.layout.FRGUIPaneFactory;
+import java.awt.event.ActionEvent;
-
+import java.awt.event.ActionListener;
-import com.fr.stable.ProductConstants;
+import java.awt.event.KeyEvent;
-import com.fr.design.utils.gui.GUICoreUtils;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 
 /**
  * Dialog displaying information about the application.
@@ -42,13 +40,13 @@ public class AboutDialog extends JDialog implements ActionListener {
         JPanel defaultPane=FRGUIPaneFactory.createBorderLayout_L_Pane();
         this.setContentPane(defaultPane);
 
-        okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
+        okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
         okButton.addActionListener(this);
 
         tabbedPane = new UITabbedPane();
         sysPane = new SystemInfoPane();
 
-        tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("About"), aboutPanel);
+        tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About"), aboutPanel);
         tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("System"), sysPane);
 
         buttonPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();

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

@@ -68,7 +68,7 @@ public class FeedBackPane extends BasicPane {
     private static final String ALLOWED_INTEGER_TYPE = "0123456789";
     private SwingWorker worker;
     private JDialog dlg = new JDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Send"), true);
-    private UIButton ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
+    private UIButton ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
     private UIButton cancle = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
     private int ifHasBeenWriten = 0;
     private UITextArea detailField;
@@ -96,7 +96,7 @@ public class FeedBackPane extends BasicPane {
     public FeedBackPane() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         initDetailArea();
-        UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("feedback_info"));
+        UILabel tip = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Feedback_Info"));
         tip.setBorder(TIP_BORDER);
         this.add(tip, BorderLayout.NORTH);
         UIScrollPane scrollPane = new UIScrollPane(initDetailPane());
@@ -135,7 +135,7 @@ public class FeedBackPane extends BasicPane {
             }
         };
         this.detailField.setForeground(Color.gray);
-        this.detailField.setText(com.fr.design.i18n.Toolkit.i18nText("feedback_tip"));
+        this.detailField.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Feedback_Tip"));
         detailField.addKeyListener(new KeyAdapter() {
 
             @Override
@@ -156,7 +156,7 @@ public class FeedBackPane extends BasicPane {
                 detailField.setForeground(Color.black);
                 String text = detailField.getText();
                 // 判断在中文输入状态是否还包含提示符 要删掉
-                String tip = com.fr.design.i18n.Toolkit.i18nText("feedback_tip");
+                String tip = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Feedback_Tip");
                 if (text.contains(tip)) {
                     text = text.substring(0, text.indexOf(tip));
                     detailField.setText(text);

designer-base/src/main/java/com/fr/design/constants/UIConstants.java

@@ -219,7 +219,7 @@ public interface UIConstants {
 
         @Override
         public String toString() {
-            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Loading") + "...";
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading") + "...";
         }
     };
     /**
@@ -228,7 +228,7 @@ public interface UIConstants {
     public static final Object CONNECTION_FAILED = new Object() {
 
         public String toString() {
-            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed") + "!";
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed") + "!";
         }
     };
 

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

@@ -121,14 +121,14 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
         dg.setButtonEnabled(true);
         String tempName = nPanel.getObjectName();
         if (StringUtils.isBlank(tempName)) {
-            nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Table_Data_Empty_Name_Tips"));
+            nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table_Data_Empty_Name_Tips"));
             dg.setButtonEnabled(false);
         } else if (!ComparatorUtils.equals(oldName, tempName) && isDsNameRepeaded(tempName)) {
-            nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Table_Data_Duplicate_Name_Tips", tempName));
+            nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table_Data_Duplicate_Name_Tips", tempName));
             dg.setButtonEnabled(false);
         } else if (isProcedureName(oldName)) {
             if (isIncludeUnderline(tempName)) {
-                nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Stored_Procedure_Name_Tips"));
+                nPanel.setShowText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Stored_Procedure_Name_Tips"));
                 dg.setButtonEnabled(false);
             }
         } else {

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

@@ -455,7 +455,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
         }
         if (!connect) {
             DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
-            JOptionPane.showMessageDialog(designerFrame, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"),
+            JOptionPane.showMessageDialog(designerFrame, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"),
                     com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Failed"), JOptionPane.INFORMATION_MESSAGE);
             failedToFindTable();
             return null;

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

@@ -34,22 +34,22 @@ public class TableDataCreatorProducer {
         TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("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_Tabledata_Type_Class"),
+        TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"),
                 "/com/fr/design/images/data/source/classTableData.png", ClassTableData.class, ClassTableDataPane.class);
-        TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Embedded"),
+        TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Embedded"),
                 "Embedded",
                 "/com/fr/design/images/data/dataTable.png", EmbeddedTableData.class, EmbeddedTableDataPane.class);
-        TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Relation"),
+        TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Relation"),
                 "Multi",
                 "/com/fr/design/images/data/multi.png", ConditionTableData.class, MultiTDTableDataPane.class) {
             public boolean isNeedParameterWhenPopulateJControlPane() {
                 return true;
             }
         };
-        TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_File"),
+        TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_File"),
                 "File",
                 "/com/fr/design/images/data/file.png", FileTableData.class, FileTableDataSmallHeightPane.class);
-        TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Tree"),
+        TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Tree"),
                 "Tree",
                 "/com/fr/design/images/data/tree.png", RecursionTableData.class, TreeTableDataPane.class) {
             public boolean isNeedParameterWhenPopulateJControlPane() {
@@ -69,28 +69,28 @@ public class TableDataCreatorProducer {
     }
 
     public TableDataNameObjectCreator[] createServerTableDataCreator() {
-        TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Database_Query"), "/com/fr/design/images/data/dock/serverdatabase.png", DBTableData.class,
+        TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Database_Query"), "/com/fr/design/images/data/dock/serverdatabase.png", DBTableData.class,
                 DBTableDataPane.class);
-        TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Class"), "/com/fr/design/images/data/dock/serverclasstabledata.png", ClassTableData.class,
+        TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"), "/com/fr/design/images/data/dock/serverclasstabledata.png", ClassTableData.class,
                 ClassTableDataPane.class);
-        TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Embedded"), "/com/fr/design/images/data/dock/serverdatatable.png", EmbeddedTableData.class,
+        TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Embedded"), "/com/fr/design/images/data/dock/serverdatatable.png", EmbeddedTableData.class,
                 EmbeddedTableDataPane.class);
-        TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_File"), "/com/fr/design/images/data/file.png", FileTableData.class,
+        TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_File"), "/com/fr/design/images/data/file.png", FileTableData.class,
                 FileTableDataSmallPane.class);
 
-        TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Tree"), "/com/fr/design/images/data/tree.png",
+        TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Tree"), "/com/fr/design/images/data/tree.png",
                 RecursionTableData.class, GlobalTreeTableDataPane.class) {
             public boolean isNeedParameterWhenPopulateJControlPane() {
                 return true;
             }
         };
-        TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Relation"), "/com/fr/design/images/data/multi.png",
+        TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Relation"), "/com/fr/design/images/data/multi.png",
                 ConditionTableData.class, GlobalMultiTDTableDataPane.class) {
             public boolean isNeedParameterWhenPopulateJControlPane() {
                 return true;
             }
         };
-        TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Stored_Procedure"), "/com/fr/design/images/data/store_procedure.png",
+        TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Stored_Procedure"), "/com/fr/design/images/data/store_procedure.png",
                 StoreProcedure.class, ProcedureDataPane.class) {
             public boolean shouldInsertSeparator() {
                 return true;

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

@@ -49,7 +49,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
                 if (StringUtils.isEmpty(tempName)) {
                     isNamePermitted = false;
                     nameableList.stopEditing();
-                    JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Table_Data_Empty_Name_Tips"));
+                    JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Table_Data_Empty_Name_Tips"));
                     setIllegalIndex(editingIndex);
                     return;
                 }
@@ -58,12 +58,12 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
                         && isNameRepeated(new List[]{Arrays.asList(allDSNames), Arrays.asList(allListNames)}, tempName)) {
                     isNamePermitted = false;
                     nameableList.stopEditing();
-                    JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Table_Data_Duplicate_Name_Tips", tempName));
+                    JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Table_Data_Duplicate_Name_Tips", tempName));
                     setIllegalIndex(editingIndex);
                 } else if (editingType instanceof StoreProcedure && isIncludeUnderline(tempName)) {
                     isNamePermitted = false;
                     nameableList.stopEditing();
-                    JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Stored_Procedure_Name_Tips"));
+                    JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(TableDataPaneListPane.this), Toolkit.i18nText("Fine-Design_Basic_Stored_Procedure_Name_Tips"));
                     setIllegalIndex(editingIndex);
                 }
                 if (nameableList.getSelectedValue() instanceof ListModelElement) {
@@ -247,7 +247,7 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
             NameObject nameObject = (NameObject) tableDataArray[i];
 
             if (exsitTableDataNameList.contains(nameObject.getName())) {
-                throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Table_Data_Duplicate_Name_Tips", nameObject.getName()));
+                throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Table_Data_Duplicate_Name_Tips", nameObject.getName()));
             }
 
             exsitTableDataNameList.add(nameObject.getName());

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

@@ -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_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("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/TreeTableDataDictPane.java

@@ -53,7 +53,7 @@ public class TreeTableDataDictPane extends BasicPane implements Previewable {
     public TreeTableDataDictPane(String treeName) {
         this.setLayout(new BorderLayout(5, 30));
         this.setBorder(BorderFactory.createEmptyBorder(20, 20, 0, 0));
-        selectTableDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_TableData_Select_One") + " :");
+        selectTableDataLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_TableData_Select_One") + " :");
         setTableDataNameComboBox(treeName);
         tableDataNameComboBox.setPreferredSize(new Dimension(180, 20));
         JPanel tableFlowPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();

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

@@ -40,7 +40,7 @@ public class VerticalChoosePane extends ChoosePane implements DesignerBean {
         rs.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, -RIGHTBORDER));
         UILabel l1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Database"), UILabel.LEFT);
         UILabel l2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Model"), UILabel.LEFT);
-        UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Select_Table"), UILabel.LEFT);
+        UILabel l3 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Select_Table"), UILabel.LEFT);
 
         if (labelSize > 0) {
             Dimension pSize = new Dimension(labelSize, 20);

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

@@ -43,7 +43,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
                 String tempName = getEditingName();
                 if (StringUtils.isEmpty(tempName)) {
                     nameableList.stopEditing();
-                    JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Connection_Empty_Name"));
+                    JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Empty_Name"));
                     setIllegalIndex(editingIndex);
                     isNamePermitted = false;
                     return;
@@ -52,7 +52,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
                         && isNameRepeated(new List[]{Arrays.asList(allListNames)}, tempName)) {
                     isNamePermitted = false;
                     nameableList.stopEditing();
-                    String message = Toolkit.i18nText("Fine-Design_Connection_Duplicate_Name", tempName);
+                    String message = Toolkit.i18nText("Fine-Design_Basic_Connection_Duplicate_Name", tempName);
                     JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ConnectionListPane.this), message);
                     setIllegalIndex(editingIndex);
                 }

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

@@ -48,7 +48,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
         newCharSetComboBox = new UIComboBox(EncodeConstants.ALL_ENCODING_ARRAY);
         message = new UILabel();
         uiLabel = new UILabel();
-        okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
+        okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
         cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();

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

@@ -335,15 +335,15 @@ public class JDBCDefPane extends JPanel {
 					{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_Connection_Pool_Max_Wait_Time") + ":" , SwingConstants.RIGHT), DBCP_MAX_WAIT},
+					{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_Connection_Pool_Evictionruns_millis") + ":", SwingConstants.RIGHT),
+					{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_Connection_Pool_Mix_Evictable_Idle_Time_Millis") + ":" , SwingConstants.RIGHT),
+					{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Mix_Evictable_Idle_Time_Millis") + ":" , SwingConstants.RIGHT),
 							DBCP_MINEVICTABLEIDLETIMEMILLIS}};
 
 			JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSize, columnSize, 10, 4);

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

@@ -295,7 +295,7 @@ public class PreviewTablePane extends BasicPane {
         try {
             int choiceColumn = Integer.parseInt(columnErrMessage.trim());
             int tatalColumn = Integer.parseInt(tatolColumnErrMessage.trim());
-            columnErrMessage = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Preview_Warn_Text", choiceColumn + 1, tatalColumn);
+            columnErrMessage = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Preview_Warn_Text", choiceColumn + 1, tatalColumn);
         } catch (Exception e) {
             FRContext.getLogger().error(e.getMessage(), e);
             return;
@@ -362,7 +362,7 @@ public class PreviewTablePane extends BasicPane {
                     boolean status = DataOperator.getInstance().testConnection(((DBTableData) tableData).getDatabase());
                     if (!status) {
                         connectionBar.close();
-                        throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"));
+                        throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
                     }
                 }
                 connectionBar.close();

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

@@ -25,7 +25,6 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.File;
 
 public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
     private UITextField classNameTextField;
@@ -93,7 +92,7 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
         		{new UILabel(com.fr.design.i18n.Toolkit.i18nText("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_Class_Location_Description", StableUtils.pathJoin(ProjectConstants.WEBINF_NAME, ProjectConstants.CLASSES_NAME)))}
+                {null,new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Class_Location_Description", StableUtils.pathJoin(ProjectConstants.WEBINF_NAME, ProjectConstants.CLASSES_NAME)))}
         };
         JPanel northPane = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
         this.add(northPane, BorderLayout.NORTH);

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

@@ -93,7 +93,7 @@ public class EmbeddedTableDataDefinedPane extends BasicPane{
 	
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Embedded_Column_Setting");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Embedded_Column_Setting");
 	}
 	 
 	public void checkValid() throws Exception {

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

@@ -107,7 +107,7 @@ public class EmbeddedTableDataPane extends AbstractTableDataPane<EmbeddedTableDa
 
     private void initOtherNorthPaneComponents(JPanel northPane) {
         // 表结构设置
-        columnSetButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Embedded_Table_Design"));
+        columnSetButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Embedded_Table_Design"));
         columnSetButton.setMnemonic('C');
         northPane.add(columnSetButton);
         columnSetButton.addActionListener(new ActionListener() {

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

@@ -221,7 +221,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
                 FRContext.getLogger().error(e.getMessage(), e);
             }
             if (in == null) {
-                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"),
+                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"));
@@ -759,7 +759,7 @@ public class FileTableDataPane extends AbstractTableDataPane<FileTableData> {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_File");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_File");
     }
 
     private void preview() {

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

@@ -66,7 +66,7 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
         jpanel.setLayout(new BorderLayout());
 
         JPanel northPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
-        UILabel chooseTableData = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Select_To_Merge"));
+        UILabel chooseTableData = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Select_To_Merge"));
         UIButton previewButton = new UIButton();
         previewButton.setIcon(BaseUtils.readIcon("/com/fr/web/images/preview.png"));
         previewButton.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
@@ -131,7 +131,7 @@ public class MultiTDTableDataPane extends AbstractTableDataPane<MultiTDTableData
             public UITableEditAction[] createAction() {
                 return new UITableEditAction[]{new RefreshAction()};
             }
-        }, " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Default_Parameter"));
+        }, " " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Default_Parameter"));
 
         jpanel.add(editorPane, BorderLayout.CENTER);
 

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

@@ -1,17 +1,16 @@
 package com.fr.design.data.tabledata.tabledatapane;
 
-import java.awt.Component;
-import java.awt.event.ActionEvent;
-
 import com.fr.design.gui.itableeditorpane.UITableEditAction;
 import com.fr.design.gui.itableeditorpane.UITableModelAdapter;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.file.FILE;
 import com.fr.file.FILEChooserPane;
 import com.fr.file.filter.ChooseFileFilter;
-
 import com.fr.stable.CoreConstants;
 
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+
 //august：按理说，这个只有一列 就不该用jtable。不过这样总比之前用ArrayTableModel好
 public abstract class OneListTableModel<T> extends UITableModelAdapter<T> {
 
@@ -64,7 +63,7 @@ public abstract class OneListTableModel<T> extends UITableModelAdapter<T> {
 		@Override
 		public void actionPerformed(ActionEvent e) {
 			super.actionPerformed(e);
-			FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("File")));
+			FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("js", "javascript" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")));
 			if(fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) {
 				final FILE file = fileChooser.getSelectedFILE();
 				if(file == null) {
@@ -90,7 +89,7 @@ public abstract class OneListTableModel<T> extends UITableModelAdapter<T> {
 		@Override
 		public void actionPerformed(ActionEvent e) {
 			super.actionPerformed(e);
-			FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("File")));
+			FILEChooserPane fileChooser = FILEChooserPane.getInstance(false, false, true, new ChooseFileFilter("css", "css" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_File")));
 			if(fileChooser.showOpenDialog(DesignerContext.getDesignerFrame()) == FILEChooserPane.OK_OPTION) {
 				final FILE file = fileChooser.getSelectedFILE();
 				if(file == null) {

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

@@ -196,7 +196,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
                     warningLabel.setText(StringUtils.EMPTY);
                 } catch (Exception ex) {
                     if (ex instanceof SQLException) {
-                        warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"));
+                        warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
                     } else {
                         warningLabel.setText(ex.getMessage());
                     }
@@ -319,7 +319,7 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
             storeProcedureContext.setText(procedureText);
             warningLabel.setText("");
         } catch (Exception e) {
-            warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"));
+            warningLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
             storeProcedureContext.setText("");
             editorPane.populate(new StoreProcedureParameter[0]);
         }

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

@@ -39,7 +39,7 @@ public class TreeTableDataPane extends AbstractTableDataPane<RecursionTableData>
 
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Tabledata_Type_Tree");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Tree");
 	}
 	
 }

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

@@ -194,7 +194,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
                     connectionBar.close();
                     // bug 61345 预览失败时，关闭窗口
                     dialog.setVisible(false);
-                    throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"));
+                    throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
                 }
                 connectionBar.close();
                 storeProcedure.resetDataModelList();

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

@@ -149,7 +149,7 @@ public class InformationWarnPane extends JPanel{
 		private JPanel createControlButtonPane() {
 			controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 
-			okButton = new UIButton("<html><font FACE='MicroSoft YaHei'>" + com.fr.design.i18n.Toolkit.i18nText("OK") + "</font></html>") {
+			okButton = new UIButton("<html><font FACE='MicroSoft YaHei'>" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK") + "</font></html>") {
 				@Override
 				public Dimension getPreferredSize() {
 					// TODO Auto-generated method stub

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

@@ -113,7 +113,7 @@ public abstract class UIDialog extends JDialog {
     }
 
     private void addOkButton(JPanel buttonsPane) {
-        okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
+        okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
         okButton.setName(OK_BUTTON);
         okButton.setMnemonic('O');
         buttonsPane.add(okButton);

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

@@ -28,7 +28,7 @@ public class ColumnSelectedEditor extends Editor<SimpleDSColumn> {
 	protected String[] columnNames;
 
 	public ColumnSelectedEditor() {
-		this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_DS_Column"));
+		this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Column"));
 		this.setLayout(FRGUIPaneFactory.createLeftZeroLayout());
 		tableDataComboBox = new TableDataComboBox(DesignTableDataManager.getEditingTableDataSource());
 		columnNames = new String[0];

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

@@ -16,7 +16,6 @@ import com.fr.design.module.DesignModuleFactory;
 import com.fr.design.utils.gui.GUIPaintUtils;
 import com.fr.file.filetree.FileNode;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 
 import com.fr.log.FineLoggerFactory;
@@ -122,7 +121,7 @@ public class HistoryTemplateListPane extends JPanel implements FileOperations, C
         try {
             historyList.remove(contains(selected));
             selected.getEditingFILE().closeTemplate();
-            FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Closed_Warn_Text", selected.getEditingFILE().getName()));
+            FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Closed_Warn_Text", selected.getEditingFILE().getName()));
             MutilTempalteTabPane.getInstance().refreshOpenedTemplate(historyList);
         } catch (Exception e) {
             FRContext.getLogger().error(e.getMessage(), e);

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

@@ -738,7 +738,7 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M
                     ProductConstants.PRODUCT_NAME, JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE);
             if (returnVal == JOptionPane.YES_OPTION && specifiedTemplate.saveTemplate()) {
                 specifiedTemplate.saveTemplate();
-                FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName()));
+                FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved", specifiedTemplate.getEditingFILE().getName()));
             }
         }
         HistoryTemplateListPane.getInstance().closeSelectedReport(specifiedTemplate);

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

@@ -156,7 +156,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
     @Override
     public void refresh() {
         reportletsTree.refresh();
-        FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_File_Tree_Refresh_Successfully") + "!");
+        FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_File_Tree_Refresh_Successfully") + "!");
     }
 
     /**
@@ -175,7 +175,7 @@ public class TemplateTreePane extends JPanel implements FileOperations {
             FileNodeFILE nodeFile = new FileNodeFILE(new FileNode(StableUtils.pathJoin(ProjectConstants.REPORTLETS_NAME, reportPath), false));
 
             if (nodeFile.isLocked()) {
-                if (JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("fileLocked_undeleted"),
+                if (JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FileLocked_Undeleted"),
                         com.fr.design.i18n.Toolkit.i18nText("Error"), JOptionPane.YES_OPTION, JOptionPane.ERROR_MESSAGE) == JOptionPane.YES_OPTION) {
                     refreshDockingView();
                 }

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

@@ -933,7 +933,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                     BaseUtils.readIcon("/com/fr/design/images/dialog/variable.png"),
                     variableResolver.resolveCurReportVariables()).createMutableTreeNode());
 
-            rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Source_Type_Tabledata"),
+            rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Source_Type_Tabledata"),
                     BaseUtils.readIcon("/com/fr/design/images/dialog/parameter.gif"),
                     variableResolver.resolveTableDataParameterVariables()).createMutableTreeNode());
 

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

@@ -129,7 +129,7 @@ public abstract class FunctionConstants {
 		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Array"), Function.ARRAY),
 		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Report"), Function.REPORT),
 		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FormulaD-Other"), Function.OTHER),
-		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Function_Type_Hierarchy"), Function.HA)
+		new NameAndTypeAndFunctionList(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function_Type_Hierarchy"), Function.HA)
 	};
 	
 	public static FunctionGroup ALL = new FunctionGroup() {

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

@@ -90,7 +90,7 @@ public class JavaEditorPane extends BasicPane {
         this.add(jt, BorderLayout.CENTER);
         UILabel label = new UILabel();
         label.setText("<html><font color='red'>" +
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Compile_Save_Attention") +
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Compile_Save_Attention") +
                 "</font></html>");
         label.setPreferredSize(new Dimension(label.getWidth(),label.getHeight() + 20));
         this.add(label, BorderLayout.SOUTH);
@@ -157,11 +157,11 @@ public class JavaEditorPane extends BasicPane {
         }
         try {
             WorkContext.getWorkResource().write(StableUtils.pathJoin(ProjectConstants.CLASSES_NAME, getJavaPath()), text.getBytes(EncodeConstants.ENCODING_UTF_8));
-            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Common_Save_Successfully") + "！");
+            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Common_Save_Successfully") + "！");
             fireSaveActionListener();
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Common_Save_Failed") + "！");
+            JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Common_Save_Failed") + "！");
         }
 
     }

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

@@ -4,5 +4,5 @@ import com.fr.design.i18n.Toolkit;
 
 public class NameInspector {
 
-    public static final String ILLEGAL_NAME_HOLDER = Toolkit.i18nText("Fine-Design_Illegal_Name_Tips");
+    public static final String ILLEGAL_NAME_HOLDER = Toolkit.i18nText("Fine-Design_Basic_Illegal_Name_Tips");
 }

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

@@ -126,7 +126,7 @@ public abstract class WidgetOption implements Serializable {
                 NUMBEREDITOR, TREECOMBOBOX, RADIOGROUP, CHECKBOXGROUP, TEXTAREA, PASSWORD, CHECKBOX, TREE, MULTI_FILEEDITOR};
     }
 
-    public static final WidgetOption DATEEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Date"),
+    public static final WidgetOption DATEEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Date"),
             BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/date_16.png"),
             DateEditor.class);
 
@@ -137,59 +137,59 @@ public abstract class WidgetOption implements Serializable {
             TreeComboBoxEditor.class);
 
     public static final WidgetOption CHECKBOXGROUP = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Checkbox_Group"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/checkbox_group_16.png"), CheckBoxGroup.class);
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox_Group"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/checkbox_group_16.png"), CheckBoxGroup.class);
 
     public static final WidgetOption RADIOGROUP = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Radio_Group"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_group_16.png"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Radio_Group"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_group_16.png"),
             RadioGroup.class);
 
     public static final WidgetOption NUMBEREDITOR = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Number"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/number_field_16.png"), NumberEditor.class);
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Number"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/number_field_16.png"), NumberEditor.class);
 
     public static final WidgetOption LABEL = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Label"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/label_16.png"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Label"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/label_16.png"),
             Label.class);
 
     public static final WidgetOption BUTTON = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Button"), BaseUtils.readIcon("/com/fr/web/images/form/resources/button_16.png"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Button"), BaseUtils.readIcon("/com/fr/web/images/form/resources/button_16.png"),
             Button.class);
 
     public static final WidgetOption FREEBUTTON = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Button"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_16.png"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Button"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_16.png"),
             FreeButton.class);
 
     public static final WidgetOption MULTI_FILEEDITOR = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_File"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/files_up.png"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_File"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/files_up.png"),
             MultiFileEditor.class);
 
     public static final WidgetOption COMBOBOX = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Combo_Box"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_box_16.png"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Box"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_box_16.png"),
             ComboBox.class);
 
     public static final WidgetOption COMBOCHECKBOX = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Combo_Checkbox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_check_16.png"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Checkbox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_check_16.png"),
             ComboCheckBox.class);
 
     public static final WidgetOption CHECKBOX = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Checkbox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/check_box_16.png"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/check_box_16.png"),
             CheckBox.class);
 
     public static final WidgetOption LIST = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_List"), BaseUtils.readIcon("/com/fr/web/images/form/resources/list_16.png"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_List"), BaseUtils.readIcon("/com/fr/web/images/form/resources/list_16.png"),
             ListEditor.class);
 
 
     public static final WidgetOption TEXTEDITOR = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Text")
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Text")
             , BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_field_16.png"),
             TextEditor.class);
 
     public static final WidgetOption TEXTAREA = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Textarea"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_area_16.png"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Textarea"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_area_16.png"),
             TextArea.class);
 
     public static final WidgetOption PASSWORD = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Widget_Type_Password"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Password"),
             BaseUtils.readIcon("/com/fr/design/images/buttonicon/widget/password_field_16.png"), Password.class);
 
     public static final WidgetOption IFRAMEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Form-Iframe"), BaseUtils.readIcon("/com/fr/web/images/form/resources/iframe_16.png"),

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

@@ -213,7 +213,7 @@ public class UICalendarPanel extends JPanel {
         gap.setPreferredSize(new Dimension(26,1));
         sPane.add(gap);
 
-        UIButton okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")) {
+        UIButton okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")) {
             public Dimension getPreferredSize() {
                 return new Dimension(32,18);
             }

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

@@ -46,7 +46,7 @@ public class ImgChoosePane extends BasicPane {
 				if (image == null) {
 					imgSizeLabel.setText("");
 				} else {
-					imgSizeLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Size_Detail",
+					imgSizeLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Size_Detail",
 							image.getWidth(null) + "x" + image.getHeight(null)));
 				}
 			}

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

@@ -74,7 +74,7 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
         this.add(selectTreeDataPanel, BorderLayout.NORTH);
 
         valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()});
-        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
+        FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
         formulaEditor.setEnabled(true);
         textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor});
         Component[][] coms = {
@@ -104,12 +104,12 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
             String[] columnNames = new String[namelist.size()];
             namelist.toArray(columnNames);
             valuePane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length)}, columnNames[0]);
-            FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
+            FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
             formulaEditor.setEnabled(true);
             textPane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length), formulaEditor}, columnNames[0]);
         } catch (Exception e) {
             valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1);
-            FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
+            FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
             formulaEditor.setEnabled(true);
             textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1);
         }

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

@@ -55,7 +55,7 @@ public abstract class LoadingBasicPane extends BasicPane {
         card = new CardLayout();
         setLayout(card);
         JPanel loadingDisPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        UILabel loadingPane = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Loading_And_Waiting") , SwingConstants.CENTER);
+        UILabel loadingPane = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_And_Waiting") , SwingConstants.CENTER);
         loadingDisPane.add(loadingPane, BorderLayout.CENTER);
         progressBar = new JProgressBar();
         progressBar.setIndeterminate(true);

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

@@ -17,7 +17,7 @@ public class DictionaryConstants {
 		"^\\d{6}$" };
 	
 	public final static String[] regexpsDisplays = new String[] {
-		com.fr.design.i18n.Toolkit.i18nText("None"),
+		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"),
 		com.fr.design.i18n.Toolkit.i18nText("Required"),
 		com.fr.design.i18n.Toolkit.i18nText("Length"),
 		com.fr.design.i18n.Toolkit.i18nText("Float"),
@@ -55,7 +55,7 @@ public class DictionaryConstants {
 	};
 	
 	public static final String[] symbolDisplays = new String[]{
-		com.fr.design.i18n.Toolkit.i18nText("None"),
+		com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"),
 		com.fr.design.i18n.Toolkit.i18nText("Form-Single_quote"),
 		com.fr.design.i18n.Toolkit.i18nText("Form-Double_quotes")
 	};

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

@@ -23,7 +23,7 @@ import java.util.concurrent.ExecutionException;
 public abstract class LazyComboBox extends UIComboBox implements PopupMenuListener {
 
     private static final int NUM = 80;
-    private static final String[] PENDING_CONTENT = new String[]{"", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Loading") + "..."};
+    private static final String[] PENDING_CONTENT = new String[]{"", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading") + "..."};
 
     /**
      * 是否加载完成

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

@@ -10,7 +10,6 @@ import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.geom.GeneralPath;
-import java.awt.geom.Line2D;
 import java.awt.geom.Point2D;
 
 import javax.swing.DefaultComboBoxModel;
@@ -20,8 +19,6 @@ import javax.swing.JList;
 import com.fr.base.FRContext;
 import com.fr.base.GraphHelper;
 import com.fr.base.ScreenResolution;
-import com.fr.design.gui.icombobox.UIComboBox;
-import com.fr.design.gui.icombobox.UIComboBoxRenderer;
 import com.fr.general.FRFont;
 
 import com.fr.stable.Constants;
@@ -91,7 +88,7 @@ public class LineComboBox extends UIComboBox {
             FontMetrics fm = GraphHelper.getFontMetrics(rfont);
             if (style == Constants.LINE_NONE) {
                 //draw "none" string
-                GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("None"), 4, (d.height - fm.getHeight()) / 2 + fm.getAscent());
+                GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"), 4, (d.height - fm.getHeight()) / 2 + fm.getAscent());
             } else {
                 GraphHelper.drawLine(g2d, 4, d.height / 2, d.width - 8, d.height / 2, style);
             }

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

@@ -99,7 +99,7 @@ public class TableViewList extends UIList {
                     count--;
                 }
                 if (!status) {
-                    throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Database_Connection_Failed"));
+                    throw new Exception(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Database_Connection_Failed"));
                 }
                 TableViewList.this.setModel(processDataInAnotherThread(databaseName, searchFilter, typesFilter));
                 return null;

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

@@ -16,7 +16,7 @@ public class UIScrollMenuDemo extends JFrame {
         UIMenuBar menuBar = new UIMenuBar();
 
         // File Menu, F - Mnemonic
-        JMenu fileMenu = new JMenu("File");
+        JMenu fileMenu = new JMenu("Fine-Design_Basic_File");
         fileMenu.setMnemonic(KeyEvent.VK_F);
         menuBar.add(fileMenu);
 

designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java

@@ -106,7 +106,7 @@ public class UISBChooser extends JDialog {
         JButton b = new JButton("Cancel");
         b.addActionListener(new CancelAction());
         p3.add(b);
-        b = new JButton("OK");
+        b = new JButton("Fine-Design_Report_OK");
         getRootPane().setDefaultButton(b);
         b.addActionListener(new OKAction());
         p3.add(b);

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

@@ -235,7 +235,7 @@ public abstract class UITableModelAdapter<T extends Object> extends AbstractTabl
 		public void actionPerformed(ActionEvent e) {
 			int[] selectedRow = table.getSelectedRows();
 			if (ismultiSelected()) {
-				JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Multiple_Select_Warn_Text"));
+				JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Multiple_Select_Warn_Text"));
 				return;
 			}
 			if (table.getCellEditor() != null) {

designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java

@@ -68,7 +68,7 @@ public class EnvFileTree extends RefreshableJTree {
                     String name = node.getName();
                     if (treeNode.hasFullAuthority()) {
                         if (lock != null && !node.getUserID().equals(lock)) {
-                            name = name + Toolkit.i18nText("Fine-Design_Template_Status_Locked", "(", ")");
+                            name = name + Toolkit.i18nText("Fine-Design_Basic_Template_Status_Locked", "(", ")");
                             this.setIcon(FileTreeIcon.getIcon(node));
                         } else {
                             this.setIcon(FileTreeIcon.getIcon(node, false));

designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java

@@ -6,7 +6,6 @@ import com.fr.design.gui.itree.checkboxtree.CheckBoxTree;
 import com.fr.design.i18n.Toolkit;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.NameObject;
-import com.fr.locale.InterProviderFactory;
 import com.fr.stable.StringUtils;
 
 import javax.swing.Icon;
@@ -37,7 +36,7 @@ public abstract class RefreshableJTree extends CheckBoxTree {
 
         @Override
         public String toString() {
-            return Toolkit.i18nText("Fine-Design_Loading") + "...";
+            return Toolkit.i18nText("Fine-Design_Basic_Loading") + "...";
         }
     };
 

designer-base/src/main/java/com/fr/design/hyperlink/ReporletHyperNorthPane.java

@@ -151,7 +151,7 @@ public class ReporletHyperNorthPane extends AbstractHyperNorthPane<ReportletHype
 
     private class FakeTipAction extends UpdateAction {
         public FakeTipAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Select"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Select"));
         }
 
         public void actionPerformed(ActionEvent e) {
@@ -164,7 +164,7 @@ public class ReporletHyperNorthPane extends AbstractHyperNorthPane<ReportletHype
         double p = TableLayout.PREFERRED;
         double[] rowSize = {p, p, p};
         double[] columnSize = {p, TableLayout.FILL};
-        showParameterInterface = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_UI_Display"));
+        showParameterInterface = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_UI_Display"));
         JPanel showParameterPanel = new JPanel();
         showParameterPanel.add(new UILabel());
         showParameterPanel.add(showParameterInterface);

designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperlinkPane.java

@@ -96,7 +96,7 @@ public class ReportletHyperlinkPane extends AbstractHyperLinkPane<ReportletHyper
 
     protected class HyperlinkParametersAction extends UITableEditAction {
         public HyperlinkParametersAction() {
-            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Parameter"));
+            this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Parameter"));
             this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/p.gif"));
         }
 

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

@@ -1 +1 @@
-package com.fr.design.javascript;

import com.fr.data.ClassSubmitJob;
import com.fr.design.write.submit.CustomSubmitJobPane;
import com.fr.design.beans.FurtherBasicBeanPane;

import com.fr.js.CustomActionJavaScript;

import java.awt.*;

/**
 * Author : Shockway
 * Date: 13-8-12
 * Time: 下午7:47
 */
public class CustomActionPane extends FurtherBasicBeanPane<CustomActionJavaScript> {
	CustomSubmitJobPane classPane = new CustomSubmitJobPane();

	public CustomActionPane() {
		this.setLayout(new BorderLayout());
		this.add(classPane, BorderLayout.CENTER);
	}

	/**
	 * 判断界面是否为js 传入
	 * @param ob 对象是否为js
	 * @return 是否是js对象
	 */
	@Override
	public boolean accept(Object ob) {
		return ob instanceof CustomActionJavaScript;
	}

	/**
	 * 标题
	 * @return 标题
	 */
	@Override
	public String title4PopupWindow() {
		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Submit_Type_Custom");
	}

	/**
	 * 重置
	 */
	@Override
	public void reset() {
		this.classPane.reset();
	}

	@Override
	public void populateBean(CustomActionJavaScript ob) {
		classPane.populateBean(ob.getJob());
	}

	@Override
	public CustomActionJavaScript updateBean() {
		CustomActionJavaScript cs = new CustomActionJavaScript();
		cs.setJob((ClassSubmitJob)classPane.updateBean());
		return cs;
	}
}
+package com.fr.design.javascript;

import com.fr.data.ClassSubmitJob;
import com.fr.design.write.submit.CustomSubmitJobPane;
import com.fr.design.beans.FurtherBasicBeanPane;

import com.fr.js.CustomActionJavaScript;

import java.awt.*;

/**
 * Author : Shockway
 * Date: 13-8-12
 * Time: 下午7:47
 */
public class CustomActionPane extends FurtherBasicBeanPane<CustomActionJavaScript> {
	CustomSubmitJobPane classPane = new CustomSubmitJobPane();

	public CustomActionPane() {
		this.setLayout(new BorderLayout());
		this.add(classPane, BorderLayout.CENTER);
	}

	/**
	 * 判断界面是否为js 传入
	 * @param ob 对象是否为js
	 * @return 是否是js对象
	 */
	@Override
	public boolean accept(Object ob) {
		return ob instanceof CustomActionJavaScript;
	}

	/**
	 * 标题
	 * @return 标题
	 */
	@Override
	public String title4PopupWindow() {
		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Submit_Type_Custom");
	}

	/**
	 * 重置
	 */
	@Override
	public void reset() {
		this.classPane.reset();
	}

	@Override
	public void populateBean(CustomActionJavaScript ob) {
		classPane.populateBean(ob.getJob());
	}

	@Override
	public CustomActionJavaScript updateBean() {
		CustomActionJavaScript cs = new CustomActionJavaScript();
		cs.setJob((ClassSubmitJob)classPane.updateBean());
		return cs;
	}
}

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

@@ -62,7 +62,7 @@ public class JavaScriptImplPane extends AbstractHyperLinkPane<JavaScriptImpl> {
                     }
                     if (tempSet.contains(list.get(i).toString())) {
                         list.remove(i);
-                        JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Duplicate_Name") + "!");
+                        JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Parameter_Duplicate_Name") + "!");
                         parameterChanger(list);
                         return;
                     }

designer-base/src/main/java/com/fr/design/layout/TableLayoutTest.java

@@ -57,7 +57,7 @@ public class TableLayoutTest extends JFrame
         UITextField textfieldState   = new UITextField(2);
         UITextField textfieldZip     = new UITextField(5);
 
-        UIButton buttonOk = new UIButton("OK");
+        UIButton buttonOk = new UIButton("Fine-Design_Report_OK");
         UIButton buttonCancel = new UIButton("Cancel");
         JPanel panelButton = new JPanel();
         panelButton.add(buttonOk);

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

@@ -22,7 +22,7 @@ public class AuthorityPropertyPane extends JPanel {
 	public AuthorityPropertyPane(TargetComponent t) {
 		this.setLayout(new BorderLayout());
 		this.setBorder(null);
-		UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Privilege_Preference")) {
+		UILabel authorityTitle = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Privilege_Preference")) {
 			@Override
 			public Dimension getPreferredSize() {
 				return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT);

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

@@ -40,7 +40,6 @@ import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.file.FILE;
 import com.fr.file.FILEFactory;
 import com.fr.file.FileFILE;
-import com.fr.file.FileNodeFILE;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
 
@@ -53,7 +52,6 @@ import com.fr.plugin.observer.PluginEventListener;
 import com.fr.stable.CoreConstants;
 import com.fr.stable.OperatingSystem;
 import com.fr.stable.ProductConstants;
-import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.image4j.codec.ico.ICODecoder;
 import com.fr.stable.project.ProjectConstants;
@@ -846,13 +844,13 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
                         JOptionPane.QUESTION_MESSAGE);
                 if (returnVal == JOptionPane.YES_OPTION && editingTemplate.saveTemplate()) {
                     editingTemplate.saveTemplate();
-                    FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Already_Saved",
+                    FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved",
                             editingTemplate.getEditingFILE().getName()));
                 }
             } else {
                 if (editingTemplate.saveTemplate()) {
                     editingTemplate.saveTemplate();
-                    FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Already_Saved",
+                    FineLoggerFactory.getLogger().info(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Already_Saved",
                             editingTemplate.getEditingFILE().getName()));
                 }
             }

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

@@ -578,7 +578,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
             if (selectedOperation.isNameAlreadyExist(userInput, oldName, suffix)) {
                 jt.selectAll();
                 // 如果文件名已存在，则灰掉确认按钮
-                hintsLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_File_Name_Duplicate", userInput));
+                hintsLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_File_Name_Duplicate", userInput));
                 hintsLabel.setVisible(true);
                 confirmButton.setEnabled(false);
             } else {

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

@@ -1,6 +1,5 @@
 package com.fr.design.mainframe;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
 import com.fr.base.Parameter;
 import com.fr.base.ScreenResolution;
@@ -537,7 +536,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }
         if (!access) {
-            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
+            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
             return false;
         }
         collectInfo();
@@ -587,7 +586,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
                 FineLoggerFactory.getLogger().error(e.getMessage(), e);
             }
             if (!access) {
-                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
+                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Template_Permission_Denied") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Message"), JOptionPane.WARNING_MESSAGE);
                 return false;
             }
             editingFILE = fileChooser.getSelectedFILE();
@@ -883,7 +882,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     public boolean isOldDesigner() {
         String xmlDesignerVersion = getTarget().getXMLDesignerVersion();
         if (isHigherThanCurrent(xmlDesignerVersion)) {
-            String infor = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Template_Version_Not_Match", StringUtils.parseVersion(xmlDesignerVersion));
+            String infor = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_Version_Not_Match", StringUtils.parseVersion(xmlDesignerVersion));
             String moreInfo = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Server-version-tip-moreInfo");
             new InformationWarnPane(infor, moreInfo, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips")).show();
             return true;

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

@@ -22,7 +22,7 @@ public class NoSupportAuthorityEdit extends AuthorityEditPane {
         super(HistoryTemplateListPane.getInstance().getCurrentEditingTemplate());
         this.setLayout(new BorderLayout());
         this.setBorder(null);
-        UILabel title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Privilege_Preference")) {
+        UILabel title = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Privilege_Preference")) {
             @Override
             public Dimension getPreferredSize() {
                 return new Dimension(super.getPreferredSize().width, TITLE_HEIGHT);

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

@@ -13,14 +13,12 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.utils.DesignUtils;
 import com.fr.env.EnvListPane;
-import com.fr.event.EventDispatcher;
 import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 import com.fr.stable.EnvChangedListener;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.WorkContextCallback;
 import com.fr.workspace.Workspace;
-import com.fr.workspace.WorkspaceEvent;
 import com.fr.workspace.connect.AuthException;
 
 import javax.swing.BorderFactory;
@@ -149,7 +147,7 @@ public class TemplatePane extends JPanel implements MouseListener {
             Workspace workspace = DesignerWorkspaceGenerator.generate(selectedEnv);
             boolean checkValid = workspace == null ? false : selectedEnv.checkValid();
             if (!checkValid) {
-                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Switch_Workspace_Failed"),
+                JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
                         null, 0, UIManager.getIcon("OptionPane.errorIcon"));
                 return false;
             }

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

@@ -86,11 +86,11 @@ public class DesignerLogHandler {
                 caption.clearMessage();
             }
         };
-        showInfo = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Log_Level_Info"), true);
+        showInfo = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Info"), true);
         showInfo.addItemListener(itemlistener);
-        showError = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Log_Level_Warn"), true);
+        showError = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Warn"), true);
         showError.addItemListener(itemlistener);
-        showServer = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Log_Level_Error"), true);
+        showServer = new JCheckBoxMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Log_Level_Error"), true);
         showServer.addItemListener(itemlistener);
         caption.addSetListener(new ActionListener() {
 

designer-base/src/main/java/com/fr/design/mainframe/widget/editors/DataTableEditor.java

@@ -24,7 +24,7 @@ public class DataTableEditor extends Editor<DataTableConfig> {
 
 	public DataTableEditor() {
 		this.initCompontents();
-		this.setName(com.fr.design.i18n.Toolkit.i18nText("FieldBinding"));
+		this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FieldBinding"));
 	}
 
 	private void initCompontents() {

designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java

@@ -39,7 +39,7 @@ public class WidgetValueEditor extends AbstractPropertyEditor {
 		case DataControl.TYPE_NUMBER:
 			return new DoubleEditor();
 		case DataControl.TYPE_FORMULA:
-			return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
+			return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
 		case DataControl.TYPE_DATABINDING:
 			return onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor();
 		case DataControl.TYPE_STRING:

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

@@ -35,7 +35,7 @@ public class BackgroundWrapper implements Encoder, Decoder {
         } else if (v instanceof GradientBackground) {
             return com.fr.design.i18n.Toolkit.i18nText("Gradient-Color");
         } else {
-            return com.fr.design.i18n.Toolkit.i18nText("None");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None");
         }
     }
 

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

@@ -4,13 +4,9 @@
 
 package com.fr.design.menu;
 
-import com.fr.general.ComparatorUtils;
-import com.fr.general.GeneralContext;
-
 
 import javax.swing.*;
 import java.awt.event.KeyEvent;
-import java.util.Locale;
 
 import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
 
@@ -661,7 +657,7 @@ public class KeySetUtils {
 
         @Override
         public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Attribute");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Engine_Attribute");
         }
 
         @Override
@@ -678,7 +674,7 @@ public class KeySetUtils {
 
         @Override
         public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Authority_Edit_Status");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Authority_Edit_Status");
         }
 
         @Override
@@ -883,7 +879,7 @@ public class KeySetUtils {
 
         @Override
         public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert_Hyperlink");
         }
 
         @Override
@@ -994,7 +990,7 @@ public class KeySetUtils {
 
         @Override
         public String getMenuName() {
-            return com.fr.design.i18n.Toolkit.i18nText("M_Insert-Float");
+            return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert-Float");
         }
 
         @Override

designer-base/src/main/java/com/fr/design/parameter/ParameterArrayPane.java

@@ -36,7 +36,7 @@ public class ParameterArrayPane extends JListControlPane {
 				String tempName = getEditingName();
 				if (StringUtils.isEmpty(tempName)) {
 					nameableList.stopEditing();
-					JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Empty_Parameter_Name"));
+					JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Empty_Parameter_Name"));
 					setIllegalIndex(editingIndex);
 					return;
 				}
@@ -44,7 +44,7 @@ public class ParameterArrayPane extends JListControlPane {
 						&& isNameRepeated(new List[]{Arrays.asList(parameters), Arrays.asList(allListNames)}, tempName)) {
 					nameableList.stopEditing();
 					JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(ParameterArrayPane.this),
-							com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Duplicate_Parameter_Name"));
+							com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Duplicate_Parameter_Name"));
 					setIllegalIndex(editingIndex);
 				}
 			}

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

@@ -142,7 +142,7 @@ public class UserManagerPane extends BasicPane {
             sync2AddedMembersFormAdded();
             // 不需要重复更新右侧列表显示 但是更新一下计数显示
             countLabel.setText(
-                    Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member_Count",
+                    Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member_Count",
                             String.valueOf(addedMembers.size())
                     )
             );
@@ -211,7 +211,7 @@ public class UserManagerPane extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return Toolkit.i18nText("Fine-Design_Remote_Design_Add_Member");
+        return Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Add_Member");
     }
 
     private JPanel createLeftPanel() {
@@ -221,7 +221,7 @@ public class UserManagerPane extends BasicPane {
                 BorderFactory.createCompoundBorder(
                         new EmptyBorder(6, 0, 0, 0),
                         UITitledBorder.createBorderWithTitle(
-                                Toolkit.i18nText("Fine-Design_Remote_Design_Decision_Member")
+                                Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Decision_Member")
                         )
                 )
         );
@@ -233,7 +233,7 @@ public class UserManagerPane extends BasicPane {
         keyField.requestFocus();
         keyField.addKeyListener(keyFieldKeyListener);
         keyField.getDocument().addDocumentListener(documentListener);
-        keyButton.setText(Toolkit.i18nText("Fine-Design_Remote_Design_Search"));
+        keyButton.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Search"));
         keyButton.addActionListener(keyButtonActionListener);
         searchPanel.add(keyField);
         searchPanel.add(keyButton);
@@ -279,14 +279,14 @@ public class UserManagerPane extends BasicPane {
         content.setBorder(
                 BorderFactory.createCompoundBorder(
                         new EmptyBorder(6, 0, 0, 0),
-                        UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member")
+                        UITitledBorder.createBorderWithTitle(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member")
                         )
                 )
         );
 
         // 计数
         countLabel.setText(
-                Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member_Count",
+                Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member_Count",
                         String.valueOf(addedMembers.size()))
         );
         countLabel.setBorder(BorderFactory.createEmptyBorder(7, 12, 8, 0));
@@ -332,7 +332,7 @@ public class UserManagerPane extends BasicPane {
         addedList.revalidate();
         addedList.repaint();
         countLabel.setText(
-                Toolkit.i18nText("Fine-Design_Remote_Design_Selected_Member_Count",
+                Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Selected_Member_Count",
                         String.valueOf(addedMembers.size())
                 ));
     }

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

@@ -158,12 +158,12 @@ public class AlignmentPane extends BasicPane {
         leftIndentSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), maximum, new Integer(1)));
         leftIndentSpinner.addChangeListener(changeListener);
         GUICoreUtils.setColumnForSpinner(leftIndentSpinner, 3);
-        indentPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Indent_Left"), leftIndentSpinner));
+        indentPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Indent_Left"), leftIndentSpinner));
 
         rightIndentSpinner = new UIBasicSpinner(new SpinnerNumberModel(new Integer(0), new Integer(0), maximum, new Integer(1)));
         rightIndentSpinner.addChangeListener(changeListener);
         GUICoreUtils.setColumnForSpinner(rightIndentSpinner, 3);
-        indentPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Indent_Right") , rightIndentSpinner));
+        indentPane.add(this.createCenterFlowPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Indent_Right") , rightIndentSpinner));
         return indentPane;
     }
 

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

@@ -50,7 +50,7 @@ public class AlphaPane extends JPanel {
 		alphaPane.setBorder(BorderFactory.createEmptyBorder());
 		this.add(alphaPane, BorderLayout.CENTER);
 		
-		alphaPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Alpha") + ":"));
+		alphaPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha") + ":"));
 		
 		alphaPane.add(alphaSlider = new UISlider(UISlider.HORIZONTAL, 0, ALPHA_FLOAT, START_VALUE));
 		alphaSlider.setPreferredSize(new Dimension(80, 20));

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

@@ -106,9 +106,9 @@ public class BorderPane extends BasicPane {
 		borderAllControlPane.add(createVerButtonPane(NO_BORDERS, com.fr.design.i18n.Toolkit.i18nText("No")));
 		// Button setting all borders to active with
 		// current color and current style excepting inside borders
-		borderAllControlPane.add(createVerButtonPane(EXTERNAL_BORDERS, com.fr.design.i18n.Toolkit.i18nText("External")));
+		borderAllControlPane.add(createVerButtonPane(EXTERNAL_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External")));
 
-		borderAllControlPane.add(createVerButtonPane(INSIDE_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Inside")));
+		borderAllControlPane.add(createVerButtonPane(INSIDE_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Inner")));
 
 		// Control
 		JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();

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

@@ -32,13 +32,13 @@ public class FontSizeStylePane extends JPanel {
         this.add(fontVSizPane);
         
 //        fontVSizPane.setLayout(new BoxLayout(fontVSizPane, BoxLayout.X_AXIS));
-        fontVSizPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Font_Size"), null));
+        fontVSizPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Font_Size"), null));
         
         String[] styles = {
-            com.fr.design.i18n.Toolkit.i18nText("FRFont-plain"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Plain"),
-            com.fr.design.i18n.Toolkit.i18nText("FRFont-bold"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold"),
-            com.fr.design.i18n.Toolkit.i18nText("FRFont-italic"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Italic"),
-            com.fr.design.i18n.Toolkit.i18nText("FRFont-bolditalic")};
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold_Italic")};
 
         styleField = new UITextField();
         styleField.setEditable(false);

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

@@ -61,7 +61,7 @@ public class BackgroundUIComboBoxPane extends BasicPane {
         JPanel northPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
         labelPane.add(northPane, BorderLayout.NORTH);
 
-        northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Setting") + ":"));
+        northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Setting") + ":"));
         northPane.add(selectBox);
 
         cardLayout = new CardLayout();
@@ -161,6 +161,6 @@ public class BackgroundUIComboBoxPane extends BasicPane {
 
     @Override
     protected String title4PopupWindow() {
-        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Setting");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Setting");
     }
 }

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

@@ -34,7 +34,7 @@ public class GradientBackgroundPane extends BackgroundDetailPane {
 	public GradientBackgroundPane() {
 
 		// bug 5452 简化GradientPane
-		JPanel jpanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Choose_Gradient_Color"));
+		JPanel jpanel = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Choose_Gradient_Color"));
 		jpanel.setPreferredSize(new Dimension(450, 320));
 		jpanel.setLayout(new BorderLayout());
 

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

@@ -1,19 +1,17 @@
 package com.fr.design.style.background.gradient;
 
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-
-import com.fr.design.gui.ilable.UILabel;
-import javax.swing.JPanel;
-
 import com.fr.base.background.GradientBackground;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.icombobox.UIComboBox;
+import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.general.Background;
-
 import com.fr.design.style.AlphaPane;
 import com.fr.design.style.background.BackgroundPane4BoxChange;
+import com.fr.general.Background;
+
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
 
 /**
  * @author kunsnat E-mail:kunsnat@gmail.com
@@ -58,12 +56,12 @@ public class GradientBackgroundSelectPane extends BackgroundPane4BoxChange {
 		JPanel secondFloorPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
 		mainPane.add(secondFloorPane);
 		
-		secondFloorPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Gradient_Area") + ":"));
+		secondFloorPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Gradient_Area") + ":"));
 		
 		changeBox = new GradientChangeBoxPane();
 		secondFloorPane.add(changeBox);
 		
-		secondFloorPane.add(repeatShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Gradient_Repeat_Show")));
+		secondFloorPane.add(repeatShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Gradient_Repeat_Show")));
 	}
 	
 	public void populate(Background background) {
@@ -112,7 +110,7 @@ public class GradientBackgroundSelectPane extends BackgroundPane4BoxChange {
 	
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Choose_Gradient_Color");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Choose_Gradient_Color");
 	}
 
 }

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

@@ -1,28 +1,26 @@
 package com.fr.design.style.background.gradient;
 
-import java.awt.BorderLayout;
-import java.awt.CardLayout;
-import java.awt.Rectangle;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-
 import com.fr.base.background.GradientBackground;
 import com.fr.design.constants.UIConstants;
+import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.dialog.BasicPane;
-
 import com.fr.stable.Constants;
 
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
 /**
  * @author kunsnat E-mail:kunsnat@gmail.com
  * @version 创建时间：2011-11-29 上午10:42:43
@@ -30,8 +28,8 @@ import com.fr.stable.Constants;
  */
 public class GradientChangeBoxPane extends BasicPane {
 	private static final long serialVersionUID = -6747468244414651602L;
-	private static final String CURRENT = Toolkit.i18nText("Fine-Design_Style_Background_Gradient_Current_Area");
+	private static final String CURRENT = Toolkit.i18nText("Fine-Design_Basic_Style_Background_Gradient_Current_Area");
-	private static final String CUSTOM = Toolkit.i18nText("Fine-Design_Style_Background_Gradient_Custom_Area");
+	private static final String CUSTOM = Toolkit.i18nText("Fine-Design_Basic_Style_Background_Gradient_Custom_Area");
 
 	private JPanel cardPane;
 	private CardLayout cardLayout;
@@ -124,7 +122,7 @@ public class GradientChangeBoxPane extends BasicPane {
 	
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Choose_Gradient_Color");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Choose_Gradient_Color");
 	}
 
 }

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

@@ -61,7 +61,7 @@ public class GradientFromToPixPane extends BasicPane {
 
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Background_Choose_Gradient_Color");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Background_Choose_Gradient_Color");
 	}
 
 }

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

@@ -220,7 +220,7 @@ public class ImageBackgroundPane extends BackgroundDetailPane {
             if (image == null) {
                 imageSizeLabel.setText("");
             } else {
-                imageSizeLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Size_Detail", image.getWidth(null) + "x" + image.getHeight(null)));
+                imageSizeLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Size_Detail", image.getWidth(null) + "x" + image.getHeight(null)));
             }
         }
     };

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

@@ -98,7 +98,7 @@ public class ColorSelectDialog extends MiddleChartDialog{
     	buttonPane.add(ok);
     	buttonPane.add(cancel);
     	
-    	ok.setActionCommand("OK");
+    	ok.setActionCommand("Fine-Design_Report_OK");
     	ok.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
 				seletePane.setColor(okListener.getColor());

designer-base/src/main/java/com/fr/design/web/CustomIconPane.java

@@ -4,7 +4,6 @@ import com.fr.base.BaseUtils;
 import com.fr.base.GraphHelper;
 import com.fr.base.Icon;
 import com.fr.base.IconManager;
-import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.ibutton.UIButton;
@@ -454,7 +453,7 @@ IconManager.DEFAULT_ICONHEIGHT, BufferedImage.TYPE_INT_ARGB);
 
         @Override
 	    protected String title4PopupWindow() {
-	    	return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Add_Icon");
+	    	return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Style_Add_Icon");
 	    }
 	    
 	    // 用户自定义的只有name 和 imgae两属性， path不要去管

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

@@ -32,7 +32,7 @@ public class ButtonConstants {
             com.fr.design.i18n.Toolkit.i18nText("Custom"),
             com.fr.design.i18n.Toolkit.i18nText("Utils-Insert_Row"),
             com.fr.design.i18n.Toolkit.i18nText("Utils-Delete_Row"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Button_Type_Parameter_Submit"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Button_Type_Parameter_Submit"),
             com.fr.design.i18n.Toolkit.i18nText("Widget-TreeNode")
     };
 

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

@@ -21,9 +21,9 @@ import java.awt.*;
 public class DateValuePane extends JPanel {
     private UIButtonGroup widgetValueHead;
     private Editor[] editor;
-    private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("None");
+    private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None");
     private static final String DATE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Date");
-    private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula");
+    private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula");
 
 
     public DateValuePane() {
@@ -45,7 +45,7 @@ public class DateValuePane extends JPanel {
             @Override
             public void stateChanged(ChangeEvent e) {
                 int index = widgetValueHead.getSelectedIndex();
-                if (ComparatorUtils.equals(tabTitles[index], com.fr.design.i18n.Toolkit.i18nText("None"))) {
+                if (ComparatorUtils.equals(tabTitles[index], com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"))) {
                     customPane.setVisible(false);
                 } else {
                     customPane.setVisible(true);

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

@@ -3,7 +3,6 @@ package com.fr.design.widget.component;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
-import com.fr.design.gui.ispinner.UIBasicSpinner;
 import com.fr.design.gui.ispinner.UISpinner;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -16,7 +15,6 @@ import com.fr.stable.StringUtils;
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import javax.swing.text.DefaultFormatter;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -77,7 +75,7 @@ public class NumberEditorValidatePane extends JPanel {
         JPanel errorMsgBorderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         errorMsgBorderPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, IntervalConstants.INTERVAL_L1, 0));
         errorMsgBorderPane.add(errorMsgTextFieldPane, BorderLayout.CENTER);
-        UILabel numberLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Decimal_Digits"));
+        UILabel numberLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Decimal_Digits"));
         limitNumberPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{numberLabel, decimalLength}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
         limitNumberPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, 0, 0));
         double f = TableLayout.FILL;

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

@@ -93,7 +93,7 @@ public abstract class CustomJobPane  extends BasicBeanPane {
 		this.add(objectProperiesPane, BorderLayout.CENTER);
 
 		UITextArea area = new UITextArea(2, 1);
-		area.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Extend_Class", "com.fr.data.AbstractSubmitTask"));
+		area.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Extend_Class", "com.fr.data.AbstractSubmitTask"));
 		JPanel dsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		dsPane.add(area);
 		dsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Custom_Job_Description"), null));

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

@@ -106,10 +106,10 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
     private String subMitName;
 
 	private static final String[] DML_CONFIG_TYPES = new String[] {
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Smart_Submit"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Smart_Submit"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Delete_Submit"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Delete_Submit"),
-			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Smart_Submit"),
+			com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Smart_Submit"),
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Update_Submit")};
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Update_Submit")};
 
 	/**
 	 * 无单元格。没有智能添加单元格等按钮
@@ -128,9 +128,9 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 
 		dmlConfigComboBox = new UIComboBox(DML_CONFIG_TYPES);
 
-		JPanel typePane = GUICoreUtils.createFlowPane(new Component[] { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Choose_Submit_Type") + ":"), dmlConfigComboBox },
+		JPanel typePane = GUICoreUtils.createFlowPane(new Component[] { new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Choose_Submit_Type") + ":"), dmlConfigComboBox },
 				FlowLayout.LEFT, 10);
-		typePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Submit_Type")));
+		typePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Write_Submit_Type")));
 		northPane.add(typePane, BorderLayout.NORTH);
 
 		chooseTable = new ChoosePaneSupportFormula();
@@ -477,7 +477,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
                 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") };
                     returnValue = JOptionPane.showOptionDialog(DBManipulationPane.this,
-							com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Cover_Tips", keyColumnNameValueList.get(j).cn.name),
+							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]);
                     // Richie:全部覆盖
                     if (returnValue == 0) {

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

@@ -28,12 +28,12 @@ public class SubmitJobListPane extends ObjectJControlPane {
 	public NameableCreator[] createNameableCreators() {
 		return new NameableCreator[] {
 			new NameObjectCreator(
-					com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Submit_Event"),
+					com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Submit_Event"),
 					"/com/fr/web/images/reportlet.png",
 					DMLConfigJob.class,
 					DMLJobPane.class),
 			new NameObjectCreator(
-					com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Write_Custom_Event"),
+					com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Custom_Event"),
 					"/com/fr/web/images/reportlet.png",
 					ClassSubmitJob.class,
 					CustomSubmitJobPane.class)

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

@@ -33,13 +33,13 @@ public class EnvListPane extends JListControlPane {
                 allListNames[nameableList.getSelectedIndex()] = StringUtils.EMPTY;
                 if (StringUtils.isEmpty(tempName)) {
                     nameableList.stopEditing();
-                    JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Workspace_Empty_Name_Warn_Text"));
+                    JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Empty_Name_Warn_Text"));
                     setIllegalIndex(editingIndex);
                     return;
                 }
                 if (!ComparatorUtils.equals(tempName, selectedName) && isNameRepeated(new List[]{Arrays.asList(allListNames)}, tempName)) {
                     nameableList.stopEditing();
-                    JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Workspace_Duplicate_Name_Warn_Text", tempName));
+                    JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EnvListPane.this), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Workspace_Duplicate_Name_Warn_Text", tempName));
                     setIllegalIndex(editingIndex);
                 }
             }

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

@@ -66,7 +66,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
     private JDialog dialog;
     private UILabel message = new UILabel();
     private UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_OK"));
-    private UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Report_Cancel"));
+    private UIButton cancelButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Cancel"));
     private UILabel uiLabel = new UILabel();
 
     /**
@@ -523,9 +523,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
                 DesignerEnvManager.getEnvManager().setCertificatePass(connection.getCertSecretKey());
                 try {
                     return WorkContext.getConnector().testConnection(connection);
-                } catch (AuthException e) {
+                } catch (AuthException ignored) {
-                    message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"));
-                    uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
                     return null;
                 }
             }
@@ -534,13 +532,18 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
             protected void done() {
                 okButton.setEnabled(true);
                 try {
-                    if (get()) {
+                    Boolean result = get();
+                    if (result == null) {
+                        message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"));
+                        uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
+                    } else {
+                        if (result) {
                             message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Successful"));
                             uiLabel.setIcon(UIManager.getIcon("OptionPane.informationIcon"));
                         } else {
                             message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Failed"));
                             uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
-
+                        }
                     }
                 } catch (InterruptedException | ExecutionException e) {
                     FineLoggerFactory.getLogger().error(e, e.getMessage());

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

@@ -41,7 +41,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
 
     private void init(String[] args) {
         //初始化
-        EventDispatcher.fire(ModuleEvent.MajorModuleStarting, Toolkit.i18nText("Fine-Design_Initializing"));
+        EventDispatcher.fire(ModuleEvent.MajorModuleStarting, Toolkit.i18nText("Fine-Design_Basic_Initializing"));
         // 初始化look and feel.这个在预加载之前执行是因为lookAndFeel里的东西，预加载时也要用到
         DesignUtils.initLookAndFeel();
         // 初始化Log Handler

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

@@ -43,7 +43,7 @@ public class ChartDialog extends MiddleChartDialog {
 		this.setModal(true);
 		this.setLayout(new BorderLayout());
     	final ChartTypePane chartTypePane = new ChartTypePane();
-    	setTitle(com.fr.design.i18n.Toolkit.i18nText("M-Popup_ChartType"));
+    	setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Popup_Chart_Type"));
 
         this.applyClosingAction();
         this.applyEscapeAction();
@@ -55,7 +55,7 @@ public class ChartDialog extends MiddleChartDialog {
     	
     	this.add(buttonPane, BorderLayout.SOUTH);
     	
-    	ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
+    	ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
     	cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
     	
     	buttonPane.add(ok);

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

@@ -81,7 +81,7 @@ public class ChartTypePane extends ChartCommonWizardPane {
 
         JSplitPane spane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, typeScrollPane, subListPane);
         spane.setDividerLocation(120);
-        spane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("M-Popup_ChartType")));
+        spane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Popup_Chart_Type")));
         this.add(spane);
 
         iconViewList.setSelectedIndex(0);

designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java

@@ -88,7 +88,7 @@ public class ChartAlertValuePane extends BasicBeanPane<ChartAlertValue> {
 		JPanel lineStylePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
 		alertLinePane.add(lineStylePane);
 		
-		lineStylePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Line_Style") + ":"));
+		lineStylePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style") + ":"));
 		lineCombo = new LineComboBox(CoreConstants.STRIKE_LINE_STYLE_ARRAY_4_CHART);
 		lineStylePane.add(lineCombo);
 		
@@ -130,10 +130,10 @@ public class ChartAlertValuePane extends BasicBeanPane<ChartAlertValue> {
 		double[] rowSize = {t, t, t, t, t};
 		double[] columnSize = {0.1, 0.2, 0.5, 0.2};
 		Component[][] components= {
-				{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Content") + ":"),  contentField = new UITextField(3)},
+				{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content") + ":"),  contentField = new UITextField(3)},
-				{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Font") + ":"),  fontNameBox},
+				{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font") + ":"),  fontNameBox},
-				{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Font_Size") + ":"),  fontSizeBox},
+				{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Size") + ":"),  fontSizeBox},
-				{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Layout") + ": "), leftButton = new UIRadioButton(getLeftName())},
+				{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout") + ": "), leftButton = new UIRadioButton(getLeftName())},
 				{null,    null, 			rightButton = new UIRadioButton(getRightName())},
 				
 		};
@@ -148,11 +148,11 @@ public class ChartAlertValuePane extends BasicBeanPane<ChartAlertValue> {
 	}
 	
 	protected String getLeftName() {// 居左 居右
-		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_At_The_Left");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_At_The_Left");
 	}
 	
 	protected String getRightName() {
-		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_At_The_Right");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_At_The_Right");
 	}
 	
 	@Override

designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java

@@ -10,7 +10,7 @@ public class CustomChartStyleAxisPane extends TernaryChartStyleAxisPane {
 	}
 
 	protected String getValueAxisName() {
-    	return com.fr.design.i18n.Toolkit.i18nText("Main_Axis");
+    	return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Axis");
     }
     
     protected String getSecondValueAxisName() {

designer-chart/src/main/java/com/fr/design/chart/axis/MinMaxValuePane.java

@@ -31,9 +31,9 @@ public class MinMaxValuePane extends JPanel {
     protected UITextField secUnitField;
 
 	public MinMaxValuePane() {
-		minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Custom_Min_Value"));
+		minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Min_Value"));
 		minValueField = new UITextField(6);
-		maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Custom_Max_Value"));
+		maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Max_Value"));
 		maxValueField = new UITextField(6);
 		isCustomMainUnitBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Main_Graduation_Unit"));
 		mainUnitField = new UITextField(6);

designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java

@@ -16,7 +16,7 @@ public class BorderAttriPane extends BasicPane  {
     private ColorSelectBox colorSelectBox;
 
     public BorderAttriPane() {
-    	this(com.fr.design.i18n.Toolkit.i18nText("Line-Style"), com.fr.design.i18n.Toolkit.i18nText("Color"));
+    	this(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style"), com.fr.design.i18n.Toolkit.i18nText("Color"));
     }
     
     public BorderAttriPane(String lineString, String colorSting) {

designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java

@@ -18,7 +18,7 @@ public class SetChartStyleAciton extends ChartComponentAction {
 
     public SetChartStyleAciton(ChartComponent chartComponent) {
         super(chartComponent);
-        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style"));
+        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pattern"));
     }
 
     public void actionPerformed(ActionEvent e) {

designer-chart/src/main/java/com/fr/design/chart/report/MapCubeDataPane.java

@@ -45,7 +45,7 @@ public class MapCubeDataPane extends UIComboBoxPane<TopDefinitionProvider> {
 
 	@Override
 	protected String title4PopupWindow() {
-		return com.fr.design.i18n.Toolkit.i18nText("LayerData");
+		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layer_Data");
 	}
 	
 	/**

designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java

@@ -46,7 +46,7 @@ public class MapReportEditor extends AbstractCellEditor implements TableCellEdit
 		TextEditor textEidtor = new TextEditor();
 		initListeners(textEidtor);
 		
-		FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
+		FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"));
 		initListeners(formulaEditor);
 		
 		Editor[] editors = new Editor[]{textEidtor, formulaEditor};