diff --git a/designer/src/com/fr/design/mainframe/CellWidgetPropertyPane.java b/designer/src/com/fr/design/mainframe/CellWidgetPropertyPane.java index e0a2cf441..39b3e3d93 100644 --- a/designer/src/com/fr/design/mainframe/CellWidgetPropertyPane.java +++ b/designer/src/com/fr/design/mainframe/CellWidgetPropertyPane.java @@ -75,8 +75,8 @@ public class CellWidgetPropertyPane extends BasicPane { FRContext.getLogger().error(e.getMessage(), e); } } - cellEditorDefPane.populate(cellWidget); + cellEditorDefPane.populate(cellWidget); } @@ -122,10 +122,16 @@ public class CellWidgetPropertyPane extends BasicPane { } } }); - DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); + if(DesignerContext.getDesignerFrame().getSelectedJTemplate() != null){ + DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); + } } + public void reInitAllListener(){ + cellEditorDefPane.registerListener(); + } + private Widget upDateWidgetAuthority(TemplateCellElement cellElement, Widget newWidget) { try { Widget oldWidget = (Widget) cellElement.getWidget().clone(); diff --git a/designer/src/com/fr/design/widget/WidgetPane.java b/designer/src/com/fr/design/widget/WidgetPane.java index 593bf2197..61e79acb8 100644 --- a/designer/src/com/fr/design/widget/WidgetPane.java +++ b/designer/src/com/fr/design/widget/WidgetPane.java @@ -163,6 +163,10 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener } + public void registerListener(){ + initAllListeners(); + } + private static class EditorTypeComboBox extends UIComboBox { private Item item = new Item(Inter.getLocText("Widget-User_Defined"), diff --git a/designer/src/com/fr/design/widget/ui/ButtonDefinePane.java b/designer/src/com/fr/design/widget/ui/ButtonDefinePane.java index 3d2a703dd..59a5b62bb 100644 --- a/designer/src/com/fr/design/widget/ui/ButtonDefinePane.java +++ b/designer/src/com/fr/design/widget/ui/ButtonDefinePane.java @@ -1,10 +1,12 @@ package com.fr.design.widget.ui; import com.fr.design.layout.FRGUIPaneFactory; +import com.fr.design.mainframe.CellWidgetPropertyPane; import com.fr.design.widget.ui.btn.ButtonDetailPaneFactory; import com.fr.form.ui.Button; import com.fr.form.ui.FreeButton; import com.fr.design.widget.btn.ButtonDetailPane; + import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import java.awt.*; @@ -38,6 +40,8 @@ public class ButtonDefinePane extends AbstractDataModify