From 39d79d3f9eb186d2b6398bef6f64aa7e8af148d4 Mon Sep 17 00:00:00 2001 From: XiaXiang Date: Tue, 6 Nov 2018 09:11:01 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-10591=20=E4=BF=AE=E6=94=B9=E5=8C=85?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fr/design/{reportfit => report/fit}/FitType.java | 4 ++-- .../fit}/menupane/BrowserFitAttrPane.java | 8 ++++---- .../fit}/menupane/FitPreviewPane.java | 2 +- .../{reportfit => report/fit}/menupane/FitRadioGroup.java | 2 +- .../fit}/menupane/FontRadioGroup.java | 2 +- .../fit}/menupane/ReportFitAttrAction.java | 6 +++--- .../fit}/menupane/ReportFitAttrPane.java | 4 ++-- .../fit}/menupane/TemplateBrowserFitAttrPane.java | 6 +++--- .../fit}/menupane/TemplateFitAttrPane.java | 4 ++-- .../java/com/fr/design/designer/creator/XElementCase.java | 4 ++-- .../src/main/java/com/fr/design/mainframe/JForm.java | 2 +- .../widget/propertypane/BrowserFitAlignmentItems.java | 2 +- .../widget/propertypane/BrowserFitPropertyEditor.java | 4 ++-- .../src/main/java/com/fr/design/mainframe/JWorkBook.java | 2 +- 14 files changed, 26 insertions(+), 26 deletions(-) rename designer-base/src/main/java/com/fr/design/{reportfit => report/fit}/FitType.java (95%) rename designer-base/src/main/java/com/fr/design/{reportfit => report/fit}/menupane/BrowserFitAttrPane.java (98%) rename designer-base/src/main/java/com/fr/design/{reportfit => report/fit}/menupane/FitPreviewPane.java (99%) rename designer-base/src/main/java/com/fr/design/{reportfit => report/fit}/menupane/FitRadioGroup.java (97%) rename designer-base/src/main/java/com/fr/design/{reportfit => report/fit}/menupane/FontRadioGroup.java (88%) rename designer-base/src/main/java/com/fr/design/{reportfit => report/fit}/menupane/ReportFitAttrAction.java (96%) rename designer-base/src/main/java/com/fr/design/{reportfit => report/fit}/menupane/ReportFitAttrPane.java (92%) rename designer-base/src/main/java/com/fr/design/{reportfit => report/fit}/menupane/TemplateBrowserFitAttrPane.java (95%) rename designer-base/src/main/java/com/fr/design/{reportfit => report/fit}/menupane/TemplateFitAttrPane.java (92%) diff --git a/designer-base/src/main/java/com/fr/design/reportfit/FitType.java b/designer-base/src/main/java/com/fr/design/report/fit/FitType.java similarity index 95% rename from designer-base/src/main/java/com/fr/design/reportfit/FitType.java rename to designer-base/src/main/java/com/fr/design/report/fit/FitType.java index 6b342240dd..00aceb6eb1 100644 --- a/designer-base/src/main/java/com/fr/design/reportfit/FitType.java +++ b/designer-base/src/main/java/com/fr/design/report/fit/FitType.java @@ -1,7 +1,7 @@ -package com.fr.design.reportfit; +package com.fr.design.report.fit; import com.fr.design.designer.properties.items.Item; -import com.fr.report.reportfit.ReportFitAttr; +import com.fr.report.fit.ReportFitAttr; import com.fr.stable.StringUtils; /** diff --git a/designer-base/src/main/java/com/fr/design/reportfit/menupane/BrowserFitAttrPane.java b/designer-base/src/main/java/com/fr/design/report/fit/menupane/BrowserFitAttrPane.java similarity index 98% rename from designer-base/src/main/java/com/fr/design/reportfit/menupane/BrowserFitAttrPane.java rename to designer-base/src/main/java/com/fr/design/report/fit/menupane/BrowserFitAttrPane.java index 470a2101bb..da495c54d4 100644 --- a/designer-base/src/main/java/com/fr/design/reportfit/menupane/BrowserFitAttrPane.java +++ b/designer-base/src/main/java/com/fr/design/report/fit/menupane/BrowserFitAttrPane.java @@ -1,6 +1,6 @@ -package com.fr.design.reportfit.menupane; +package com.fr.design.report.fit.menupane; -import com.fr.design.reportfit.FitType; +import com.fr.design.report.fit.FitType; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.ibutton.UIRadioButton; @@ -10,8 +10,8 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.log.FineLoggerFactory; -import com.fr.report.reportfit.ReportFitAttr; -import com.fr.reportfit.ReportFitConfig; +import com.fr.report.fit.ReportFitAttr; +import com.fr.report.fit.ReportFitConfig; import javax.swing.BorderFactory; import javax.swing.ButtonGroup; diff --git a/designer-base/src/main/java/com/fr/design/reportfit/menupane/FitPreviewPane.java b/designer-base/src/main/java/com/fr/design/report/fit/menupane/FitPreviewPane.java similarity index 99% rename from designer-base/src/main/java/com/fr/design/reportfit/menupane/FitPreviewPane.java rename to designer-base/src/main/java/com/fr/design/report/fit/menupane/FitPreviewPane.java index fe6232c889..d2ae37adf5 100644 --- a/designer-base/src/main/java/com/fr/design/reportfit/menupane/FitPreviewPane.java +++ b/designer-base/src/main/java/com/fr/design/report/fit/menupane/FitPreviewPane.java @@ -1,4 +1,4 @@ -package com.fr.design.reportfit.menupane; +package com.fr.design.report.fit.menupane; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ilable.UILabel; diff --git a/designer-base/src/main/java/com/fr/design/reportfit/menupane/FitRadioGroup.java b/designer-base/src/main/java/com/fr/design/report/fit/menupane/FitRadioGroup.java similarity index 97% rename from designer-base/src/main/java/com/fr/design/reportfit/menupane/FitRadioGroup.java rename to designer-base/src/main/java/com/fr/design/report/fit/menupane/FitRadioGroup.java index 363ee64f70..bc06e89579 100644 --- a/designer-base/src/main/java/com/fr/design/reportfit/menupane/FitRadioGroup.java +++ b/designer-base/src/main/java/com/fr/design/report/fit/menupane/FitRadioGroup.java @@ -1,4 +1,4 @@ -package com.fr.design.reportfit.menupane; +package com.fr.design.report.fit.menupane; import com.fr.design.gui.ibutton.UIRadioButton; diff --git a/designer-base/src/main/java/com/fr/design/reportfit/menupane/FontRadioGroup.java b/designer-base/src/main/java/com/fr/design/report/fit/menupane/FontRadioGroup.java similarity index 88% rename from designer-base/src/main/java/com/fr/design/reportfit/menupane/FontRadioGroup.java rename to designer-base/src/main/java/com/fr/design/report/fit/menupane/FontRadioGroup.java index f0c313b5cd..64d4f7b033 100644 --- a/designer-base/src/main/java/com/fr/design/reportfit/menupane/FontRadioGroup.java +++ b/designer-base/src/main/java/com/fr/design/report/fit/menupane/FontRadioGroup.java @@ -1,4 +1,4 @@ -package com.fr.design.reportfit.menupane; +package com.fr.design.report.fit.menupane; /** * 字体的两个选项组成的group diff --git a/designer-base/src/main/java/com/fr/design/reportfit/menupane/ReportFitAttrAction.java b/designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java similarity index 96% rename from designer-base/src/main/java/com/fr/design/reportfit/menupane/ReportFitAttrAction.java rename to designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java index dc41879565..57fa7bb332 100644 --- a/designer-base/src/main/java/com/fr/design/reportfit/menupane/ReportFitAttrAction.java +++ b/designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java @@ -1,4 +1,4 @@ -package com.fr.design.reportfit.menupane; +package com.fr.design.report.fit.menupane; import com.fr.base.BaseUtils; import com.fr.design.actions.JTemplateAction; @@ -8,8 +8,8 @@ import com.fr.design.dialog.UIDialog; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; import com.fr.design.menu.MenuKeySet; -import com.fr.report.reportfit.FitProvider; -import com.fr.report.reportfit.ReportFitAttr; +import com.fr.report.fit.FitProvider; +import com.fr.report.fit.ReportFitAttr; import javax.swing.KeyStroke; import java.awt.Dimension; diff --git a/designer-base/src/main/java/com/fr/design/reportfit/menupane/ReportFitAttrPane.java b/designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrPane.java similarity index 92% rename from designer-base/src/main/java/com/fr/design/reportfit/menupane/ReportFitAttrPane.java rename to designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrPane.java index 983ff21ab2..55e11e9fd2 100644 --- a/designer-base/src/main/java/com/fr/design/reportfit/menupane/ReportFitAttrPane.java +++ b/designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrPane.java @@ -1,7 +1,7 @@ -package com.fr.design.reportfit.menupane; +package com.fr.design.report.fit.menupane; import com.fr.design.beans.BasicBeanPane; -import com.fr.report.reportfit.ReportFitAttr; +import com.fr.report.fit.ReportFitAttr; import javax.swing.BorderFactory; import javax.swing.BoxLayout; diff --git a/designer-base/src/main/java/com/fr/design/reportfit/menupane/TemplateBrowserFitAttrPane.java b/designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateBrowserFitAttrPane.java similarity index 95% rename from designer-base/src/main/java/com/fr/design/reportfit/menupane/TemplateBrowserFitAttrPane.java rename to designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateBrowserFitAttrPane.java index de8108ace3..664fa2471d 100644 --- a/designer-base/src/main/java/com/fr/design/reportfit/menupane/TemplateBrowserFitAttrPane.java +++ b/designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateBrowserFitAttrPane.java @@ -1,9 +1,9 @@ -package com.fr.design.reportfit.menupane; +package com.fr.design.report.fit.menupane; import com.fr.design.gui.ilable.UILabel; import com.fr.log.FineLoggerFactory; -import com.fr.report.reportfit.ReportFitAttr; -import com.fr.reportfit.ReportFitConfig; +import com.fr.report.fit.ReportFitAttr; +import com.fr.report.fit.ReportFitConfig; import java.awt.Component; diff --git a/designer-base/src/main/java/com/fr/design/reportfit/menupane/TemplateFitAttrPane.java b/designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateFitAttrPane.java similarity index 92% rename from designer-base/src/main/java/com/fr/design/reportfit/menupane/TemplateFitAttrPane.java rename to designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateFitAttrPane.java index e78259af6f..01b3196f5d 100644 --- a/designer-base/src/main/java/com/fr/design/reportfit/menupane/TemplateFitAttrPane.java +++ b/designer-base/src/main/java/com/fr/design/report/fit/menupane/TemplateFitAttrPane.java @@ -1,7 +1,7 @@ -package com.fr.design.reportfit.menupane; +package com.fr.design.report.fit.menupane; import com.fr.design.beans.BasicBeanPane; -import com.fr.report.reportfit.ReportFitAttr; +import com.fr.report.fit.ReportFitAttr; import javax.swing.BorderFactory; import javax.swing.BoxLayout; diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java b/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java index 1b30af7719..da36cd8ba5 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XElementCase.java @@ -19,11 +19,11 @@ import com.fr.form.FormProvider; import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.ElementCaseEditorProvider; -import com.fr.report.reportfit.ReportFitAttr; +import com.fr.report.fit.ReportFitAttr; import com.fr.stable.ArrayUtils; import com.fr.stable.CoreGraphHelper; import com.fr.stable.core.PropertyChangeAdapter; -import com.fr.report.reportfit.FitProvider; +import com.fr.report.fit.FitProvider; import javax.swing.*; import java.awt.*; diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java index 5f043c6983..f6dfdba524 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java @@ -35,7 +35,7 @@ import com.fr.design.mainframe.actions.EmbeddedFormExportExportAction; import com.fr.design.mainframe.actions.TemplateParameterAction; import com.fr.design.mainframe.form.FormECCompositeProvider; import com.fr.design.mainframe.form.FormECDesignerProvider; -import com.fr.design.reportfit.menupane.ReportFitAttrAction; +import com.fr.design.report.fit.menupane.ReportFitAttrAction; import com.fr.design.mainframe.templateinfo.JFormProcessInfo; import com.fr.design.mainframe.templateinfo.TemplateProcessInfo; import com.fr.design.mainframe.toolbar.ToolBarMenuDock; diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/propertypane/BrowserFitAlignmentItems.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/propertypane/BrowserFitAlignmentItems.java index 27669e8aba..e14cb121f4 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/propertypane/BrowserFitAlignmentItems.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/propertypane/BrowserFitAlignmentItems.java @@ -1,6 +1,6 @@ package com.fr.design.mainframe.widget.propertypane; -import com.fr.design.reportfit.FitType; +import com.fr.design.report.fit.FitType; import com.fr.design.designer.properties.items.Item; import com.fr.design.designer.properties.items.ItemProvider; diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/propertypane/BrowserFitPropertyEditor.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/propertypane/BrowserFitPropertyEditor.java index cdbc0c1a18..473422c446 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/propertypane/BrowserFitPropertyEditor.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/propertypane/BrowserFitPropertyEditor.java @@ -2,8 +2,8 @@ package com.fr.design.mainframe.widget.propertypane; import com.fr.design.designer.creator.CRPropertyDescriptor; import com.fr.design.form.util.XCreatorConstants; -import com.fr.report.reportfit.ReportFitAttr; -import com.fr.reportfit.ReportFitConfig; +import com.fr.report.fit.ReportFitAttr; +import com.fr.report.fit.ReportFitConfig; import java.beans.IntrospectionException; diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java b/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java index 7072c55dd2..e8f5bc5f72 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java @@ -41,7 +41,7 @@ import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icontainer.UIModeControlContainer; import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.mainframe.cell.QuickEditorRegion; -import com.fr.design.reportfit.menupane.ReportFitAttrAction; +import com.fr.design.report.fit.menupane.ReportFitAttrAction; import com.fr.design.mainframe.templateinfo.JWorkBookProcessInfo; import com.fr.design.mainframe.templateinfo.TemplateProcessInfo; import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;