From d240aba665366092c3872e986ef409b81c755da0 Mon Sep 17 00:00:00 2001 From: "Henry.Wang" Date: Thu, 17 Jun 2021 10:44:41 +0800 Subject: [PATCH] =?UTF-8?q?KERNEL-8038=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E4=B8=80=E4=BA=9B=E9=9D=99=E6=80=81=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=AF=BC=E8=87=B4=E6=9C=80=E8=BF=91=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E7=9A=84=E6=A8=A1=E6=9D=BF=E5=AF=B9=E8=B1=A1=E4=B8=8D=E9=87=8A?= =?UTF-8?q?=E6=94=BE=E5=86=85=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/file/{CloseReleasable.java => Releasable.java} | 2 +- .../com/fr/design/gui/controlpane/EventPropertyPane.java | 5 ++--- .../java/com/fr/design/mainframe/FormParaWidgetPane.java | 4 ++-- .../java/com/fr/design/mainframe/FormWidgetDetailPane.java | 4 ++-- .../java/com/fr/design/mainframe/WidgetPropertyPane.java | 4 ++-- .../fr/design/mainframe/widget/ui/FormWidgetCardPane.java | 4 ++-- 6 files changed, 11 insertions(+), 12 deletions(-) rename designer-base/src/main/java/com/fr/design/file/{CloseReleasable.java => Releasable.java} (63%) diff --git a/designer-base/src/main/java/com/fr/design/file/CloseReleasable.java b/designer-base/src/main/java/com/fr/design/file/Releasable.java similarity index 63% rename from designer-base/src/main/java/com/fr/design/file/CloseReleasable.java rename to designer-base/src/main/java/com/fr/design/file/Releasable.java index b76c2b18e..cb78789e6 100644 --- a/designer-base/src/main/java/com/fr/design/file/CloseReleasable.java +++ b/designer-base/src/main/java/com/fr/design/file/Releasable.java @@ -1,5 +1,5 @@ package com.fr.design.file; -public interface CloseReleasable { +public interface Releasable { void releaseResources(); } diff --git a/designer-form/src/main/java/com/fr/design/gui/controlpane/EventPropertyPane.java b/designer-form/src/main/java/com/fr/design/gui/controlpane/EventPropertyPane.java index 7ba3b6e25..834b6b4a8 100644 --- a/designer-form/src/main/java/com/fr/design/gui/controlpane/EventPropertyPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/controlpane/EventPropertyPane.java @@ -2,8 +2,7 @@ package com.fr.design.gui.controlpane; import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.properties.EventPropertyTable; -import com.fr.design.file.CloseReleasable; -import com.fr.design.gui.icombobox.FRTreeComboBox; +import com.fr.design.file.Releasable; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.FormDesigner; import com.fr.design.widget.EventCreator; @@ -15,7 +14,7 @@ import com.fr.stable.Nameable; /** * Created by kerry on 5/17/21 */ -public class EventPropertyPane extends UIListGroupControlPane implements CloseReleasable { +public class EventPropertyPane extends UIListGroupControlPane implements Releasable { private XCreator creator; private FormDesigner designer; diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java index 32fa71a68..d8b604e19 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java @@ -7,7 +7,7 @@ import com.fr.design.constants.UIConstants; import com.fr.design.designer.beans.events.DesignerEditListener; import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.creator.XCreatorUtils; -import com.fr.design.file.CloseReleasable; +import com.fr.design.file.Releasable; import com.fr.design.fun.FormWidgetOptionProvider; import com.fr.design.gui.core.FormWidgetOption; import com.fr.design.gui.core.UserDefinedWidgetOption; @@ -57,7 +57,7 @@ import java.awt.event.MouseEvent; /** * @author null */ -public class FormParaWidgetPane extends JPanel implements CloseReleasable { +public class FormParaWidgetPane extends JPanel implements Releasable { private static FormParaWidgetPane THIS; private final static int BORDER = 5; private final static int WIDGET_WIDTHGAP = 4; diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java index a53f1e366..f22592ee7 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java @@ -2,7 +2,7 @@ package com.fr.design.mainframe; import com.fr.base.BaseUtils; import com.fr.design.dialog.BasicPane; -import com.fr.design.file.CloseReleasable; +import com.fr.design.file.Releasable; import com.fr.design.gui.ibutton.UIHeadGroup; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.reuse.ComponentReuseNotificationInfo; @@ -24,7 +24,7 @@ import java.util.List; * Date: 14-7-8 * Time: 下午8:18 */ -public class FormWidgetDetailPane extends FormDockView implements CloseReleasable { +public class FormWidgetDetailPane extends FormDockView implements Releasable { private static final int ONLINE_TAB = 1; private JPanel centerPane; diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java index 927fe892b..9be0d84b2 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java @@ -9,7 +9,7 @@ import com.fr.design.designer.creator.*; import com.fr.design.designer.creator.cardlayout.XWCardTagLayout; import com.fr.design.designer.properties.mobile.MobileBookMarkPropertyUI; import com.fr.design.designer.properties.mobile.MobileStylePropertyUI; -import com.fr.design.file.CloseReleasable; +import com.fr.design.file.Releasable; import com.fr.design.form.util.FormDesignerUtils; import com.fr.design.fun.WidgetPropertyUIProvider; import com.fr.design.gui.controlpane.EventPropertyPane; @@ -33,7 +33,7 @@ import java.util.Set; * 控件属性表绘制 * Modified by fanglei */ -public class WidgetPropertyPane extends FormDockView implements BaseWidgetPropertyPane, CloseReleasable { +public class WidgetPropertyPane extends FormDockView implements BaseWidgetPropertyPane, Releasable { private static final int PADDING = 10; private static final int PADDING_M = 12; diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java index 2f7b100e4..609e45b5d 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java @@ -14,7 +14,7 @@ import com.fr.design.designer.creator.XWTitleLayout; import com.fr.design.designer.creator.cardlayout.XWCardTagLayout; import com.fr.design.dialog.AttrScrollPane; import com.fr.design.dialog.BasicScrollPane; -import com.fr.design.file.CloseReleasable; +import com.fr.design.file.Releasable; import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.foldablepane.UIExpandablePane; import com.fr.design.gui.frpane.AbstractAttrNoScrollPane; @@ -49,7 +49,7 @@ import java.awt.BorderLayout; /** * Created by ibm on 2017/7/25. */ -public class FormWidgetCardPane extends AbstractAttrNoScrollPane implements CloseReleasable { +public class FormWidgetCardPane extends AbstractAttrNoScrollPane implements Releasable { private AttributeChangeListener listener; private FormDesigner designer; //当前的编辑器属性定义面板