From 1b8e359b04d5c579b38e13e24e99440401f8b5a0 Mon Sep 17 00:00:00 2001 From: plough Date: Tue, 16 Jan 2018 16:51:51 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-6270=20&=20REPORT-6443=20=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E9=9D=A2=E6=9D=BF=E9=87=8C=E7=9A=84=E7=9B=B8=E5=85=B3?= =?UTF-8?q?bug=EF=BC=88=E9=97=AE=E9=A2=982=E3=80=813=EF=BC=89=EF=BC=9B?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=A0=91=E6=B6=88=E5=A4=B1=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer_form/src/com/fr/design/mainframe/ComponentTree.java | 1 + .../src/com/fr/design/mainframe/FormHierarchyTreePane.java | 2 -- designer_form/src/com/fr/design/mainframe/JForm.java | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/designer_form/src/com/fr/design/mainframe/ComponentTree.java b/designer_form/src/com/fr/design/mainframe/ComponentTree.java index 22eeb36890..c7b2412518 100644 --- a/designer_form/src/com/fr/design/mainframe/ComponentTree.java +++ b/designer_form/src/com/fr/design/mainframe/ComponentTree.java @@ -52,6 +52,7 @@ public class ComponentTree extends JTree { } private void initListeners() { + this.addTreeSelectionListener(designer); ComponetTreeMouseListener componetTreeMouseListener = new ComponetTreeMouseListener(this); this.addMouseMotionListener(componetTreeMouseListener); this.addMouseListener(componetTreeMouseListener); diff --git a/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java b/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java index 540dd63c23..c5a27044df 100644 --- a/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java +++ b/designer_form/src/com/fr/design/mainframe/FormHierarchyTreePane.java @@ -111,8 +111,6 @@ public class FormHierarchyTreePane extends FormDockView implements HierarchyTree // 这里要刷新一下，否则控件树中没有任何一个控件处于选中状态 refreshComponentTree(); - // 初始刷新完成后，再加 listener - componentTree.addTreeSelectionListener(formDesigner); } private void refreshComponentTree() { diff --git a/designer_form/src/com/fr/design/mainframe/JForm.java b/designer_form/src/com/fr/design/mainframe/JForm.java index 30f3f5ca07..01f42d7515 100644 --- a/designer_form/src/com/fr/design/mainframe/JForm.java +++ b/designer_form/src/com/fr/design/mainframe/JForm.java @@ -248,6 +248,9 @@ public class JForm extends JTemplate implements BaseJForm { @Override public void fireCreatorModified(DesignerEvent evt) { + if (formDesign.getArea() == null || !formDesign.getArea().isValid()) { + return; + } if (evt.getCreatorEventID() == DesignerEvent.CREATOR_CUTED) { setPropertyPaneChange(formDesign.getRootComponent()); } else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_DELETED) {