控件校验剩余控件整改

designer/src/com/fr/design/widget/ui/CheckBoxGroupDefinePane.java

@@ -41,7 +41,7 @@ public class CheckBoxGroupDefinePane extends FieldEditorDefinePane<CheckBoxGroup
 	protected JPanel setFirstContentPane() {
 		JPanel attrPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		attrPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
-		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
 		advancedPane.add(attrPane);
 		JPanel northPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		northPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));

designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java

@@ -10,9 +10,7 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.editor.ValueEditorPane;
 import com.fr.design.editor.ValueEditorPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.form.ui.ComboBox;
 import com.fr.form.ui.DateEditor;
-import com.fr.general.ComparatorUtils;
 import com.fr.general.DateUtils;
 import com.fr.general.Inter;
 import com.fr.script.Calculator;
@@ -23,8 +21,6 @@ import com.fr.stable.UtilEvalError;
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

designer/src/com/fr/design/widget/ui/DirectWriteEditorDefinePane.java

@@ -26,7 +26,7 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
 		directWriteCheckBox = new UICheckBox(Inter.getLocText("Form-Allow_Edit"), false);
 		directWriteCheckBox.setPreferredSize(new Dimension(100, 30));
 		getValidatePane().add(GUICoreUtils.createFlowPane(new JComponent[]{directWriteCheckBox}, FlowLayout.LEFT, 5));
-		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
 		waterMarkDictPane = new WaterMarkDictPane();
 		advancedPane.add(contentPane);
 		contentPane.add(waterMarkDictPane);

designer/src/com/fr/design/widget/ui/IframeEditorDefinePane.java

@@ -57,7 +57,7 @@ public class IframeEditorDefinePane extends AbstractDataModify<IframeEditor> {
 		centerPane.add(GUICoreUtils.createFlowPane(new UILabel(Inter.getLocText("Form-Url") + ":"), srcTextField = new UITextField(16), FlowLayout.LEFT));
 		centerPane.add(GUICoreUtils.createFlowPane( new UILabel(Inter.getLocText("Parameter") + ":"), parameterViewPane = new ReportletParameterViewPane(), FlowLayout.LEFT));
 		parameterViewPane.setPreferredSize(new Dimension(540, 235));
-		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
 		advancedPane.add(contentPane);
 		contentPane.add(centerPane);
 		this.add(advancedPane, BorderLayout.CENTER);

designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java

@@ -157,7 +157,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         content.setLayout(FRGUIPaneFactory.createBorderLayout());
         // richer:数字的允许直接编辑没有意义
 
-        JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+        JPanel northPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
         content.add(northPane, BorderLayout.NORTH);
 
         waterMarkDictPane = new WaterMarkDictPane();

designer/src/com/fr/design/widget/ui/RadioGroupDefinePane.java

@@ -35,7 +35,7 @@ public class RadioGroupDefinePane extends FieldEditorDefinePane<RadioGroup> {
 		JPanel centerPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
 		buttonGroupDictPane = new ButtonGroupDictPane();
 		buttonGroupDictPane.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 0));
-		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
 		centerPane.add(buttonGroupDictPane);
 		advancedPane.add(centerPane);
 		attrPane.add(advancedPane, BorderLayout.CENTER);

designer/src/com/fr/design/widget/ui/TextFieldEditorDefinePane.java

@@ -48,7 +48,7 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
         regPane.addPhoneRegListener(pl);
         getValidatePane().add(GUICoreUtils.createFlowPane(regPane, FlowLayout.LEFT));
         getValidatePane().add(GUICoreUtils.createFlowPane(new JComponent[]{new UILabel(Inter.getLocText(new String[]{"Error", "Tooltips"}) + ":"), getRegErrorMsgTextField()}, FlowLayout.LEFT, 24));
