Browse Source

Merge pull request #830 in DESIGN/design from ~RICHIE/design:release/10.0 to release/10.0

* commit '7e331655959e78946d668fd65db285e1b3bd29f0':
  KERNEL-442 不能识别大小写,被迫改个名字
bugfix/10.0
richie 6 years ago
parent
commit
9b18aa22a3
  1. 34
      designer-base/src/main/java/com/fr/design/upm/UpmDialog.java
  2. 4
      designer-base/src/main/java/com/fr/design/upm/UpmFinder.java
  3. 4
      designer-base/src/main/java/com/fr/design/upm/UpmShowDialog.java
  4. 4
      designer-base/src/main/java/com/fr/design/upm/UpmShowPane.java

34
designer-base/src/main/java/com/fr/design/upm/UpmDialog.java

@ -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 {
}
}

4
designer-base/src/main/java/com/fr/design/upm/UpmFinder.java

@ -51,9 +51,9 @@ public class UpmFinder {
} }
public static void showUPMDialog() { public static void showUPMDialog() {
UpmPane upmPane = new UpmPane(); UpmShowPane upmPane = new UpmShowPane();
if (dialog == null) { if (dialog == null) {
dialog = new UpmDialog(DesignerContext.getDesignerFrame(), upmPane); dialog = new UpmShowDialog(DesignerContext.getDesignerFrame(), upmPane);
} }
dialog.setVisible(true); dialog.setVisible(true);
} }

4
designer-base/src/main/java/com/fr/design/upm/UPMDialog.java → designer-base/src/main/java/com/fr/design/upm/UpmShowDialog.java

@ -13,11 +13,11 @@ import java.awt.*;
* @version 10.0 * @version 10.0
* Created by richie on 2019-04-12 * 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); private static final Dimension DEFAULT_SHOP = new Dimension(900, 700);
public UpmDialog(Frame frame, BasicPane pane) { public UpmShowDialog(Frame frame, BasicPane pane) {
super(frame); super(frame);
setUndecorated(true); setUndecorated(true);
JPanel panel = (JPanel) getContentPane(); JPanel panel = (JPanel) getContentPane();

4
designer-base/src/main/java/com/fr/design/upm/UPMPane.java → 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 * Created by richie on 2019-04-12
* Update Plugin Manager容器 * Update Plugin Manager容器
*/ */
public class UpmPane extends BasicPane { public class UpmShowPane extends BasicPane {
private ModernUIPane<Object> modernUIPane; private ModernUIPane<Object> modernUIPane;
@ -27,7 +27,7 @@ public class UpmPane extends BasicPane {
return "UPM"; return "UPM";
} }
public UpmPane() { public UpmShowPane() {
setLayout(new BorderLayout()); setLayout(new BorderLayout());
if (UpmFinder.checkUPMResourcesExist()) { if (UpmFinder.checkUPMResourcesExist()) {
modernUIPane = new ModernUIPane.Builder<>() modernUIPane = new ModernUIPane.Builder<>()
Loading…
Cancel
Save