From 0f78972703cbf38bdc6b8ee1e80d97ad20a72805 Mon Sep 17 00:00:00 2001 From: plough Date: Wed, 20 Jun 2018 14:47:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/src/com/fr/design/mainframe/JTemplate.java | 2 +- designer-base/src/com/fr/design/report/WatermarkPane.java | 2 +- .../src/com/fr/design/report/WatermarkPreviewPane.java | 2 +- .../com/fr/design/designer/creator/XWAbsoluteLayout.java | 2 +- .../designer/creator/cardlayout/XWCardMainBorderLayout.java | 2 +- .../src/com/fr/design/mainframe/FormDesignerUI.java | 6 +----- .../src/com/fr/design/mainframe/ShareWidgetButton.java | 2 +- .../fr/design/mainframe/actions/FormMobileAttrAction.java | 2 +- .../widget/accessibles/AccessibleBodyWatermarkEditor.java | 2 +- .../design/mainframe/widget/wrappers/WatermarkWrapper.java | 2 +- .../ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java | 2 +- .../widget/ui/designer/layout/FRFitLayoutDefinePane.java | 2 +- .../fr/design/actions/report/ReportMobileAttrAction.java | 2 +- .../com/fr/design/actions/report/ReportWatermarkAction.java | 2 +- designer-realize/src/com/fr/grid/GridUI.java | 3 +-- 15 files changed, 15 insertions(+), 20 deletions(-) diff --git a/designer-base/src/com/fr/design/mainframe/JTemplate.java b/designer-base/src/com/fr/design/mainframe/JTemplate.java index 62ed475db..433c68f8e 100644 --- a/designer-base/src/com/fr/design/mainframe/JTemplate.java +++ b/designer-base/src/com/fr/design/mainframe/JTemplate.java @@ -5,7 +5,7 @@ import com.fr.base.FRContext; import com.fr.base.Parameter; import com.fr.base.ScreenResolution; import com.fr.base.io.BaseBook; -import com.fr.base.iofileattr.TemplateIdAttrMark; +import com.fr.base.iofile.attr.TemplateIdAttrMark; import com.fr.design.DesignModelAdapter; import com.fr.design.DesignState; import com.fr.design.DesignerEnvManager; diff --git a/designer-base/src/com/fr/design/report/WatermarkPane.java b/designer-base/src/com/fr/design/report/WatermarkPane.java index ab9bbf7ae..6d66e3d31 100644 --- a/designer-base/src/com/fr/design/report/WatermarkPane.java +++ b/designer-base/src/com/fr/design/report/WatermarkPane.java @@ -1,6 +1,6 @@ package com.fr.design.report; -import com.fr.base.iofileattr.WatermarkAttr; +import com.fr.base.iofile.attr.WatermarkAttr; import com.fr.design.dialog.BasicPane; import com.fr.design.formula.TinyFormulaPane; import com.fr.design.gui.icombobox.UIComboBox; diff --git a/designer-base/src/com/fr/design/report/WatermarkPreviewPane.java b/designer-base/src/com/fr/design/report/WatermarkPreviewPane.java index 6517a9217..3c2d20704 100644 --- a/designer-base/src/com/fr/design/report/WatermarkPreviewPane.java +++ b/designer-base/src/com/fr/design/report/WatermarkPreviewPane.java @@ -1,6 +1,6 @@ package com.fr.design.report; -import com.fr.base.iofileattr.WatermarkAttr; +import com.fr.base.iofile.attr.WatermarkAttr; import com.fr.design.constants.UIConstants; import com.fr.page.WatermarkPainter; diff --git a/designer-form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java b/designer-form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java index 5afe30d38..0122fc971 100644 --- a/designer-form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java +++ b/designer-form/src/com/fr/design/designer/creator/XWAbsoluteLayout.java @@ -4,7 +4,7 @@ package com.fr.design.designer.creator; import com.fr.base.GraphHelper; -import com.fr.base.iofileattr.SharableAttrMark; +import com.fr.base.iofile.attr.SharableAttrMark; import com.fr.design.constants.UIConstants; import com.fr.design.designer.beans.AdapterBus; import com.fr.design.designer.beans.ComponentAdapter; 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 3cfc9a426..9a32c3987 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 @@ -4,7 +4,7 @@ package com.fr.design.designer.creator.cardlayout; import com.fr.base.GraphHelper; -import com.fr.base.iofileattr.SharableAttrMark; +import com.fr.base.iofile.attr.SharableAttrMark; import com.fr.design.constants.UIConstants; import com.fr.design.designer.beans.AdapterBus; import com.fr.design.designer.beans.ComponentAdapter; diff --git a/designer-form/src/com/fr/design/mainframe/FormDesignerUI.java b/designer-form/src/com/fr/design/mainframe/FormDesignerUI.java index 724225b12..959644ec8 100644 --- a/designer-form/src/com/fr/design/mainframe/FormDesignerUI.java +++ b/designer-form/src/com/fr/design/mainframe/FormDesignerUI.java @@ -1,14 +1,12 @@ package com.fr.design.mainframe; import java.awt.AlphaComposite; -import java.awt.Color; import java.awt.Component; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Rectangle; import java.awt.geom.Area; import java.awt.geom.Rectangle2D; -import java.awt.image.BufferedImage; import java.util.ArrayList; import javax.swing.JComponent; @@ -19,7 +17,7 @@ import com.fr.base.BaseUtils; import com.fr.base.GraphHelper; import com.fr.base.ScreenResolution; import com.fr.base.Utils; -import com.fr.base.iofileattr.WatermarkAttr; +import com.fr.base.iofile.attr.WatermarkAttr; import com.fr.design.constants.UIConstants; import com.fr.design.designer.beans.AdapterBus; import com.fr.design.designer.beans.ComponentAdapter; @@ -37,8 +35,6 @@ import com.fr.general.Inter; import com.fr.page.WatermarkPainter; import com.fr.report.core.ReportUtils; import com.fr.stable.ArrayUtils; -import com.fr.stable.Constants; -import com.fr.stable.CoreGraphHelper; /** * FormDesigner的UI类，是一个有状态的UI类，它根据FormDesigner的当前状态画出 diff --git a/designer-form/src/com/fr/design/mainframe/ShareWidgetButton.java b/designer-form/src/com/fr/design/mainframe/ShareWidgetButton.java index d6d9f307a..cbca8c4f8 100644 --- a/designer-form/src/com/fr/design/mainframe/ShareWidgetButton.java +++ b/designer-form/src/com/fr/design/mainframe/ShareWidgetButton.java @@ -1,7 +1,7 @@ package com.fr.design.mainframe; import com.fr.base.BaseUtils; -import com.fr.base.iofileattr.SharableAttrMark; +import com.fr.base.iofile.attr.SharableAttrMark; import com.fr.design.designer.creator.XCreator; import com.fr.design.designer.creator.XCreatorUtils; import com.fr.design.gui.ilable.UILabel; diff --git a/designer-form/src/com/fr/design/mainframe/actions/FormMobileAttrAction.java b/designer-form/src/com/fr/design/mainframe/actions/FormMobileAttrAction.java index 0287438fc..4670d0e87 100644 --- a/designer-form/src/com/fr/design/mainframe/actions/FormMobileAttrAction.java +++ b/designer-form/src/com/fr/design/mainframe/actions/FormMobileAttrAction.java @@ -1,7 +1,7 @@ package com.fr.design.mainframe.actions; import com.fr.base.BaseUtils; -import com.fr.base.iofileattr.MobileOnlyTemplateAttrMark; +import com.fr.base.iofile.attr.MobileOnlyTemplateAttrMark; import com.fr.design.actions.JTemplateAction; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; diff --git a/designer-form/src/com/fr/design/mainframe/widget/accessibles/AccessibleBodyWatermarkEditor.java b/designer-form/src/com/fr/design/mainframe/widget/accessibles/AccessibleBodyWatermarkEditor.java index a3cd042fa..b6de59857 100644 --- a/designer-form/src/com/fr/design/mainframe/widget/accessibles/AccessibleBodyWatermarkEditor.java +++ b/designer-form/src/com/fr/design/mainframe/widget/accessibles/AccessibleBodyWatermarkEditor.java @@ -1,6 +1,6 @@ package com.fr.design.mainframe.widget.accessibles; -import com.fr.base.iofileattr.WatermarkAttr; +import com.fr.base.iofile.attr.WatermarkAttr; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.mainframe.widget.editors.ITextComponent; diff --git a/designer-form/src/com/fr/design/mainframe/widget/wrappers/WatermarkWrapper.java b/designer-form/src/com/fr/design/mainframe/widget/wrappers/WatermarkWrapper.java index a807f03bb..061be241d 100644 --- a/designer-form/src/com/fr/design/mainframe/widget/wrappers/WatermarkWrapper.java +++ b/designer-form/src/com/fr/design/mainframe/widget/wrappers/WatermarkWrapper.java @@ -1,6 +1,6 @@ package com.fr.design.mainframe.widget.wrappers; -import com.fr.base.iofileattr.WatermarkAttr; +import com.fr.base.iofile.attr.WatermarkAttr; import com.fr.design.Exception.ValidationException; import com.fr.design.designer.properties.Decoder; import com.fr.design.designer.properties.Encoder; diff --git a/designer-form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java b/designer-form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java index fdbe0b24f..f895118f1 100644 --- a/designer-form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java +++ b/designer-form/src/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java @@ -1,7 +1,7 @@ package com.fr.design.widget.ui.designer.layout; import com.fr.base.io.IOFile; -import com.fr.base.iofileattr.WatermarkAttr; +import com.fr.base.iofile.attr.WatermarkAttr; import com.fr.design.data.DataCreatorUI; import com.fr.design.designer.IntervalConstants; import com.fr.design.designer.creator.XCreator; diff --git a/designer-form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java b/designer-form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java index f17716ec2..a3cb01eb2 100644 --- a/designer-form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java +++ b/designer-form/src/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java @@ -1,7 +1,7 @@ package com.fr.design.widget.ui.designer.layout; import com.fr.base.io.IOFile; -import com.fr.base.iofileattr.WatermarkAttr; +import com.fr.base.iofile.attr.WatermarkAttr; import com.fr.design.data.DataCreatorUI; import com.fr.design.designer.IntervalConstants; import com.fr.design.designer.creator.XCreator; diff --git a/designer-realize/src/com/fr/design/actions/report/ReportMobileAttrAction.java b/designer-realize/src/com/fr/design/actions/report/ReportMobileAttrAction.java index f6acfb251..d718c92fe 100644 --- a/designer-realize/src/com/fr/design/actions/report/ReportMobileAttrAction.java +++ b/designer-realize/src/com/fr/design/actions/report/ReportMobileAttrAction.java @@ -1,6 +1,6 @@ package com.fr.design.actions.report; -import com.fr.base.iofileattr.MobileOnlyTemplateAttrMark; +import com.fr.base.iofile.attr.MobileOnlyTemplateAttrMark; import com.fr.design.actions.JWorkBookAction; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; diff --git a/designer-realize/src/com/fr/design/actions/report/ReportWatermarkAction.java b/designer-realize/src/com/fr/design/actions/report/ReportWatermarkAction.java index e16063c1b..bec8fb217 100644 --- a/designer-realize/src/com/fr/design/actions/report/ReportWatermarkAction.java +++ b/designer-realize/src/com/fr/design/actions/report/ReportWatermarkAction.java @@ -1,7 +1,7 @@ package com.fr.design.actions.report; import com.fr.base.BaseUtils; -import com.fr.base.iofileattr.WatermarkAttr; +import com.fr.base.iofile.attr.WatermarkAttr; import com.fr.design.actions.JWorkBookAction; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.mainframe.DesignerContext; diff --git a/designer-realize/src/com/fr/grid/GridUI.java b/designer-realize/src/com/fr/grid/GridUI.java index 4c240880c..8577212dc 100644 --- a/designer-realize/src/com/fr/grid/GridUI.java +++ b/designer-realize/src/com/fr/grid/GridUI.java @@ -10,7 +10,7 @@ import com.fr.base.PaperSize; import com.fr.base.Utils; import com.fr.base.background.ColorBackground; import com.fr.base.background.ImageFileBackground; -import com.fr.base.iofileattr.WatermarkAttr; +import com.fr.base.iofile.attr.WatermarkAttr; import com.fr.design.constants.UIConstants; import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.mainframe.DesignerContext; @@ -24,7 +24,6 @@ import com.fr.grid.selection.FloatSelection; import com.fr.grid.selection.Selection; import com.fr.main.FineBook; import com.fr.page.PaperSettingProvider; -import com.fr.page.ReportPage; import com.fr.page.ReportSettingsProvider; import com.fr.page.WatermarkPainter; import com.fr.report.ReportHelper;