From 3b042ad1d84b525c5f90324f53bf392b96dc6621 Mon Sep 17 00:00:00 2001
From: hades <hades@fanraun.com>
Date: Fri, 27 Mar 2020 16:02:36 +0800
Subject: [PATCH] =?UTF-8?q?fix=20mac=E4=B8=8B=E4=B8=8D=E7=94=A8awt?=
 =?UTF-8?q?=E7=9A=84=E5=BA=93=E8=AF=BB=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/mainframe/DesignerFrame.java  | 12 ------------
 .../main/java/com/fr/start/DesignerJavaRuntime.java  |  8 +++++++-
 2 files changed, 7 insertions(+), 13 deletions(-)

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 1b86b62397..2cf8d8c350 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
@@ -60,7 +60,6 @@ import com.fr.plugin.manage.PluginFilter;
 import com.fr.plugin.observer.PluginEvent;
 import com.fr.plugin.observer.PluginEventListener;
 import com.fr.stable.ProductConstants;
-import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.image4j.codec.ico.ICODecoder;
 import com.fr.stable.os.OperatingSystem;
@@ -73,7 +72,6 @@ import com.fr.workspace.Workspace;
 import com.fr.workspace.connect.WorkspaceConnectionInfo;
 import org.jetbrains.annotations.Nullable;
 
-import javax.imageio.ImageIO;
 import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
@@ -178,16 +176,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
 
     private int contentHeight = (int) (java.awt.Toolkit.getDefaultToolkit().getScreenSize().getHeight());
 
-        static {
-        if (SupportOSImpl.DOCK_ICON.support()) {
-            try {
-                ImageIO.write(IOUtils.readImage("com/fr/design/icon/logo.png"), "png", new File(
-                        StableUtils.pathJoin(StableUtils.getInstallHome(), "bin", "logo.png")));
-            } catch (IOException ignore) {
-            }
-        }
-    }
-
     private WindowAdapter windowAdapter = new WindowAdapter() {
 
         @Override
diff --git a/designer-realize/src/main/java/com/fr/start/DesignerJavaRuntime.java b/designer-realize/src/main/java/com/fr/start/DesignerJavaRuntime.java
index 1a6e272a49..5f4f62210e 100644
--- a/designer-realize/src/main/java/com/fr/start/DesignerJavaRuntime.java
+++ b/designer-realize/src/main/java/com/fr/start/DesignerJavaRuntime.java
@@ -9,7 +9,6 @@ import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.os.OperatingSystem;
 
-import javax.imageio.ImageIO;
 import java.io.File;
 import java.io.IOException;
 
@@ -35,6 +34,13 @@ public class DesignerJavaRuntime extends AbstractJavaRuntime {
     private static final String DOCK_NAME_OPTIONS = "-Xdock:name=" + FineDesigner.class.getSimpleName();
     private static final String[] DEBUG_OPTIONS = new String[]{"-Dfile.encoding=UTF-8", "-Xmx2048m"};
 
+    static {
+        try {
+            IOUtils.copy(DesignerJavaRuntime.class.getResourceAsStream("/com/fr/design/icon/logo.png"), "logo.png", new File(BIN_HOME));
+        } catch (IOException ignore) {
+        }
+    }
+
     private static final DesignerJavaRuntime INSTANCE = new DesignerJavaRuntime();
 
     public static DesignerJavaRuntime getInstance() {