diff --git a/designer-base/src/main/java/com/fr/design/upm/UpmDialog.java b/designer-base/src/main/java/com/fr/design/upm/UpmDialog.java deleted file mode 100644 index a03fe1d8f..000000000 --- a/designer-base/src/main/java/com/fr/design/upm/UpmDialog.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.fr.design.upm; - -import com.fr.design.dialog.BasicPane; -import com.fr.design.dialog.UIDialog; -import com.fr.design.utils.gui.GUICoreUtils; -import com.fr.stable.StableUtils; - -import javax.swing.*; -import java.awt.*; - -/** - * @author richie - * @version 10.0 - * Created by richie on 2019-04-12 - */ -public class UpmDialog extends UIDialog { - - private static final Dimension DEFAULT_SHOP = new Dimension(900, 700); - - public UpmDialog(Frame frame, BasicPane pane) { - super(frame); - setUndecorated(true); - JPanel panel = (JPanel) getContentPane(); - panel.setLayout(new BorderLayout()); - add(pane, BorderLayout.CENTER); - setSize(DEFAULT_SHOP); - GUICoreUtils.centerWindow(this); - setResizable(false); - } - - @Override - public void checkValid() throws Exception { - } -} 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 3e012f545..5b90d4330 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,9 +51,9 @@ public class UpmFinder { } public static void showUPMDialog() { - UpmPane upmPane = new UpmPane(); + UpmShowPane upmPane = new UpmShowPane(); if (dialog == null) { - dialog = new UpmDialog(DesignerContext.getDesignerFrame(), upmPane); + dialog = new UpmShowDialog(DesignerContext.getDesignerFrame(), upmPane); } dialog.setVisible(true); } diff --git a/designer-base/src/main/java/com/fr/design/upm/UPMDialog.java b/designer-base/src/main/java/com/fr/design/upm/UpmShowDialog.java similarity index 87% rename from designer-base/src/main/java/com/fr/design/upm/UPMDialog.java rename to designer-base/src/main/java/com/fr/design/upm/UpmShowDialog.java index a03fe1d8f..704e01121 100644 --- a/designer-base/src/main/java/com/fr/design/upm/UPMDialog.java +++ b/designer-base/src/main/java/com/fr/design/upm/UpmShowDialog.java @@ -13,11 +13,11 @@ import java.awt.*; * @version 10.0 * Created by richie on 2019-04-12 */ -public class UpmDialog extends UIDialog { +public class UpmShowDialog extends UIDialog { private static final Dimension DEFAULT_SHOP = new Dimension(900, 700); - public UpmDialog(Frame frame, BasicPane pane) { + public UpmShowDialog(Frame frame, BasicPane pane) { super(frame); setUndecorated(true); JPanel panel = (JPanel) getContentPane(); diff --git a/designer-base/src/main/java/com/fr/design/upm/UPMPane.java b/designer-base/src/main/java/com/fr/design/upm/UpmShowPane.java similarity index 96% rename from designer-base/src/main/java/com/fr/design/upm/UPMPane.java rename to designer-base/src/main/java/com/fr/design/upm/UpmShowPane.java index 3e4ccc581..e64e5f02e 100644 --- a/designer-base/src/main/java/com/fr/design/upm/UPMPane.java +++ b/designer-base/src/main/java/com/fr/design/upm/UpmShowPane.java @@ -18,7 +18,7 @@ import java.awt.*; * Created by richie on 2019-04-12 * Update Plugin Manager容器 */ -public class UpmPane extends BasicPane { +public class UpmShowPane extends BasicPane { private ModernUIPane modernUIPane; @@ -27,7 +27,7 @@ public class UpmPane extends BasicPane { return "UPM"; } - public UpmPane() { + public UpmShowPane() { setLayout(new BorderLayout()); if (UpmFinder.checkUPMResourcesExist()) { modernUIPane = new ModernUIPane.Builder<>()