diff --git a/CHANGELOG b/CHANGELOG deleted file mode 100644 index a7bb2c82ac520e44391f7fbfc772cf06a712500e..0000000000000000000000000000000000000000 --- a/CHANGELOG +++ /dev/null @@ -1,2 +0,0 @@ - -init diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000000000000000000000000000000000000..df1a85193ab0cb2c7a8100090fe75e9935c82fe1 --- /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/README.OPENSOURCE b/README.OPENSOURCE new file mode 100644 index 0000000000000000000000000000000000000000..7074eb06430d5f32b0a3d38aac612ed272924d71 --- /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 96dccaa7d8e3054a9d688e16a3f4f191267cf1ee..73ed2647aaa43035490f8e0948aa1c460bae6bf6 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,14 @@ # achartengine -**本项目基于开源项目achartengine进行openharmony的移植和开发，可以通过项目标签以及github地址（ https://github.com/ddanny/achartengine ）追踪到原项目版本** #### 项目介绍 - 项目名称：achartengine图表 - 所属系列：openharmony的第三方组件适配移植 - 功能：图表 -- 基线版本： achartengine Releases master +- 基线版本： Releases master - 项目移植状态：主功能完成，原图表效果存在差异 - 调用差异：无 - 开发版本：sdk5，DevEco Studio2.1 beta4 -- 原项目Doc地址：https://github.com/ddanny/achartengine - #### 安装教程 @@ -41,16 +38,15 @@ 使用详见： com.achartengine.demo.chart -#### 测试信息 +#### 测试信息 CodeCheck代码测试无异常 CloudTest代码测试无异常 火绒安全病毒安全检测通过 -当前版本demo功能与原图表效果存在差异 - +当前版本demo功能与原组件基本无差异 #### 版本迭代 diff --git a/achartengine/.gitignore b/achartengine/.gitignore deleted file mode 100644 index 796b96d1c402326528b4ba3c12ee9d92d0e212e9..0000000000000000000000000000000000000000 --- 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 6a5ababbf217d8345a2c36deb7b64d255a63db51..0000000000000000000000000000000000000000 --- 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 cb5ab36fd8a30146e42afcbe664a81c79354d4f7..0000000000000000000000000000000000000000 --- 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 5fd5111d6d8ee6d6f6a0df9969f934194a745343..587bb8dd286787a90f748a38c8a6f7c2562cf558 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 f3efca5c092120ca9c3763d84cce3a7890501b65..e7a74749decda92a9dec0fd405e04f241bcf03cc 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 88aecba9fd008cd9bb2c22fcdfca11a457eef0e0..16dda1a3a71715df31045244eec9c48378d589d0 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 3344e4b234a980fdc69770ddd69204f0e6664550..dd5c948055aaec5fe0916adcbba1055ddd66cb93 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 e12090c0428e842fa80d17218598b43718e9ca84..e508b66c8d350edf7e306dd94a7fbe8987dfe789 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 a8c1bfb238f7024283f27735ce3e1c0dc7542c1e..3a7f19ae8406e4a2347ae8a1ea57485a3a896cbe 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 4acd7082c5ed08a029cd202b11abc50d6fb221e1..f932692224ad9bf23b19ebb79f1fc1750c12365a 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 a840d101386aa3f4ff9918b666f4cb2578ae557c..93f06ab2ef8570e17a751776697b412bc13fcc9c 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 928d24fa88d21a1b9d489567e455a45c056451e3..6de208503d5b66926ed666dc9e5d792ffd187695 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 7c7d12197c926c376b13cb72dee85b473e0833a7..70035bbadf70cd2741ff3c3fe9668c895e99c963 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 e1749af9f75ecfff06eb27105b35540163c0e3a7..d566167decb92d0a9c10ddb73eb109408ed59d99 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 5272cadb8b3cdf51ecee8b92e632b90518aee77a..5c524871e563749ea431b5adf15b631609e253ba 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 816b890f243981cb63c06cd189b71fb5749378f7..a64e4fdd64e43443592b577f9342567a47f0a40b 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 56b85216c7e9be3a7e993e02dc903712d6e2301d..edd197dfccda31b5619796ee87ee4db8c78ac84e 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 87041b64994f055bc7da4d150f526253cca4cd44..bd798952ef43397cc4c4271995d4a1d5539fcdf1 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 003c616b5b937e80df1a38b7a9ce3b1d801e678c..89abf9b298a6fb4559322e7b7a3e73bb40496559 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 ce8f9084d54ee519f4ddccf57c36a8484eb9685a..2a457d6036ed90a7e74d846b00a354c028ead499 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 2f8816b872eed1be9d878c47e0596ef21ac5fc84..1ed874cfb83f4884fa55ffc9f9857010f668cf4c 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 3a9c66b7a6bb0d5b8ee1a8ba4c7b895e9560c04d..2c523b3ca48c2d2aee25bae80651a4605a7a7d0c 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 6746e40b27743dabb1b12076c974e7a591a09ff1..e685ef237a7fba8b928a508d94f3fced3d995294 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 da97450df7bb1937efa8ac2c0e7a596f9e0f6b48..7d6b17a92d6ae654c8b135075f5fd30b4f55d89a 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 e390d39209f78386755aeebb6a45bcc88a69a0b1..081513767d28d4f95d6b2064e811bfab49606967 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 41d1a13790f71d5ba1b8ce094f0c0e62296e98dd..4c10f88b3dc4a40b9a9a96652ac01d8ff822462e 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 9e1d677809082e6b06b47487670113a138bf0f93..3e8b285adb5eac869031f6bb360c3d41b0c68a97 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 4642aef32c7b2818423244b313ee657dd5f2d4be..26cd2bc73ff06d724afdb95dfebde1806e87b4b2 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 eb51d918f0a24444ed94f0a33b007342f3e08569..8b9ca2019ccca012de200e3c84ba47609c5ed79f 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 8ed45e9ec3ec571582b7ba1359b8d32fb906c3f3..2c75cfb07b6d534d0dd696f70bb45b19cb98cbe2 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 88fbc048cfabfbbe2a328abef58a2c46ea9e207f..761df57fac642addb9722244d3340b10478c553e 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 bf5eea2b3ba959c4e4f372284aa734a6605b48ec..229099c4496f28d612144c4ead463a284c7460a1 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 1157be8dc0c188e18ba4255383f7e4c55d594988..aa693bc858ce84304f736069d2b1a1ff88a7fd28 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 b1683741fba9e3330c4bc57bbf1f19a9df22f573..61eb0776965b0fb648801121d503578e97adf345 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 391f17e7361909215709859ea73da18a218c208f..f647673252229dd314d7555586e2ba133bb5cfd2 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 221d61bbe45a3ab7bc411203005005439f074890..0e9e4c0b93e777020561a9e346e8715852b2ae32 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 403c87cef1173ca069bfd1ba2454830498ad7f89..15c9638db6030bef6383e3b4b9bab229831a9871 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 a28364532ef0ab5f034b91e9ebd5cd9d55af460a..9bd0c2d398b2903694d0efd06f383e9fe3f5bb0a 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 4459d4950807af9eb5c5c7354439203eec4b603d..08161b3b3004eee0fa43c64b8df63ba7877cd6ad 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 77bd09cc616363a2008d0ca69ff8cd8f6228d6d7..af05b362af3f8cb2686545e5ff34e526b9a310d7 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 70914d842d3f49a473098271882eefe6bb057a99..a194b35b863916ce6f35d38268b564c4ae9c9288 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 0e482707de399613dd163b10061d5fdaee03bb99..1cefa2d85876b85b5d1ca9cf39152ed6c4fabf0d 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 19e40ba00d8c8c6a7d27abbda343672f6c63ecee..6346879f1e61f97d443fb9dda9f7e7c137e82224 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 e4dc232d9ce7c76325c928d70206de5d61dbdd26..dafe54de8152463cf45dcfff31d04a22100fb97f 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 6462b7463ebfbbf6985bfb147c49cb9b6b01c135..a6589e1616a62c8ed4463c9cd7720c000edb78d9 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 b7f67771524c44c0690b8a9c62b76175c8849c24..55ec21421eca9856baeed699ae4079a950651128 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 6ade31af7268f1efe93b1b575052500f056c4859..a58939726d0153eb08ffcdde7ec0e0532fa26f80 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 bb60afc0c57f19bffcbca3eeef8b8c2c28f8fd0b..902481479c4259d10f61f9f48cded5f4ee50ec8f 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 0c97e40387002fdc451540ea95a45f8559f69520..b0b365c131a423e2c45e74cb242fb0a9fe98bec0 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 96994185d9b2ce4873317d6a052189e7bf4e8743..a79859637fd2ec482b089204af58ba9dad078aec 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 a84b15d568d1a0ae5595cdacc8e1550b0eb5df00..17ce688512d4c8b3d966820b35f28a1c99860637 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/changeLog.md b/changeLog.md deleted file mode 100644 index f93ba504c9375b6f2e12851ca4b49ee8f0238416..0000000000000000000000000000000000000000 --- a/changeLog.md +++ /dev/null @@ -1,8 +0,0 @@ -# 基本功能： -- 实现各类图表功能 - -# 修改点： -1.自定义view - -# 遗留问题（暂不支持的功能）： -1.天气柱形图渐变色与原库不相符 以纯色替换 diff --git a/entry/src/main/config.json b/entry/src/main/config.json index 9f58aacc83e923e8061dd51254bbeb753b061d75..fcb010c54951dd2312f7d8c534d49f91b90c4d3b 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 71ea55aa723c6c3f94c25597642625569f0bb107..cd8f7a2932e140701b380b29665b0acd4dd3fbae 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 16428f8d1625bf6792d732e1451185dd2626b277..adff4bd5562147b1eafa00386eb2d8aa13bc634d 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 331bd2ee67d107785e8359eb5bffd11d0c699fb2..0e9f32d26af46609a1637e716b73675193efbc54 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 b6e09674b19933aac071cdbac4d29034a147ca93..241c3265087ecd2b43aaba38c1d127d9aba4788a 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 9caf93c5e3090f58eeb2bfbc357ad8b0c37f1654..22c8a3898b3a52a6e76cd34501eda81071fc7568 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 d42679975f85a070dd8f9815957dd1afcaf61165..4c1ac012283c1d223b9ca5a0bb2909232c3a557b 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 3b523cad65401156800d844c5a28f9bc958f9553..09384494f6bb11b2cfd5b804b6ae499ed6483a30 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 236f78fc0705e746f29c0671ed3c6343984d1f2f..d047dcf9651220231740389d6350259acfa541f5 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 749dd0de9aba700000388426bb3c031f55e2d25b..14f99d9ce0a359c9ad6b01328d841efadd6af308 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 4aac041f13a71d2108840571c25c071424c3ea64..6c94e6f9afa80d767d25df0f683d5ff64b465615 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 b3236330dc7a8bbfe3910e8455fc93eed29e022a..a5cd2acd11a676b7c889abd6ba04a37ec6f4f7ee 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 9372874012526ab2de122a4b85ff2bfbe9fbae71..ebc99cb2e884a6ca0bbe88704e13843a917673a8 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 99176507cca1fdb92deb88d9488680510024f0a9..ccd069a5c78d444e571a8bea8a542c0986eeddc3 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 29527083726f861a3413789bbcf8a244e51bfa4b..2670be07f7ff134e3d9cac7e7f69e0618f37510e 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 400dda83bdb19a21ed1d37b56228e8a2d4c94046..23d292b3c38f382c7b646d84771f1d7a195aadfe 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 b34b36bdfdf77e4cff52bbfcce6811513f61d83e..cd92f0b1044fb37cada04d48b88359bbb7e9ca71 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 5c7d564247c253e5648ecb35fd42c43a2c211c86..e06039e6cf31d0bcde3a42fe0918f4cfc22eae34 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 e3ff395c697ec325e7b86438af00380122cfbc7b..239e0c55661f2c9ae64410d255cdafba61d87014 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 8c768f4621ebb8d56b8abde39906eef3f946706a..4a390555037e8b8138a4e4bcbd092d9322e937e8 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 8c2841589484b773dbd2ead428583819782cf13c..40c2b6fc6ab09a7bbfdffb31d497a44ac929a1e6 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 c449928c5931cd9df27725af01cd889e8e8d4b3c..e7e0a9bf0b866fc93d410c9fd9a6f1fdbf8a610e 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 585f76982728fff2e79110631fc782634c610782..698fddb5875a222a112988d151547e73fdc9591c 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 7650baf554299698b64a4dd414db4c0bcac91228..c8c08aa5bb68b9837abed2e005262121363f7a6b 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 fddad5786e8f24a132a28b6c3caad03a4f81e7e8..cb1de6f588c9c163d77cd5091ab79b993de4bcfb 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 5f2afbb519626b56b5ec54c01ee933c513a3ee06..f7b4d6fee0a68869e851da385d078b64572afb27 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 26d1aa283ada260710765df57b8c256d9de639c9..5be8e4889a39e922bc817f25c68e7f33ef56f71b 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 cd27d61f7d9fb3233108850556f78406de448bbe..24cb8a596e7cf31328fcd04d75006dfc367d0aee 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 a9af1d82def58cb65d844f690cb7957bb4c6e66d..375ff850b510ebc978e16f63ac157ffecb835b6d 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 f596464066ec3871c80b0f81812304474fed79c5..90082ea8de1c56aa4c7bc548ba0d4fa9d4b4e667 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 cccace5328e89deb6f7fb31b2a0efa9444c5aa04..b536563fb31290c532011ef21f0beede4297f1f0 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 773984bfe5d80f1650479064cc4378f40bf61e98..d9050e9d34e2f8760d8ee627418b9d5469080116 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 7a90dfd792eb3f94c4c2cf91f5e46af0bfb06f83..a70ba03ce2ad632479eda3c063793b2302089fe4 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 691cd145df1cf55b9ff95637caa6bc43270b032d..e924b7e04e90a0a8d965b706dae6b05b2f5c1bdc 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 56e3892cac24cd29458cbfa943ed097c042b0854..4ad787d7dd73fdefa9e7761941d60851ecd77264 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 3e4c14ab9f755b97589a7b2c3deeea7ae32a52c5..2f3ac9a34b31a5c5cd249a08c8d2cc10b8f8c8f6 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 {