From e1723d3e8cd04ef7a094c09410a95d454f0a6a4a Mon Sep 17 00:00:00 2001 From: zhenxiong han Date: Wed, 19 May 2021 14:45:16 +0800 Subject: [PATCH 1/8] update package --- achartengine/.gitignore | 1 - achartengine/achartengine-achartengine.iml | 53 ----------- achartengine/achartengine.iml | 43 --------- achartengine/src/main/config.json | 2 +- .../achartengine/GraphicalView.java | 33 +++---- .../achartengine/ITouchHandler.java | 7 +- .../achartengine/TouchHandler.java | 19 ++-- .../achartengine/chart/AbstractChart.java | 14 +-- .../achartengine/chart/BarChart.java | 15 ++-- .../achartengine/chart/BubbleChart.java | 12 +-- .../achartengine/chart/ClickableArea.java | 2 +- .../achartengine/chart/CombinedXYChart.java | 14 +-- .../achartengine/chart/CubicLineChart.java | 10 +-- .../achartengine/chart/DialChart.java | 11 ++- .../achartengine/chart/DoughnutChart.java | 8 +- .../achartengine/chart/LineChart.java | 12 +-- .../achartengine/chart/PieChart.java | 15 ++-- .../achartengine/chart/PieMapper.java | 6 +- .../achartengine/chart/PieSegment.java | 2 +- .../achartengine/chart/PointStyle.java | 2 +- .../achartengine/chart/RangeBarChart.java | 10 +-- .../chart/RangeStackedBarChart.java | 2 +- .../achartengine/chart/RoundChart.java | 8 +- .../achartengine/chart/ScatterChart.java | 10 +-- .../achartengine/chart/TimeChart.java | 8 +- .../achartengine/chart/XYChart.java | 18 ++-- .../achartengine/model/CategorySeries.java | 2 +- .../model/MultipleCategorySeries.java | 2 +- .../achartengine/model/Point.java | 2 +- .../model/RangeCategorySeries.java | 2 +- .../achartengine/model/SeriesSelection.java | 2 +- .../achartengine/model/TimeSeries.java | 2 +- .../model/XYMultipleSeriesDataset.java | 2 +- .../achartengine/model/XYSeries.java | 8 +- .../achartengine/model/XYValueSeries.java | 4 +- .../achartengine/renderer/BasicStroke.java | 2 +- .../renderer/DefaultRenderer.java | 2 +- .../achartengine/renderer/DialRenderer.java | 4 +- .../renderer/SimpleSeriesRenderer.java | 2 +- .../renderer/XYMultipleSeriesRenderer.java | 4 +- .../renderer/XYSeriesRenderer.java | 4 +- .../achartengine/tools/AbstractTool.java | 8 +- .../achartengine/tools/FitZoom.java | 14 +-- .../{org => com}/achartengine/tools/Pan.java | 8 +- .../achartengine/tools/PanListener.java | 2 +- .../{org => com}/achartengine/tools/Zoom.java | 10 +-- .../achartengine/tools/ZoomEvent.java | 2 +- .../achartengine/tools/ZoomListener.java | 2 +- .../achartengine/util/IndexXYMap.java | 2 +- .../achartengine/util/MathHelper.java | 2 +- .../achartengine/util/XYEntry.java | 2 +- entry/src/main/config.json | 14 +-- .../chartdemo}/demo/ChartDemoAbility.java | 10 +-- .../chartdemo}/demo/ChartFactory.java | 90 +++++++++---------- .../demo/GeneratedChartDemoAbility.java | 4 +- .../chartdemo}/demo/GraphicalAbility.java | 2 +- .../chartdemo}/demo/GraphicalActivity.java | 8 +- .../chartdemo}/demo/MainAbility.java | 4 +- .../chartdemo}/demo/MyApplication.java | 2 +- .../demo/PieChartBuilderAbility.java | 4 +- .../chartdemo}/demo/SampleItem.java | 2 +- .../chartdemo}/demo/SampleItemProvider.java | 3 +- .../demo/chart/AbstractDemoChart.java | 18 ++-- .../chart/AverageCubicTemperatureChart.java | 10 +-- .../demo/chart/AverageTemperatureChart.java | 14 +-- .../demo/chart/BudgetDoughnutChart.java | 6 +- .../chartdemo}/demo/chart/BudgetPieChart.java | 8 +- .../demo/chart/CombinedTemperatureChart.java | 18 ++-- .../chartdemo}/demo/chart/IDemoChart.java | 2 +- .../demo/chart/MultipleTemperatureChart.java | 12 +-- .../demo/chart/ProjectStatusBubbleChart.java | 12 +-- .../demo/chart/ProjectStatusChart.java | 10 +-- .../chartdemo}/demo/chart/SalesBarChart.java | 12 +-- .../demo/chart/SalesComparisonChart.java | 12 +-- .../demo/chart/SalesGrowthChart.java | 12 +-- .../demo/chart/SalesStackedBarChart.java | 10 +-- .../chartdemo}/demo/chart/ScatterChart.java | 11 ++- .../demo/chart/SensorValuesChart.java | 12 +-- .../demo/chart/TemperatureChart.java | 14 +-- .../chart/TrigonometricFunctionsChart.java | 8 +- .../demo/chart/WeightDialChart.java | 12 +-- .../demo/chart/XYCharBuilderAbility.java | 3 +- .../chartdemo}/demo/chart/XYChartBuilder.java | 20 ++--- .../chartdemo}/demo/slice/ChartDemo.java | 24 +++-- .../demo/slice/GeneratedChartDemo.java | 31 ++++--- .../demo/slice/MainAbilitySlice.java | 4 +- .../demo/slice/PieChartBuilder.java | 16 ++-- 87 files changed, 379 insertions(+), 508 deletions(-) delete mode 100644 achartengine/.gitignore delete mode 100644 achartengine/achartengine-achartengine.iml delete mode 100644 achartengine/achartengine.iml rename achartengine/src/main/java/{org => com}/achartengine/GraphicalView.java (94%) rename achartengine/src/main/java/{org => com}/achartengine/ITouchHandler.java (90%) rename achartengine/src/main/java/{org => com}/achartengine/TouchHandler.java (93%) rename achartengine/src/main/java/{org => com}/achartengine/chart/AbstractChart.java (97%) rename achartengine/src/main/java/{org => com}/achartengine/chart/BarChart.java (96%) rename achartengine/src/main/java/{org => com}/achartengine/chart/BubbleChart.java (94%) rename achartengine/src/main/java/{org => com}/achartengine/chart/ClickableArea.java (96%) rename achartengine/src/main/java/{org => com}/achartengine/chart/CombinedXYChart.java (95%) rename achartengine/src/main/java/{org => com}/achartengine/chart/CubicLineChart.java (95%) rename achartengine/src/main/java/{org => com}/achartengine/chart/DialChart.java (96%) rename achartengine/src/main/java/{org => com}/achartengine/chart/DoughnutChart.java (96%) rename achartengine/src/main/java/{org => com}/achartengine/chart/LineChart.java (96%) rename achartengine/src/main/java/{org => com}/achartengine/chart/PieChart.java (94%) rename achartengine/src/main/java/{org => com}/achartengine/chart/PieMapper.java (97%) rename achartengine/src/main/java/{org => com}/achartengine/chart/PieSegment.java (98%) rename achartengine/src/main/java/{org => com}/achartengine/chart/PointStyle.java (98%) rename achartengine/src/main/java/{org => com}/achartengine/chart/RangeBarChart.java (95%) rename achartengine/src/main/java/{org => com}/achartengine/chart/RangeStackedBarChart.java (96%) rename achartengine/src/main/java/{org => com}/achartengine/chart/RoundChart.java (95%) rename achartengine/src/main/java/{org => com}/achartengine/chart/ScatterChart.java (97%) rename achartengine/src/main/java/{org => com}/achartengine/chart/TimeChart.java (97%) rename achartengine/src/main/java/{org => com}/achartengine/chart/XYChart.java (99%) rename achartengine/src/main/java/{org => com}/achartengine/model/CategorySeries.java (99%) rename achartengine/src/main/java/{org => com}/achartengine/model/MultipleCategorySeries.java (99%) rename achartengine/src/main/java/{org => com}/achartengine/model/Point.java (97%) rename achartengine/src/main/java/{org => com}/achartengine/model/RangeCategorySeries.java (98%) rename achartengine/src/main/java/{org => com}/achartengine/model/SeriesSelection.java (97%) rename achartengine/src/main/java/{org => com}/achartengine/model/TimeSeries.java (97%) rename achartengine/src/main/java/{org => com}/achartengine/model/XYMultipleSeriesDataset.java (98%) rename achartengine/src/main/java/{org => com}/achartengine/model/XYSeries.java (98%) rename achartengine/src/main/java/{org => com}/achartengine/model/XYValueSeries.java (97%) rename achartengine/src/main/java/{org => com}/achartengine/renderer/BasicStroke.java (98%) rename achartengine/src/main/java/{org => com}/achartengine/renderer/DefaultRenderer.java (99%) rename achartengine/src/main/java/{org => com}/achartengine/renderer/DialRenderer.java (98%) rename achartengine/src/main/java/{org => com}/achartengine/renderer/SimpleSeriesRenderer.java (99%) rename achartengine/src/main/java/{org => com}/achartengine/renderer/XYMultipleSeriesRenderer.java (99%) rename achartengine/src/main/java/{org => com}/achartengine/renderer/XYSeriesRenderer.java (99%) rename achartengine/src/main/java/{org => com}/achartengine/tools/AbstractTool.java (94%) rename achartengine/src/main/java/{org => com}/achartengine/tools/FitZoom.java (89%) rename achartengine/src/main/java/{org => com}/achartengine/tools/Pan.java (96%) rename achartengine/src/main/java/{org => com}/achartengine/tools/PanListener.java (95%) rename achartengine/src/main/java/{org => com}/achartengine/tools/Zoom.java (96%) rename achartengine/src/main/java/{org => com}/achartengine/tools/ZoomEvent.java (97%) rename achartengine/src/main/java/{org => com}/achartengine/tools/ZoomListener.java (96%) rename achartengine/src/main/java/{org => com}/achartengine/util/IndexXYMap.java (98%) rename achartengine/src/main/java/{org => com}/achartengine/util/MathHelper.java (99%) rename achartengine/src/main/java/{org => com}/achartengine/util/XYEntry.java (97%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/ChartDemoAbility.java (77%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/ChartFactory.java (92%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/GeneratedChartDemoAbility.java (89%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/GraphicalAbility.java (95%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/GraphicalActivity.java (89%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/MainAbility.java (72%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/MyApplication.java (81%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/PieChartBuilderAbility.java (89%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/SampleItem.java (87%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/SampleItemProvider.java (93%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/AbstractDemoChart.java (93%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/AverageCubicTemperatureChart.java (92%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/AverageTemperatureChart.java (91%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/BudgetDoughnutChart.java (93%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/BudgetPieChart.java (91%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/CombinedTemperatureChart.java (92%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/IDemoChart.java (96%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/MultipleTemperatureChart.java (92%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/ProjectStatusBubbleChart.java (90%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/ProjectStatusChart.java (93%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/SalesBarChart.java (89%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/SalesComparisonChart.java (91%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/SalesGrowthChart.java (91%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/SalesStackedBarChart.java (91%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/ScatterChart.java (91%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/SensorValuesChart.java (91%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/TemperatureChart.java (89%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/TrigonometricFunctionsChart.java (92%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/WeightDialChart.java (88%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/XYCharBuilderAbility.java (90%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/chart/XYChartBuilder.java (93%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/slice/ChartDemo.java (87%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/slice/GeneratedChartDemo.java (93%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/slice/MainAbilitySlice.java (82%) rename entry/src/main/java/{com/achartengine => org/achartengine/chartdemo}/demo/slice/PieChartBuilder.java (91%) diff --git a/achartengine/.gitignore b/achartengine/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/achartengine/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/achartengine/achartengine-achartengine.iml b/achartengine/achartengine-achartengine.iml deleted file mode 100644 index 6a5abab..0000000 --- a/achartengine/achartengine-achartengine.iml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/achartengine/achartengine.iml b/achartengine/achartengine.iml deleted file mode 100644 index cb5ab36..0000000 --- a/achartengine/achartengine.iml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/achartengine/src/main/config.json b/achartengine/src/main/config.json index 5fd5111..587bb8d 100644 --- a/achartengine/src/main/config.json +++ b/achartengine/src/main/config.json @@ -1,6 +1,6 @@ { "app": { - "bundleName": "com.achartengine.demo", + "bundleName": "com.achartengine", "vendor": "achartengine", "version": { "code": 1, diff --git a/achartengine/src/main/java/org/achartengine/GraphicalView.java b/achartengine/src/main/java/com/achartengine/GraphicalView.java similarity index 94% rename from achartengine/src/main/java/org/achartengine/GraphicalView.java rename to achartengine/src/main/java/com/achartengine/GraphicalView.java index f3efca5..e7a7474 100644 --- a/achartengine/src/main/java/org/achartengine/GraphicalView.java +++ b/achartengine/src/main/java/com/achartengine/GraphicalView.java @@ -13,14 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine; +package com.achartengine; import ohos.agp.components.Component; -import ohos.agp.components.DragEvent; -import ohos.agp.components.element.Element; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; -import ohos.agp.render.PixelMapHolder; import ohos.agp.utils.Color; import ohos.agp.utils.DimensFloat; import ohos.agp.utils.Rect; @@ -28,28 +25,22 @@ import ohos.agp.utils.RectFloat; import ohos.app.Context; import ohos.eventhandler.EventHandler; import ohos.eventhandler.EventRunner; -import ohos.global.systemres.ResourceTable; import ohos.hiviewdfx.HiLog; import ohos.hiviewdfx.HiLogLabel; -import ohos.media.image.ImageSource; import ohos.media.image.PixelMap; import ohos.multimodalinput.event.MmiPoint; import ohos.multimodalinput.event.TouchEvent; -import org.achartengine.chart.AbstractChart; -import org.achartengine.chart.RoundChart; -import org.achartengine.chart.XYChart; -import org.achartengine.model.Point; -import org.achartengine.model.SeriesSelection; -import org.achartengine.renderer.DefaultRenderer; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.tools.FitZoom; -import org.achartengine.tools.PanListener; -import org.achartengine.tools.Zoom; -import org.achartengine.tools.ZoomListener; - - -import java.io.IOException; -import java.util.logging.Handler; +import com.achartengine.chart.AbstractChart; +import com.achartengine.chart.RoundChart; +import com.achartengine.chart.XYChart; +import com.achartengine.model.Point; +import com.achartengine.model.SeriesSelection; +import com.achartengine.renderer.DefaultRenderer; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.tools.FitZoom; +import com.achartengine.tools.PanListener; +import com.achartengine.tools.Zoom; +import com.achartengine.tools.ZoomListener; /** * The view that encapsulates the graphical chart. diff --git a/achartengine/src/main/java/org/achartengine/ITouchHandler.java b/achartengine/src/main/java/com/achartengine/ITouchHandler.java similarity index 90% rename from achartengine/src/main/java/org/achartengine/ITouchHandler.java rename to achartengine/src/main/java/com/achartengine/ITouchHandler.java index 88aecba..16dda1a 100644 --- a/achartengine/src/main/java/org/achartengine/ITouchHandler.java +++ b/achartengine/src/main/java/com/achartengine/ITouchHandler.java @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine; +package com.achartengine; -import ohos.agp.components.DragEvent; import ohos.multimodalinput.event.TouchEvent; -import org.achartengine.tools.PanListener; -import org.achartengine.tools.ZoomListener; +import com.achartengine.tools.PanListener; +import com.achartengine.tools.ZoomListener; diff --git a/achartengine/src/main/java/org/achartengine/TouchHandler.java b/achartengine/src/main/java/com/achartengine/TouchHandler.java similarity index 93% rename from achartengine/src/main/java/org/achartengine/TouchHandler.java rename to achartengine/src/main/java/com/achartengine/TouchHandler.java index 3344e4b..dd5c948 100644 --- a/achartengine/src/main/java/org/achartengine/TouchHandler.java +++ b/achartengine/src/main/java/com/achartengine/TouchHandler.java @@ -13,20 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine; +package com.achartengine; -import ohos.agp.components.DragEvent; import ohos.agp.utils.RectFloat; import ohos.multimodalinput.event.MmiPoint; import ohos.multimodalinput.event.TouchEvent; -import org.achartengine.chart.AbstractChart; -import org.achartengine.chart.RoundChart; -import org.achartengine.chart.XYChart; -import org.achartengine.renderer.DefaultRenderer; -import org.achartengine.tools.Pan; -import org.achartengine.tools.PanListener; -import org.achartengine.tools.Zoom; -import org.achartengine.tools.ZoomListener; +import com.achartengine.chart.AbstractChart; +import com.achartengine.chart.RoundChart; +import com.achartengine.chart.XYChart; +import com.achartengine.renderer.DefaultRenderer; +import com.achartengine.tools.Pan; +import com.achartengine.tools.PanListener; +import com.achartengine.tools.Zoom; +import com.achartengine.tools.ZoomListener; /** diff --git a/achartengine/src/main/java/org/achartengine/chart/AbstractChart.java b/achartengine/src/main/java/com/achartengine/chart/AbstractChart.java similarity index 97% rename from achartengine/src/main/java/org/achartengine/chart/AbstractChart.java rename to achartengine/src/main/java/com/achartengine/chart/AbstractChart.java index e12090c..e508b66 100644 --- a/achartengine/src/main/java/org/achartengine/chart/AbstractChart.java +++ b/achartengine/src/main/java/com/achartengine/chart/AbstractChart.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chart; +package com.achartengine.chart; -import org.achartengine.model.SeriesSelection; -import org.achartengine.renderer.DefaultRenderer; -import org.achartengine.renderer.SimpleSeriesRenderer; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.util.MathHelper; +import com.achartengine.model.SeriesSelection; +import com.achartengine.renderer.DefaultRenderer; +import com.achartengine.renderer.SimpleSeriesRenderer; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.util.MathHelper; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.render.Path; @@ -515,7 +515,7 @@ public abstract class AbstractChart implements Serializable { * @param screenPoint * @return the series and point indexes */ - public SeriesSelection getSeriesAndPointForScreenCoordinate(org.achartengine.model.Point screenPoint) { + public SeriesSelection getSeriesAndPointForScreenCoordinate(com.achartengine.model.Point screenPoint) { return null; } diff --git a/achartengine/src/main/java/org/achartengine/chart/BarChart.java b/achartengine/src/main/java/com/achartengine/chart/BarChart.java similarity index 96% rename from achartengine/src/main/java/org/achartengine/chart/BarChart.java rename to achartengine/src/main/java/com/achartengine/chart/BarChart.java index a8c1bfb..3a7f19a 100644 --- a/achartengine/src/main/java/org/achartengine/chart/BarChart.java +++ b/achartengine/src/main/java/com/achartengine/chart/BarChart.java @@ -13,22 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chart; +package com.achartengine.chart; import java.util.List; -import ohos.agp.colors.RgbColor; -import ohos.agp.components.element.ShapeElement; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.utils.Color; import ohos.agp.utils.RectFloat; -import org.achartengine.model.Point; -import org.achartengine.model.XYMultipleSeriesDataset; -import org.achartengine.model.XYSeries; -import org.achartengine.renderer.SimpleSeriesRenderer; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; +import com.achartengine.model.XYMultipleSeriesDataset; +import com.achartengine.model.XYSeries; +import com.achartengine.renderer.SimpleSeriesRenderer; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; diff --git a/achartengine/src/main/java/org/achartengine/chart/BubbleChart.java b/achartengine/src/main/java/com/achartengine/chart/BubbleChart.java similarity index 94% rename from achartengine/src/main/java/org/achartengine/chart/BubbleChart.java rename to achartengine/src/main/java/com/achartengine/chart/BubbleChart.java index 4acd708..f932692 100644 --- a/achartengine/src/main/java/org/achartengine/chart/BubbleChart.java +++ b/achartengine/src/main/java/com/achartengine/chart/BubbleChart.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chart; +package com.achartengine.chart; import java.util.List; @@ -21,11 +21,11 @@ import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.utils.Color; import ohos.agp.utils.RectFloat; -import org.achartengine.model.XYMultipleSeriesDataset; -import org.achartengine.model.XYValueSeries; -import org.achartengine.renderer.SimpleSeriesRenderer; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; +import com.achartengine.model.XYMultipleSeriesDataset; +import com.achartengine.model.XYValueSeries; +import com.achartengine.renderer.SimpleSeriesRenderer; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; diff --git a/achartengine/src/main/java/org/achartengine/chart/ClickableArea.java b/achartengine/src/main/java/com/achartengine/chart/ClickableArea.java similarity index 96% rename from achartengine/src/main/java/org/achartengine/chart/ClickableArea.java rename to achartengine/src/main/java/com/achartengine/chart/ClickableArea.java index a840d10..93f06ab 100644 --- a/achartengine/src/main/java/org/achartengine/chart/ClickableArea.java +++ b/achartengine/src/main/java/com/achartengine/chart/ClickableArea.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chart; +package com.achartengine.chart; import ohos.agp.utils.RectFloat; diff --git a/achartengine/src/main/java/org/achartengine/chart/CombinedXYChart.java b/achartengine/src/main/java/com/achartengine/chart/CombinedXYChart.java similarity index 95% rename from achartengine/src/main/java/org/achartengine/chart/CombinedXYChart.java rename to achartengine/src/main/java/com/achartengine/chart/CombinedXYChart.java index 928d24f..6de2085 100644 --- a/achartengine/src/main/java/org/achartengine/chart/CombinedXYChart.java +++ b/achartengine/src/main/java/com/achartengine/chart/CombinedXYChart.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chart; +package com.achartengine.chart; import java.io.Serializable; import java.util.List; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; -import org.achartengine.model.XYMultipleSeriesDataset; -import org.achartengine.model.XYSeries; -import org.achartengine.renderer.SimpleSeriesRenderer; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYMultipleSeriesRenderer.Orientation; -import org.achartengine.renderer.XYSeriesRenderer; +import com.achartengine.model.XYMultipleSeriesDataset; +import com.achartengine.model.XYSeries; +import com.achartengine.renderer.SimpleSeriesRenderer; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYMultipleSeriesRenderer.Orientation; +import com.achartengine.renderer.XYSeriesRenderer; diff --git a/achartengine/src/main/java/org/achartengine/chart/CubicLineChart.java b/achartengine/src/main/java/com/achartengine/chart/CubicLineChart.java similarity index 95% rename from achartengine/src/main/java/org/achartengine/chart/CubicLineChart.java rename to achartengine/src/main/java/com/achartengine/chart/CubicLineChart.java index 7c7d121..70035bb 100644 --- a/achartengine/src/main/java/org/achartengine/chart/CubicLineChart.java +++ b/achartengine/src/main/java/com/achartengine/chart/CubicLineChart.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chart; +package com.achartengine.chart; import java.util.List; @@ -21,10 +21,10 @@ import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.render.Path; import ohos.agp.render.PathMeasure; -import org.achartengine.model.Point; -import org.achartengine.model.XYMultipleSeriesDataset; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; +import com.achartengine.model.Point; +import com.achartengine.model.XYMultipleSeriesDataset; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; /** diff --git a/achartengine/src/main/java/org/achartengine/chart/DialChart.java b/achartengine/src/main/java/com/achartengine/chart/DialChart.java similarity index 96% rename from achartengine/src/main/java/org/achartengine/chart/DialChart.java rename to achartengine/src/main/java/com/achartengine/chart/DialChart.java index e1749af..d566167 100644 --- a/achartengine/src/main/java/org/achartengine/chart/DialChart.java +++ b/achartengine/src/main/java/com/achartengine/chart/DialChart.java @@ -13,17 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chart; +package com.achartengine.chart; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.utils.Color; import ohos.agp.utils.Point; -import org.achartengine.model.CategorySeries; -import org.achartengine.renderer.DefaultRenderer; -import org.achartengine.renderer.DialRenderer; -import org.achartengine.renderer.DialRenderer.Type; -import org.achartengine.util.MathHelper; +import com.achartengine.model.CategorySeries; +import com.achartengine.renderer.DialRenderer; +import com.achartengine.renderer.DialRenderer.Type; +import com.achartengine.util.MathHelper; diff --git a/achartengine/src/main/java/org/achartengine/chart/DoughnutChart.java b/achartengine/src/main/java/com/achartengine/chart/DoughnutChart.java similarity index 96% rename from achartengine/src/main/java/org/achartengine/chart/DoughnutChart.java rename to achartengine/src/main/java/com/achartengine/chart/DoughnutChart.java index 5272cad..5c52487 100644 --- a/achartengine/src/main/java/org/achartengine/chart/DoughnutChart.java +++ b/achartengine/src/main/java/com/achartengine/chart/DoughnutChart.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chart; +package com.achartengine.chart; import java.util.ArrayList; import java.util.List; @@ -23,9 +23,9 @@ import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.utils.Color; import ohos.agp.utils.RectFloat; -import org.achartengine.model.MultipleCategorySeries; -import org.achartengine.renderer.DefaultRenderer; -import org.achartengine.renderer.SimpleSeriesRenderer; +import com.achartengine.model.MultipleCategorySeries; +import com.achartengine.renderer.DefaultRenderer; +import com.achartengine.renderer.SimpleSeriesRenderer; diff --git a/achartengine/src/main/java/org/achartengine/chart/LineChart.java b/achartengine/src/main/java/com/achartengine/chart/LineChart.java similarity index 96% rename from achartengine/src/main/java/org/achartengine/chart/LineChart.java rename to achartengine/src/main/java/com/achartengine/chart/LineChart.java index 816b890..a64e4fd 100644 --- a/achartengine/src/main/java/org/achartengine/chart/LineChart.java +++ b/achartengine/src/main/java/com/achartengine/chart/LineChart.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chart; +package com.achartengine.chart; import java.util.ArrayList; import java.util.List; @@ -24,11 +24,11 @@ import ohos.agp.render.Picture; import ohos.agp.utils.Color; import ohos.agp.utils.Point; import ohos.agp.utils.RectFloat; -import org.achartengine.model.XYMultipleSeriesDataset; -import org.achartengine.renderer.SimpleSeriesRenderer; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer.FillOutsideLine; +import com.achartengine.model.XYMultipleSeriesDataset; +import com.achartengine.renderer.SimpleSeriesRenderer; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer.FillOutsideLine; diff --git a/achartengine/src/main/java/org/achartengine/chart/PieChart.java b/achartengine/src/main/java/com/achartengine/chart/PieChart.java similarity index 94% rename from achartengine/src/main/java/org/achartengine/chart/PieChart.java rename to achartengine/src/main/java/com/achartengine/chart/PieChart.java index 56b8521..edd197d 100644 --- a/achartengine/src/main/java/org/achartengine/chart/PieChart.java +++ b/achartengine/src/main/java/com/achartengine/chart/PieChart.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chart; +package com.achartengine.chart; import java.util.ArrayList; import java.util.List; @@ -21,16 +21,13 @@ import java.util.List; import ohos.agp.render.Arc; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; -import ohos.agp.render.Path; import ohos.agp.utils.Color; import ohos.agp.utils.RectFloat; -import ohos.hiviewdfx.HiLog; -import ohos.hiviewdfx.HiLogLabel; -import org.achartengine.model.CategorySeries; -import org.achartengine.model.Point; -import org.achartengine.model.SeriesSelection; -import org.achartengine.renderer.DefaultRenderer; -import org.achartengine.renderer.SimpleSeriesRenderer; +import com.achartengine.model.CategorySeries; +import com.achartengine.model.Point; +import com.achartengine.model.SeriesSelection; +import com.achartengine.renderer.DefaultRenderer; +import com.achartengine.renderer.SimpleSeriesRenderer; diff --git a/achartengine/src/main/java/org/achartengine/chart/PieMapper.java b/achartengine/src/main/java/com/achartengine/chart/PieMapper.java similarity index 97% rename from achartengine/src/main/java/org/achartengine/chart/PieMapper.java rename to achartengine/src/main/java/com/achartengine/chart/PieMapper.java index 87041b6..bd79895 100644 --- a/achartengine/src/main/java/org/achartengine/chart/PieMapper.java +++ b/achartengine/src/main/java/com/achartengine/chart/PieMapper.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chart; +package com.achartengine.chart; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.achartengine.model.Point; -import org.achartengine.model.SeriesSelection; +import com.achartengine.model.Point; +import com.achartengine.model.SeriesSelection; /** * PieChart Segment Selection Management. diff --git a/achartengine/src/main/java/org/achartengine/chart/PieSegment.java b/achartengine/src/main/java/com/achartengine/chart/PieSegment.java similarity index 98% rename from achartengine/src/main/java/org/achartengine/chart/PieSegment.java rename to achartengine/src/main/java/com/achartengine/chart/PieSegment.java index 003c616..89abf9b 100644 --- a/achartengine/src/main/java/org/achartengine/chart/PieSegment.java +++ b/achartengine/src/main/java/com/achartengine/chart/PieSegment.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chart; +package com.achartengine.chart; import java.io.Serializable; diff --git a/achartengine/src/main/java/org/achartengine/chart/PointStyle.java b/achartengine/src/main/java/com/achartengine/chart/PointStyle.java similarity index 98% rename from achartengine/src/main/java/org/achartengine/chart/PointStyle.java rename to achartengine/src/main/java/com/achartengine/chart/PointStyle.java index ce8f908..2a457d6 100644 --- a/achartengine/src/main/java/org/achartengine/chart/PointStyle.java +++ b/achartengine/src/main/java/com/achartengine/chart/PointStyle.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chart; +package com.achartengine.chart; /** * The chart point style enumerator. diff --git a/achartengine/src/main/java/org/achartengine/chart/RangeBarChart.java b/achartengine/src/main/java/com/achartengine/chart/RangeBarChart.java similarity index 95% rename from achartengine/src/main/java/org/achartengine/chart/RangeBarChart.java rename to achartengine/src/main/java/com/achartengine/chart/RangeBarChart.java index 2f8816b..1ed874c 100644 --- a/achartengine/src/main/java/org/achartengine/chart/RangeBarChart.java +++ b/achartengine/src/main/java/com/achartengine/chart/RangeBarChart.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chart; +package com.achartengine.chart; import java.util.List; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.utils.Color; -import org.achartengine.model.XYMultipleSeriesDataset; -import org.achartengine.model.XYSeries; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; +import com.achartengine.model.XYMultipleSeriesDataset; +import com.achartengine.model.XYSeries; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; diff --git a/achartengine/src/main/java/org/achartengine/chart/RangeStackedBarChart.java b/achartengine/src/main/java/com/achartengine/chart/RangeStackedBarChart.java similarity index 96% rename from achartengine/src/main/java/org/achartengine/chart/RangeStackedBarChart.java rename to achartengine/src/main/java/com/achartengine/chart/RangeStackedBarChart.java index 3a9c66b..2c523b3 100644 --- a/achartengine/src/main/java/org/achartengine/chart/RangeStackedBarChart.java +++ b/achartengine/src/main/java/com/achartengine/chart/RangeStackedBarChart.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chart; +package com.achartengine.chart; public class RangeStackedBarChart extends RangeBarChart { /** The chart type. */ diff --git a/achartengine/src/main/java/org/achartengine/chart/RoundChart.java b/achartengine/src/main/java/com/achartengine/chart/RoundChart.java similarity index 95% rename from achartengine/src/main/java/org/achartengine/chart/RoundChart.java rename to achartengine/src/main/java/com/achartengine/chart/RoundChart.java index 6746e40..e685ef2 100644 --- a/achartengine/src/main/java/org/achartengine/chart/RoundChart.java +++ b/achartengine/src/main/java/com/achartengine/chart/RoundChart.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chart; +package com.achartengine.chart; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.utils.Color; import ohos.agp.utils.RectFloat; -import org.achartengine.model.CategorySeries; -import org.achartengine.renderer.DefaultRenderer; -import org.achartengine.renderer.SimpleSeriesRenderer; +import com.achartengine.model.CategorySeries; +import com.achartengine.renderer.DefaultRenderer; +import com.achartengine.renderer.SimpleSeriesRenderer; /** diff --git a/achartengine/src/main/java/org/achartengine/chart/ScatterChart.java b/achartengine/src/main/java/com/achartengine/chart/ScatterChart.java similarity index 97% rename from achartengine/src/main/java/org/achartengine/chart/ScatterChart.java rename to achartengine/src/main/java/com/achartengine/chart/ScatterChart.java index da97450..7d6b17a 100644 --- a/achartengine/src/main/java/org/achartengine/chart/ScatterChart.java +++ b/achartengine/src/main/java/com/achartengine/chart/ScatterChart.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chart; +package com.achartengine.chart; import java.util.List; @@ -22,10 +22,10 @@ import ohos.agp.render.Paint; import ohos.agp.utils.Color; import ohos.agp.utils.Point; import ohos.agp.utils.RectFloat; -import org.achartengine.model.XYMultipleSeriesDataset; -import org.achartengine.renderer.SimpleSeriesRenderer; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; +import com.achartengine.model.XYMultipleSeriesDataset; +import com.achartengine.renderer.SimpleSeriesRenderer; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; diff --git a/achartengine/src/main/java/org/achartengine/chart/TimeChart.java b/achartengine/src/main/java/com/achartengine/chart/TimeChart.java similarity index 97% rename from achartengine/src/main/java/org/achartengine/chart/TimeChart.java rename to achartengine/src/main/java/com/achartengine/chart/TimeChart.java index e390d39..0815137 100644 --- a/achartengine/src/main/java/org/achartengine/chart/TimeChart.java +++ b/achartengine/src/main/java/com/achartengine/chart/TimeChart.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chart; +package com.achartengine.chart; import java.text.DateFormat; import java.text.SimpleDateFormat; @@ -25,9 +25,9 @@ import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.utils.Color; import ohos.agp.utils.Point; -import org.achartengine.model.XYMultipleSeriesDataset; -import org.achartengine.model.XYSeries; -import org.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.model.XYMultipleSeriesDataset; +import com.achartengine.model.XYSeries; +import com.achartengine.renderer.XYMultipleSeriesRenderer; diff --git a/achartengine/src/main/java/org/achartengine/chart/XYChart.java b/achartengine/src/main/java/com/achartengine/chart/XYChart.java similarity index 99% rename from achartengine/src/main/java/org/achartengine/chart/XYChart.java rename to achartengine/src/main/java/com/achartengine/chart/XYChart.java index 41d1a13..4c10f88 100644 --- a/achartengine/src/main/java/org/achartengine/chart/XYChart.java +++ b/achartengine/src/main/java/com/achartengine/chart/XYChart.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chart; +package com.achartengine.chart; -import org.achartengine.model.SeriesSelection; -import org.achartengine.model.XYMultipleSeriesDataset; -import org.achartengine.model.XYSeries; -import org.achartengine.renderer.*; -import org.achartengine.util.MathHelper; +import com.achartengine.model.SeriesSelection; +import com.achartengine.model.XYMultipleSeriesDataset; +import com.achartengine.model.XYSeries; +import com.achartengine.renderer.*; +import com.achartengine.util.MathHelper; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.render.PathEffect; @@ -42,7 +42,7 @@ public abstract class XYChart extends AbstractChart { /** The current translate value. */ private float mTranslate; /** The canvas center point. */ - private org.achartengine.model.Point mCenter; + private com.achartengine.model.Point mCenter; /** The visible chart area, in screen coordinates. */ private Rect mScreenR; /** The calculated range. */ @@ -134,7 +134,7 @@ public abstract class XYChart extends AbstractChart { if (mScale < 1) { mTranslate *= -1; } - mCenter = new org.achartengine.model.Point((x + width) / 2, (y + height) / 2); + mCenter = new com.achartengine.model.Point((x + width) / 2, (y + height) / 2); if (rotate) { transform(canvas, angle, false); } @@ -956,7 +956,7 @@ public abstract class XYChart extends AbstractChart { } } - public SeriesSelection getSeriesAndPointForScreenCoordinate(final org.achartengine.model.Point screenPoint) { + public SeriesSelection getSeriesAndPointForScreenCoordinate(final com.achartengine.model.Point screenPoint) { if (clickableAreas != null) for (int seriesIndex = clickableAreas.size() - 1; seriesIndex >= 0; seriesIndex--) { // series 0 is drawn first. Then series 1 is drawn on top, and series 2 diff --git a/achartengine/src/main/java/org/achartengine/model/CategorySeries.java b/achartengine/src/main/java/com/achartengine/model/CategorySeries.java similarity index 99% rename from achartengine/src/main/java/org/achartengine/model/CategorySeries.java rename to achartengine/src/main/java/com/achartengine/model/CategorySeries.java index 9e1d677..3e8b285 100644 --- a/achartengine/src/main/java/org/achartengine/model/CategorySeries.java +++ b/achartengine/src/main/java/com/achartengine/model/CategorySeries.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.model; +package com.achartengine.model; import java.io.Serializable; import java.util.ArrayList; diff --git a/achartengine/src/main/java/org/achartengine/model/MultipleCategorySeries.java b/achartengine/src/main/java/com/achartengine/model/MultipleCategorySeries.java similarity index 99% rename from achartengine/src/main/java/org/achartengine/model/MultipleCategorySeries.java rename to achartengine/src/main/java/com/achartengine/model/MultipleCategorySeries.java index 4642aef..26cd2bc 100644 --- a/achartengine/src/main/java/org/achartengine/model/MultipleCategorySeries.java +++ b/achartengine/src/main/java/com/achartengine/model/MultipleCategorySeries.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.model; +package com.achartengine.model; import java.io.Serializable; import java.util.ArrayList; diff --git a/achartengine/src/main/java/org/achartengine/model/Point.java b/achartengine/src/main/java/com/achartengine/model/Point.java similarity index 97% rename from achartengine/src/main/java/org/achartengine/model/Point.java rename to achartengine/src/main/java/com/achartengine/model/Point.java index eb51d91..8b9ca20 100644 --- a/achartengine/src/main/java/org/achartengine/model/Point.java +++ b/achartengine/src/main/java/com/achartengine/model/Point.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.model; +package com.achartengine.model; import java.io.Serializable; diff --git a/achartengine/src/main/java/org/achartengine/model/RangeCategorySeries.java b/achartengine/src/main/java/com/achartengine/model/RangeCategorySeries.java similarity index 98% rename from achartengine/src/main/java/org/achartengine/model/RangeCategorySeries.java rename to achartengine/src/main/java/com/achartengine/model/RangeCategorySeries.java index 8ed45e9..2c75cfb 100644 --- a/achartengine/src/main/java/org/achartengine/model/RangeCategorySeries.java +++ b/achartengine/src/main/java/com/achartengine/model/RangeCategorySeries.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.model; +package com.achartengine.model; import java.util.ArrayList; import java.util.List; diff --git a/achartengine/src/main/java/org/achartengine/model/SeriesSelection.java b/achartengine/src/main/java/com/achartengine/model/SeriesSelection.java similarity index 97% rename from achartengine/src/main/java/org/achartengine/model/SeriesSelection.java rename to achartengine/src/main/java/com/achartengine/model/SeriesSelection.java index 88fbc04..761df57 100644 --- a/achartengine/src/main/java/org/achartengine/model/SeriesSelection.java +++ b/achartengine/src/main/java/com/achartengine/model/SeriesSelection.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.model; +package com.achartengine.model; public class SeriesSelection { private int mSeriesIndex; diff --git a/achartengine/src/main/java/org/achartengine/model/TimeSeries.java b/achartengine/src/main/java/com/achartengine/model/TimeSeries.java similarity index 97% rename from achartengine/src/main/java/org/achartengine/model/TimeSeries.java rename to achartengine/src/main/java/com/achartengine/model/TimeSeries.java index bf5eea2..229099c 100644 --- a/achartengine/src/main/java/org/achartengine/model/TimeSeries.java +++ b/achartengine/src/main/java/com/achartengine/model/TimeSeries.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.model; +package com.achartengine.model; import java.util.Date; diff --git a/achartengine/src/main/java/org/achartengine/model/XYMultipleSeriesDataset.java b/achartengine/src/main/java/com/achartengine/model/XYMultipleSeriesDataset.java similarity index 98% rename from achartengine/src/main/java/org/achartengine/model/XYMultipleSeriesDataset.java rename to achartengine/src/main/java/com/achartengine/model/XYMultipleSeriesDataset.java index 1157be8..aa693bc 100644 --- a/achartengine/src/main/java/org/achartengine/model/XYMultipleSeriesDataset.java +++ b/achartengine/src/main/java/com/achartengine/model/XYMultipleSeriesDataset.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.model; +package com.achartengine.model; import java.io.Serializable; import java.util.ArrayList; diff --git a/achartengine/src/main/java/org/achartengine/model/XYSeries.java b/achartengine/src/main/java/com/achartengine/model/XYSeries.java similarity index 98% rename from achartengine/src/main/java/org/achartengine/model/XYSeries.java rename to achartengine/src/main/java/com/achartengine/model/XYSeries.java index b168374..61eb077 100644 --- a/achartengine/src/main/java/org/achartengine/model/XYSeries.java +++ b/achartengine/src/main/java/com/achartengine/model/XYSeries.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.model; +package com.achartengine.model; import java.io.Serializable; import java.util.ArrayList; @@ -22,9 +22,9 @@ import java.util.List; import java.util.SortedMap; import java.util.TreeMap; -import org.achartengine.util.IndexXYMap; -import org.achartengine.util.MathHelper; -import org.achartengine.util.XYEntry; +import com.achartengine.util.IndexXYMap; +import com.achartengine.util.MathHelper; +import com.achartengine.util.XYEntry; /** * An XY series encapsulates values for XY charts like line, time, area, diff --git a/achartengine/src/main/java/org/achartengine/model/XYValueSeries.java b/achartengine/src/main/java/com/achartengine/model/XYValueSeries.java similarity index 97% rename from achartengine/src/main/java/org/achartengine/model/XYValueSeries.java rename to achartengine/src/main/java/com/achartengine/model/XYValueSeries.java index 391f17e..f647673 100644 --- a/achartengine/src/main/java/org/achartengine/model/XYValueSeries.java +++ b/achartengine/src/main/java/com/achartengine/model/XYValueSeries.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.model; +package com.achartengine.model; import java.util.ArrayList; import java.util.List; -import org.achartengine.util.MathHelper; +import com.achartengine.util.MathHelper; /** * An extension of the XY series which adds a third dimension. It is used for XY diff --git a/achartengine/src/main/java/org/achartengine/renderer/BasicStroke.java b/achartengine/src/main/java/com/achartengine/renderer/BasicStroke.java similarity index 98% rename from achartengine/src/main/java/org/achartengine/renderer/BasicStroke.java rename to achartengine/src/main/java/com/achartengine/renderer/BasicStroke.java index 221d61b..0e9e4c0 100644 --- a/achartengine/src/main/java/org/achartengine/renderer/BasicStroke.java +++ b/achartengine/src/main/java/com/achartengine/renderer/BasicStroke.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.renderer; +package com.achartengine.renderer; import java.io.Serializable; diff --git a/achartengine/src/main/java/org/achartengine/renderer/DefaultRenderer.java b/achartengine/src/main/java/com/achartengine/renderer/DefaultRenderer.java similarity index 99% rename from achartengine/src/main/java/org/achartengine/renderer/DefaultRenderer.java rename to achartengine/src/main/java/com/achartengine/renderer/DefaultRenderer.java index 403c87c..15c9638 100644 --- a/achartengine/src/main/java/org/achartengine/renderer/DefaultRenderer.java +++ b/achartengine/src/main/java/com/achartengine/renderer/DefaultRenderer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.renderer; +package com.achartengine.renderer; import ohos.agp.utils.Color; diff --git a/achartengine/src/main/java/org/achartengine/renderer/DialRenderer.java b/achartengine/src/main/java/com/achartengine/renderer/DialRenderer.java similarity index 98% rename from achartengine/src/main/java/org/achartengine/renderer/DialRenderer.java rename to achartengine/src/main/java/com/achartengine/renderer/DialRenderer.java index a283645..9bd0c2d 100644 --- a/achartengine/src/main/java/org/achartengine/renderer/DialRenderer.java +++ b/achartengine/src/main/java/com/achartengine/renderer/DialRenderer.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.renderer; +package com.achartengine.renderer; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.achartengine.util.MathHelper; +import com.achartengine.util.MathHelper; /** * Dial chart renderer. diff --git a/achartengine/src/main/java/org/achartengine/renderer/SimpleSeriesRenderer.java b/achartengine/src/main/java/com/achartengine/renderer/SimpleSeriesRenderer.java similarity index 99% rename from achartengine/src/main/java/org/achartengine/renderer/SimpleSeriesRenderer.java rename to achartengine/src/main/java/com/achartengine/renderer/SimpleSeriesRenderer.java index 4459d49..08161b3 100644 --- a/achartengine/src/main/java/org/achartengine/renderer/SimpleSeriesRenderer.java +++ b/achartengine/src/main/java/com/achartengine/renderer/SimpleSeriesRenderer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.renderer; +package com.achartengine.renderer; import ohos.agp.utils.Color; diff --git a/achartengine/src/main/java/org/achartengine/renderer/XYMultipleSeriesRenderer.java b/achartengine/src/main/java/com/achartengine/renderer/XYMultipleSeriesRenderer.java similarity index 99% rename from achartengine/src/main/java/org/achartengine/renderer/XYMultipleSeriesRenderer.java rename to achartengine/src/main/java/com/achartengine/renderer/XYMultipleSeriesRenderer.java index 77bd09c..af05b36 100644 --- a/achartengine/src/main/java/org/achartengine/renderer/XYMultipleSeriesRenderer.java +++ b/achartengine/src/main/java/com/achartengine/renderer/XYMultipleSeriesRenderer.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.renderer; +package com.achartengine.renderer; -import org.achartengine.util.MathHelper; +import com.achartengine.util.MathHelper; import ohos.agp.utils.Color; import ohos.agp.utils.LayoutAlignment; diff --git a/achartengine/src/main/java/org/achartengine/renderer/XYSeriesRenderer.java b/achartengine/src/main/java/com/achartengine/renderer/XYSeriesRenderer.java similarity index 99% rename from achartengine/src/main/java/org/achartengine/renderer/XYSeriesRenderer.java rename to achartengine/src/main/java/com/achartengine/renderer/XYSeriesRenderer.java index 70914d8..a194b35 100644 --- a/achartengine/src/main/java/org/achartengine/renderer/XYSeriesRenderer.java +++ b/achartengine/src/main/java/com/achartengine/renderer/XYSeriesRenderer.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.renderer; +package com.achartengine.renderer; import ohos.agp.utils.Color; import ohos.agp.utils.TextAlignment; -import org.achartengine.chart.PointStyle; +import com.achartengine.chart.PointStyle; import java.io.Serializable; import java.util.ArrayList; diff --git a/achartengine/src/main/java/org/achartengine/tools/AbstractTool.java b/achartengine/src/main/java/com/achartengine/tools/AbstractTool.java similarity index 94% rename from achartengine/src/main/java/org/achartengine/tools/AbstractTool.java rename to achartengine/src/main/java/com/achartengine/tools/AbstractTool.java index 0e48270..1cefa2d 100644 --- a/achartengine/src/main/java/org/achartengine/tools/AbstractTool.java +++ b/achartengine/src/main/java/com/achartengine/tools/AbstractTool.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.tools; +package com.achartengine.tools; -import org.achartengine.chart.AbstractChart; -import org.achartengine.chart.XYChart; -import org.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.chart.AbstractChart; +import com.achartengine.chart.XYChart; +import com.achartengine.renderer.XYMultipleSeriesRenderer; /** * Abstract class for being extended by graphical view tools. diff --git a/achartengine/src/main/java/org/achartengine/tools/FitZoom.java b/achartengine/src/main/java/com/achartengine/tools/FitZoom.java similarity index 89% rename from achartengine/src/main/java/org/achartengine/tools/FitZoom.java rename to achartengine/src/main/java/com/achartengine/tools/FitZoom.java index 19e40ba..6346879 100644 --- a/achartengine/src/main/java/org/achartengine/tools/FitZoom.java +++ b/achartengine/src/main/java/com/achartengine/tools/FitZoom.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.tools; +package com.achartengine.tools; -import org.achartengine.chart.AbstractChart; -import org.achartengine.chart.RoundChart; -import org.achartengine.chart.XYChart; -import org.achartengine.model.XYSeries; -import org.achartengine.renderer.DefaultRenderer; -import org.achartengine.util.MathHelper; +import com.achartengine.chart.AbstractChart; +import com.achartengine.chart.RoundChart; +import com.achartengine.chart.XYChart; +import com.achartengine.model.XYSeries; +import com.achartengine.renderer.DefaultRenderer; +import com.achartengine.util.MathHelper; public class FitZoom extends AbstractTool { /** diff --git a/achartengine/src/main/java/org/achartengine/tools/Pan.java b/achartengine/src/main/java/com/achartengine/tools/Pan.java similarity index 96% rename from achartengine/src/main/java/org/achartengine/tools/Pan.java rename to achartengine/src/main/java/com/achartengine/tools/Pan.java index e4dc232..dafe54d 100644 --- a/achartengine/src/main/java/org/achartengine/tools/Pan.java +++ b/achartengine/src/main/java/com/achartengine/tools/Pan.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.tools; +package com.achartengine.tools; import java.util.ArrayList; import java.util.List; -import org.achartengine.chart.AbstractChart; -import org.achartengine.chart.RoundChart; -import org.achartengine.chart.XYChart; +import com.achartengine.chart.AbstractChart; +import com.achartengine.chart.RoundChart; +import com.achartengine.chart.XYChart; /** * The pan tool. diff --git a/achartengine/src/main/java/org/achartengine/tools/PanListener.java b/achartengine/src/main/java/com/achartengine/tools/PanListener.java similarity index 95% rename from achartengine/src/main/java/org/achartengine/tools/PanListener.java rename to achartengine/src/main/java/com/achartengine/tools/PanListener.java index 6462b74..a6589e1 100644 --- a/achartengine/src/main/java/org/achartengine/tools/PanListener.java +++ b/achartengine/src/main/java/com/achartengine/tools/PanListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.tools; +package com.achartengine.tools; /** * A pan listener. diff --git a/achartengine/src/main/java/org/achartengine/tools/Zoom.java b/achartengine/src/main/java/com/achartengine/tools/Zoom.java similarity index 96% rename from achartengine/src/main/java/org/achartengine/tools/Zoom.java rename to achartengine/src/main/java/com/achartengine/tools/Zoom.java index b7f6777..55ec214 100644 --- a/achartengine/src/main/java/org/achartengine/tools/Zoom.java +++ b/achartengine/src/main/java/com/achartengine/tools/Zoom.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.tools; +package com.achartengine.tools; import java.util.ArrayList; import java.util.List; -import org.achartengine.chart.AbstractChart; -import org.achartengine.chart.RoundChart; -import org.achartengine.chart.XYChart; -import org.achartengine.renderer.DefaultRenderer; +import com.achartengine.chart.AbstractChart; +import com.achartengine.chart.RoundChart; +import com.achartengine.chart.XYChart; +import com.achartengine.renderer.DefaultRenderer; /** * The zoom tool. diff --git a/achartengine/src/main/java/org/achartengine/tools/ZoomEvent.java b/achartengine/src/main/java/com/achartengine/tools/ZoomEvent.java similarity index 97% rename from achartengine/src/main/java/org/achartengine/tools/ZoomEvent.java rename to achartengine/src/main/java/com/achartengine/tools/ZoomEvent.java index 6ade31a..a589397 100644 --- a/achartengine/src/main/java/org/achartengine/tools/ZoomEvent.java +++ b/achartengine/src/main/java/com/achartengine/tools/ZoomEvent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.tools; +package com.achartengine.tools; /** diff --git a/achartengine/src/main/java/org/achartengine/tools/ZoomListener.java b/achartengine/src/main/java/com/achartengine/tools/ZoomListener.java similarity index 96% rename from achartengine/src/main/java/org/achartengine/tools/ZoomListener.java rename to achartengine/src/main/java/com/achartengine/tools/ZoomListener.java index bb60afc..9024814 100644 --- a/achartengine/src/main/java/org/achartengine/tools/ZoomListener.java +++ b/achartengine/src/main/java/com/achartengine/tools/ZoomListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.tools; +package com.achartengine.tools; /** * A zoom listener. diff --git a/achartengine/src/main/java/org/achartengine/util/IndexXYMap.java b/achartengine/src/main/java/com/achartengine/util/IndexXYMap.java similarity index 98% rename from achartengine/src/main/java/org/achartengine/util/IndexXYMap.java rename to achartengine/src/main/java/com/achartengine/util/IndexXYMap.java index 0c97e40..b0b365c 100644 --- a/achartengine/src/main/java/org/achartengine/util/IndexXYMap.java +++ b/achartengine/src/main/java/com/achartengine/util/IndexXYMap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.util; +package com.achartengine.util; import java.util.ArrayList; import java.util.Collections; diff --git a/achartengine/src/main/java/org/achartengine/util/MathHelper.java b/achartengine/src/main/java/com/achartengine/util/MathHelper.java similarity index 99% rename from achartengine/src/main/java/org/achartengine/util/MathHelper.java rename to achartengine/src/main/java/com/achartengine/util/MathHelper.java index 9699418..a798596 100644 --- a/achartengine/src/main/java/org/achartengine/util/MathHelper.java +++ b/achartengine/src/main/java/com/achartengine/util/MathHelper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.util; +package com.achartengine.util; import java.text.NumberFormat; import java.text.ParseException; diff --git a/achartengine/src/main/java/org/achartengine/util/XYEntry.java b/achartengine/src/main/java/com/achartengine/util/XYEntry.java similarity index 97% rename from achartengine/src/main/java/org/achartengine/util/XYEntry.java rename to achartengine/src/main/java/com/achartengine/util/XYEntry.java index a84b15d..17ce688 100644 --- a/achartengine/src/main/java/org/achartengine/util/XYEntry.java +++ b/achartengine/src/main/java/com/achartengine/util/XYEntry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.util; +package com.achartengine.util; import java.util.Map.Entry; diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 9f58aac..fcb010c 100644 --- a/entry/src/main/config.json +++ b/entry/src/main/config.json @@ -1,6 +1,6 @@ { "app": { - "bundleName": "com.achartengine.demo", + "bundleName": "org.achartengine.chartdemo.demo", "vendor": "achartengine", "version": { "code": 1, @@ -14,7 +14,7 @@ }, "deviceConfig": {}, "module": { - "package": "com.achartengine.demo", + "package": "org.achartengine.chartdemo.demo", "name": ".MyApplication", "deviceType": [ "phone", @@ -38,7 +38,7 @@ } ], "orientation": "unspecified", - "name": "com.achartengine.demo.ChartDemoAbility", + "name": "org.achartengine.chartdemo.demo.ChartDemoAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "achartengine", @@ -47,7 +47,7 @@ }, { "orientation": "unspecified", - "name": "com.achartengine.demo.chart.XYCharBuilderAbility", + "name": "org.achartengine.chartdemo.demo.chart.XYCharBuilderAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "achartengine", @@ -56,7 +56,7 @@ }, { "orientation": "unspecified", - "name": "com.achartengine.demo.PieChartBuilderAbility", + "name": "org.achartengine.chartdemo.demo.PieChartBuilderAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "achartengine", @@ -65,7 +65,7 @@ }, { "orientation": "unspecified", - "name": "com.achartengine.demo.GeneratedChartDemoAbility", + "name": "org.achartengine.chartdemo.demo.GeneratedChartDemoAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "achartengine", @@ -74,7 +74,7 @@ }, { "orientation": "unspecified", - "name": "com.achartengine.demo.GraphicalAbility", + "name": "org.achartengine.chartdemo.demo.GraphicalAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "achartengine", diff --git a/entry/src/main/java/com/achartengine/demo/ChartDemoAbility.java b/entry/src/main/java/org/achartengine/chartdemo/demo/ChartDemoAbility.java similarity index 77% rename from entry/src/main/java/com/achartengine/demo/ChartDemoAbility.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/ChartDemoAbility.java index 71ea55a..cd8f7a2 100644 --- a/entry/src/main/java/com/achartengine/demo/ChartDemoAbility.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/ChartDemoAbility.java @@ -13,17 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo; +package org.achartengine.chartdemo.demo; -import com.achartengine.demo.slice.ChartDemo; -import com.achartengine.demo.slice.MainAbilitySlice; +import org.achartengine.chartdemo.demo.slice.ChartDemo; import ohos.aafwk.ability.Ability; -import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.content.Intent; -import ohos.agp.components.*; - -import java.util.ArrayList; -import java.util.List; public class ChartDemoAbility extends Ability { diff --git a/entry/src/main/java/com/achartengine/demo/ChartFactory.java b/entry/src/main/java/org/achartengine/chartdemo/demo/ChartFactory.java similarity index 92% rename from entry/src/main/java/com/achartengine/demo/ChartFactory.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/ChartFactory.java index 16428f8..adff4bd 100644 --- a/entry/src/main/java/com/achartengine/demo/ChartFactory.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/ChartFactory.java @@ -13,34 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo; +package org.achartengine.chartdemo.demo; import ohos.aafwk.content.Intent; import ohos.aafwk.content.Operation; import ohos.app.Context; -import ohos.hiviewdfx.HiLog; -import ohos.hiviewdfx.HiLogLabel; -import org.achartengine.GraphicalView; -import org.achartengine.chart.BarChart; -import org.achartengine.chart.BarChart.Type; -import org.achartengine.chart.BubbleChart; -import org.achartengine.chart.CombinedXYChart; -import org.achartengine.chart.CombinedXYChart.XYCombinedChartDef; -import org.achartengine.chart.CubicLineChart; -import org.achartengine.chart.DialChart; -import org.achartengine.chart.DoughnutChart; -import org.achartengine.chart.LineChart; -import org.achartengine.chart.PieChart; -import org.achartengine.chart.RangeBarChart; -import org.achartengine.chart.ScatterChart; -import org.achartengine.chart.TimeChart; -import org.achartengine.chart.XYChart; -import org.achartengine.model.CategorySeries; -import org.achartengine.model.MultipleCategorySeries; -import org.achartengine.model.XYMultipleSeriesDataset; -import org.achartengine.renderer.DefaultRenderer; -import org.achartengine.renderer.DialRenderer; -import org.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.GraphicalView; +import com.achartengine.chart.BarChart; +import com.achartengine.chart.BarChart.Type; +import com.achartengine.chart.BubbleChart; +import com.achartengine.chart.CombinedXYChart; +import com.achartengine.chart.CombinedXYChart.XYCombinedChartDef; +import com.achartengine.chart.CubicLineChart; +import com.achartengine.chart.DialChart; +import com.achartengine.chart.DoughnutChart; +import com.achartengine.chart.LineChart; +import com.achartengine.chart.PieChart; +import com.achartengine.chart.RangeBarChart; +import com.achartengine.chart.ScatterChart; +import com.achartengine.chart.TimeChart; +import com.achartengine.chart.XYChart; +import com.achartengine.model.CategorySeries; +import com.achartengine.model.MultipleCategorySeries; +import com.achartengine.model.XYMultipleSeriesDataset; +import com.achartengine.renderer.DefaultRenderer; +import com.achartengine.renderer.DialRenderer; +import com.achartengine.renderer.XYMultipleSeriesRenderer; @@ -396,8 +394,8 @@ public class ChartFactory { Intent intent = new Intent(); Operation operation = new Intent.OperationBuilder() .withDeviceId("") - .withBundleName("com.achartengine.demo") - .withAbilityName("com.achartengine.demo.GraphicalAbility") + .withBundleName(context.getBundleName()) + .withAbilityName("org.achartengine.chartdemo.demo.GraphicalAbility") .build(); intent.setOperation(operation); XYChart chart = new LineChart(dataset, renderer); @@ -430,8 +428,8 @@ public class ChartFactory { Intent intent = new Intent(); Operation operation = new Intent.OperationBuilder() .withDeviceId("") - .withBundleName("com.achartengine.demo") - .withAbilityName("com.achartengine.demo.GraphicalAbility") + .withBundleName(context.getBundleName()) + .withAbilityName("org.achartengine.chartdemo.demo.GraphicalAbility") .build(); intent.setOperation(operation); XYChart chart = new CubicLineChart(dataset, renderer, smoothness); @@ -460,8 +458,8 @@ public class ChartFactory { Intent intent = new Intent(); Operation operation = new Intent.OperationBuilder() .withDeviceId("") - .withBundleName("com.achartengine.demo") - .withAbilityName("com.achartengine.demo.GraphicalAbility") + .withBundleName(context.getBundleName()) + .withAbilityName("org.achartengine.chartdemo.demo.GraphicalAbility") .build(); intent.setOperation(operation); XYChart chart = new ScatterChart(dataset, renderer); @@ -490,8 +488,8 @@ public class ChartFactory { Intent intent = new Intent(); Operation operation = new Intent.OperationBuilder() .withDeviceId("") - .withBundleName("com.achartengine.demo") - .withAbilityName("com.achartengine.demo.GraphicalAbility") + .withBundleName(context.getBundleName()) + .withAbilityName("org.achartengine.chartdemo.demo.GraphicalAbility") .build(); intent.setOperation(operation); XYChart chart = new BubbleChart(dataset, renderer); @@ -523,8 +521,8 @@ public class ChartFactory { Intent intent = new Intent(); Operation operation = new Intent.OperationBuilder() .withDeviceId("") - .withBundleName("com.achartengine.demo") - .withAbilityName("com.achartengine.demo.GraphicalAbility") + .withBundleName(context.getBundleName()) + .withAbilityName("org.achartengine.chartdemo.demo.GraphicalAbility") .build(); intent.setOperation(operation); TimeChart chart = new TimeChart(dataset, renderer); @@ -555,8 +553,8 @@ public class ChartFactory { Intent intent = new Intent(); Operation operation = new Intent.OperationBuilder() .withDeviceId("") - .withBundleName("com.achartengine.demo") - .withAbilityName("com.achartengine.demo.GraphicalAbility") + .withBundleName(context.getBundleName()) + .withAbilityName("org.achartengine.chartdemo.demo.GraphicalAbility") .build(); intent.setOperation(operation); BarChart chart = new BarChart(dataset, renderer, type); @@ -589,8 +587,8 @@ public class ChartFactory { Intent intent = new Intent(); Operation operation = new Intent.OperationBuilder() .withDeviceId("") - .withBundleName("com.achartengine.demo") - .withAbilityName("com.achartengine.demo.GraphicalAbility") + .withBundleName(context.getBundleName()) + .withAbilityName("org.achartengine.chartdemo.demo.GraphicalAbility") .build(); intent.setOperation(operation); RangeBarChart chart = new RangeBarChart(dataset, renderer, type); @@ -623,8 +621,8 @@ public class ChartFactory { Intent intent = new Intent(); Operation operation = new Intent.OperationBuilder() .withDeviceId("") - .withBundleName("com.achartengine.demo") - .withAbilityName("com.achartengine.demo.GraphicalAbility") + .withBundleName(context.getBundleName()) + .withAbilityName("org.achartengine.chartdemo.demo.GraphicalAbility") .build(); intent.setOperation(operation); CombinedXYChart chart = new CombinedXYChart(dataset, renderer, types); @@ -655,8 +653,8 @@ public class ChartFactory { Intent intent = new Intent(); Operation operation = new Intent.OperationBuilder() .withDeviceId("") - .withBundleName("com.achartengine.demo") - .withAbilityName("com.achartengine.demo.GraphicalAbility") + .withBundleName(context.getBundleName()) + .withAbilityName("org.achartengine.chartdemo.demo.GraphicalAbility") .build(); intent.setOperation(operation); PieChart chart = new PieChart(dataset, renderer); @@ -684,8 +682,8 @@ public class ChartFactory { Intent intent = new Intent(); Operation operation = new Intent.OperationBuilder() .withDeviceId("") - .withBundleName("com.achartengine.demo") - .withAbilityName("com.achartengine.demo.GraphicalAbility") + .withBundleName(context.getBundleName()) + .withAbilityName("org.achartengine.chartdemo.demo.GraphicalAbility") .build(); intent.setOperation(operation); DoughnutChart chart = new DoughnutChart(dataset, renderer); @@ -714,8 +712,8 @@ public class ChartFactory { Intent intent = new Intent(); Operation operation = new Intent.OperationBuilder() .withDeviceId("") - .withBundleName("com.achartengine.demo") - .withAbilityName("com.achartengine.demo.GraphicalAbility") + .withBundleName(context.getBundleName()) + .withAbilityName("org.achartengine.chartdemo.demo.GraphicalAbility") .build(); intent.setOperation(operation); DialChart chart = new DialChart(dataset, renderer); diff --git a/entry/src/main/java/com/achartengine/demo/GeneratedChartDemoAbility.java b/entry/src/main/java/org/achartengine/chartdemo/demo/GeneratedChartDemoAbility.java similarity index 89% rename from entry/src/main/java/com/achartengine/demo/GeneratedChartDemoAbility.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/GeneratedChartDemoAbility.java index 331bd2e..0e9f32d 100644 --- a/entry/src/main/java/com/achartengine/demo/GeneratedChartDemoAbility.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/GeneratedChartDemoAbility.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo; +package org.achartengine.chartdemo.demo; -import com.achartengine.demo.slice.GeneratedChartDemo; +import org.achartengine.chartdemo.demo.slice.GeneratedChartDemo; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/achartengine/demo/GraphicalAbility.java b/entry/src/main/java/org/achartengine/chartdemo/demo/GraphicalAbility.java similarity index 95% rename from entry/src/main/java/com/achartengine/demo/GraphicalAbility.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/GraphicalAbility.java index b6e0967..241c326 100644 --- a/entry/src/main/java/com/achartengine/demo/GraphicalAbility.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/GraphicalAbility.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo; +package org.achartengine.chartdemo.demo; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/achartengine/demo/GraphicalActivity.java b/entry/src/main/java/org/achartengine/chartdemo/demo/GraphicalActivity.java similarity index 89% rename from entry/src/main/java/com/achartengine/demo/GraphicalActivity.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/GraphicalActivity.java index 9caf93c..22c8a38 100644 --- a/entry/src/main/java/com/achartengine/demo/GraphicalActivity.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/GraphicalActivity.java @@ -13,16 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo; +package org.achartengine.chartdemo.demo; import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.content.Intent; import ohos.agp.components.ComponentContainer; import ohos.agp.components.DirectionalLayout; -import org.achartengine.GraphicalView; -import org.achartengine.chart.AbstractChart; -import org.achartengine.chart.XYChart; -import org.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.GraphicalView; +import com.achartengine.chart.AbstractChart; /** diff --git a/entry/src/main/java/com/achartengine/demo/MainAbility.java b/entry/src/main/java/org/achartengine/chartdemo/demo/MainAbility.java similarity index 72% rename from entry/src/main/java/com/achartengine/demo/MainAbility.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/MainAbility.java index d426799..4c1ac01 100644 --- a/entry/src/main/java/com/achartengine/demo/MainAbility.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/MainAbility.java @@ -1,6 +1,6 @@ -package com.achartengine.demo; +package org.achartengine.chartdemo.demo; -import com.achartengine.demo.slice.MainAbilitySlice; +import org.achartengine.chartdemo.demo.slice.MainAbilitySlice; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/achartengine/demo/MyApplication.java b/entry/src/main/java/org/achartengine/chartdemo/demo/MyApplication.java similarity index 81% rename from entry/src/main/java/com/achartengine/demo/MyApplication.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/MyApplication.java index 3b523ca..0938449 100644 --- a/entry/src/main/java/com/achartengine/demo/MyApplication.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/MyApplication.java @@ -1,4 +1,4 @@ -package com.achartengine.demo; +package org.achartengine.chartdemo.demo; import ohos.aafwk.ability.AbilityPackage; diff --git a/entry/src/main/java/com/achartengine/demo/PieChartBuilderAbility.java b/entry/src/main/java/org/achartengine/chartdemo/demo/PieChartBuilderAbility.java similarity index 89% rename from entry/src/main/java/com/achartengine/demo/PieChartBuilderAbility.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/PieChartBuilderAbility.java index 236f78f..d047dcf 100644 --- a/entry/src/main/java/com/achartengine/demo/PieChartBuilderAbility.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/PieChartBuilderAbility.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo; +package org.achartengine.chartdemo.demo; -import com.achartengine.demo.slice.PieChartBuilder; +import org.achartengine.chartdemo.demo.slice.PieChartBuilder; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/achartengine/demo/SampleItem.java b/entry/src/main/java/org/achartengine/chartdemo/demo/SampleItem.java similarity index 87% rename from entry/src/main/java/com/achartengine/demo/SampleItem.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/SampleItem.java index 749dd0d..14f99d9 100644 --- a/entry/src/main/java/com/achartengine/demo/SampleItem.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/SampleItem.java @@ -1,4 +1,4 @@ -package com.achartengine.demo; +package org.achartengine.chartdemo.demo; public class SampleItem { private String name; diff --git a/entry/src/main/java/com/achartengine/demo/SampleItemProvider.java b/entry/src/main/java/org/achartengine/chartdemo/demo/SampleItemProvider.java similarity index 93% rename from entry/src/main/java/com/achartengine/demo/SampleItemProvider.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/SampleItemProvider.java index 4aac041..6c94e6f 100644 --- a/entry/src/main/java/com/achartengine/demo/SampleItemProvider.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/SampleItemProvider.java @@ -1,5 +1,6 @@ -package com.achartengine.demo; +package org.achartengine.chartdemo.demo; +import org.achartengine.chartdemo.demo.ResourceTable; import ohos.aafwk.ability.AbilitySlice; import ohos.agp.components.*; diff --git a/entry/src/main/java/com/achartengine/demo/chart/AbstractDemoChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/AbstractDemoChart.java similarity index 93% rename from entry/src/main/java/com/achartengine/demo/chart/AbstractDemoChart.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/AbstractDemoChart.java index b323633..a5cd2ac 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/AbstractDemoChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/AbstractDemoChart.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; -import org.achartengine.chart.PointStyle; -import org.achartengine.model.*; -import org.achartengine.renderer.DefaultRenderer; -import org.achartengine.renderer.SimpleSeriesRenderer; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; +import com.achartengine.chart.PointStyle; +import com.achartengine.model.*; +import com.achartengine.renderer.DefaultRenderer; +import com.achartengine.renderer.SimpleSeriesRenderer; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; import java.util.Date; import java.util.List; @@ -40,7 +40,7 @@ public abstract class AbstractDemoChart implements IDemoChart { * @return the XY multiple dataset */ protected XYMultipleSeriesDataset buildDataset(String[] titles, List xValues, - List yValues) { + List yValues) { XYMultipleSeriesDataset dataset = new XYMultipleSeriesDataset(); addXYSeries(dataset, titles, xValues, yValues, 0); return dataset; @@ -169,7 +169,7 @@ public abstract class AbstractDemoChart implements IDemoChart { * @return the category series */ protected MultipleCategorySeries buildMultipleCategoryDataset(String title, - List titles, List values) { + List titles, List values) { MultipleCategorySeries series = new MultipleCategorySeries(title); int k = 0; for (double[] value : values) { diff --git a/entry/src/main/java/com/achartengine/demo/chart/AverageCubicTemperatureChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/AverageCubicTemperatureChart.java similarity index 92% rename from entry/src/main/java/com/achartengine/demo/chart/AverageCubicTemperatureChart.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/AverageCubicTemperatureChart.java index 9372874..ebc99cb 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/AverageCubicTemperatureChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/AverageCubicTemperatureChart.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -import com.achartengine.demo.ChartFactory; -import org.achartengine.chart.PointStyle; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.chartdemo.demo.ChartFactory; +import com.achartengine.chart.PointStyle; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; import java.util.ArrayList; import java.util.List; diff --git a/entry/src/main/java/com/achartengine/demo/chart/AverageTemperatureChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/AverageTemperatureChart.java similarity index 91% rename from entry/src/main/java/com/achartengine/demo/chart/AverageTemperatureChart.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/AverageTemperatureChart.java index 9917650..ccd069a 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/AverageTemperatureChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/AverageTemperatureChart.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.agp.utils.LayoutAlignment; import ohos.app.Context; -import com.achartengine.demo.ChartFactory; -import org.achartengine.chart.PointStyle; -import org.achartengine.model.XYMultipleSeriesDataset; -import org.achartengine.model.XYSeries; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.chartdemo.demo.ChartFactory; +import com.achartengine.chart.PointStyle; +import com.achartengine.model.XYMultipleSeriesDataset; +import com.achartengine.model.XYSeries; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; import java.util.ArrayList; import java.util.List; diff --git a/entry/src/main/java/com/achartengine/demo/chart/BudgetDoughnutChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/BudgetDoughnutChart.java similarity index 93% rename from entry/src/main/java/com/achartengine/demo/chart/BudgetDoughnutChart.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/BudgetDoughnutChart.java index 2952708..2670be0 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/BudgetDoughnutChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/BudgetDoughnutChart.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -import com.achartengine.demo.ChartFactory; -import org.achartengine.renderer.DefaultRenderer; +import org.achartengine.chartdemo.demo.ChartFactory; +import com.achartengine.renderer.DefaultRenderer; import java.util.ArrayList; import java.util.List; diff --git a/entry/src/main/java/com/achartengine/demo/chart/BudgetPieChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/BudgetPieChart.java similarity index 91% rename from entry/src/main/java/com/achartengine/demo/chart/BudgetPieChart.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/BudgetPieChart.java index 400dda8..23d292b 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/BudgetPieChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/BudgetPieChart.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -import com.achartengine.demo.ChartFactory; -import org.achartengine.renderer.DefaultRenderer; -import org.achartengine.renderer.SimpleSeriesRenderer; +import org.achartengine.chartdemo.demo.ChartFactory; +import com.achartengine.renderer.DefaultRenderer; +import com.achartengine.renderer.SimpleSeriesRenderer; /** diff --git a/entry/src/main/java/com/achartengine/demo/chart/CombinedTemperatureChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/CombinedTemperatureChart.java similarity index 92% rename from entry/src/main/java/com/achartengine/demo/chart/CombinedTemperatureChart.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/CombinedTemperatureChart.java index b34b36b..cd92f0b 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/CombinedTemperatureChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/CombinedTemperatureChart.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; +import com.achartengine.chart.*; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.agp.utils.TextAlignment; import ohos.app.Context; -import com.achartengine.demo.ChartFactory; -import org.achartengine.chart.*; -import org.achartengine.chart.CombinedXYChart.XYCombinedChartDef; -import org.achartengine.model.XYMultipleSeriesDataset; -import org.achartengine.model.XYSeries; -import org.achartengine.model.XYValueSeries; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.chartdemo.demo.ChartFactory; +import com.achartengine.chart.CombinedXYChart.XYCombinedChartDef; +import com.achartengine.model.XYMultipleSeriesDataset; +import com.achartengine.model.XYSeries; +import com.achartengine.model.XYValueSeries; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; import java.util.ArrayList; import java.util.List; diff --git a/entry/src/main/java/com/achartengine/demo/chart/IDemoChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/IDemoChart.java similarity index 96% rename from entry/src/main/java/com/achartengine/demo/chart/IDemoChart.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/IDemoChart.java index 5c7d564..e06039e 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/IDemoChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/IDemoChart.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/achartengine/demo/chart/MultipleTemperatureChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/MultipleTemperatureChart.java similarity index 92% rename from entry/src/main/java/com/achartengine/demo/chart/MultipleTemperatureChart.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/MultipleTemperatureChart.java index e3ff395..239e0c5 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/MultipleTemperatureChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/MultipleTemperatureChart.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.agp.utils.LayoutAlignment; import ohos.app.Context; -import com.achartengine.demo.ChartFactory; -import org.achartengine.chart.PointStyle; -import org.achartengine.model.XYMultipleSeriesDataset; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.chartdemo.demo.ChartFactory; +import com.achartengine.chart.PointStyle; +import com.achartengine.model.XYMultipleSeriesDataset; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; import java.util.ArrayList; import java.util.List; diff --git a/entry/src/main/java/com/achartengine/demo/chart/ProjectStatusBubbleChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/ProjectStatusBubbleChart.java similarity index 90% rename from entry/src/main/java/com/achartengine/demo/chart/ProjectStatusBubbleChart.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/ProjectStatusBubbleChart.java index 8c768f4..4a39055 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/ProjectStatusBubbleChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/ProjectStatusBubbleChart.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -import com.achartengine.demo.ChartFactory; -import org.achartengine.model.XYMultipleSeriesDataset; -import org.achartengine.model.XYValueSeries; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.chartdemo.demo.ChartFactory; +import com.achartengine.model.XYMultipleSeriesDataset; +import com.achartengine.model.XYValueSeries; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; /** * Project status demo bubble chart. diff --git a/entry/src/main/java/com/achartengine/demo/chart/ProjectStatusChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/ProjectStatusChart.java similarity index 93% rename from entry/src/main/java/com/achartengine/demo/chart/ProjectStatusChart.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/ProjectStatusChart.java index 8c28415..40c2b6f 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/ProjectStatusChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/ProjectStatusChart.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -import com.achartengine.demo.ChartFactory; -import org.achartengine.chart.PointStyle; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.chartdemo.demo.ChartFactory; +import com.achartengine.chart.PointStyle; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; import java.util.ArrayList; import java.util.Date; diff --git a/entry/src/main/java/com/achartengine/demo/chart/SalesBarChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesBarChart.java similarity index 89% rename from entry/src/main/java/com/achartengine/demo/chart/SalesBarChart.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesBarChart.java index c449928..e7e0a9b 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/SalesBarChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesBarChart.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -import com.achartengine.demo.ChartFactory; -import org.achartengine.chart.BarChart.Type; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYMultipleSeriesRenderer.Orientation; -import org.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.chartdemo.demo.ChartFactory; +import com.achartengine.chart.BarChart.Type; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYMultipleSeriesRenderer.Orientation; +import com.achartengine.renderer.XYSeriesRenderer; import java.util.ArrayList; import java.util.List; diff --git a/entry/src/main/java/com/achartengine/demo/chart/SalesComparisonChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesComparisonChart.java similarity index 91% rename from entry/src/main/java/com/achartengine/demo/chart/SalesComparisonChart.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesComparisonChart.java index 585f769..698fddb 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/SalesComparisonChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesComparisonChart.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -import com.achartengine.demo.ChartFactory; -import org.achartengine.chart.PointStyle; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer.FillOutsideLine; +import org.achartengine.chartdemo.demo.ChartFactory; +import com.achartengine.chart.PointStyle; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer.FillOutsideLine; import java.util.ArrayList; import java.util.List; diff --git a/entry/src/main/java/com/achartengine/demo/chart/SalesGrowthChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesGrowthChart.java similarity index 91% rename from entry/src/main/java/com/achartengine/demo/chart/SalesGrowthChart.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesGrowthChart.java index 7650baf..c8c08aa 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/SalesGrowthChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesGrowthChart.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -import com.achartengine.demo.ChartFactory; -import org.achartengine.chart.PointStyle; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer.FillOutsideLine; +import org.achartengine.chartdemo.demo.ChartFactory; +import com.achartengine.chart.PointStyle; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer.FillOutsideLine; import java.util.ArrayList; import java.util.Date; diff --git a/entry/src/main/java/com/achartengine/demo/chart/SalesStackedBarChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesStackedBarChart.java similarity index 91% rename from entry/src/main/java/com/achartengine/demo/chart/SalesStackedBarChart.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesStackedBarChart.java index fddad57..cb1de6f 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/SalesStackedBarChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesStackedBarChart.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -import com.achartengine.demo.ChartFactory; -import org.achartengine.chart.BarChart.Type; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.chartdemo.demo.ChartFactory; +import com.achartengine.chart.BarChart.Type; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; import java.util.ArrayList; import java.util.List; diff --git a/entry/src/main/java/com/achartengine/demo/chart/ScatterChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/ScatterChart.java similarity index 91% rename from entry/src/main/java/com/achartengine/demo/chart/ScatterChart.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/ScatterChart.java index 5f2afbb..f7b4d6f 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/ScatterChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/ScatterChart.java @@ -13,20 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -import com.achartengine.demo.ChartFactory; -import org.achartengine.chart.PointStyle; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.chartdemo.demo.ChartFactory; +import com.achartengine.chart.PointStyle; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; import java.security.SecureRandom; import java.util.ArrayList; import java.util.List; -import java.util.Random; /** * Scatter demo chart. diff --git a/entry/src/main/java/com/achartengine/demo/chart/SensorValuesChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SensorValuesChart.java similarity index 91% rename from entry/src/main/java/com/achartengine/demo/chart/SensorValuesChart.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/SensorValuesChart.java index 26d1aa2..5be8e48 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/SensorValuesChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SensorValuesChart.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -import com.achartengine.demo.ChartFactory; -import org.achartengine.chart.PointStyle; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; -import org.achartengine.util.MathHelper; +import org.achartengine.chartdemo.demo.ChartFactory; +import com.achartengine.chart.PointStyle; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; +import com.achartengine.util.MathHelper; import java.util.ArrayList; import java.util.Date; diff --git a/entry/src/main/java/com/achartengine/demo/chart/TemperatureChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/TemperatureChart.java similarity index 89% rename from entry/src/main/java/com/achartengine/demo/chart/TemperatureChart.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/TemperatureChart.java index cd27d61..24cb8a5 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/TemperatureChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/TemperatureChart.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.agp.utils.LayoutAlignment; import ohos.app.Context; -import com.achartengine.demo.ChartFactory; -import org.achartengine.chart.BarChart.Type; -import org.achartengine.model.RangeCategorySeries; -import org.achartengine.model.XYMultipleSeriesDataset; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.chartdemo.demo.ChartFactory; +import com.achartengine.chart.BarChart.Type; +import com.achartengine.model.RangeCategorySeries; +import com.achartengine.model.XYMultipleSeriesDataset; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; /** * Temperature demo range chart. diff --git a/entry/src/main/java/com/achartengine/demo/chart/TrigonometricFunctionsChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/TrigonometricFunctionsChart.java similarity index 92% rename from entry/src/main/java/com/achartengine/demo/chart/TrigonometricFunctionsChart.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/TrigonometricFunctionsChart.java index a9af1d8..375ff85 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/TrigonometricFunctionsChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/TrigonometricFunctionsChart.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -import com.achartengine.demo.ChartFactory; -import org.achartengine.chart.PointStyle; -import org.achartengine.renderer.XYMultipleSeriesRenderer; +import org.achartengine.chartdemo.demo.ChartFactory; +import com.achartengine.chart.PointStyle; +import com.achartengine.renderer.XYMultipleSeriesRenderer; import java.util.ArrayList; import java.util.List; diff --git a/entry/src/main/java/com/achartengine/demo/chart/WeightDialChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/WeightDialChart.java similarity index 88% rename from entry/src/main/java/com/achartengine/demo/chart/WeightDialChart.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/WeightDialChart.java index f596464..90082ea 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/WeightDialChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/WeightDialChart.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -import com.achartengine.demo.ChartFactory; -import org.achartengine.model.CategorySeries; -import org.achartengine.renderer.DialRenderer; -import org.achartengine.renderer.DialRenderer.Type; -import org.achartengine.renderer.SimpleSeriesRenderer; +import org.achartengine.chartdemo.demo.ChartFactory; +import com.achartengine.model.CategorySeries; +import com.achartengine.renderer.DialRenderer; +import com.achartengine.renderer.DialRenderer.Type; +import com.achartengine.renderer.SimpleSeriesRenderer; /** * Budget demo pie chart. diff --git a/entry/src/main/java/com/achartengine/demo/chart/XYCharBuilderAbility.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/XYCharBuilderAbility.java similarity index 90% rename from entry/src/main/java/com/achartengine/demo/chart/XYCharBuilderAbility.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/XYCharBuilderAbility.java index cccace5..b536563 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/XYCharBuilderAbility.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/XYCharBuilderAbility.java @@ -13,9 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; -import com.achartengine.demo.slice.PieChartBuilder; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/achartengine/demo/chart/XYChartBuilder.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/XYChartBuilder.java similarity index 93% rename from entry/src/main/java/com/achartengine/demo/chart/XYChartBuilder.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/chart/XYChartBuilder.java index 773984b..d9050e9 100644 --- a/entry/src/main/java/com/achartengine/demo/chart/XYChartBuilder.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/XYChartBuilder.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.chart; +package org.achartengine.chartdemo.demo.chart; -import com.achartengine.demo.ResourceTable; +import org.achartengine.chartdemo.demo.ResourceTable; import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.content.Intent; import ohos.agp.components.*; import ohos.agp.utils.Color; import ohos.agp.window.dialog.ToastDialog; -import com.achartengine.demo.ChartFactory; -import org.achartengine.GraphicalView; -import org.achartengine.chart.PointStyle; -import org.achartengine.model.SeriesSelection; -import org.achartengine.model.XYMultipleSeriesDataset; -import org.achartengine.model.XYSeries; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.chartdemo.demo.ChartFactory; +import com.achartengine.GraphicalView; +import com.achartengine.chart.PointStyle; +import com.achartengine.model.SeriesSelection; +import com.achartengine.model.XYMultipleSeriesDataset; +import com.achartengine.model.XYSeries; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; public class XYChartBuilder extends AbilitySlice { diff --git a/entry/src/main/java/com/achartengine/demo/slice/ChartDemo.java b/entry/src/main/java/org/achartengine/chartdemo/demo/slice/ChartDemo.java similarity index 87% rename from entry/src/main/java/com/achartengine/demo/slice/ChartDemo.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/slice/ChartDemo.java index 7a90dfd..a70ba03 100644 --- a/entry/src/main/java/com/achartengine/demo/slice/ChartDemo.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/slice/ChartDemo.java @@ -13,18 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.slice; +package org.achartengine.chartdemo.demo.slice; -import com.achartengine.demo.ChartFactory; -import com.achartengine.demo.ResourceTable; -import com.achartengine.demo.SampleItem; -import com.achartengine.demo.SampleItemProvider; -import com.achartengine.demo.chart.*; +import org.achartengine.chartdemo.demo.ResourceTable; +import org.achartengine.chartdemo.demo.SampleItem; +import org.achartengine.chartdemo.demo.SampleItemProvider; +import org.achartengine.chartdemo.demo.chart.*; import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.content.Intent; import ohos.aafwk.content.Operation; import ohos.agp.components.*; -import ohos.utils.Sequenceable; import java.util.ArrayList; import java.util.List; @@ -79,15 +77,15 @@ public class ChartDemo extends AbilitySlice { // intent = new Intent(this, XYChartBuilder.class); operation = new Intent.OperationBuilder() .withDeviceId("") - .withBundleName("com.achartengine.demo") - .withAbilityName("com.achartengine.demo.chart.XYCharBuilderAbility") + .withBundleName(getBundleName()) + .withAbilityName("org.achartengine.chartdemo.demo.chart.XYCharBuilderAbility") .build(); } else if (i == 1) { // intent = new Intent(this, PieChartBuilder.class); operation = new Intent.OperationBuilder() .withDeviceId("") - .withBundleName("com.achartengine.demo") - .withAbilityName("com.achartengine.demo.PieChartBuilderAbility") + .withBundleName(getBundleName()) + .withAbilityName("org.achartengine.chartdemo.demo.PieChartBuilderAbility") .build(); } else if (i <= mCharts.length + 1) { intent = mCharts[i - 2].execute(ChartDemo.this); @@ -108,8 +106,8 @@ public class ChartDemo extends AbilitySlice { // intent = new Intent(this, GeneratedChartDemo.class); operation = new Intent.OperationBuilder() .withDeviceId("") - .withBundleName("com.achartengine.demo") - .withAbilityName("com.achartengine.demo.GeneratedChartDemoAbility") + .withBundleName(getBundleName()) + .withAbilityName("org.achartengine.chartdemo.demo.GeneratedChartDemoAbility") .build(); } diff --git a/entry/src/main/java/com/achartengine/demo/slice/GeneratedChartDemo.java b/entry/src/main/java/org/achartengine/chartdemo/demo/slice/GeneratedChartDemo.java similarity index 93% rename from entry/src/main/java/com/achartengine/demo/slice/GeneratedChartDemo.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/slice/GeneratedChartDemo.java index 691cd14..e924b7e 100644 --- a/entry/src/main/java/com/achartengine/demo/slice/GeneratedChartDemo.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/slice/GeneratedChartDemo.java @@ -13,33 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.slice; +package org.achartengine.chartdemo.demo.slice; import java.security.SecureRandom; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Random; -import com.achartengine.demo.ResourceTable; -import com.achartengine.demo.SampleItem; -import com.achartengine.demo.SampleItemProvider; +import org.achartengine.chartdemo.demo.ResourceTable; +import org.achartengine.chartdemo.demo.SampleItem; +import org.achartengine.chartdemo.demo.SampleItemProvider; import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.content.Intent; import ohos.agp.components.Component; import ohos.agp.components.ListContainer; import ohos.agp.utils.Color; -import com.achartengine.demo.ChartFactory; -import org.achartengine.chart.BarChart.Type; -import org.achartengine.chart.PointStyle; -import org.achartengine.chart.TimeChart; - -import org.achartengine.model.CategorySeries; -import org.achartengine.model.TimeSeries; -import org.achartengine.model.XYMultipleSeriesDataset; -import org.achartengine.model.XYSeries; -import org.achartengine.renderer.XYMultipleSeriesRenderer; -import org.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.chartdemo.demo.ChartFactory; +import com.achartengine.chart.BarChart.Type; +import com.achartengine.chart.PointStyle; +import com.achartengine.chart.TimeChart; + +import com.achartengine.model.CategorySeries; +import com.achartengine.model.TimeSeries; +import com.achartengine.model.XYMultipleSeriesDataset; +import com.achartengine.model.XYSeries; +import com.achartengine.renderer.XYMultipleSeriesRenderer; +import com.achartengine.renderer.XYSeriesRenderer; public class GeneratedChartDemo extends AbilitySlice { diff --git a/entry/src/main/java/com/achartengine/demo/slice/MainAbilitySlice.java b/entry/src/main/java/org/achartengine/chartdemo/demo/slice/MainAbilitySlice.java similarity index 82% rename from entry/src/main/java/com/achartengine/demo/slice/MainAbilitySlice.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/slice/MainAbilitySlice.java index 56e3892..4ad787d 100644 --- a/entry/src/main/java/com/achartengine/demo/slice/MainAbilitySlice.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/slice/MainAbilitySlice.java @@ -1,6 +1,6 @@ -package com.achartengine.demo.slice; +package org.achartengine.chartdemo.demo.slice; -import com.achartengine.demo.ResourceTable; +import org.achartengine.chartdemo.demo.ResourceTable; import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.content.Intent; diff --git a/entry/src/main/java/com/achartengine/demo/slice/PieChartBuilder.java b/entry/src/main/java/org/achartengine/chartdemo/demo/slice/PieChartBuilder.java similarity index 91% rename from entry/src/main/java/com/achartengine/demo/slice/PieChartBuilder.java rename to entry/src/main/java/org/achartengine/chartdemo/demo/slice/PieChartBuilder.java index 3e4c14a..2f3ac9a 100644 --- a/entry/src/main/java/com/achartengine/demo/slice/PieChartBuilder.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/slice/PieChartBuilder.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.demo.slice; +package org.achartengine.chartdemo.demo.slice; -import com.achartengine.demo.ResourceTable; +import org.achartengine.chartdemo.demo.ResourceTable; import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.content.Intent; import ohos.agp.components.*; import ohos.agp.components.element.ShapeElement; import ohos.agp.utils.Color; import ohos.agp.window.dialog.ToastDialog; -import com.achartengine.demo.ChartFactory; -import org.achartengine.GraphicalView; -import org.achartengine.model.CategorySeries; -import org.achartengine.model.SeriesSelection; -import org.achartengine.renderer.DefaultRenderer; -import org.achartengine.renderer.SimpleSeriesRenderer; +import org.achartengine.chartdemo.demo.ChartFactory; +import com.achartengine.GraphicalView; +import com.achartengine.model.CategorySeries; +import com.achartengine.model.SeriesSelection; +import com.achartengine.renderer.DefaultRenderer; +import com.achartengine.renderer.SimpleSeriesRenderer; public class PieChartBuilder extends AbilitySlice { -- Gitee From b016d4b5aaada455edcdacf40c56b10918d85985 Mon Sep 17 00:00:00 2001 From: zhenxiong han Date: Fri, 21 May 2021 09:29:03 +0800 Subject: [PATCH 2/8] update --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 96dccaa..2636a69 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # achartengine -**本项目基于开源项目achartengine进行openharmony的移植和开发，可以通过项目标签以及github地址（ https://github.com/ddanny/achartengine ）追踪到原项目版本** #### 项目介绍 - 项目名称：achartengine图表 -- Gitee From 8f144d8a38a6b1971e6320538c67d0e79e666fa6 Mon Sep 17 00:00:00 2001 From: zhenxiong han Date: Fri, 21 May 2021 10:57:37 +0800 Subject: [PATCH 3/8] update --- README.OPENSOURCE | 19 +++++++++++++++++++ README.md | 2 -- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 README.OPENSOURCE diff --git a/README.OPENSOURCE b/README.OPENSOURCE new file mode 100644 index 0000000..7074eb0 --- /dev/null +++ b/README.OPENSOURCE @@ -0,0 +1,19 @@ +[ + + { + + "Name": "achartengine", + + "License": "Apache License", + + "License File": "/License", + + "Version Number": "master", + + "Upstream URL": "https://github.com/ddanny/achartengine", + + "Description": "Charting library for Android applications" + + } + +] \ No newline at end of file diff --git a/README.md b/README.md index 2636a69..83a9493 100644 --- a/README.md +++ b/README.md @@ -9,8 +9,6 @@ - 项目移植状态：主功能完成，原图表效果存在差异 - 调用差异：无 - 开发版本：sdk5，DevEco Studio2.1 beta4 -- 原项目Doc地址：https://github.com/ddanny/achartengine - #### 安装教程 -- Gitee From 77ab95cccdc56a28dbe8b8667d1a82cd1ae58bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E6=8C=AF=E9=9B=84?= <729900236@qq.com> Date: Fri, 21 May 2021 11:29:00 +0800 Subject: [PATCH 4/8] update README.md. --- README.md | 9 --------- 1 file changed, 9 deletions(-) diff --git a/README.md b/README.md index 83a9493..af8c1c8 100644 --- a/README.md +++ b/README.md @@ -38,15 +38,6 @@ 使用详见： com.achartengine.demo.chart -#### 测试信息 - -CodeCheck代码测试无异常 - -CloudTest代码测试无异常 - -火绒安全病毒安全检测通过 - -当前版本demo功能与原图表效果存在差异 #### 版本迭代 -- Gitee From a442cd1e8106f3a546d8a37050a57c5c43704501 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E6=8C=AF=E9=9B=84?= <729900236@qq.com> Date: Fri, 21 May 2021 17:12:56 +0800 Subject: [PATCH 5/8] update README.md. --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index af8c1c8..e040cfc 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,14 @@ 使用详见： com.achartengine.demo.chart +#### 测试信息 +CodeCheck代码测试无异常 + +CloudTest代码测试无异常 + +火绒安全病毒安全检测通过 + +当前版本demo功能与原组件基本无差异 #### 版本迭代 -- Gitee From f330c91b7897b4409e8e9d8ecda456dee191c768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E6=8C=AF=E9=9B=84?= <729900236@qq.com> Date: Mon, 24 May 2021 16:10:05 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6=20CHAN?= =?UTF-8?q?GELOG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 CHANGELOG diff --git a/CHANGELOG b/CHANGELOG deleted file mode 100644 index a7bb2c8..0000000 --- a/CHANGELOG +++ /dev/null @@ -1,2 +0,0 @@ - -init -- Gitee From 704569ab55b4568fc9c7806579b14c745422c0e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E6=8C=AF=E9=9B=84?= <729900236@qq.com> Date: Mon, 24 May 2021 16:11:02 +0800 Subject: [PATCH 7/8] rename changeLog.md to CHANGELOG.md. --- CHANGELOG.md | 4 ++++ changeLog.md | 8 -------- 2 files changed, 4 insertions(+), 8 deletions(-) create mode 100644 CHANGELOG.md delete mode 100644 changeLog.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..df1a851 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,4 @@ +## 0.0.1-SNAPSHOT +ohos 第一个版本 + * 实现了原库的大部分 api + * 因为渐变色API差异，天气柱形图渐变色未实现 \ No newline at end of file diff --git a/changeLog.md b/changeLog.md deleted file mode 100644 index f93ba50..0000000 --- a/changeLog.md +++ /dev/null @@ -1,8 +0,0 @@ -# 基本功能： -- 实现各类图表功能 - -# 修改点： -1.自定义view - -# 遗留问题（暂不支持的功能）： -1.天气柱形图渐变色与原库不相符 以纯色替换 -- Gitee From b57cd091d1f03a3f4d2a9f78d822438b6463b353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E6=8C=AF=E9=9B=84?= <729900236@qq.com> Date: Mon, 24 May 2021 16:12:40 +0800 Subject: [PATCH 8/8] update README.md. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e040cfc..73ed264 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ - 项目名称：achartengine图表 - 所属系列：openharmony的第三方组件适配移植 - 功能：图表 -- 基线版本： achartengine Releases master +- 基线版本： Releases master - 项目移植状态：主功能完成，原图表效果存在差异 - 调用差异：无 - 开发版本：sdk5，DevEco Studio2.1 beta4 -- Gitee