-        JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+        JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
         waterMarkDictPane = new WaterMarkDictPane();
         waterMarkDictPane.addInputKeyListener(new KeyAdapter() {
             public void keyTyped(KeyEvent e) {

designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java

@@ -46,7 +46,7 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane<TreeEditor> {
 	}
 
 	protected JPanel setSecondContentPane() {
-		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
 		JPanel contentPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
 		advancedPane.add(contentPane);
 		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));

designer/src/com/fr/design/widget/ui/WriteUnableRepeatEditorPane.java

@@ -20,7 +20,7 @@ public abstract class WriteUnableRepeatEditorPane<E extends WriteUnableRepeatEdi
 	
 	@Override
 	protected JPanel setFirstContentPane() {
-		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+		JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
 		JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
 		advancedPane.add(contentPane);
 		contentPane.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0));

designer/src/com/fr/design/widget/ui/btn/TreeNodeToogleButtonDefinePane.java

@@ -34,7 +34,7 @@ public class TreeNodeToogleButtonDefinePane<T extends TreeNodeToggleButton> exte
                 {new UILabel(Inter.getLocText(new String[]{"Form-Button", "Type"}) + ":"), createButtonTypeComboBox()}
         };
         JPanel northPane = TableLayoutHelper.createTableLayoutPane(n_components, rowSize, columnSize);
-        JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+        JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
         advancedPane.add(northPane);
         add(advancedPane, BorderLayout.CENTER);
     }

designer_base/src/com/fr/design/widget/btn/ButtonWithHotkeysDetailPane.java

@@ -31,7 +31,7 @@ public abstract class ButtonWithHotkeysDetailPane<T extends Button> extends Butt
     }
 
 	private void initComponents() {
-        JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("Advanced"));
+        JPanel advancedPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Advanced"));
         advancedPane.setPreferredSize(new Dimension(600,300));
         JPanel attrPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         attrPane.setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 4));

designer_form/src/com/fr/design/designer/creator/XFieldEditor.java

@@ -53,7 +53,7 @@ public abstract class XFieldEditor extends XWidgetCreator {
                 : new CRPropertyDescriptor[]{allowBlank, fontSize};
     }
 
-    public Boolean isDisplayRegField(Boolean displayRegField) {
+    public boolean isDisplayRegField(boolean displayRegField) {
         RegExp reg = ((TextEditor) toData()).getRegex();
         if (reg == null || !StringUtils.isNotEmpty(reg.toRegText())) {
 

designer_form/src/com/fr/design/designer/creator/XPassword.java

@@ -64,7 +64,7 @@ public class XPassword extends XWrapperedFieldEditor {
         CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass())
                 .setI18NName(Inter.getLocText("FR-Designer_WaterMark"))
                 .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced");
-        Boolean displayRegField = true;
+        boolean displayRegField = true;
         displayRegField = isDisplayRegField(displayRegField);
         return displayRegField ? (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, regErrorMessage, waterMark}) :
                 (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, waterMark});

designer_form/src/com/fr/design/designer/creator/XTextArea.java

@@ -49,7 +49,7 @@ public class XTextArea extends XFieldEditor {
         CRPropertyDescriptor waterMark = new CRPropertyDescriptor("waterMark", this.data.getClass()).setI18NName(
                 Inter.getLocText("WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
                 "Advanced");
-        Boolean displayRegField = true;
+        boolean displayRegField = true;
         displayRegField = isDisplayRegField(displayRegField);
         return displayRegField ? (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, regErrorMessage, waterMark}) :
                 (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, waterMark});

designer_form/src/com/fr/design/designer/creator/XTextEditor.java

@@ -53,7 +53,7 @@ public class XTextEditor extends XWrapperedFieldEditor {
                 Inter.getLocText("FR-Designer_WaterMark")).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY,
                 "Advanced");
         CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(new CRPropertyDescriptor[]{widgetValue}, super.supportedDescriptor());
-        Boolean displayRegField = true;
+        boolean displayRegField = true;
         displayRegField = isDisplayRegField(displayRegField);
         return displayRegField ? (CRPropertyDescriptor[]) ArrayUtils.addAll(sup,
                 new CRPropertyDescriptor[]{regex, regErrorMessage, waterMark}) :

designer_form/src/com/fr/design/form/util/XCreatorConstants.java

@@ -21,7 +21,7 @@ public class XCreatorConstants {
     // 描述属性的分类
     public static final String PROPERTY_CATEGORY = "category";
     public static final String DEFAULT_GROUP_NAME = "Form-Basic_Properties";
-    public static final String PROPERTY_VALIDATE = "validate";
+    public static final String PROPERTY_VALIDATE = "FR-Designer_Validate";
     public static final Color FORM_BG = new Color(252, 252, 254);
     // 拖拽标识块的大小
     public static final int RESIZE_BOX_SIZ = 5;