Browse Source

KERNEL-8038 设计器存在一些静态方法导致最近关闭的模板对象不释放内存

feature/10.0
Henry.Wang 4 years ago
parent
commit
d240aba665
  1. 2
      designer-base/src/main/java/com/fr/design/file/Releasable.java
  2. 5
      designer-form/src/main/java/com/fr/design/gui/controlpane/EventPropertyPane.java
  3. 4
      designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java
  4. 4
      designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java
  5. 4
      designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java
  6. 4
      designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java

2
designer-base/src/main/java/com/fr/design/file/CloseReleasable.java → designer-base/src/main/java/com/fr/design/file/Releasable.java

@ -1,5 +1,5 @@
package com.fr.design.file; package com.fr.design.file;
public interface CloseReleasable { public interface Releasable {
void releaseResources(); void releaseResources();
} }

5
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.creator.XCreator;
import com.fr.design.designer.properties.EventPropertyTable; import com.fr.design.designer.properties.EventPropertyTable;
import com.fr.design.file.CloseReleasable; import com.fr.design.file.Releasable;
import com.fr.design.gui.icombobox.FRTreeComboBox;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.FormDesigner; import com.fr.design.mainframe.FormDesigner;
import com.fr.design.widget.EventCreator; import com.fr.design.widget.EventCreator;
@ -15,7 +14,7 @@ import com.fr.stable.Nameable;
/** /**
* Created by kerry on 5/17/21 * 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 XCreator creator;
private FormDesigner designer; private FormDesigner designer;

4
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.DesignerEditListener;
import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.beans.events.DesignerEvent;
import com.fr.design.designer.creator.XCreatorUtils; 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.fun.FormWidgetOptionProvider;
import com.fr.design.gui.core.FormWidgetOption; import com.fr.design.gui.core.FormWidgetOption;
import com.fr.design.gui.core.UserDefinedWidgetOption; import com.fr.design.gui.core.UserDefinedWidgetOption;
@ -57,7 +57,7 @@ import java.awt.event.MouseEvent;
/** /**
* @author null * @author null
*/ */
public class FormParaWidgetPane extends JPanel implements CloseReleasable { public class FormParaWidgetPane extends JPanel implements Releasable {
private static FormParaWidgetPane THIS; private static FormParaWidgetPane THIS;
private final static int BORDER = 5; private final static int BORDER = 5;
private final static int WIDGET_WIDTHGAP = 4; private final static int WIDGET_WIDTHGAP = 4;

4
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.base.BaseUtils;
import com.fr.design.dialog.BasicPane; 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.gui.ibutton.UIHeadGroup;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.reuse.ComponentReuseNotificationInfo; import com.fr.design.mainframe.reuse.ComponentReuseNotificationInfo;
@ -24,7 +24,7 @@ import java.util.List;
* Date: 14-7-8 * Date: 14-7-8
* Time: 下午8:18 * 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 static final int ONLINE_TAB = 1;
private JPanel centerPane; private JPanel centerPane;

4
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.creator.cardlayout.XWCardTagLayout;
import com.fr.design.designer.properties.mobile.MobileBookMarkPropertyUI; import com.fr.design.designer.properties.mobile.MobileBookMarkPropertyUI;
import com.fr.design.designer.properties.mobile.MobileStylePropertyUI; 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.form.util.FormDesignerUtils;
import com.fr.design.fun.WidgetPropertyUIProvider; import com.fr.design.fun.WidgetPropertyUIProvider;
import com.fr.design.gui.controlpane.EventPropertyPane; import com.fr.design.gui.controlpane.EventPropertyPane;
@ -33,7 +33,7 @@ import java.util.Set;
* 控件属性表绘制 * 控件属性表绘制
* Modified by fanglei * 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 = 10;
private static final int PADDING_M = 12; private static final int PADDING_M = 12;

4
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.designer.creator.cardlayout.XWCardTagLayout;
import com.fr.design.dialog.AttrScrollPane; import com.fr.design.dialog.AttrScrollPane;
import com.fr.design.dialog.BasicScrollPane; 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.file.HistoryTemplateListCache;
import com.fr.design.foldablepane.UIExpandablePane; import com.fr.design.foldablepane.UIExpandablePane;
import com.fr.design.gui.frpane.AbstractAttrNoScrollPane; import com.fr.design.gui.frpane.AbstractAttrNoScrollPane;
@ -49,7 +49,7 @@ import java.awt.BorderLayout;
/** /**
* Created by ibm on 2017/7/25. * 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 AttributeChangeListener listener;
private FormDesigner designer; private FormDesigner designer;
//当前的编辑器属性定义面板 //当前的编辑器属性定义面板

Loading…
Cancel
Save