规范国际化

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

@@ -253,7 +253,7 @@ class TipWindow extends JWindow implements ActionListener {
 		}
 		else {
 			panel.setOpaque(false);
-			JLabel label = new JLabel(FocusableTip.getString("Fine-Design_Basic_ Focus_Hotkey"));
+			JLabel label = new JLabel(FocusableTip.getString("Fine-Design_Basic_Focus_Hotkey"));
 			Color fg = UIManager.getColor("Label.disabledForeground");
 			Font font = textArea.getFont();
 			font = font.deriveFont(font.getSize2D() - 1.0f);

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

@@ -35,7 +35,7 @@ public class CheckBoxDictPane extends JPanel {
 		endComboBox = new DictionaryComboBox(DictionaryConstants.symbols, DictionaryConstants.symbolDisplays);
 		endComboBox.setEditable(true);
 		Component[][] components = new Component[][]{
-				new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Delimiter")), delimiterComboBox},
+				new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delimiter")), delimiterComboBox},
 				new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol")),startComboBox},
 				new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_End_Symbol")),endComboBox}
 		};

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

@@ -96,7 +96,7 @@ public class DataLabelPane extends TooltipContentsPane {
         }
         delimiterBox.setPreferredSize(new Dimension(70, 20));
         JPanel boxPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
-        boxPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Delimiter") + ":"));
+        boxPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delimiter") + ":"));
         boxPane.add(delimiterBox);
         return boxPane;
     }

designer-form/src/main/java/com/fr/design/designer/beans/actions/ChangeNameAction.java

@@ -17,7 +17,7 @@ public class ChangeNameAction extends FormUndoableAction {
 	public ChangeNameAction(FormDesigner t) {
 		super(t);
 		
-        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Change_Widget_Name"));
+        this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Change_Widget_Name"));
         this.setMnemonic('G');
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/refresh.png"));
     }

designer-form/src/main/java/com/fr/design/designer/creator/XCheckBoxGroup.java

@@ -56,7 +56,7 @@ public class XCheckBoxGroup extends XFieldEditor {
 		if (((CheckBoxGroup) this.toData()).isReturnString()) {
 			crp = (CRPropertyDescriptor[]) ArrayUtils.addAll(crp, new CRPropertyDescriptor[] {
 					new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName(
-							com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
+							com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
 					new CRPropertyDescriptor("startSymbol", this.data.getClass()).setI18NName(
 							com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Combo_CheckBox_Start_Symbol")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
 					new CRPropertyDescriptor("endSymbol", this.data.getClass()).setI18NName(

designer-form/src/main/java/com/fr/design/designer/creator/XComboCheckBox.java

@@ -29,13 +29,13 @@ public class XComboCheckBox extends XComboBox {
                         com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Support_Tag")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
                         "Advanced"),
 				new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName(
-						com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
+						com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
 						"Advanced"),
 				new CRPropertyDescriptor("returnString", this.data.getClass()).setEditorClass(
 						InChangeBooleanEditor.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Return_String"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced") } : new CRPropertyDescriptor[] {
 				new CRPropertyDescriptor("delimiter", this.data.getClass()).setI18NName(
-						com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
+						com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Delimiter")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
 						"Advanced"),
 				new CRPropertyDescriptor("returnString", this.data.getClass()).setI18NName(
 						com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Return_String")).setEditorClass(InChangeBooleanEditor.class)

designer-form/src/main/java/com/fr/design/designer/creator/XCustomWriteAbleRepeatEditor.java

@@ -1 +1 @@
-package com.fr.design.designer.creator;

import com.fr.design.form.util.XCreatorConstants;
import com.fr.form.ui.WriteAbleRepeatEditor;

import com.fr.stable.ArrayUtils;

import java.awt.*;
import java.beans.IntrospectionException;

/**
 * Author : Shockway
 * Date: 13-9-22
 * Time: 上午10:40
 */
public abstract class XCustomWriteAbleRepeatEditor extends XWriteAbleRepeatEditor {
	public XCustomWriteAbleRepeatEditor(WriteAbleRepeatEditor widget, Dimension initSize) {
		super(widget, initSize);
	}

	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
		return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(),
				new CRPropertyDescriptor[] { new CRPropertyDescriptor("customData",
						this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Allow_Custom_Data"))
						.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate")});
	}
}
+package com.fr.design.designer.creator;

import com.fr.design.form.util.XCreatorConstants;
import com.fr.form.ui.WriteAbleRepeatEditor;

import com.fr.stable.ArrayUtils;

import java.awt.*;
import java.beans.IntrospectionException;

/**
 * Author : Shockway
 * Date: 13-9-22
 * Time: 上午10:40
 */
public abstract class XCustomWriteAbleRepeatEditor extends XWriteAbleRepeatEditor {
	public XCustomWriteAbleRepeatEditor(WriteAbleRepeatEditor widget, Dimension initSize) {
		super(widget, initSize);
	}

	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
		return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(),
				new CRPropertyDescriptor[] { new CRPropertyDescriptor("customData",
						this.data.getClass()).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Custom_Data"))
						.putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate")});
	}
}

designer-form/src/main/java/com/fr/design/designer/creator/XDirectWriteEditor.java

@@ -25,7 +25,7 @@ public abstract class XDirectWriteEditor extends XFieldEditor {
 	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
 		return (CRPropertyDescriptor[]) ArrayUtils.addAll(super.supportedDescriptor(),
 				new CRPropertyDescriptor[] { new CRPropertyDescriptor("directEdit", this.data.getClass())
-								.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Allow_Edit")).putKeyValue(
+								.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Edit")).putKeyValue(
 								 XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate") });
 	}
 }

designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java

@@ -102,7 +102,7 @@ public class XElementCase extends XBorderStyleWidgetCreator implements FormEleme
 						.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Padding"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"),
 				new CRPropertyDescriptor("toolBars", this.data.getClass()).setEditorClass(ElementCaseToolBarEditor.class)
-						.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ EC_Toolbar"))
+						.setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_EC_Toolbar"))
 						.putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")
 		};
 		CRPropertyDescriptor[] extraTableEditor = getExtraTableEditor();

designer-form/src/main/java/com/fr/design/designer/creator/XTreeComboBoxEditor.java

@@ -52,13 +52,13 @@ public class XTreeComboBoxEditor extends XTreeEditor {
 
 	protected CRPropertyDescriptor[] addAllowEdit(CRPropertyDescriptor[] crp) throws IntrospectionException{
 		return (CRPropertyDescriptor[])ArrayUtils.add(crp, new CRPropertyDescriptor("directEdit", this.data.getClass())
-          .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Allow_Edit")).putKeyValue(
+          .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Edit")).putKeyValue(
                   XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"));
 	}
 
 	protected CRPropertyDescriptor[] addCustomData(CRPropertyDescriptor[] crp) throws IntrospectionException{
 		return (CRPropertyDescriptor[])ArrayUtils.add(crp, new CRPropertyDescriptor("customData", this.data.getClass())
-          .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Allow_Custom_Data")).putKeyValue(
+          .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Custom_Data")).putKeyValue(
                   XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"));
 	}
 

designer-form/src/main/java/com/fr/design/designer/creator/XWidgetCreator.java

@@ -172,7 +172,7 @@ public abstract class XWidgetCreator extends XCreator {
      */
     public void ChangeCreatorName(FormDesigner designer, XCreator creator) {
         String oldName = creator.toData().getWidgetName();
-        String value = JOptionPane.showInputDialog(designer, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Change_Widget_Name_Discription"), oldName);
+        String value = JOptionPane.showInputDialog(designer, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Change_Widget_Name_Discription"), oldName);
         if (value != null) {
             designer.renameCreator(creator, value);
         }

designer-form/src/main/java/com/fr/design/designer/properties/mobile/ElementCasePropertyTable.java

@@ -56,7 +56,7 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{
                         .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Vertical"))
                         .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fit")),
                 new CRPropertyDescriptor("heightRestrict", this.xCreator.toData().getClass()).setEditorClass(InChangeBooleanEditor.class)
-                        .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ EC_Heightrestrict"))
+                        .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_EC_Heightrestrict"))
                         .setRendererClass(BooleanRender.class)
                         .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fit"))
         };
@@ -71,7 +71,7 @@ public class ElementCasePropertyTable extends AbstractPropertyTable{
     protected CRPropertyDescriptor[] revealHeightLimit() throws IntrospectionException {
         CRPropertyDescriptor heightLimitProperty = new CRPropertyDescriptor("heightPercent", this.xCreator.toData().getClass())
                                                                 .setEditorClass(RefinedDoubleEditor.class)
-                                                                .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ EC_Heightpercent"))
+                                                                .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_EC_Heightpercent"))
                                                                 .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced");
         ArrayList<CRPropertyDescriptor> defaultList = (ArrayList<CRPropertyDescriptor>) createNonListenerProperties();
         defaultList.add(heightLimitProperty);

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

@@ -24,7 +24,7 @@ public abstract class CustomWritableRepeatEditorPane<T extends CustomWriteAbleRe
 
 
 	public  JPanel setValidatePane(){
-		this.customDataCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Allow_Custom_Data"), false);
+		this.customDataCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Custom_Data"), false);
 		this.customDataCheckBox.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
 		JPanel otherContentPane = super.setValidatePane();
 		otherContentPane.add(GUICoreUtils.createFlowPane(new JComponent[]{customDataCheckBox}, FlowLayout.LEFT, 0));

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

@@ -75,7 +75,7 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
 	}
 
 	public  JPanel setValidatePane(){
-        directWriteCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Allow_Edit"), false);
+        directWriteCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Edit"), false);
 		directWriteCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         JPanel otherContentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
         otherContentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));

designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java

@@ -36,7 +36,7 @@ public class ElementEditorDefinePane extends WTitleLayoutDefinePane<ElementCaseE
         elementCaseToolBarEditor = new AccessibleElementCaseToolBarEditor();
         Component[][] components = new Component[][]{
                 new Component[]{paddingBoundPane, null},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ EC_Toolbar")), elementCaseToolBarEditor},
+                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_EC_Toolbar")), elementCaseToolBarEditor},
         };
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W0, IntervalConstants.INTERVAL_L1);
         panel.setBorder(BorderFactory.createEmptyBorder(5, 0, 10, 0));

designer-realize/src/main/java/com/fr/design/widget/ui/CustomWritableRepeatEditorPane.java

@@ -18,7 +18,7 @@ import java.awt.*;
 public abstract class CustomWritableRepeatEditorPane<T extends CustomWriteAbleRepeatEditor> extends WritableRepeatEditorPane<T> {
 
 	private UICheckBox customDataCheckBox;
-	private static final int CUSTOM_DATA_CHECK_BOX_WIDTH = GraphHelper.getLocTextWidth("Fine-Design_Form_ Allow_Custom_Data") + 30;
+	private static final int CUSTOM_DATA_CHECK_BOX_WIDTH = GraphHelper.getLocTextWidth("Fine-Design_Form_Allow_Custom_Data") + 30;
 	private static final int CUSTOM_DATA_CHECK_BOX_HEIGHT = 30;
 
 	public CustomWritableRepeatEditorPane() {
@@ -29,7 +29,7 @@ public abstract class CustomWritableRepeatEditorPane<T extends CustomWriteAbleRe
 	protected JPanel setThirdContentPane() {
 		JPanel contentPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
 		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		this.customDataCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Allow_Custom_Data"), false);
+		this.customDataCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Custom_Data"), false);
 		this.customDataCheckBox.setPreferredSize(
 				new Dimension(CUSTOM_DATA_CHECK_BOX_WIDTH, CUSTOM_DATA_CHECK_BOX_HEIGHT));
 		this.customDataCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));

designer-realize/src/main/java/com/fr/design/widget/ui/DirectWriteEditorDefinePane.java

@@ -23,7 +23,7 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
 	protected JPanel setFirstContentPane() {
 		JPanel contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0));
-		directWriteCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ Allow_Edit"), false);
+		directWriteCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Edit"), false);
 		directWriteCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
 
 		waterMarkDictPane = new WaterMarkDictPane();