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

Merge pull request #240 in BA/design from ~KERRY/design:dev to dev 

* commit 'e3fc76d8a4a13f7cfe031837e99fe602c3b41001':
  删除无用jar包
master
superman 8 years ago
parent
0708255326 e3fc76d8a4
commit
5765bb15e2
6 changed files with 18 additions and 34 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. 4
      designer/src/com/fr/design/widget/ui/FieldEditorDefinePane.java
  2. 3
      designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java
  3. 4
      designer/src/com/fr/design/widget/ui/TextFieldEditorDefinePane.java
  4. 38
      designer_form/src/com/fr/design/designer/creator/XFieldEditor.java
  5. 1
      designer_form/src/com/fr/design/designer/creator/XRadioGroup.java
  6. 2
      designer_form/src/com/fr/design/designer/creator/XTextEditor.java

4
designer/src/com/fr/design/widget/ui/FieldEditorDefinePane.java
Unescape View File

@ -6,21 +6,17 @@ import java.awt.event.ItemListener;
import javax.swing.BorderFactory;
import com.fr.design.gui.frpane.TreeSettingPane;
import com.fr.design.gui.ilable.UILabel;
import javax.swing.JPanel;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import com.fr.design.beans.BasicBeanPane;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.present.dict.DictionaryPane;
import com.fr.form.ui.FieldEditor;
import com.fr.general.Inter;
import com.fr.design.widget.DataModify;
public abstract class FieldEditorDefinePane<T extends FieldEditor> extends AbstractDataModify<T> {
private UICheckBox allowBlankCheckBox;

3
designer/src/com/fr/design/widget/ui/NumberEditorDefinePane.java
Unescape View File

@ -14,13 +14,10 @@ import javax.swing.JPanel;
import javax.swing.SpinnerNumberModel;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import javax.swing.text.DefaultFormatter;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.ispinner.UIBasicSpinner;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.form.ui.NumberEditor;
import com.fr.general.Inter;

4
designer/src/com/fr/design/widget/ui/TextFieldEditorDefinePane.java
Unescape View File

@ -3,18 +3,14 @@ package com.fr.design.widget.ui;
import com.fr.design.gui.frpane.RegPane;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.form.ui.TextEditor;
import com.fr.form.ui.reg.NoneReg;
import com.fr.form.ui.reg.RegExp;
import com.fr.general.Inter;
import com.fr.stable.StringUtils;
import javax.swing.*;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;

38
designer_form/src/com/fr/design/designer/creator/XFieldEditor.java
Unescape View File

@ -6,8 +6,6 @@ package com.fr.design.designer.creator;
import java.awt.Color;
import java.awt.Dimension;
import java.beans.IntrospectionException;
import java.util.ArrayList;
import java.util.List;
import javax.swing.BorderFactory;
import javax.swing.border.Border;
@ -24,8 +22,8 @@ import com.fr.stable.ArrayUtils;
*/
public abstract class XFieldEditor extends XWidgetCreator {
protected static final Border FIELDBORDER = BorderFactory.createLineBorder(new Color(128, 152, 186), 1);
protected static final Border FIELDBORDER = BorderFactory.createLineBorder(new Color(128, 152, 186), 1);
public XFieldEditor(FieldEditor widget, Dimension initSize) {
super(widget, initSize);
}
@ -33,22 +31,22 @@ public abstract class XFieldEditor extends XWidgetCreator {
@Override
public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
return (CRPropertyDescriptor[]) ArrayUtils.addAll(
super.supportedDescriptor(),getCRPropertyDescriptor()
);
super.supportedDescriptor(), getCRPropertyDescriptor()
);
}
private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException {
CRPropertyDescriptor allowBlank = new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName(
Inter.getLocText("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"))
.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");
return !((FieldEditor) toData()).isAllowBlank() ?
new CRPropertyDescriptor[] {allowBlank, blankErrorMsg, fontSize}
: new CRPropertyDescriptor[] {allowBlank, fontSize};
}
private CRPropertyDescriptor[] getCRPropertyDescriptor() throws IntrospectionException {
CRPropertyDescriptor allowBlank = new CRPropertyDescriptor("allowBlank", this.data.getClass()).setI18NName(
Inter.getLocText("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"))
.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");
return !((FieldEditor) toData()).isAllowBlank() ?
new CRPropertyDescriptor[]{allowBlank, blankErrorMsg, fontSize}
: new CRPropertyDescriptor[]{allowBlank, fontSize};
}
}

1
designer_form/src/com/fr/design/designer/creator/XRadioGroup.java
Unescape View File

@ -19,7 +19,6 @@ import com.fr.design.mainframe.widget.editors.WidgetValueEditor;
import com.fr.design.mainframe.widget.renderer.DictionaryRenderer;
import com.fr.form.ui.RadioGroup;
import com.fr.design.form.util.XCreatorConstants;
import com.fr.function.ARRAY;
import com.fr.general.Inter;
import com.fr.stable.ArrayUtils;

2
designer_form/src/com/fr/design/designer/creator/XTextEditor.java
Unescape View File

@ -18,14 +18,12 @@ import com.fr.design.mainframe.widget.editors.RegexEditor;
import com.fr.design.mainframe.widget.editors.WidgetValueEditor;
import com.fr.design.mainframe.widget.renderer.RegexCellRencerer;
import com.fr.form.ui.TextEditor;
import com.fr.form.ui.reg.NoneReg;
import com.fr.form.ui.reg.RegExp;
import com.fr.general.FRFont;
import com.fr.general.Inter;
import com.fr.stable.ArrayUtils;
import com.fr.stable.Constants;
import com.fr.stable.StringUtils;
import jdk.nashorn.internal.runtime.regexp.joni.Regex;
/**
* @author richer

Write Preview
Loading…
Cancel
Save