无JIRA任务，修改包名

6 years ago · 0f78972703
15 changed files with 15 additions and 20 deletions
--- 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;
--- 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;
--- 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;

--- 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;
--- 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;
--- 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的当前状态画出
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;
--- 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;