From 1452ebb7535030b5d3b284de6980ae7a167a85d9 Mon Sep 17 00:00:00 2001 From: kerry Date: Fri, 5 Aug 2016 17:09:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/designer/creator/XFieldEditor.java | 8 ++++---- .../com/fr/design/designer/creator/XPassword.java | 10 +++++----- .../com/fr/design/designer/creator/XTextArea.java | 12 ++++++------ .../com/fr/design/designer/creator/XTextEditor.java | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/designer_form/src/com/fr/design/designer/creator/XFieldEditor.java b/designer_form/src/com/fr/design/designer/creator/XFieldEditor.java index 42ae055e4..3041d95fb 100644 --- a/designer_form/src/com/fr/design/designer/creator/XFieldEditor.java +++ b/designer_form/src/com/fr/design/designer/creator/XFieldEditor.java @@ -40,14 +40,14 @@ public abstract class XFieldEditor extends XWidgetCreator { private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException { CRPropertyDescriptor allowBlank = new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName( - Inter.getLocText("Allow_Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue( + Inter.getLocText("FR-Designer_Allow-Blank")).setEditorClass(InChangeBooleanEditor.class).putKeyValue( XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); CRPropertyDescriptor blankErrorMsg = new CRPropertyDescriptor("errorMessage", this.data.getClass()).setI18NName( - Inter.getLocText("Verify-Message")) + Inter.getLocText("FR-Engine_Verify-Message")) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); CRPropertyDescriptor fontSize = new CRPropertyDescriptor("fontSize", this.data.getClass(), "getFontSize", "setFontSize") - .setI18NName(Inter.getLocText(new String[]{"FRFont", "FRFont-Size"})) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"); + .setI18NName(Inter.getLocText("FR-Designer_Font-Size")) + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced"); return !((FieldEditor) toData()).isAllowBlank() ? new CRPropertyDescriptor[]{allowBlank, blankErrorMsg, fontSize} : new CRPropertyDescriptor[]{allowBlank, fontSize}; diff --git a/designer_form/src/com/fr/design/designer/creator/XPassword.java b/designer_form/src/com/fr/design/designer/creator/XPassword.java index 1a9b4493d..c72808d5c 100644 --- a/designer_form/src/com/fr/design/designer/creator/XPassword.java +++ b/designer_form/src/com/fr/design/designer/creator/XPassword.java @@ -51,19 +51,19 @@ public class XPassword extends XWrapperedFieldEditor { CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll( new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass( - WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")} + Inter.getLocText("FR-Designer-Estate_Widget_Value")).setEditorClass( + WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced")} , super.supportedDescriptor()); + CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName( + Inter.getLocText("FR-Engine_Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()) .setI18NName(Inter.getLocText("FR-Designer_Input_Rule")) .setEditorClass(RegexEditor.RegexEditor4TextArea.class) .putKeyValue("renderer", RegexCellRencerer.class) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); - CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName( - Inter.getLocText("Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass()) .setI18NName(Inter.getLocText("FR-Designer_WaterMark")) - .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"); + .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced"); boolean displayRegField = true; displayRegField = isDisplayRegField(displayRegField); return displayRegField ? (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, regErrorMessage, waterMark}) : diff --git a/designer_form/src/com/fr/design/designer/creator/XTextArea.java b/designer_form/src/com/fr/design/designer/creator/XTextArea.java index 3b7f0e6f1..0a1005647 100644 --- a/designer_form/src/com/fr/design/designer/creator/XTextArea.java +++ b/designer_form/src/com/fr/design/designer/creator/XTextArea.java @@ -39,16 +39,16 @@ public class XTextArea extends XFieldEditor { CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll( new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - Inter.getLocText(new String[]{"Widget", "Value"})).setEditorClass( - WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced")}, super.supportedDescriptor()); + Inter.getLocText("FR-Designer-Estate_Widget_Value")).setEditorClass( + WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced")}, super.supportedDescriptor()); CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName( - Inter.getLocText("Input_Rule")).setEditorClass(RegexEditor.RegexEditor4TextArea.class) + Inter.getLocText("FR-Designer_Input_Rule")).setEditorClass(RegexEditor.RegexEditor4TextArea.class) .putKeyValue("renderer", RegexCellRencerer.class).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName( - Inter.getLocText("Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); + Inter.getLocText("FR-Engine_Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName( - Inter.getLocText("WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, - "Advanced"); + Inter.getLocText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, + "FR-Designer_Advanced"); boolean displayRegField = true; displayRegField = isDisplayRegField(displayRegField); return displayRegField ? (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, regErrorMessage, waterMark}) : diff --git a/designer_form/src/com/fr/design/designer/creator/XTextEditor.java b/designer_form/src/com/fr/design/designer/creator/XTextEditor.java index 31b7d0f48..a123e9e24 100644 --- a/designer_form/src/com/fr/design/designer/creator/XTextEditor.java +++ b/designer_form/src/com/fr/design/designer/creator/XTextEditor.java @@ -42,16 +42,16 @@ public class XTextEditor extends XWrapperedFieldEditor { @Override public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { CRPropertyDescriptor widgetValue = new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - Inter.getLocText(new String[]{"FR-Designer_Widget", "Value"})).setEditorClass( - WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"); + Inter.getLocText("FR-Designer-Estate_Widget_Value")).setEditorClass( + WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced"); CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName( Inter.getLocText("FR-Designer_Input_Rule")).setEditorClass(RegexEditor.class).putKeyValue( "renderer", RegexCellRencerer.class).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName( - Inter.getLocText("Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); + Inter.getLocText("FR-Engine_Verify-Message")).putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate"); CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName( Inter.getLocText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, - "Advanced"); + "FR-Designer_Advanced"); CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[]{widgetValue}, super.supportedDescriptor()); boolean displayRegField = true; displayRegField = isDisplayRegField(displayRegField);