Browse Source

不能直接修改反射的参数,把FieldEditorDefinePane中的designer获取方式换成从WidgetPropertyPane中获取

方磊 7 years ago
parent
commit
c17f1a17b1
  1. 7
      designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java
  2. 4
      designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java
  3. 7
      designer_form/src/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java
  4. 4
      designer_form/src/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java

7
designer_form/src/com/fr/design/parameter/RootDesignDefinePane.java

@ -54,13 +54,6 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
initComponent();
}
public RootDesignDefinePane(XCreator xCreator, FormDesigner designer) {
super(xCreator, designer);
this.root = (XWParameterLayout) xCreator;
initComponent();
}
public void initComponent() {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
designerWidth = new UISpinner(1, Integer.MAX_VALUE, 1);

4
designer_form/src/com/fr/design/widget/FormWidgetDefinePaneFactoryBase.java

@ -85,8 +85,8 @@ public class FormWidgetDefinePaneFactoryBase {
Appearance dn = defineMap.get(widget.getClass());
DataModify<Widget> definePane = null;
try {
Constructor con = dn.getDefineClass().getConstructor(XCreator.class, FormDesigner.class);
definePane = (DataModify)con.newInstance(creator, designer);
Constructor con = dn.getDefineClass().getConstructor(XCreator.class);
definePane = (DataModify)con.newInstance(creator);
operator.did(definePane.dataUI(), dn.getDisplayName());
} catch (Exception e) {
FRContext.getLogger().error(e.getMessage(), e);

7
designer_form/src/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java

@ -10,6 +10,7 @@ import com.fr.design.gui.itextfield.UITextField;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.FormDesigner;
import com.fr.design.mainframe.WidgetPropertyPane;
import com.fr.design.widget.ui.designer.component.FontSizeComboPane;
import com.fr.form.ui.FieldEditor;
import com.fr.form.ui.Widget;
@ -38,11 +39,6 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
this.initComponents();
}
public FieldEditorDefinePane(XCreator xCreator, FormDesigner designer) {
super(xCreator, designer);
this.initComponents();
}
protected void initComponents() {
this.setLayout(FRGUIPaneFactory.createBorderLayout());
labelNameTextField = new UITextField();
@ -79,6 +75,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
e.setAllowBlank(this.allowBlankCheckBox.isSelected());
e.setErrorMessage(this.errorMsgTextField.getText());
e.setFontSize(fontSizePane.getValue());
designer = WidgetPropertyPane.getInstance().getEditingFormDesigner();
if (!ComparatorUtils.equals(e.getLabelName(), labelNameTextField.getText())) {
XCreator xCreator = designer.getSelectionModel().getSelection().getSelectedCreator();
Widget selectedWidget = xCreator.toData();

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

@ -28,10 +28,6 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
super(xCreator);
}
public TextFieldEditorDefinePane(XCreator xCreator, FormDesigner designer) {
super(xCreator, designer);
}
@Override
protected JPanel setFirstContentPane() {
regPane = createRegPane();

Loading…
Cancel
Save