fanruan
/
design
6
1
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

解决冲突

master
kerry 7 years ago
parent
6e01b5ed16
commit
2bbe2d14fa
1 changed files with 32 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 57
      designer_base/src/com/fr/design/gui/frpane/RegPane.java

57
designer_base/src/com/fr/design/gui/frpane/RegPane.java
Unescape View File

@ -28,22 +28,22 @@ import java.util.EventObject;
public class RegPane extends BasicPane {
public static final RegExp[] ALL_REG_TYPE = {
new NoneReg(),
//new RequiredReg(),
new LengthReg(),
//new FloatReg(),
new MailReg(),
new IDCardReg(),
new PostCardReg(),
new PhoneReg(),
new MobileReg(),
new CustomReg()
new NoneReg(),
//new RequiredReg(),
new LengthReg(),
//new FloatReg(),
new MailReg(),
new IDCardReg(),
new PostCardReg(),
new PhoneReg(),
new MobileReg(),
new CustomReg()
};
public static final RegExp[] TEXTAREA_REG_TYPE = {
new NoneReg(),
new LengthReg(),
new CustomReg()
new NoneReg(),
new LengthReg(),
new CustomReg()
};
public static final RegExp[] PASSWORD_REG_TYPE = TEXTAREA_REG_TYPE;
@ -342,11 +342,10 @@ public class RegPane extends BasicPane {
DefaultComboBoxModel DefaultComboBoxModel= new DefaultComboBoxModel(dataType);
public RegPhonePane() {
this.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 5));
this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
this.add(new UILabel(Inter.getLocText("FR-Designer_Data_Type") + ":"));
dataTypeComboBox = new UIComboBox(DefaultComboBoxModel);
JTextField editFiled = (JTextField)(dataTypeComboBox.getEditor().getEditorComponent());
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Data_Type")), dataTypeComboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
this.add(panel);
editFiled.setDocument(new LimitedDocument(LIMIT_LENGTH, REG_PATTERN));
dataTypeComboBox.addItemListener(new ItemListener() {
@Override
@ -365,6 +364,7 @@ public class RegPane extends BasicPane {
});
dataTypeComboBox.setSelectedIndex(0);
firePhoneRegAction(dataTypeComboBox.getSelectedItem().toString());
this.add(dataTypeComboBox);
}
@Override
protected String title4PopupWindow() {
@ -405,8 +405,14 @@ public class RegPane extends BasicPane {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 5));
this.setPreferredSize(new Dimension(210, 56));
// this.add(new UILabel(Inter.getLocText("FR-Designer_Reg_Min_Length") + ":"));
minLenSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
// this.add(minLenSpinner);
// this.add(new UILabel(Inter.getLocText("FR-Designer_Reg_Max_Length") + ":"));
maxLenSpinner = new UISpinner(0, Integer.MAX_VALUE, 1, 0);
// this.add(maxLenSpinner);
double f = TableLayout.FILL;
double p = TableLayout.PREFERRED;
Component[][] components = new Component[][]{
@ -455,11 +461,11 @@ public class RegPane extends BasicPane {
private UITextField regTextField;
public CustomRegRexPane(){
this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
this.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 5));
regTextField = new UITextField();
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Reg_Expressions")), regTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
this.add(panel);
this.add(new UILabel(Inter.getLocText("FR-Designer_Reg_Expressions") + ":"));
regTextField = new UITextField(10);
this.add(regTextField);
}
@Override
@ -489,15 +495,16 @@ public class RegPane extends BasicPane {
private UITextField regErrorMsgField;
public RegErrorMsgPane(){
this.setLayout(FRGUIPaneFactory.createBorderLayout());
this.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
this.setLayout(FRGUIPaneFactory.createLabelFlowLayout());
initRegErrorMsgField();
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{new UILabel(Inter.getLocText("FR-Designer_Widget_Error_Tip")), regErrorMsgField}}, TableLayoutHelper.FILL_LASTCOLUMN, 18, 7);
this.add(panel);
// this.setBorder(BorderFactory.createEmptyBorder(5, 10, 5, 5));
this.add(new UILabel(Inter.getLocText("FR-Designer_Widget_Error_Tip") + ":"));
regErrorMsgField = new UITextField(10);
this.add(regErrorMsgField);
}
private void initRegErrorMsgField(){
regErrorMsgField = new UITextField();
regErrorMsgField = new UITextField(13);
regErrorMsgField.getDocument().addDocumentListener(new DocumentListener() {
public void changedUpdate(DocumentEvent e) {
regErrorMsgField.setToolTipText(regErrorMsgField.getText());

Write Preview
Loading…
Cancel
Save