From fb3a4724cbb8b975aa83419166f3a0a32f33e512 Mon Sep 17 00:00:00 2001 From: hugh Date: Wed, 14 Sep 2016 12:04:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E6=96=B9=E6=B3=95=E4=BE=BF=E4=BA=8EOEM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/DesignerFrame.java | 73 ++++++++++++------- .../src/com/fr/start/BaseDesigner.java | 2 +- 2 files changed, 49 insertions(+), 26 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index a1f5f16a4..6caa27a15 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java @@ -115,7 +115,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta private int contentWidth = (int) (Toolkit.getDefaultToolkit().getScreenSize().getWidth()); private int contentHeight = (int) (Toolkit.getDefaultToolkit().getScreenSize().getHeight()); - + private WindowAdapter windowAdapter = new WindowAdapter() { public void windowOpened(WindowEvent e) { HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().setComposite(); @@ -166,11 +166,52 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta protected DesktopCardPane getCenterTemplateCardPane() { return centerTemplateCardPane; } - + + /** + * 生成frame的方法 + * @param ad + * @return + */ + public static DesignerFrame getNewInstance(ToolBarMenuDock ad){ + DesignerFrame frame = new DesignerFrame(ad); + frame.initMenuPane(ad); + return frame; + } + + /** + * 初始menuPane的方法 方便OEM时修改该组件 + * @param ad + */ + protected void initMenuPane(ToolBarMenuDock ad){ + menuPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + menuPane.add(new UIMenuHighLight(), BorderLayout.SOUTH); + menuPane.add(initNorthEastPane(ad), BorderLayout.EAST); + basePane.add(menuPane, BorderLayout.NORTH); + this.resetToolkitByPlus(null); + } + /** - * Constructor. + * @param ad + * @return */ - public DesignerFrame(ToolBarMenuDock ad) { + protected JPanel initNorthEastPane(final ToolBarMenuDock ad){ + //hugh: private修改为protected方便oem的时候修改右上的组件构成 + //顶部日志+登陆按钮 + final JPanel northEastPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); + GeneralContext.addPluginReadListener(new PluginReadListener() { + @Override + public void success() { + TitlePlaceProcessor processor = ExtraDesignClassManager.getInstance().getSingle(TitlePlaceProcessor.MARK_STRING); + if (processor == null) { + processor = new DefaultTitlePlace(); + } + processor.hold(northEastPane, LogMessageBar.getInstance(), ad.createBBSLoginPane()); + } + }); + return northEastPane; + } + + protected DesignerFrame(ToolBarMenuDock ad) { setName(DESIGNER_FRAME_NAME); this.ad = ad; this.initTitleIcon(); @@ -182,9 +223,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta // the content pane basePane.setLayout(new BorderLayout()); - menuPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - menuPane.add(new UIMenuHighLight(), BorderLayout.SOUTH); - menuPane.add(initNorthEastPane(ad), BorderLayout.EAST); + toolbarPane = new JPanel() { public Dimension getPreferredSize() { @@ -211,7 +250,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta centerPane.add(centerTemplateCardPane = new DesktopCardPane(), BorderLayout.CENTER); centerPane.add(toolbarPane, BorderLayout.NORTH); - basePane.add(menuPane, BorderLayout.NORTH); + basePane.add(centerPane, BorderLayout.CENTER); laoyoutWestPane(); basePane.add(EastRegionContainerPane.getInstance(), BorderLayout.EAST); @@ -222,7 +261,7 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta // 调整Window大小 modWindowBounds(); - this.resetToolkitByPlus(null); + // p:检查所有按钮的可见性和是否可以编辑性. checkToolbarMenuEnable(); @@ -256,22 +295,6 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta this.setIconImage(BaseUtils.readImage("/com/fr/base/images/oem/logo.png")); } } - - private JPanel initNorthEastPane(final ToolBarMenuDock ad){ - //顶部日志+登陆按钮 - final JPanel northEastPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - GeneralContext.addPluginReadListener(new PluginReadListener() { - @Override - public void success() { - TitlePlaceProcessor processor = ExtraDesignClassManager.getInstance().getSingle(TitlePlaceProcessor.MARK_STRING); - if (processor == null) { - processor = new DefaultTitlePlace(); - } - processor.hold(northEastPane, LogMessageBar.getInstance(), ad.createBBSLoginPane()); - } - }); - return northEastPane; - } private void addWindowListeners(ArrayList listeners){ for(WindowListener listener : listeners){ diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java index 470affb44..45c90a086 100644 --- a/designer_base/src/com/fr/start/BaseDesigner.java +++ b/designer_base/src/com/fr/start/BaseDesigner.java @@ -148,7 +148,7 @@ public abstract class BaseDesigner extends ToolBarMenuDock { } protected DesignerFrame createDesignerFrame() { - return new DesignerFrame(this); + return DesignerFrame.getNewInstance(this); } protected int getStartPort() { From 1fcca594cb2c12b812c4cbb21c86cbcde2f9b0b2 Mon Sep 17 00:00:00 2001 From: hugh Date: Wed, 14 Sep 2016 14:39:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=BA=E4=BA=86=E6=96=B9=E4=BE=BFOEM?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=8F=B3=E4=B8=8A=E7=9A=84=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=A0=8F=E5=81=9A=E4=B8=80=E4=BA=9B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/mainframe/DesignerFrame.java | 19 ++----------------- .../src/com/fr/start/BaseDesigner.java | 4 +++- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java index 6caa27a15..83d26786a 100644 --- a/designer_base/src/com/fr/design/mainframe/DesignerFrame.java +++ b/designer_base/src/com/fr/design/mainframe/DesignerFrame.java @@ -167,22 +167,11 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta return centerTemplateCardPane; } - /** - * 生成frame的方法 - * @param ad - * @return - */ - public static DesignerFrame getNewInstance(ToolBarMenuDock ad){ - DesignerFrame frame = new DesignerFrame(ad); - frame.initMenuPane(ad); - return frame; - } - /** * 初始menuPane的方法 方便OEM时修改该组件 * @param ad */ - protected void initMenuPane(ToolBarMenuDock ad){ + public void initMenuPane(){ menuPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); menuPane.add(new UIMenuHighLight(), BorderLayout.SOUTH); menuPane.add(initNorthEastPane(ad), BorderLayout.EAST); @@ -211,20 +200,16 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta return northEastPane; } - protected DesignerFrame(ToolBarMenuDock ad) { + public DesignerFrame(ToolBarMenuDock ad) { setName(DESIGNER_FRAME_NAME); this.ad = ad; this.initTitleIcon(); this.setTitle();// james:因为有默认的了 - // set this to context. DesignerContext.setDesignerFrame(this); // the content pane basePane.setLayout(new BorderLayout()); - - - toolbarPane = new JPanel() { public Dimension getPreferredSize() { Dimension dim = super.getPreferredSize(); diff --git a/designer_base/src/com/fr/start/BaseDesigner.java b/designer_base/src/com/fr/start/BaseDesigner.java index 45c90a086..92261b6db 100644 --- a/designer_base/src/com/fr/start/BaseDesigner.java +++ b/designer_base/src/com/fr/start/BaseDesigner.java @@ -148,7 +148,9 @@ public abstract class BaseDesigner extends ToolBarMenuDock { } protected DesignerFrame createDesignerFrame() { - return DesignerFrame.getNewInstance(this); + DesignerFrame frame = new DesignerFrame(this); + frame.initMenuPane(); + return frame; } protected int getStartPort() { From d3be97ae904da93c6b69d176ab284167d3fe5c24 Mon Sep 17 00:00:00 2001 From: hugh Date: Wed, 14 Sep 2016 14:53:32 +0800 Subject: [PATCH 3/3] =?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 83d26786a..a1bffce17 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 92261b6db..a116c9864 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() {