From 605eab32af1c2dd23c747192adfd9fecae36a19e Mon Sep 17 00:00:00 2001 From: kerry Date: Tue, 2 Jan 2018 19:55:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Override=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/designer/creator/DedicateLayoutContainer.java | 1 + designer_form/src/com/fr/design/designer/creator/XCreator.java | 1 + .../fr/design/designer/creator/cardlayout/XWCardLayout.java | 1 + .../designer/creator/cardlayout/XWCardMainBorderLayout.java | 1 + .../fr/design/designer/creator/cardlayout/XWCardTagLayout.java | 2 ++ .../design/designer/creator/cardlayout/XWCardTitleLayout.java | 3 +++ 6 files changed, 9 insertions(+) diff --git a/designer_form/src/com/fr/design/designer/creator/DedicateLayoutContainer.java b/designer_form/src/com/fr/design/designer/creator/DedicateLayoutContainer.java index adff2b434e..29adf25a98 100644 --- a/designer_form/src/com/fr/design/designer/creator/DedicateLayoutContainer.java +++ b/designer_form/src/com/fr/design/designer/creator/DedicateLayoutContainer.java @@ -51,6 +51,7 @@ public abstract class DedicateLayoutContainer extends XLayoutContainer { * * @param path 控件树list */ + @Override public void notShowInComponentTree(List path) { path.remove(path.size() - 1); } diff --git a/designer_form/src/com/fr/design/designer/creator/XCreator.java b/designer_form/src/com/fr/design/designer/creator/XCreator.java index 0e0098a29e..d4d18c046a 100644 --- a/designer_form/src/com/fr/design/designer/creator/XCreator.java +++ b/designer_form/src/com/fr/design/designer/creator/XCreator.java @@ -370,6 +370,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo * 控件树不显示此组件 * @param path 控件树list */ + @Override public void notShowInComponentTree(List path) { return; } diff --git a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java index 332dacb240..6e04666729 100644 --- a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java +++ b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java @@ -232,6 +232,7 @@ public class XWCardLayout extends XLayoutContainer { * 控件树不显示此组件 * @param path 控件树list */ + @Override public void notShowInComponentTree(List path) { path.remove(LAYOUT_INDEX); } diff --git a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java index 6f6cea870b..06d48d3660 100644 --- a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java +++ b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java @@ -315,6 +315,7 @@ public class XWCardMainBorderLayout extends XWBorderLayout{ } } + @Override public int getIndexOfChild(Object child) { XWCardTitleLayout titlePart = this.getTitlePart(); return titlePart.getIndexOfChild(child); diff --git a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java index 547ab73908..b25eb7efce 100644 --- a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java +++ b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java @@ -251,11 +251,13 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout { } + @Override public int getIndexOfChild(Object child) { XLayoutContainer cardPart = ((XWCardMainBorderLayout)this.getTopLayout()).getCardPart(); return cardPart.getIndexOfChild(child); } + @Override public boolean isSupportDrag(){ return false; } diff --git a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardTitleLayout.java b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardTitleLayout.java index 15954e23e7..ae38dcf733 100644 --- a/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardTitleLayout.java +++ b/designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardTitleLayout.java @@ -63,10 +63,12 @@ public class XWCardTitleLayout extends XWBorderLayout { * 控件树不显示此组件 * @param path 控件树list */ + @Override public void notShowInComponentTree(List path) { path.remove(LAYOUT_INDEX); } + @Override public int getIndexOfChild(Object child) { int count = getComponentCount(); for (int i = 0; i < count; i++) { @@ -81,6 +83,7 @@ public class XWCardTitleLayout extends XWBorderLayout { /** * 将WLayout转换为XLayoutContainer */ + @Override public void convert(){ isRefreshing = true; WCardTitleLayout titleLayout = (WCardTitleLayout)this.toData();