From b42d22e10d10d34c94c70eea3f31a4c739590113 Mon Sep 17 00:00:00 2001 From: kerry Date: Fri, 22 Sep 2017 12:13:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/widget/ui/AbstractDataModify.java | 4 ++-- .../design/mainframe/widget/BasicPropertyPane.java | 6 ++++-- .../widget/accessibles/BaseAccessibleEditor.java | 6 +++++- .../src/com/fr/design/widget/DataModify.java | 3 ++- .../AccessibleElementCaseToolBarEditor.java | 2 +- .../mainframe/widget/ui/FormWidgetCardPane.java | 7 +++++-- .../widget/ui/designer/AbstractDataModify.java | 3 ++- .../widget/ui/designer/DateEditorDefinePane.java | 9 +++++++-- .../ui/designer/component/PaddingBoundPane.java | 7 +++++-- .../designer/component/WidgetAbsoluteBoundPane.java | 3 ++- .../ui/designer/component/WidgetBoundPane.java | 5 +++-- .../ui/designer/layout/ElementEditorDefinePane.java | 6 ++++-- .../ui/designer/layout/WTabFitLayoutDefinePane.java | 7 ++++--- .../ui/designer/layout/WTitleLayoutDefinePane.java | 13 +++++++------ 14 files changed, 53 insertions(+), 28 deletions(-) diff --git a/designer/src/com/fr/design/widget/ui/AbstractDataModify.java b/designer/src/com/fr/design/widget/ui/AbstractDataModify.java index b7ab8a606..3836464b2 100644 --- a/designer/src/com/fr/design/widget/ui/AbstractDataModify.java +++ b/designer/src/com/fr/design/widget/ui/AbstractDataModify.java @@ -3,9 +3,9 @@ package com.fr.design.widget.ui; import com.fr.design.beans.BasicBeanPane; import com.fr.design.data.DataCreatorUI; import com.fr.design.widget.DataModify; -import com.fr.stable.StringUtils; -import javax.swing.*; +import javax.swing.JComponent; + /** * Created by richie on 15/11/16. diff --git a/designer_base/src/com/fr/design/mainframe/widget/BasicPropertyPane.java b/designer_base/src/com/fr/design/mainframe/widget/BasicPropertyPane.java index c66530b62..6546bd56c 100644 --- a/designer_base/src/com/fr/design/mainframe/widget/BasicPropertyPane.java +++ b/designer_base/src/com/fr/design/mainframe/widget/BasicPropertyPane.java @@ -8,8 +8,10 @@ import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.general.Inter; -import javax.swing.*; -import java.awt.*; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Component; /** * Created by plough on 2017/8/7. diff --git a/designer_base/src/com/fr/design/mainframe/widget/accessibles/BaseAccessibleEditor.java b/designer_base/src/com/fr/design/mainframe/widget/accessibles/BaseAccessibleEditor.java index 43231203e..ec6d4405e 100644 --- a/designer_base/src/com/fr/design/mainframe/widget/accessibles/BaseAccessibleEditor.java +++ b/designer_base/src/com/fr/design/mainframe/widget/accessibles/BaseAccessibleEditor.java @@ -1,6 +1,10 @@ package com.fr.design.mainframe.widget.accessibles; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; diff --git a/designer_base/src/com/fr/design/widget/DataModify.java b/designer_base/src/com/fr/design/widget/DataModify.java index 96552e7f0..b901d7c69 100644 --- a/designer_base/src/com/fr/design/widget/DataModify.java +++ b/designer_base/src/com/fr/design/widget/DataModify.java @@ -2,7 +2,8 @@ package com.fr.design.widget; import com.fr.design.data.DataCreatorUI; -import javax.swing.*; +import javax.swing.JComponent; + public interface DataModify { diff --git a/designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleElementCaseToolBarEditor.java b/designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleElementCaseToolBarEditor.java index 31c0749c9..ec675fe7e 100644 --- a/designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleElementCaseToolBarEditor.java +++ b/designer_form/src/com/fr/design/mainframe/widget/accessibles/AccessibleElementCaseToolBarEditor.java @@ -12,7 +12,7 @@ import com.fr.form.web.FormToolBarManager; import com.fr.general.Inter; import com.fr.stable.ArrayUtils; -import javax.swing.*; +import javax.swing.SwingUtilities; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import java.util.ArrayList; diff --git a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java index 3cfe27375..0bc744e51 100644 --- a/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java +++ b/designer_form/src/com/fr/design/mainframe/widget/ui/FormWidgetCardPane.java @@ -22,8 +22,11 @@ import com.fr.general.ComparatorUtils; import com.fr.general.Inter; import com.fr.stable.StringUtils; -import javax.swing.*; -import java.awt.*; +import javax.swing.BorderFactory; +import javax.swing.JComponent; +import javax.swing.JPanel; +import java.awt.BorderLayout; + /** * Created by ibm on 2017/7/25. diff --git a/designer_form/src/com/fr/design/widget/ui/designer/AbstractDataModify.java b/designer_form/src/com/fr/design/widget/ui/designer/AbstractDataModify.java index e0fc7c11c..3aca5f00a 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/AbstractDataModify.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/AbstractDataModify.java @@ -5,7 +5,8 @@ import com.fr.design.data.DataCreatorUI; import com.fr.design.designer.creator.XCreator; import com.fr.design.widget.DataModify; -import javax.swing.*; +import javax.swing.JComponent; + /** * Created by kerry on 17/07/28. diff --git a/designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java index 9bcd832da..5931cf774 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java @@ -20,10 +20,15 @@ import com.fr.script.Calculator; import com.fr.stable.ArrayUtils; import com.fr.stable.UtilEvalError; -import javax.swing.*; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import javax.swing.SwingConstants; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.CardLayout; +import java.awt.Color; +import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.text.SimpleDateFormat; diff --git a/designer_form/src/com/fr/design/widget/ui/designer/component/PaddingBoundPane.java b/designer_form/src/com/fr/design/widget/ui/designer/component/PaddingBoundPane.java index bb2bbe3bf..a5b13c66a 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/component/PaddingBoundPane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/component/PaddingBoundPane.java @@ -11,8 +11,11 @@ import com.fr.form.ui.AbstractMarginWidget; import com.fr.form.ui.PaddingMargin; import com.fr.general.Inter; -import javax.swing.*; -import java.awt.*; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import javax.swing.SwingConstants; +import java.awt.Component; + /** * Created by ibm on 2017/8/3. diff --git a/designer_form/src/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java b/designer_form/src/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java index 402348f41..c35cc7926 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/component/WidgetAbsoluteBoundPane.java @@ -6,7 +6,8 @@ import com.fr.design.widget.WidgetBoundsPaneFactory; import com.fr.form.ui.container.WLayout; import com.fr.general.Inter; -import java.awt.*; +import java.awt.Rectangle; + /** * Created by ibm on 2017/8/3. diff --git a/designer_form/src/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java b/designer_form/src/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java index 916a499f5..68feb1596 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java @@ -16,8 +16,9 @@ import com.fr.form.ui.container.WFitLayout; import com.fr.form.ui.container.WLayout; import com.fr.general.Inter; -import javax.swing.*; -import java.awt.*; +import javax.swing.JOptionPane; +import java.awt.Rectangle; + /** * Created by ibm on 2017/7/30. diff --git a/designer_form/src/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java index 0bc4b818f..9fd1c6e94 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/layout/ElementEditorDefinePane.java @@ -11,8 +11,10 @@ import com.fr.form.web.FormToolBarManager; import com.fr.general.ComparatorUtils; import com.fr.general.Inter; -import javax.swing.*; -import java.awt.*; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Component; /** * Created by ibm on 2017/8/7. diff --git a/designer_form/src/com/fr/design/widget/ui/designer/layout/WTabFitLayoutDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/layout/WTabFitLayoutDefinePane.java index b522950a3..b3678eecd 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/layout/WTabFitLayoutDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/layout/WTabFitLayoutDefinePane.java @@ -19,11 +19,12 @@ import com.fr.form.ui.container.cardlayout.WCardMainBorderLayout; import com.fr.form.ui.container.cardlayout.WCardTagLayout; import com.fr.form.ui.container.cardlayout.WCardTitleLayout; import com.fr.form.ui.container.cardlayout.WTabFitLayout; -import com.fr.general.ComparatorUtils; import com.fr.general.Inter; -import javax.swing.*; -import java.awt.*; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Component; /** * Created by ibm on 2017/8/5. diff --git a/designer_form/src/com/fr/design/widget/ui/designer/layout/WTitleLayoutDefinePane.java b/designer_form/src/com/fr/design/widget/ui/designer/layout/WTitleLayoutDefinePane.java index a507a99b8..ac1659b31 100644 --- a/designer_form/src/com/fr/design/widget/ui/designer/layout/WTitleLayoutDefinePane.java +++ b/designer_form/src/com/fr/design/widget/ui/designer/layout/WTitleLayoutDefinePane.java @@ -2,21 +2,22 @@ package com.fr.design.widget.ui.designer.layout; import com.fr.design.designer.creator.XCreator; import com.fr.design.foldablepane.UIExpandablePane; -import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.mainframe.widget.accessibles.AccessibleWLayoutBorderStyleEditor; import com.fr.design.widget.ui.designer.AbstractDataModify; -import com.fr.design.widget.ui.designer.component.PaddingBoundPane; -import com.fr.form.ui.*; -import com.fr.form.ui.container.WTitleLayout; +import com.fr.form.ui.AbstractBorderStyleWidget; +import com.fr.form.ui.LayoutBorderStyle; import com.fr.general.ComparatorUtils; import com.fr.general.Inter; -import javax.swing.*; -import java.awt.*; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Component; + /** * Created by ibm on 2017/8/3.