From d44cba8bedb86d044f757f1a24cdc8174bb835e5 Mon Sep 17 00:00:00 2001 From: richie Date: Wed, 25 Sep 2019 16:03:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/fanruan/api/design/chart/BaseOtherPane.java | 2 +- .../java/com/fanruan/api/design/chart/DefaultTypePane.java | 2 +- .../api/design/chart/field/BaseCellDataFieldsPane.java | 2 +- .../fanruan/api/design/chart/field/BaseDataSetFieldsPane.java | 2 +- .../fanruan/api/{engine => report}/chart/BaseChartType.java | 2 +- .../api/{engine => report}/chart/BaseChartWithData.java | 4 ++-- .../chart/field/BaseColumnFieldCollection.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename src/main/java/com/fanruan/api/{engine => report}/chart/BaseChartType.java (96%) rename src/main/java/com/fanruan/api/{engine => report}/chart/BaseChartWithData.java (94%) rename src/main/java/com/fanruan/api/{engine => report}/chart/field/BaseColumnFieldCollection.java (83%) diff --git a/src/main/java/com/fanruan/api/design/chart/BaseOtherPane.java b/src/main/java/com/fanruan/api/design/chart/BaseOtherPane.java index d60b489..25ad5ce 100644 --- a/src/main/java/com/fanruan/api/design/chart/BaseOtherPane.java +++ b/src/main/java/com/fanruan/api/design/chart/BaseOtherPane.java @@ -1,6 +1,6 @@ package com.fanruan.api.design.chart; -import com.fanruan.api.engine.chart.BaseChartWithData; +import com.fanruan.api.report.chart.BaseChartWithData; import com.fr.design.chartx.impl.AbstractOtherPane; import javax.swing.JPanel; diff --git a/src/main/java/com/fanruan/api/design/chart/DefaultTypePane.java b/src/main/java/com/fanruan/api/design/chart/DefaultTypePane.java index 37e86e5..298225a 100644 --- a/src/main/java/com/fanruan/api/design/chart/DefaultTypePane.java +++ b/src/main/java/com/fanruan/api/design/chart/DefaultTypePane.java @@ -1,6 +1,6 @@ package com.fanruan.api.design.chart; -import com.fanruan.api.engine.chart.BaseChartWithData; +import com.fanruan.api.report.chart.BaseChartWithData; import com.fr.chart.charttypes.ChartTypeManager; import com.fr.chartx.attr.ChartProvider; import com.fr.design.ChartTypeInterfaceManager; diff --git a/src/main/java/com/fanruan/api/design/chart/field/BaseCellDataFieldsPane.java b/src/main/java/com/fanruan/api/design/chart/field/BaseCellDataFieldsPane.java index 590e01a..874f2f0 100644 --- a/src/main/java/com/fanruan/api/design/chart/field/BaseCellDataFieldsPane.java +++ b/src/main/java/com/fanruan/api/design/chart/field/BaseCellDataFieldsPane.java @@ -1,7 +1,7 @@ package com.fanruan.api.design.chart.field; import com.fanruan.api.design.ui.component.formula.UIFormulaTextField; -import com.fanruan.api.engine.chart.field.BaseColumnFieldCollection; +import com.fanruan.api.report.chart.field.BaseColumnFieldCollection; import com.fr.chartx.data.field.ColumnField; import com.fr.design.chartx.fields.AbstractCellDataFieldsPane; diff --git a/src/main/java/com/fanruan/api/design/chart/field/BaseDataSetFieldsPane.java b/src/main/java/com/fanruan/api/design/chart/field/BaseDataSetFieldsPane.java index 36e01be..fd375a3 100644 --- a/src/main/java/com/fanruan/api/design/chart/field/BaseDataSetFieldsPane.java +++ b/src/main/java/com/fanruan/api/design/chart/field/BaseDataSetFieldsPane.java @@ -2,7 +2,7 @@ package com.fanruan.api.design.chart.field; import com.fanruan.api.design.ui.component.UIComboBox; import com.fanruan.api.design.ui.component.chart.CalculateComboBox; -import com.fanruan.api.engine.chart.field.BaseColumnFieldCollection; +import com.fanruan.api.report.chart.field.BaseColumnFieldCollection; import com.fr.chartx.data.field.ColumnField; import com.fr.design.chartx.fields.AbstractDataSetFieldsPane; import com.fr.general.GeneralUtils; diff --git a/src/main/java/com/fanruan/api/engine/chart/BaseChartType.java b/src/main/java/com/fanruan/api/report/chart/BaseChartType.java similarity index 96% rename from src/main/java/com/fanruan/api/engine/chart/BaseChartType.java rename to src/main/java/com/fanruan/api/report/chart/BaseChartType.java index 1886f8f..d0a5a8a 100644 --- a/src/main/java/com/fanruan/api/engine/chart/BaseChartType.java +++ b/src/main/java/com/fanruan/api/report/chart/BaseChartType.java @@ -1,4 +1,4 @@ -package com.fanruan.api.engine.chart; +package com.fanruan.api.report.chart; import com.fr.chart.impl.AbstractChartType; diff --git a/src/main/java/com/fanruan/api/engine/chart/BaseChartWithData.java b/src/main/java/com/fanruan/api/report/chart/BaseChartWithData.java similarity index 94% rename from src/main/java/com/fanruan/api/engine/chart/BaseChartWithData.java rename to src/main/java/com/fanruan/api/report/chart/BaseChartWithData.java index e53acfd..fcedd04 100644 --- a/src/main/java/com/fanruan/api/engine/chart/BaseChartWithData.java +++ b/src/main/java/com/fanruan/api/report/chart/BaseChartWithData.java @@ -1,6 +1,6 @@ -package com.fanruan.api.engine.chart; +package com.fanruan.api.report.chart; -import com.fanruan.api.engine.chart.field.BaseColumnFieldCollection; +import com.fanruan.api.report.chart.field.BaseColumnFieldCollection; import com.fr.base.chart.cross.FormulaProcessor; import com.fr.chart.ChartWebPara; import com.fr.chart.impl.AbstractChartWithData; diff --git a/src/main/java/com/fanruan/api/engine/chart/field/BaseColumnFieldCollection.java b/src/main/java/com/fanruan/api/report/chart/field/BaseColumnFieldCollection.java similarity index 83% rename from src/main/java/com/fanruan/api/engine/chart/field/BaseColumnFieldCollection.java rename to src/main/java/com/fanruan/api/report/chart/field/BaseColumnFieldCollection.java index 9d8bceb..cf081d5 100644 --- a/src/main/java/com/fanruan/api/engine/chart/field/BaseColumnFieldCollection.java +++ b/src/main/java/com/fanruan/api/report/chart/field/BaseColumnFieldCollection.java @@ -1,4 +1,4 @@ -package com.fanruan.api.engine.chart.field; +package com.fanruan.api.report.chart.field; import com.fr.chartx.data.field.AbstractColumnFieldCollection;