From c0892fd1f7ab3584a05264a6dcb51869c43279f2 Mon Sep 17 00:00:00 2001
From: plough <plough@finereport.com>
Date: Tue, 29 Nov 2016 09:41:32 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-875=E3=80=82=E5=B0=86setBasicDialogSize?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E7=9A=84=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=94=B9=E5=9B=9Eprotected?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/actions/file/PreferencePane.java  |  6 +-----
 .../src/com/fr/design/dialog/BasicDialog.java       |  4 ++--
 .../src/com/fr/design/dialog/BasicPane.java         | 13 +++++++++++++
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/designer_base/src/com/fr/design/actions/file/PreferencePane.java b/designer_base/src/com/fr/design/actions/file/PreferencePane.java
index 6de8d60e8..0557eb587 100644
--- a/designer_base/src/com/fr/design/actions/file/PreferencePane.java
+++ b/designer_base/src/com/fr/design/actions/file/PreferencePane.java
@@ -646,11 +646,7 @@ public class PreferencePane extends BasicPane {
         if (l != null) {
             dg.addDialogActionListener(l);
         }
-
-        dg.setBasicDialogSize(BasicDialog.DEFAULT);
-        GUICoreUtils.centerWindow(dg);
-        dg.setResizable(false);
-        return dg;
+        return showWindow(dg);
     }
 
     private class DIALOG extends BasicDialog {
diff --git a/designer_base/src/com/fr/design/dialog/BasicDialog.java b/designer_base/src/com/fr/design/dialog/BasicDialog.java
index b2246dbc6..703b19205 100644
--- a/designer_base/src/com/fr/design/dialog/BasicDialog.java
+++ b/designer_base/src/com/fr/design/dialog/BasicDialog.java
@@ -39,11 +39,11 @@ public abstract class BasicDialog extends UIDialog {
 		super(parent, pane, isNeedButtonPane);
 	}
 
-	public void setBasicDialogSize(Dimension d) {
+	protected void setBasicDialogSize(Dimension d) {
 		super.setSize(d.width, d.height);
 	}
 
-	public void setBasicDialogSize(int w, int h) {
+	protected void setBasicDialogSize(int w, int h) {
 		super.setSize(w, h);
 	}
 
diff --git a/designer_base/src/com/fr/design/dialog/BasicPane.java b/designer_base/src/com/fr/design/dialog/BasicPane.java
index 9bc96f643..eb1b41305 100644
--- a/designer_base/src/com/fr/design/dialog/BasicPane.java
+++ b/designer_base/src/com/fr/design/dialog/BasicPane.java
@@ -52,6 +52,19 @@ public abstract class BasicPane extends JPanel {
         return dg;
     }
 
+    /**
+     * 显示窗口
+     *
+     * @param dg 已添加监听器的对话框实例
+     * @return 对话框
+     */
+    public BasicDialog showWindow(BasicDialog dg) {
+        dg.setBasicDialogSize(BasicDialog.DEFAULT);
+        GUICoreUtils.centerWindow(dg);
+        dg.setResizable(false);
+        return dg;
+    }
+
     /**
      * 显示窗口
      *