From 3e3d79165786edfdff2ca26d3ffb09172624f435 Mon Sep 17 00:00:00 2001 From: richie Date: Mon, 20 May 2019 18:27:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?KERNEL-594=20mime=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/ui/Assistant.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/ui/Assistant.java b/designer-base/src/main/java/com/fr/design/ui/Assistant.java index f15d4164f..3962692c7 100644 --- a/designer-base/src/main/java/com/fr/design/ui/Assistant.java +++ b/designer-base/src/main/java/com/fr/design/ui/Assistant.java @@ -6,8 +6,14 @@ import com.teamdev.jxbrowser.chromium.BrowserContext; import com.teamdev.jxbrowser.chromium.ProtocolService; import com.teamdev.jxbrowser.chromium.URLResponse; +import javax.activation.MimetypesFileTypeMap; import java.io.DataInputStream; +import java.io.File; +import java.io.IOException; import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; /** * @author richie @@ -44,7 +50,12 @@ public class Assistant { if (path.endsWith(".svg")) { return "image/svg+xml"; } - return "text/html"; + Path file = new File(path).toPath(); + try { + return Files.probeContentType(file); + } catch (IOException e) { + return "text/html"; + } } public static void setEmbProtocolHandler(Browser browser, EmbProtocolHandler handler) { From c57c2a9e9d302b18a63d167f55d7378a7cc55eb5 Mon Sep 17 00:00:00 2001 From: richie Date: Mon, 20 May 2019 18:40:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?KERNEL-594=20mime=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/src/main/java/com/fr/design/upm/UpmBridge.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java b/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java index b5d9d247c..92b8ea62f 100644 --- a/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java +++ b/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java @@ -81,7 +81,7 @@ public class UpmBridge { new SwingWorker(){ @Override protected Void doInBackground() throws Exception { - callback.invoke(window, Toolkit.i18nText("Fine-Design_Basic_Update_Plugin_Manager_Download_Start")); + callback.invoke(window, "start", Toolkit.i18nText("Fine-Design_Basic_Update_Plugin_Manager_Download_Start")); UpmResourceLoader.INSTANCE.download(); UpmResourceLoader.INSTANCE.install(); return null; @@ -94,6 +94,7 @@ public class UpmBridge { callback.invoke(window, "success", Toolkit.i18nText("Fine-Design_Basic_Update_Plugin_Manager_Download_Success")); EventDispatcher.fire(DownloadEvent.SUCCESS, "success"); } catch (Exception e) { + e.printStackTrace(); callback.invoke(window, "error", Toolkit.i18nText("Fine-Design_Basic_Update_Plugin_Manager_Download_Error")); FineLoggerFactory.getLogger().error(e.getMessage(), e); EventDispatcher.fire(DownloadEvent.ERROR, "error"); From 17fa27f69486d90890b115a18db1837d8496f7c1 Mon Sep 17 00:00:00 2001 From: richie Date: Mon, 20 May 2019 18:48:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?KERNEL-594=20=E7=89=88=E6=9C=AC=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E9=9C=80=E8=A6=81reload?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/upm/UpmBridge.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java b/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java index 92b8ea62f..8877631a1 100644 --- a/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java +++ b/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java @@ -57,8 +57,10 @@ public class UpmBridge { } private JSObject window; + private Browser browser; private UpmBridge(Browser browser) { + this.browser = browser; this.window = browser.executeJavaScriptAndReturnValue("window").asObject(); } @@ -112,6 +114,11 @@ public class UpmBridge { return ServerPreferenceConfig.getInstance().getOptimizedUPMVersion(); } + @JSBridge + public void reload() { + browser.reloadIgnoringCache(); + } + @JSBridge public String i18nText(String key) { return Toolkit.i18nText(key); From daede2f03583e672f8485b29477f636055335be9 Mon Sep 17 00:00:00 2001 From: richie Date: Mon, 20 May 2019 20:19:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?KERNEL-594=20=E6=9B=B4=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E9=9C=80=E8=A6=81=E9=87=8D=E6=96=B0=E6=89=93=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/upm/UpmBridge.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java b/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java index 8877631a1..6ebedd706 100644 --- a/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java +++ b/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java @@ -57,10 +57,8 @@ public class UpmBridge { } private JSObject window; - private Browser browser; private UpmBridge(Browser browser) { - this.browser = browser; this.window = browser.executeJavaScriptAndReturnValue("window").asObject(); } @@ -96,7 +94,6 @@ public class UpmBridge { callback.invoke(window, "success", Toolkit.i18nText("Fine-Design_Basic_Update_Plugin_Manager_Download_Success")); EventDispatcher.fire(DownloadEvent.SUCCESS, "success"); } catch (Exception e) { - e.printStackTrace(); callback.invoke(window, "error", Toolkit.i18nText("Fine-Design_Basic_Update_Plugin_Manager_Download_Error")); FineLoggerFactory.getLogger().error(e.getMessage(), e); EventDispatcher.fire(DownloadEvent.ERROR, "error"); @@ -114,11 +111,6 @@ public class UpmBridge { return ServerPreferenceConfig.getInstance().getOptimizedUPMVersion(); } - @JSBridge - public void reload() { - browser.reloadIgnoringCache(); - } - @JSBridge public String i18nText(String key) { return Toolkit.i18nText(key);