From d3be97ae904da93c6b69d176ab284167d3fe5c24 Mon Sep 17 00:00:00 2001
From: hugh <hugh@finereport.com>
Date: Wed, 14 Sep 2016 14:53:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=AD=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 designer_base/src/com/fr/design/mainframe/DesignerFrame.java | 5 +++--
 designer_base/src/com/fr/start/BaseDesigner.java             | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java
index 83d26786ac..a1bffce174 100644
--- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java
+++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java
@@ -171,7 +171,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
 	 * 初始menuPane的方法 方便OEM时修改该组件
 	 * @param ad
 	 */
-	public void initMenuPane(){
+	protected void initMenuPane(){
 		menuPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 		menuPane.add(new UIMenuHighLight(), BorderLayout.SOUTH);
 		menuPane.add(initNorthEastPane(ad), BorderLayout.EAST);
@@ -207,7 +207,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
 		this.setTitle();// james:因为有默认的了
 		// set this to context.
 		DesignerContext.setDesignerFrame(this);
-
+		
 		// the content pane
 		basePane.setLayout(new BorderLayout());
 		toolbarPane = new JPanel() {
@@ -267,6 +267,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
 		this.setExtendedState(JFrame.MAXIMIZED_BOTH);
 		this.setDropTarget(new DropTarget(this, DnDConstants.ACTION_MOVE, new FileDropTargetListener(), true));
 		closeMode = UIConstants.CLOSE_OF_AUTHORITY;
+		initMenuPane();
 	}
 
 	public void initTitleIcon() {
diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java
index 92261b6dbc..a116c98644 100644
--- a/designer_base/src/com/fr/start/BaseDesigner.java
+++ b/designer_base/src/com/fr/start/BaseDesigner.java
@@ -148,9 +148,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
     }
 
     protected DesignerFrame createDesignerFrame() {
-    	DesignerFrame frame = new DesignerFrame(this);
-    	frame.initMenuPane();
-    	return frame;
+    	return new DesignerFrame(this);
     }
 
     protected int getStartPort() {