From 4e9f8e1c335c84c69572d79bc812918b3c2cd9db Mon Sep 17 00:00:00 2001 From: kerry Date: Tue, 12 Dec 2017 14:37:08 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-2615=20=E4=BF=AE=E6=94=B9class=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AccessibleTemplateStyleEditor.java | 2 +- .../widget/accessibles/TemplateStylePane.java | 16 ++++++++-------- .../accessibles/TemplateStylePreviewPane.java | 2 +- .../layout/WCardTagLayoutDefinePane.java | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/designer_base/src/com/fr/design/mainframe/widget/accessibles/AccessibleTemplateStyleEditor.java b/designer_base/src/com/fr/design/mainframe/widget/accessibles/AccessibleTemplateStyleEditor.java index 5b92df50e..9e32a4d46 100644 --- a/designer_base/src/com/fr/design/mainframe/widget/accessibles/AccessibleTemplateStyleEditor.java +++ b/designer_base/src/com/fr/design/mainframe/widget/accessibles/AccessibleTemplateStyleEditor.java @@ -2,7 +2,7 @@ package com.fr.design.mainframe.widget.accessibles; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; -import com.fr.base.TemplateStyle; +import com.fr.general.cardtag.TemplateStyle; import com.fr.design.mainframe.widget.wrappers.TemplateStyleWrapper; import javax.swing.SwingUtilities; diff --git a/designer_base/src/com/fr/design/mainframe/widget/accessibles/TemplateStylePane.java b/designer_base/src/com/fr/design/mainframe/widget/accessibles/TemplateStylePane.java index 3a0a35b01..890e5dc5c 100644 --- a/designer_base/src/com/fr/design/mainframe/widget/accessibles/TemplateStylePane.java +++ b/designer_base/src/com/fr/design/mainframe/widget/accessibles/TemplateStylePane.java @@ -1,14 +1,14 @@ package com.fr.design.mainframe.widget.accessibles; -import com.fr.base.BannerTemplateStyle; -import com.fr.base.BookMarkTemplateStyle; -import com.fr.base.CardTemplateStyle; -import com.fr.base.DefaultTemplateStyle; -import com.fr.base.MenuTemplateStyle; -import com.fr.base.PentagonTemplateStyle; -import com.fr.base.TrapezoidTemplateStyle; +import com.fr.general.cardtag.BannerTemplateStyle; +import com.fr.general.cardtag.BookMarkTemplateStyle; +import com.fr.general.cardtag.CardTemplateStyle; +import com.fr.general.cardtag.DefaultTemplateStyle; +import com.fr.general.cardtag.MenuTemplateStyle; +import com.fr.general.cardtag.PentagonTemplateStyle; +import com.fr.general.cardtag.TrapezoidTemplateStyle; import com.fr.design.dialog.BasicPane; -import com.fr.base.TemplateStyle; +import com.fr.general.cardtag.TemplateStyle; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.Inter; diff --git a/designer_base/src/com/fr/design/mainframe/widget/accessibles/TemplateStylePreviewPane.java b/designer_base/src/com/fr/design/mainframe/widget/accessibles/TemplateStylePreviewPane.java index 24b9b393f..4871bfd1d 100644 --- a/designer_base/src/com/fr/design/mainframe/widget/accessibles/TemplateStylePreviewPane.java +++ b/designer_base/src/com/fr/design/mainframe/widget/accessibles/TemplateStylePreviewPane.java @@ -1,7 +1,7 @@ package com.fr.design.mainframe.widget.accessibles; import com.fr.base.BaseUtils; -import com.fr.base.TemplateStyle; +import com.fr.general.cardtag.TemplateStyle; import javax.swing.JPanel; import java.awt.Graphics; diff --git a/designer_form/src/com/fr/design/widget/ui/designer/layout/WCardTagLayoutDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/layout/WCardTagLayoutDefinePane.java index 3e6dcb0ca..3fe62fdac 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/layout/WCardTagLayoutDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/layout/WCardTagLayoutDefinePane.java @@ -1,6 +1,6 @@ package com.fr.design.widget.ui.designer.layout; -import com.fr.base.TemplateStyle; +import com.fr.general.cardtag.TemplateStyle; import com.fr.design.designer.IntervalConstants; import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XLayoutContainer;