From d2345cd070b9c72d6fbc57c85c23b720efe13660 Mon Sep 17 00:00:00 2001 From: richie Date: Fri, 19 Apr 2019 13:45:07 +0800 Subject: [PATCH] =?UTF-8?q?KERNEL-442=20=E4=B8=8D=E8=83=BD=E8=AF=86?= =?UTF-8?q?=E5=88=AB=E5=A4=A7=E5=B0=8F=E5=86=99=EF=BC=8C=E8=A2=AB=E8=BF=AB?= =?UTF-8?q?=E6=94=B9=E4=B8=AA=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/upm/UPMPane.java | 2 +- .../upm/{UpmJSBridge.java => UpmBridge.java} | 8 +-- .../java/com/fr/design/upm/UpmFinder.java | 2 +- .../java/com/fr/design/upm/UpmModernPane.java | 63 ------------------- 4 files changed, 6 insertions(+), 69 deletions(-) rename designer-base/src/main/java/com/fr/design/upm/{UpmJSBridge.java => UpmBridge.java} (98%) delete mode 100644 designer-base/src/main/java/com/fr/design/upm/UpmModernPane.java diff --git a/designer-base/src/main/java/com/fr/design/upm/UPMPane.java b/designer-base/src/main/java/com/fr/design/upm/UPMPane.java index ec0b542f4f..3e4ccc5814 100644 --- a/designer-base/src/main/java/com/fr/design/upm/UPMPane.java +++ b/designer-base/src/main/java/com/fr/design/upm/UPMPane.java @@ -50,7 +50,7 @@ public class UpmPane extends BasicPane { window.asObject().setProperty("PluginHelper", UpmBridge.getBridge(event.getBrowser())); } }).build(); - EventDispatcher.listen(DownloadEvent.FINISH, new Listener() { + EventDispatcher.listen(DownloadEvent.SUCCESS, new Listener() { @Override public void on(Event event, String param) { modernUIPane.redirect(UpmFinder.getMainResourcePath()); diff --git a/designer-base/src/main/java/com/fr/design/upm/UpmJSBridge.java b/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java similarity index 98% rename from designer-base/src/main/java/com/fr/design/upm/UpmJSBridge.java rename to designer-base/src/main/java/com/fr/design/upm/UpmBridge.java index af3fa4858c..3d0f28613a 100644 --- a/designer-base/src/main/java/com/fr/design/upm/UpmJSBridge.java +++ b/designer-base/src/main/java/com/fr/design/upm/UpmBridge.java @@ -48,15 +48,15 @@ import java.util.concurrent.RunnableFuture; * Created by richie on 2019-04-12 * 桥接Java和JavaScript的类 */ -public class UpmJSBridge { +public class UpmBridge { - public static UpmJSBridge getBridge(Browser browser) { - return new UpmJSBridge(browser); + public static UpmBridge getBridge(Browser browser) { + return new UpmBridge(browser); } private JSObject window; - private UpmJSBridge(Browser browser) { + private UpmBridge(Browser browser) { this.window = browser.executeJavaScriptAndReturnValue("window").asObject(); } diff --git a/designer-base/src/main/java/com/fr/design/upm/UpmFinder.java b/designer-base/src/main/java/com/fr/design/upm/UpmFinder.java index a74923577d..3e012f545b 100644 --- a/designer-base/src/main/java/com/fr/design/upm/UpmFinder.java +++ b/designer-base/src/main/java/com/fr/design/upm/UpmFinder.java @@ -51,7 +51,7 @@ public class UpmFinder { } public static void showUPMDialog() { - UpmModernPane upmPane = new UpmModernPane(); + UpmPane upmPane = new UpmPane(); if (dialog == null) { dialog = new UpmDialog(DesignerContext.getDesignerFrame(), upmPane); } diff --git a/designer-base/src/main/java/com/fr/design/upm/UpmModernPane.java b/designer-base/src/main/java/com/fr/design/upm/UpmModernPane.java deleted file mode 100644 index 86bee5476e..0000000000 --- a/designer-base/src/main/java/com/fr/design/upm/UpmModernPane.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.fr.design.upm; - -import com.fr.design.dialog.BasicPane; -import com.fr.design.ui.ModernUIPane; -import com.fr.design.upm.event.DownloadEvent; -import com.fr.event.Event; -import com.fr.event.EventDispatcher; -import com.fr.event.Listener; -import com.teamdev.jxbrowser.chromium.JSValue; -import com.teamdev.jxbrowser.chromium.events.ScriptContextAdapter; -import com.teamdev.jxbrowser.chromium.events.ScriptContextEvent; - -import java.awt.*; - -/** - * @author richie - * @version 10.0 - * Created by richie on 2019-04-12 - * Update Plugin Manager容器 - */ -public class UpmModernPane extends BasicPane { - - private ModernUIPane modernUIPane; - - @Override - protected String title4PopupWindow() { - return "UPM"; - } - - public UpmModernPane() { - setLayout(new BorderLayout()); - if (UpmFinder.checkUPMResourcesExist()) { - modernUIPane = new ModernUIPane.Builder<>() - .prepare(new ScriptContextAdapter() { - @Override - public void onScriptContextCreated(ScriptContextEvent event) { - JSValue window = event.getBrowser().executeJavaScriptAndReturnValue("window"); - window.asObject().setProperty("PluginHelper", UpmJSBridge.getBridge(event.getBrowser())); - } - }) - .withURL(UpmFinder.getMainResourcePath()) - .build(); - } else { - modernUIPane = new ModernUIPane.Builder<>() - .withComponent(WarnComponent.KEY) - .prepare(new ScriptContextAdapter() { - @Override - public void onScriptContextCreated(ScriptContextEvent event) { - JSValue window = event.getBrowser().executeJavaScriptAndReturnValue("window"); - window.asObject().setProperty("PluginHelper", UpmJSBridge.getBridge(event.getBrowser())); - } - }).build(); - EventDispatcher.listen(DownloadEvent.SUCCESS, new Listener() { - @Override - public void on(Event event, String param) { - modernUIPane.redirect(UpmFinder.getMainResourcePath()); - } - }); - } - add(modernUIPane, BorderLayout.CENTER); - } - -}