From f4138e5c220569d0bdd2e91e9fa2cb2fa6a44799 Mon Sep 17 00:00:00 2001 From: hades Date: Thu, 1 Jul 2021 16:35:08 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-54643=20=20=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/DesignerFrame.java | 5 -- .../design/mainframe/SafeWindowListener.java | 84 ------------------- 2 files changed, 89 deletions(-) delete mode 100644 designer-base/src/main/java/com/fr/design/mainframe/SafeWindowListener.java diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java index dc90fb0d0..25948b62c 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java @@ -535,11 +535,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta } } - @Override - public synchronized void addWindowListener(WindowListener l) { - super.addWindowListener(new SafeWindowListener(l)); - } - private void addMacOsListener() { OSSupportCenter.buildAction(new MacOsAddListenerAction(), SupportOSImpl.DOCK_QUIT); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/SafeWindowListener.java b/designer-base/src/main/java/com/fr/design/mainframe/SafeWindowListener.java deleted file mode 100644 index 4f3c812ad..000000000 --- a/designer-base/src/main/java/com/fr/design/mainframe/SafeWindowListener.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.fr.design.mainframe; - -import com.fr.log.FineLoggerFactory; -import java.awt.event.WindowEvent; -import java.awt.event.WindowListener; - -/** - * 保证监听运行出错也不影响其他功能正常使用 - * - * @author hades - * @version 10.0 - * Created by hades on 2021/6/30 - */ -public class SafeWindowListener implements WindowListener { - - private final WindowListener windowListener; - - public SafeWindowListener(WindowListener windowListener) { - this.windowListener = windowListener; - } - - @Override - public void windowOpened(WindowEvent e) { - try { - windowListener.windowOpened(e); - } catch (Throwable throwable) { - FineLoggerFactory.getLogger().debug(throwable.getMessage(), throwable); - } - } - - @Override - public void windowClosing(WindowEvent e) { - try { - windowListener.windowClosing(e); - } catch (Throwable throwable) { - FineLoggerFactory.getLogger().debug(throwable.getMessage(), throwable); - } - } - - @Override - public void windowClosed(WindowEvent e) { - try { - windowListener.windowClosed(e); - } catch (Throwable throwable) { - FineLoggerFactory.getLogger().debug(throwable.getMessage(), throwable); - } - } - - @Override - public void windowIconified(WindowEvent e) { - try { - windowListener.windowIconified(e); - } catch (Throwable throwable) { - FineLoggerFactory.getLogger().debug(throwable.getMessage(), throwable); - } - } - - @Override - public void windowDeiconified(WindowEvent e) { - try { - windowListener.windowDeiconified(e); - } catch (Throwable throwable) { - FineLoggerFactory.getLogger().debug(throwable.getMessage(), throwable); - } - } - - @Override - public void windowActivated(WindowEvent e) { - try { - windowListener.windowActivated(e); - } catch (Throwable throwable) { - FineLoggerFactory.getLogger().debug(throwable.getMessage(), throwable); - } - } - - @Override - public void windowDeactivated(WindowEvent e) { - try { - windowListener.windowDeactivated(e); - } catch (Throwable throwable) { - FineLoggerFactory.getLogger().debug(throwable.getMessage(), throwable); - } - } -}