diff --git a/CHANGELOG.md b/CHANGELOG.md index df1a85193ab0cb2c7a8100090fe75e9935c82fe1..a7c0af8dfed0a18a2e576eb23d59f9adb8379359 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 0.0.2-SNAPSHOT +ohos 第2个版本 + *更新sdk6 ## 0.0.1-SNAPSHOT ohos 第一个版本 * 实现了原库的大部分 api diff --git a/README.md b/README.md index d964d700e57f3cd0c6b20a075f4ced05ccb7dca5..70fbf3aa933e8d57ac4b030d7fd87d9a8ca7f03c 100644 --- a/README.md +++ b/README.md @@ -5,32 +5,15 @@ - 项目名称：achartengine - 所属系列：openharmony的第三方组件适配移植 - 功能：图表 -- 基线版本： master - 项目移植状态：主功能完成，原图表效果存在差异 - 调用差异：无 -- 开发版本：sdk5，DevEco Studio2.1 Release +- 开发版本：sdk6，DevEco Studio2.2 Beta1 +- 基线版本： master #### 安装教程 -1.在项目根目录下的build.gradle文件中， - ``` - allprojects { - repositories { - maven { - url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' - } - } - } -``` -2.在entry模块的build.gradle文件中， - ``` - dependencies { - implementation('com.gitee.chinasoft_ohos:achartengine:0.0.1-SNAPSHOT') - ...... - } -``` -在sdk5，DevEco Studio2.1 Release下项目可直接运行 +在sdk6，DevEco Studio2.2 Beta1下项目可直接运行 如无法运行，删除项目.gradle,.idea,build,gradle,build.gradle文件， 并依据自己的版本创建新项目，将新项目的对应文件复制到根目录下 @@ -55,17 +38,17 @@ r.setGradientStop(0, Color.GREEN.getValue()); r.setHighlighted(true); ``` -其余图表使用方式请查看对应类 +其余图表实现方式请查看图表对应类 #### 测试信息 CodeCheck代码测试无异常 CloudTest代码测试无异常 -火绒安全病毒安全检测通过 +病毒安全检测通过 当前版本demo功能与原组件基本无差异 #### 版本迭代 -- 0.0.1-SNAPSHOT +- 0.0.2-SNAPSHOT diff --git a/achartengine/build.gradle b/achartengine/build.gradle deleted file mode 100644 index 115ec9dab4917734bb2e858c3797e205259e0bf5..0000000000000000000000000000000000000000 --- a/achartengine/build.gradle +++ /dev/null @@ -1,13 +0,0 @@ -apply plugin: 'com.huawei.ohos.library' -ohos { - compileSdkVersion 5 - defaultConfig { - compatibleSdkVersion 5 - } - -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - testCompile'junit:junit:4.12' -} diff --git a/achartengine/src/main/config.json b/achartengine/src/main/config.json deleted file mode 100644 index 6afbec0cd1e2d97b520736702eceb0d8f728617b..0000000000000000000000000000000000000000 --- a/achartengine/src/main/config.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "app": { - "bundleName": "com.achartengine", - "vendor": "achartengine", - "version": { - "code": 1000000, - "name": "1.0" - }, - "apiVersion": { - "compatible": 5, - "target": 5, - "releaseType": "Beta1" - } - }, - "deviceConfig": {}, - "module": { - "package": "org.achartengine", - "deviceType": [ - "phone" - ], - "distro": { - "deliveryWithInstall": true, - "moduleName": "achartengine-achartengine", - "moduleType": "har" - } - } -} \ No newline at end of file diff --git a/achartengine/src/main/resources/base/element/string.json b/achartengine/src/main/resources/base/element/string.json deleted file mode 100644 index 7b1383d4ab87c87c92642024492fc4e144d37ae6..0000000000000000000000000000000000000000 --- a/achartengine/src/main/resources/base/element/string.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "string": [ - { - "name": "app_name", - "value": "achartengine" - }, - { - "name": "add_values", - "value": "Add values to the chart" - }, - { - "name": "x", - "value": "X" - }, - { - "name": "y", - "value": "Y" - }, - { - "name": "add", - "value": "Add" - }, - { - "name": "new_series", - "value": "New series" - } - ] -} diff --git a/achartengine/src/main/resources/rawfile/zoom-1.png b/achartengine/src/main/resources/rawfile/zoom-1.png deleted file mode 100644 index 8265f27840a14b4b275086df67af01c73a3a8420..0000000000000000000000000000000000000000 Binary files a/achartengine/src/main/resources/rawfile/zoom-1.png and /dev/null differ diff --git a/achartengine/src/main/resources/rawfile/zoom_in.png b/achartengine/src/main/resources/rawfile/zoom_in.png deleted file mode 100644 index 1ac4864d4a0c95a022e19ef38b4544711de39f1e..0000000000000000000000000000000000000000 Binary files a/achartengine/src/main/resources/rawfile/zoom_in.png and /dev/null differ diff --git a/achartengine/src/main/resources/rawfile/zoom_out.png b/achartengine/src/main/resources/rawfile/zoom_out.png deleted file mode 100644 index d67a87de533e307cb0e95ab2623259d98eb1adae..0000000000000000000000000000000000000000 Binary files a/achartengine/src/main/resources/rawfile/zoom_out.png and /dev/null differ diff --git a/build.gradle b/build.gradle index 9422189539b5824ba620bb2c32aca5c6d940c8bc..f0c73f75841a46b558f59b3d99e82c8f916c5dd3 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.huawei.ohos.app' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { compatibleSdkVersion 5 } @@ -19,8 +19,8 @@ buildscript { jcenter() } dependencies { - classpath 'com.huawei.ohos:hap:2.4.4.2' - classpath 'com.huawei.ohos:decctest:1.0.0.7' + classpath 'com.huawei.ohos:hap:2.4.5.0' + classpath 'com.huawei.ohos:decctest:1.2.4.1' } } diff --git a/entry/build.gradle b/entry/build.gradle index 6d829d9b60cafbf0a7ecc1a4fd1ebf3323b3bd8b..580f716a3d2d0d90c8dc7e169a31a039330d69d3 100644 --- a/entry/build.gradle +++ b/entry/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.huawei.ohos.hap' apply plugin: 'com.huawei.ohos.decctest' ohos { - compileSdkVersion 5 + compileSdkVersion 6 defaultConfig { compatibleSdkVersion 5 } @@ -11,7 +11,6 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar', '*.har']) testCompile'junit:junit:4.12' ohosTestImplementation 'com.huawei.ohos.testkit:runner:1.0.0.100' - implementation project(":achartengine") } decc { supportType = ['html','xml'] diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/ChartFactory.java b/entry/src/main/java/org/achartengine/ChartFactory.java similarity index 96% rename from entry/src/main/java/org/achartengine/chartdemo/demo/ChartFactory.java rename to entry/src/main/java/org/achartengine/ChartFactory.java index adff4bd5562147b1eafa00386eb2d8aa13bc634d..a4a5c2df45e66bc8b2c950e257f8270a4d8b8a70 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/ChartFactory.java +++ b/entry/src/main/java/org/achartengine/ChartFactory.java @@ -13,32 +13,32 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chartdemo.demo; +package org.achartengine; import ohos.aafwk.content.Intent; import ohos.aafwk.content.Operation; import ohos.app.Context; -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; +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; diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/GraphicalActivity.java b/entry/src/main/java/org/achartengine/GraphicalActivity.java similarity index 92% rename from entry/src/main/java/org/achartengine/chartdemo/demo/GraphicalActivity.java rename to entry/src/main/java/org/achartengine/GraphicalActivity.java index 22c8a3898b3a52a6e76cd34501eda81071fc7568..ec90fc96ac566551d0595ba1b1c2ee9ae042cc12 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/GraphicalActivity.java +++ b/entry/src/main/java/org/achartengine/GraphicalActivity.java @@ -13,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.achartengine.chartdemo.demo; +package org.achartengine; import ohos.aafwk.ability.AbilitySlice; import ohos.aafwk.content.Intent; import ohos.agp.components.ComponentContainer; import ohos.agp.components.DirectionalLayout; -import com.achartengine.GraphicalView; -import com.achartengine.chart.AbstractChart; +import org.achartengine.GraphicalView; +import org.achartengine.chart.AbstractChart; +import org.achartengine.ChartFactory; /** diff --git a/achartengine/src/main/java/com/achartengine/GraphicalView.java b/entry/src/main/java/org/achartengine/GraphicalView.java similarity index 94% rename from achartengine/src/main/java/com/achartengine/GraphicalView.java rename to entry/src/main/java/org/achartengine/GraphicalView.java index e7a74749decda92a9dec0fd405e04f241bcf03cc..ce0f2d5c2fd0fc4262504da5d4d548476d8bbc83 100644 --- a/achartengine/src/main/java/com/achartengine/GraphicalView.java +++ b/entry/src/main/java/org/achartengine/GraphicalView.java @@ -13,8 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine; +package org.achartengine; +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 ohos.agp.components.Component; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; @@ -27,20 +38,8 @@ import ohos.eventhandler.EventHandler; import ohos.eventhandler.EventRunner; import ohos.hiviewdfx.HiLog; import ohos.hiviewdfx.HiLogLabel; -import ohos.media.image.PixelMap; import ohos.multimodalinput.event.MmiPoint; import ohos.multimodalinput.event.TouchEvent; -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. @@ -68,22 +67,7 @@ public class GraphicalView * The zoom buttons rectangle. */ private Rect mZoomR = new Rect(); - /** - * The zoom in icon. - */ - private PixelMap zoomInImage; - /** - * The zoom out icon. - */ - private PixelMap zoomOutImage; - /** - * The fit zoom icon. - */ - private PixelMap fitZoomImage; - /** - * The zoom area size. - */ - private int zoomSize = 50; + /** * The zoom buttons background color. */ diff --git a/achartengine/src/main/java/com/achartengine/ITouchHandler.java b/entry/src/main/java/org/achartengine/ITouchHandler.java similarity index 92% rename from achartengine/src/main/java/com/achartengine/ITouchHandler.java rename to entry/src/main/java/org/achartengine/ITouchHandler.java index 16dda1a3a71715df31045244eec9c48378d589d0..a342b14fb95080041f6cd41e37f9e4566aeab93b 100644 --- a/achartengine/src/main/java/com/achartengine/ITouchHandler.java +++ b/entry/src/main/java/org/achartengine/ITouchHandler.java @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine; +package org.achartengine; +import org.achartengine.tools.PanListener; +import org.achartengine.tools.ZoomListener; import ohos.multimodalinput.event.TouchEvent; -import com.achartengine.tools.PanListener; -import com.achartengine.tools.ZoomListener; - /** diff --git a/achartengine/src/main/java/com/achartengine/TouchHandler.java b/entry/src/main/java/org/achartengine/TouchHandler.java similarity index 94% rename from achartengine/src/main/java/com/achartengine/TouchHandler.java rename to entry/src/main/java/org/achartengine/TouchHandler.java index dd5c948055aaec5fe0916adcbba1055ddd66cb93..b8cf453844b4350ff5aad228ef6eaab98e8787a3 100644 --- a/achartengine/src/main/java/com/achartengine/TouchHandler.java +++ b/entry/src/main/java/org/achartengine/TouchHandler.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine; +package org.achartengine; +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 ohos.agp.utils.RectFloat; import ohos.multimodalinput.event.MmiPoint; import ohos.multimodalinput.event.TouchEvent; -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/com/achartengine/chart/AbstractChart.java b/entry/src/main/java/org/achartengine/chart/AbstractChart.java similarity index 96% rename from achartengine/src/main/java/com/achartengine/chart/AbstractChart.java rename to entry/src/main/java/org/achartengine/chart/AbstractChart.java index e508b66c8d350edf7e306dd94a7fbe8987dfe789..206110f95cc71c22b662fde87568c007348a0e17 100644 --- a/achartengine/src/main/java/com/achartengine/chart/AbstractChart.java +++ b/entry/src/main/java/org/achartengine/chart/AbstractChart.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.chart; +package org.achartengine.chart; -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; import ohos.agp.utils.*; +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 java.io.Serializable; import java.text.NumberFormat; @@ -90,7 +90,7 @@ public abstract class AbstractChart implements Serializable { * @return the legend height */ protected int drawLegend(Canvas canvas, DefaultRenderer renderer, String[] titles, int left, - int right, int y, int width, int height, int legendSize, Paint paint, boolean calculate) { + int right, int y, int width, int height, int legendSize, Paint paint, boolean calculate) { float size = 32; if (renderer.isShowLegend()) { float currentX = left; @@ -108,7 +108,6 @@ public abstract class AbstractChart implements Serializable { } else { paint.setColor(Color.LTGRAY); } - float[] widths = new float[text.length()]; float sum=paint.measureText(text); // float sum = 0; // for (float value : widths) { @@ -383,7 +382,7 @@ public abstract class AbstractChart implements Serializable { * @param paint the paint to be used for drawing */ public abstract void drawLegendShape(Canvas canvas, SimpleSeriesRenderer renderer, float x, - float y, int seriesIndex, Paint paint); + float y, int seriesIndex, Paint paint); /** * Calculates the best text to fit into the available space. @@ -515,7 +514,7 @@ public abstract class AbstractChart implements Serializable { * @param screenPoint * @return the series and point indexes */ - public SeriesSelection getSeriesAndPointForScreenCoordinate(com.achartengine.model.Point screenPoint) { + public SeriesSelection getSeriesAndPointForScreenCoordinate(org.achartengine.model.Point screenPoint) { return null; } diff --git a/achartengine/src/main/java/com/achartengine/chart/BarChart.java b/entry/src/main/java/org/achartengine/chart/BarChart.java similarity index 94% rename from achartengine/src/main/java/com/achartengine/chart/BarChart.java rename to entry/src/main/java/org/achartengine/chart/BarChart.java index 3a7f19ae8406e4a2347ae8a1ea57485a3a896cbe..2206cc3af14cd461d7d80e3c72bd29f961353eae 100644 --- a/achartengine/src/main/java/com/achartengine/chart/BarChart.java +++ b/entry/src/main/java/org/achartengine/chart/BarChart.java @@ -13,20 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.chart; - -import java.util.List; +package org.achartengine.chart; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.utils.Color; import ohos.agp.utils.RectFloat; -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; +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 java.util.List; /** @@ -70,7 +69,7 @@ public class BarChart extends XYChart { @Override protected ClickableArea[] clickableAreasForPoints(List points, List values, - float yAxisValue, int seriesIndex, int startIndex) { + float yAxisValue, int seriesIndex, int startIndex) { int seriesNr = mDataset.getSeriesCount(); int length = points.size(); ClickableArea[] ret = new ClickableArea[length / 2]; @@ -103,7 +102,7 @@ public class BarChart extends XYChart { */ @Override public void drawSeries(Canvas canvas, Paint paint, List points, - XYSeriesRenderer seriesRenderer, float yAxisValue, int seriesIndex, int startIndex) { + XYSeriesRenderer seriesRenderer, float yAxisValue, int seriesIndex, int startIndex) { int seriesNr = mDataset.getSeriesCount(); int length = points.size(); paint.setColor(new Color(seriesRenderer.getColor())); @@ -177,7 +176,7 @@ public class BarChart extends XYChart { yMax = temp; } - SimpleSeriesRenderer renderer = mRenderer.getSeriesRendererAt(seriesIndex); + // if (renderer.isGradientEnabled()) { // float minY = (float) toScreenPoint(new double[] { 0, renderer.getGradientStopValue() }, scale)[1]; // float maxY = (float) toScreenPoint(new double[] { 0, renderer.getGradientStartValue() }, @@ -225,8 +224,6 @@ public class BarChart extends XYChart { } protected int getGradientPartialColor(int minColor, int maxColor, float fraction) { - int alpha = Math.round(fraction * alpha(minColor) + (1 - fraction) - * Color.alpha(maxColor)); int r = Math.round(fraction *red(minColor) + (1 - fraction) * red(maxColor)); int g = Math.round(fraction * green(minColor)+ (1 - fraction) *green(maxColor)); int b = Math.round(fraction *blue(minColor) + (1 - fraction) *blue(maxColor) ); @@ -256,7 +253,7 @@ public class BarChart extends XYChart { * @param startIndex the start index of the rendering points */ protected void drawChartValuesText(Canvas canvas, XYSeries series, XYSeriesRenderer renderer, - Paint paint, List points, int seriesIndex, int startIndex) { + Paint paint, List points, int seriesIndex, int startIndex) { int seriesNr = mDataset.getSeriesCount(); int length = points.size(); float halfDiffX = getHalfDiffX(points, length, seriesNr); @@ -300,7 +297,7 @@ public class BarChart extends XYChart { * @param paint the paint to be used for drawing */ public void drawLegendShape(Canvas canvas, SimpleSeriesRenderer renderer, float x, float y, - int seriesIndex, Paint paint) { + int seriesIndex, Paint paint) { float halfShapeWidth = SHAPE_WIDTH / 2; canvas.drawRect(new RectFloat(x, y - halfShapeWidth, x + SHAPE_WIDTH, y + halfShapeWidth), paint); } diff --git a/achartengine/src/main/java/com/achartengine/chart/BubbleChart.java b/entry/src/main/java/org/achartengine/chart/BubbleChart.java similarity index 91% rename from achartengine/src/main/java/com/achartengine/chart/BubbleChart.java rename to entry/src/main/java/org/achartengine/chart/BubbleChart.java index f932692224ad9bf23b19ebb79f1fc1750c12365a..2133a9a142e8887e85885ff50365f831b41f448e 100644 --- a/achartengine/src/main/java/com/achartengine/chart/BubbleChart.java +++ b/entry/src/main/java/org/achartengine/chart/BubbleChart.java @@ -13,20 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.chart; - -import java.util.List; +package org.achartengine.chart; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.utils.Color; import ohos.agp.utils.RectFloat; -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; +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 java.util.List; /** @@ -83,7 +82,7 @@ public class BubbleChart extends XYChart { @Override protected ClickableArea[] clickableAreasForPoints(List points, List values, - float yAxisValue, int seriesIndex, int startIndex) { + float yAxisValue, int seriesIndex, int startIndex) { int length = points.size(); XYValueSeries series = (XYValueSeries) mDataset.getSeriesAt(seriesIndex); double max = series.getMaxValue(); @@ -119,7 +118,7 @@ public class BubbleChart extends XYChart { * @param paint the paint to be used for drawing */ public void drawLegendShape(Canvas canvas, SimpleSeriesRenderer renderer, float x, float y, - int seriesIndex, Paint paint) { + int seriesIndex, Paint paint) { paint.setStyle(Paint.Style.FILL_STYLE); drawCircle(canvas, paint, x + SHAPE_WIDTH, y, 3); } diff --git a/achartengine/src/main/java/com/achartengine/chart/ClickableArea.java b/entry/src/main/java/org/achartengine/chart/ClickableArea.java similarity index 96% rename from achartengine/src/main/java/com/achartengine/chart/ClickableArea.java rename to entry/src/main/java/org/achartengine/chart/ClickableArea.java index 93f06ab2ef8570e17a751776697b412bc13fcc9c..a840d101386aa3f4ff9918b666f4cb2578ae557c 100644 --- a/achartengine/src/main/java/com/achartengine/chart/ClickableArea.java +++ b/entry/src/main/java/org/achartengine/chart/ClickableArea.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.chart; +package org.achartengine.chart; import ohos.agp.utils.RectFloat; diff --git a/achartengine/src/main/java/com/achartengine/chart/CombinedXYChart.java b/entry/src/main/java/org/achartengine/chart/CombinedXYChart.java similarity index 91% rename from achartengine/src/main/java/com/achartengine/chart/CombinedXYChart.java rename to entry/src/main/java/org/achartengine/chart/CombinedXYChart.java index 6de208503d5b66926ed666dc9e5d792ffd187695..add7184e1bd2d847dea124f4f1051322dd1b464a 100644 --- a/achartengine/src/main/java/com/achartengine/chart/CombinedXYChart.java +++ b/entry/src/main/java/org/achartengine/chart/CombinedXYChart.java @@ -13,20 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.chart; - -import java.io.Serializable; -import java.util.List; +package org.achartengine.chart; +import org.achartengine.renderer.XYMultipleSeriesRenderer.Orientation; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; -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; +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 java.io.Serializable; +import java.util.List; /** @@ -46,13 +45,13 @@ public class CombinedXYChart extends XYChart { /** * Builds a new combined XY chart instance. - * + * * @param dataset the multiple series dataset * @param renderer the multiple series renderer * @param chartDefinitions the XY chart definitions */ public CombinedXYChart(XYMultipleSeriesDataset dataset, XYMultipleSeriesRenderer renderer, - XYCombinedChartDef[] chartDefinitions) { + XYCombinedChartDef[] chartDefinitions) { super(dataset, renderer); this.chartDefinitions = chartDefinitions; int length = chartDefinitions.length; @@ -98,7 +97,7 @@ public class CombinedXYChart extends XYChart { /** * Returns a chart instance based on the provided type. - * + * * @param type the chart type * @return an instance of a chart implementation * @throws IllegalAccessException @@ -118,7 +117,7 @@ public class CombinedXYChart extends XYChart { /** * The graphical representation of a series. - * + * * @param canvas the canvas to paint to * @param paint the paint to be used for drawing * @param points the array of points to be used for drawing the series @@ -129,7 +128,7 @@ public class CombinedXYChart extends XYChart { */ @Override public void drawSeries(Canvas canvas, Paint paint, List points, - XYSeriesRenderer seriesRenderer, float yAxisValue, int seriesIndex, int startIndex) { + XYSeriesRenderer seriesRenderer, float yAxisValue, int seriesIndex, int startIndex) { XYChart chart = getXYChart(seriesIndex); chart.setScreenR(getScreenR()); chart.setCalcRange(getCalcRange(mDataset.getSeriesAt(seriesIndex).getScaleNumber()), 0); @@ -139,7 +138,7 @@ public class CombinedXYChart extends XYChart { @Override protected ClickableArea[] clickableAreasForPoints(List points, List values, - float yAxisValue, int seriesIndex, int startIndex) { + float yAxisValue, int seriesIndex, int startIndex) { XYChart chart = getXYChart(seriesIndex); return chart.clickableAreasForPoints(points, values, yAxisValue, getChartSeriesIndex(seriesIndex), startIndex); @@ -158,7 +157,7 @@ public class CombinedXYChart extends XYChart { /** * Returns the legend shape width. - * + * * @param seriesIndex the series index * @return the legend shape width */ @@ -169,7 +168,7 @@ public class CombinedXYChart extends XYChart { /** * The graphical representation of the legend shape. - * + * * @param canvas the canvas to paint to * @param renderer the series renderer * @param x the x value of the point the shape should be drawn at @@ -178,7 +177,7 @@ public class CombinedXYChart extends XYChart { * @param paint the paint to be used for drawing */ public void drawLegendShape(Canvas canvas, SimpleSeriesRenderer renderer, float x, float y, - int seriesIndex, Paint paint) { + int seriesIndex, Paint paint) { XYChart chart = getXYChart(seriesIndex); chart.drawLegendShape(canvas, renderer, x, y, getChartSeriesIndex(seriesIndex), paint); } diff --git a/achartengine/src/main/java/com/achartengine/chart/CubicLineChart.java b/entry/src/main/java/org/achartengine/chart/CubicLineChart.java similarity index 92% rename from achartengine/src/main/java/com/achartengine/chart/CubicLineChart.java rename to entry/src/main/java/org/achartengine/chart/CubicLineChart.java index 70035bbadf70cd2741ff3c3fe9668c895e99c963..0e4b4301332a0d26e36a540e90858588b440abd1 100644 --- a/achartengine/src/main/java/com/achartengine/chart/CubicLineChart.java +++ b/entry/src/main/java/org/achartengine/chart/CubicLineChart.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.chart; - -import java.util.List; +package org.achartengine.chart; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.render.Path; import ohos.agp.render.PathMeasure; -import com.achartengine.model.Point; -import com.achartengine.model.XYMultipleSeriesDataset; -import com.achartengine.renderer.XYMultipleSeriesRenderer; -import com.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.model.Point; +import org.achartengine.model.XYMultipleSeriesDataset; +import org.achartengine.renderer.XYMultipleSeriesRenderer; +import org.achartengine.renderer.XYSeriesRenderer; + +import java.util.List; /** @@ -59,7 +59,7 @@ public class CubicLineChart extends LineChart { * points */ public CubicLineChart(XYMultipleSeriesDataset dataset, XYMultipleSeriesRenderer renderer, - float smoothness) { + float smoothness) { super(dataset, renderer); mFirstMultiplier = smoothness; mSecondMultiplier = 1 - mFirstMultiplier; @@ -124,7 +124,7 @@ public class CubicLineChart extends LineChart { * @param startIndex the start index of the rendering points */ protected void drawPoints(Canvas canvas, Paint paint, List pointsList, - XYSeriesRenderer seriesRenderer, float yAxisValue, int seriesIndex, int startIndex) { + XYSeriesRenderer seriesRenderer, float yAxisValue, int seriesIndex, int startIndex) { if (isRenderPoints(seriesRenderer)) { ScatterChart pointsChart = getPointsChart(); if (pointsChart != null) { diff --git a/achartengine/src/main/java/com/achartengine/chart/DialChart.java b/entry/src/main/java/org/achartengine/chart/DialChart.java similarity index 97% rename from achartengine/src/main/java/com/achartengine/chart/DialChart.java rename to entry/src/main/java/org/achartengine/chart/DialChart.java index d566167decb92d0a9c10ddb73eb109408ed59d99..6a046e009d1c05225e939137c61d94d943cf37cd 100644 --- a/achartengine/src/main/java/com/achartengine/chart/DialChart.java +++ b/entry/src/main/java/org/achartengine/chart/DialChart.java @@ -13,17 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.chart; +package org.achartengine.chart; +import org.achartengine.renderer.DialRenderer.Type; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.utils.Color; import ohos.agp.utils.Point; -import com.achartengine.model.CategorySeries; -import com.achartengine.renderer.DialRenderer; -import com.achartengine.renderer.DialRenderer.Type; -import com.achartengine.util.MathHelper; - +import org.achartengine.model.CategorySeries; +import org.achartengine.renderer.DialRenderer; +import org.achartengine.util.MathHelper; /** diff --git a/achartengine/src/main/java/com/achartengine/chart/DoughnutChart.java b/entry/src/main/java/org/achartengine/chart/DoughnutChart.java similarity index 95% rename from achartengine/src/main/java/com/achartengine/chart/DoughnutChart.java rename to entry/src/main/java/org/achartengine/chart/DoughnutChart.java index 5c524871e563749ea431b5adf15b631609e253ba..031ef7a7936bd85d4bc3dd6eff33328809e591b6 100644 --- a/achartengine/src/main/java/com/achartengine/chart/DoughnutChart.java +++ b/entry/src/main/java/org/achartengine/chart/DoughnutChart.java @@ -13,20 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.chart; - -import java.util.ArrayList; -import java.util.List; +package org.achartengine.chart; import ohos.agp.render.Arc; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.utils.Color; import ohos.agp.utils.RectFloat; -import com.achartengine.model.MultipleCategorySeries; -import com.achartengine.renderer.DefaultRenderer; -import com.achartengine.renderer.SimpleSeriesRenderer; +import org.achartengine.model.MultipleCategorySeries; +import org.achartengine.renderer.DefaultRenderer; +import org.achartengine.renderer.SimpleSeriesRenderer; +import java.util.ArrayList; +import java.util.List; /** @@ -162,7 +161,7 @@ public class DoughnutChart extends RoundChart { * @param paint the paint to be used for drawing */ public void drawLegendShape(Canvas canvas, SimpleSeriesRenderer renderer, float x, float y, - int seriesIndex, Paint paint) { + int seriesIndex, Paint paint) { mStep--; canvas.drawCircle(x + SHAPE_WIDTH - mStep, y, mStep, paint); } diff --git a/achartengine/src/main/java/com/achartengine/chart/LineChart.java b/entry/src/main/java/org/achartengine/chart/LineChart.java similarity index 94% rename from achartengine/src/main/java/com/achartengine/chart/LineChart.java rename to entry/src/main/java/org/achartengine/chart/LineChart.java index a64e4fdd64e43443592b577f9342567a47f0a40b..300571dd0bb2016408c7d7025ae03258edd8b008 100644 --- a/achartengine/src/main/java/com/achartengine/chart/LineChart.java +++ b/entry/src/main/java/org/achartengine/chart/LineChart.java @@ -13,23 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.chart; - -import java.util.ArrayList; -import java.util.List; +package org.achartengine.chart; +import org.achartengine.renderer.XYSeriesRenderer.FillOutsideLine; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.render.Picture; import ohos.agp.utils.Color; import ohos.agp.utils.Point; import ohos.agp.utils.RectFloat; -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; +import org.achartengine.model.XYMultipleSeriesDataset; +import org.achartengine.renderer.SimpleSeriesRenderer; +import org.achartengine.renderer.XYMultipleSeriesRenderer; +import org.achartengine.renderer.XYSeriesRenderer; +import java.util.ArrayList; +import java.util.List; /** @@ -48,7 +47,7 @@ public class LineChart extends XYChart { /** * Builds a new line chart instance. - * + * * @param dataset the multiple series dataset * @param renderer the multiple series renderer */ @@ -59,19 +58,19 @@ public class LineChart extends XYChart { /** * Sets the series and the renderer. - * + * * @param dataset the series dataset * @param renderer the series renderer */ protected void setDatasetRenderer(XYMultipleSeriesDataset dataset, - XYMultipleSeriesRenderer renderer) { + XYMultipleSeriesRenderer renderer) { super.setDatasetRenderer(dataset, renderer); pointsChart = new ScatterChart(dataset, renderer); } /** * The graphical representation of a series. - * + * * @param canvas the canvas to paint to * @param paint the paint to be used for drawing * @param points the array of points to be used for drawing the series @@ -196,7 +195,7 @@ public class LineChart extends XYChart { @Override protected ClickableArea[] clickableAreasForPoints(List points, List values, - float yAxisValue, int seriesIndex, int startIndex) { + float yAxisValue, int seriesIndex, int startIndex) { int length = points.size(); ClickableArea[] ret = new ClickableArea[length / 2]; for (int i = 0; i < length; i += 2) { @@ -229,7 +228,7 @@ public class LineChart extends XYChart { * @param paint the paint to be used for drawing */ public void drawLegendShape(Canvas canvas, SimpleSeriesRenderer renderer, float x, float y, - int seriesIndex, Paint paint) { + int seriesIndex, Paint paint) { float oldWidth = paint.getStrokeWidth(); paint.setStrokeWidth(((XYSeriesRenderer) renderer).getLineWidth()); canvas.drawLine(new Point(x, y), new Point(x + SHAPE_WIDTH, y), paint); diff --git a/achartengine/src/main/java/com/achartengine/chart/PieChart.java b/entry/src/main/java/org/achartengine/chart/PieChart.java similarity index 95% rename from achartengine/src/main/java/com/achartengine/chart/PieChart.java rename to entry/src/main/java/org/achartengine/chart/PieChart.java index edd197dfccda31b5619796ee87ee4db8c78ac84e..28708c003114ca05b43dad73289b547563b72e52 100644 --- a/achartengine/src/main/java/com/achartengine/chart/PieChart.java +++ b/entry/src/main/java/org/achartengine/chart/PieChart.java @@ -13,22 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.chart; - -import java.util.ArrayList; -import java.util.List; +package org.achartengine.chart; import ohos.agp.render.Arc; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.utils.Color; import ohos.agp.utils.RectFloat; -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; +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 java.util.ArrayList; +import java.util.List; /** diff --git a/achartengine/src/main/java/com/achartengine/chart/PieMapper.java b/entry/src/main/java/org/achartengine/chart/PieMapper.java similarity index 97% rename from achartengine/src/main/java/com/achartengine/chart/PieMapper.java rename to entry/src/main/java/org/achartengine/chart/PieMapper.java index bd798952ef43397cc4c4271995d4a1d5539fcdf1..c9701b061cb008d935bd5d644bddbe38f7b46833 100644 --- a/achartengine/src/main/java/com/achartengine/chart/PieMapper.java +++ b/entry/src/main/java/org/achartengine/chart/PieMapper.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.chart; +package org.achartengine.chart; + +import org.achartengine.model.Point; +import org.achartengine.model.SeriesSelection; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import com.achartengine.model.Point; -import com.achartengine.model.SeriesSelection; - /** * PieChart Segment Selection Management. */ diff --git a/achartengine/src/main/java/com/achartengine/chart/PieSegment.java b/entry/src/main/java/org/achartengine/chart/PieSegment.java similarity index 98% rename from achartengine/src/main/java/com/achartengine/chart/PieSegment.java rename to entry/src/main/java/org/achartengine/chart/PieSegment.java index 89abf9b298a6fb4559322e7b7a3e73bb40496559..003c616b5b937e80df1a38b7a9ce3b1d801e678c 100644 --- a/achartengine/src/main/java/com/achartengine/chart/PieSegment.java +++ b/entry/src/main/java/org/achartengine/chart/PieSegment.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.chart; +package org.achartengine.chart; import java.io.Serializable; diff --git a/achartengine/src/main/java/com/achartengine/chart/PointStyle.java b/entry/src/main/java/org/achartengine/chart/PointStyle.java similarity index 98% rename from achartengine/src/main/java/com/achartengine/chart/PointStyle.java rename to entry/src/main/java/org/achartengine/chart/PointStyle.java index 2a457d6036ed90a7e74d846b00a354c028ead499..ce8f9084d54ee519f4ddccf57c36a8484eb9685a 100644 --- a/achartengine/src/main/java/com/achartengine/chart/PointStyle.java +++ b/entry/src/main/java/org/achartengine/chart/PointStyle.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.chart; +package org.achartengine.chart; /** * The chart point style enumerator. diff --git a/achartengine/src/main/java/com/achartengine/chart/RangeBarChart.java b/entry/src/main/java/org/achartengine/chart/RangeBarChart.java similarity index 93% rename from achartengine/src/main/java/com/achartengine/chart/RangeBarChart.java rename to entry/src/main/java/org/achartengine/chart/RangeBarChart.java index 1ed874cfb83f4884fa55ffc9f9857010f668cf4c..19b5452001492d81f470d9485a1d48ec9c5b7a3b 100644 --- a/achartengine/src/main/java/com/achartengine/chart/RangeBarChart.java +++ b/entry/src/main/java/org/achartengine/chart/RangeBarChart.java @@ -13,18 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.chart; - -import java.util.List; +package org.achartengine.chart; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.utils.Color; -import com.achartengine.model.XYMultipleSeriesDataset; -import com.achartengine.model.XYSeries; -import com.achartengine.renderer.XYMultipleSeriesRenderer; -import com.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.model.XYMultipleSeriesDataset; +import org.achartengine.model.XYSeries; +import org.achartengine.renderer.XYMultipleSeriesRenderer; +import org.achartengine.renderer.XYSeriesRenderer; +import java.util.List; /** @@ -100,7 +99,7 @@ public class RangeBarChart extends BarChart { * @param startIndex the start index of the rendering points */ protected void drawChartValuesText(Canvas canvas, XYSeries series, XYSeriesRenderer renderer, - Paint paint, List points, int seriesIndex, int startIndex) { + Paint paint, List points, int seriesIndex, int startIndex) { int seriesNr = mDataset.getSeriesCount(); float halfDiffX = getHalfDiffX(points, points.size(), seriesNr); int start = 0; diff --git a/achartengine/src/main/java/com/achartengine/chart/RangeStackedBarChart.java b/entry/src/main/java/org/achartengine/chart/RangeStackedBarChart.java similarity index 96% rename from achartengine/src/main/java/com/achartengine/chart/RangeStackedBarChart.java rename to entry/src/main/java/org/achartengine/chart/RangeStackedBarChart.java index 2c523b3ca48c2d2aee25bae80651a4605a7a7d0c..3a9c66b7a6bb0d5b8ee1a8ba4c7b895e9560c04d 100644 --- a/achartengine/src/main/java/com/achartengine/chart/RangeStackedBarChart.java +++ b/entry/src/main/java/org/achartengine/chart/RangeStackedBarChart.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.chart; +package org.achartengine.chart; public class RangeStackedBarChart extends RangeBarChart { /** The chart type. */ diff --git a/achartengine/src/main/java/com/achartengine/chart/RoundChart.java b/entry/src/main/java/org/achartengine/chart/RoundChart.java similarity index 93% rename from achartengine/src/main/java/com/achartengine/chart/RoundChart.java rename to entry/src/main/java/org/achartengine/chart/RoundChart.java index e685ef237a7fba8b928a508d94f3fced3d995294..fe36e3f712486aeaf8a48c28a325dab4bb346ace 100644 --- a/achartengine/src/main/java/com/achartengine/chart/RoundChart.java +++ b/entry/src/main/java/org/achartengine/chart/RoundChart.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.chart; +package org.achartengine.chart; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.utils.Color; import ohos.agp.utils.RectFloat; -import com.achartengine.model.CategorySeries; -import com.achartengine.renderer.DefaultRenderer; -import com.achartengine.renderer.SimpleSeriesRenderer; +import org.achartengine.model.CategorySeries; +import org.achartengine.renderer.DefaultRenderer; +import org.achartengine.renderer.SimpleSeriesRenderer; /** @@ -92,7 +92,7 @@ public abstract class RoundChart extends AbstractChart { * @param paint the paint to be used for drawing */ public void drawLegendShape(Canvas canvas, SimpleSeriesRenderer renderer, float x, float y, - int seriesIndex, Paint paint) { + int seriesIndex, Paint paint) { canvas.drawRect(new RectFloat(x, y - SHAPE_WIDTH / 2, x + SHAPE_WIDTH, y + SHAPE_WIDTH / 2), paint); } diff --git a/achartengine/src/main/java/com/achartengine/chart/ScatterChart.java b/entry/src/main/java/org/achartengine/chart/ScatterChart.java similarity index 94% rename from achartengine/src/main/java/com/achartengine/chart/ScatterChart.java rename to entry/src/main/java/org/achartengine/chart/ScatterChart.java index 7d6b17a92d6ae654c8b135075f5fd30b4f55d89a..b30fc804587861ca5e2bd0e9458f9fe1901e8985 100644 --- a/achartengine/src/main/java/com/achartengine/chart/ScatterChart.java +++ b/entry/src/main/java/org/achartengine/chart/ScatterChart.java @@ -13,20 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.chart; - -import java.util.List; +package org.achartengine.chart; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.utils.Color; import ohos.agp.utils.Point; import ohos.agp.utils.RectFloat; -import com.achartengine.model.XYMultipleSeriesDataset; -import com.achartengine.renderer.SimpleSeriesRenderer; -import com.achartengine.renderer.XYMultipleSeriesRenderer; -import com.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.model.XYMultipleSeriesDataset; +import org.achartengine.renderer.SimpleSeriesRenderer; +import org.achartengine.renderer.XYMultipleSeriesRenderer; +import org.achartengine.renderer.XYSeriesRenderer; +import java.util.List; /** @@ -58,7 +57,7 @@ public class ScatterChart extends XYChart { // TODO: javadoc protected void setDatasetRenderer(XYMultipleSeriesDataset dataset, - XYMultipleSeriesRenderer renderer) { + XYMultipleSeriesRenderer renderer) { super.setDatasetRenderer(dataset, renderer); size = renderer.getPointSize(); } @@ -126,7 +125,7 @@ public class ScatterChart extends XYChart { @Override protected ClickableArea[] clickableAreasForPoints(List points, List values, - float yAxisValue, int seriesIndex, int startIndex) { + float yAxisValue, int seriesIndex, int startIndex) { int length = points.size(); ClickableArea[] ret = new ClickableArea[length / 2]; for (int i = 0; i < length; i += 2) { @@ -159,7 +158,7 @@ public class ScatterChart extends XYChart { * @param paint the paint to be used for drawing */ public void drawLegendShape(Canvas canvas, SimpleSeriesRenderer renderer, float x, float y, - int seriesIndex, Paint paint) { + int seriesIndex, Paint paint) { if (((XYSeriesRenderer) renderer).isFillPoints()) { paint.setStyle(Paint.Style.FILL_STYLE); } else { diff --git a/achartengine/src/main/java/com/achartengine/chart/TimeChart.java b/entry/src/main/java/org/achartengine/chart/TimeChart.java similarity index 97% rename from achartengine/src/main/java/com/achartengine/chart/TimeChart.java rename to entry/src/main/java/org/achartengine/chart/TimeChart.java index 081513767d28d4f95d6b2064e811bfab49606967..6926ede866c220ab6738585e80b756f178e5ce7f 100644 --- a/achartengine/src/main/java/com/achartengine/chart/TimeChart.java +++ b/entry/src/main/java/org/achartengine/chart/TimeChart.java @@ -13,22 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.chart; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +package org.achartengine.chart; import ohos.agp.render.Canvas; import ohos.agp.render.Paint; import ohos.agp.utils.Color; import ohos.agp.utils.Point; -import com.achartengine.model.XYMultipleSeriesDataset; -import com.achartengine.model.XYSeries; -import com.achartengine.renderer.XYMultipleSeriesRenderer; +import org.achartengine.model.XYMultipleSeriesDataset; +import org.achartengine.model.XYSeries; +import org.achartengine.renderer.XYMultipleSeriesRenderer; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** diff --git a/achartengine/src/main/java/com/achartengine/chart/XYChart.java b/entry/src/main/java/org/achartengine/chart/XYChart.java similarity index 96% rename from achartengine/src/main/java/com/achartengine/chart/XYChart.java rename to entry/src/main/java/org/achartengine/chart/XYChart.java index 4c10f88b3dc4a40b9a9a96652ac01d8ff822462e..f4c1697fa54b98669d254fce6d37bc8abe7dd7bc 100644 --- a/achartengine/src/main/java/com/achartengine/chart/XYChart.java +++ b/entry/src/main/java/org/achartengine/chart/XYChart.java @@ -13,17 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.chart; +package org.achartengine.chart; -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; import ohos.agp.utils.*; +import org.achartengine.model.SeriesSelection; +import org.achartengine.model.XYMultipleSeriesDataset; +import org.achartengine.model.XYSeries; +import org.achartengine.renderer.BasicStroke; +import org.achartengine.renderer.SimpleSeriesRenderer; +import org.achartengine.renderer.XYMultipleSeriesRenderer; +import org.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.util.MathHelper; import java.util.*; import java.util.Map.Entry; @@ -42,7 +45,7 @@ public abstract class XYChart extends AbstractChart { /** The current translate value. */ private float mTranslate; /** The canvas center point. */ - private com.achartengine.model.Point mCenter; + private org.achartengine.model.Point mCenter; /** The visible chart area, in screen coordinates. */ private Rect mScreenR; /** The calculated range. */ @@ -61,7 +64,7 @@ public abstract class XYChart extends AbstractChart { /** * Builds a new XY chart instance. - * + * * @param dataset the multiple series dataset * @param renderer the multiple series renderer */ @@ -72,14 +75,14 @@ public abstract class XYChart extends AbstractChart { // TODO: javadoc protected void setDatasetRenderer(XYMultipleSeriesDataset dataset, - XYMultipleSeriesRenderer renderer) { + XYMultipleSeriesRenderer renderer) { mDataset = dataset; mRenderer = renderer; } /** * The graphical representation of the XY chart. - * + * * @param canvas the canvas to paint to * @param x the top left x value of the view to draw to * @param y the top left y value of the view to draw to @@ -134,7 +137,7 @@ public abstract class XYChart extends AbstractChart { if (mScale < 1) { mTranslate *= -1; } - mCenter = new com.achartengine.model.Point((x + width) / 2, (y + height) / 2); + mCenter = new org.achartengine.model.Point((x + width) / 2, (y + height) / 2); if (rotate) { transform(canvas, angle, false); } @@ -535,8 +538,8 @@ public abstract class XYChart extends AbstractChart { * @param startIndex the start index of the rendering points */ protected void drawSeries(XYSeries series, Canvas canvas, Paint paint, List pointsList, - XYSeriesRenderer seriesRenderer, float yAxisValue, int seriesIndex, XYMultipleSeriesRenderer.Orientation or, - int startIndex) { + XYSeriesRenderer seriesRenderer, float yAxisValue, int seriesIndex, XYMultipleSeriesRenderer.Orientation or, + int startIndex) { BasicStroke stroke = seriesRenderer.getStroke(); Paint.StrokeCap cap = paint.getStrokeCap(); Paint.Join join = paint.getStrokeJoin(); @@ -582,7 +585,7 @@ public abstract class XYChart extends AbstractChart { * @param startIndex the start index of the rendering points */ protected void drawPoints(Canvas canvas, Paint paint, List pointsList, - XYSeriesRenderer seriesRenderer, float yAxisValue, int seriesIndex, int startIndex) { + XYSeriesRenderer seriesRenderer, float yAxisValue, int seriesIndex, int startIndex) { if (isRenderPoints(seriesRenderer)) { ScatterChart pointsChart = getPointsChart(); if (pointsChart != null) { @@ -613,7 +616,7 @@ public abstract class XYChart extends AbstractChart { * @param startIndex the start index of the rendering points */ protected void drawChartValuesText(Canvas canvas, XYSeries series, XYSeriesRenderer renderer, - Paint paint, List points, int seriesIndex, int startIndex) { + Paint paint, List points, int seriesIndex, int startIndex) { if (points.size() > 2) { // there are more than one point // record the first point's position float previousPointX = points.get(0); @@ -903,7 +906,7 @@ public abstract class XYChart extends AbstractChart { /** * Transforms a screen point to a real coordinates point. - * + * * @param screenX the screen x axis value * @param screenY the screen y axis value * @param scale scale value @@ -956,7 +959,7 @@ public abstract class XYChart extends AbstractChart { } } - public SeriesSelection getSeriesAndPointForScreenCoordinate(final com.achartengine.model.Point screenPoint) { + public SeriesSelection getSeriesAndPointForScreenCoordinate(final org.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 @@ -982,7 +985,7 @@ public abstract class XYChart extends AbstractChart { /** * The graphical representation of a series. - * + * * @param canvas the canvas to paint to * @param paint the paint to be used for drawing * @param points the array of points to be used for drawing the series @@ -992,11 +995,11 @@ public abstract class XYChart extends AbstractChart { * @param startIndex the start index of the rendering points */ public abstract void drawSeries(Canvas canvas, Paint paint, List points, - XYSeriesRenderer seriesRenderer, float yAxisValue, int seriesIndex, int startIndex); + XYSeriesRenderer seriesRenderer, float yAxisValue, int seriesIndex, int startIndex); /** * Returns the clickable areas for all passed points - * + * * @param points the array of points * @param values the array of values of each point * @param yAxisValue the minimum value of the y axis @@ -1005,7 +1008,7 @@ public abstract class XYChart extends AbstractChart { * @param startIndex the start index of the rendering points */ protected abstract ClickableArea[] clickableAreasForPoints(List points, - List values, float yAxisValue, int seriesIndex, int startIndex); + List values, float yAxisValue, int seriesIndex, int startIndex); /** * Returns if the chart should display the null values. diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/GraphicalAbility.java b/entry/src/main/java/org/achartengine/chartdemo/demo/GraphicalAbility.java index 241c3265087ecd2b43aaba38c1d127d9aba4788a..006ff8ef2743fb9b78d5113f58297299790d3a82 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/GraphicalAbility.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/GraphicalAbility.java @@ -17,6 +17,7 @@ package org.achartengine.chartdemo.demo; import ohos.aafwk.ability.Ability; import ohos.aafwk.content.Intent; +import org.achartengine.GraphicalActivity; /** diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/AbstractDemoChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/AbstractDemoChart.java index a5cd2acd11a676b7c889abd6ba04a37ec6f4f7ee..881e33ee099973679d9b0673be801604aaa6255b 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/AbstractDemoChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/AbstractDemoChart.java @@ -15,12 +15,12 @@ */ package org.achartengine.chartdemo.demo.chart; -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 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 java.util.Date; import java.util.List; diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/AverageCubicTemperatureChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/AverageCubicTemperatureChart.java index ebc99cb2e884a6ca0bbe88704e13843a917673a8..17488ee56c0bdb9ff43c2ea044232d2164a8b586 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/AverageCubicTemperatureChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/AverageCubicTemperatureChart.java @@ -18,10 +18,10 @@ package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -import org.achartengine.chartdemo.demo.ChartFactory; -import com.achartengine.chart.PointStyle; -import com.achartengine.renderer.XYMultipleSeriesRenderer; -import com.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.ChartFactory; +import org.achartengine.chart.PointStyle; +import org.achartengine.renderer.XYMultipleSeriesRenderer; +import org.achartengine.renderer.XYSeriesRenderer; import java.util.ArrayList; import java.util.List; diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/AverageTemperatureChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/AverageTemperatureChart.java index ccd069a5c78d444e571a8bea8a542c0986eeddc3..aa896e608d20761a62b2579f81e8006be6842a11 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/AverageTemperatureChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/AverageTemperatureChart.java @@ -19,12 +19,12 @@ import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.agp.utils.LayoutAlignment; import ohos.app.Context; -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 org.achartengine.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 java.util.ArrayList; import java.util.List; diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/BudgetDoughnutChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/BudgetDoughnutChart.java index 2670be07f7ff134e3d9cac7e7f69e0618f37510e..f327929040c4eab244215164cc12d2a081ac407a 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/BudgetDoughnutChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/BudgetDoughnutChart.java @@ -18,8 +18,8 @@ package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -import org.achartengine.chartdemo.demo.ChartFactory; -import com.achartengine.renderer.DefaultRenderer; +import org.achartengine.ChartFactory; +import org.achartengine.renderer.DefaultRenderer; import java.util.ArrayList; import java.util.List; diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/BudgetPieChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/BudgetPieChart.java index 23d292b3c38f382c7b646d84771f1d7a195aadfe..e8a2a05ac12a8525d839c9d71aec0197bd2a1826 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/BudgetPieChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/BudgetPieChart.java @@ -18,9 +18,9 @@ package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -import org.achartengine.chartdemo.demo.ChartFactory; -import com.achartengine.renderer.DefaultRenderer; -import com.achartengine.renderer.SimpleSeriesRenderer; +import org.achartengine.ChartFactory; +import org.achartengine.renderer.DefaultRenderer; +import org.achartengine.renderer.SimpleSeriesRenderer; /** diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/CombinedTemperatureChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/CombinedTemperatureChart.java index cd92f0b1044fb37cada04d48b88359bbb7e9ca71..ced7c946272448d454cc5c6c29476489ee8e29c1 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/CombinedTemperatureChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/CombinedTemperatureChart.java @@ -15,18 +15,18 @@ */ 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 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 org.achartengine.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 java.util.ArrayList; import java.util.List; diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/MultipleTemperatureChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/MultipleTemperatureChart.java index 239e0c55661f2c9ae64410d255cdafba61d87014..54707d256730e23bd7a8e7225c186997d5be8f72 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/MultipleTemperatureChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/MultipleTemperatureChart.java @@ -19,11 +19,11 @@ import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.agp.utils.LayoutAlignment; import ohos.app.Context; -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 org.achartengine.ChartFactory; +import org.achartengine.chart.PointStyle; +import org.achartengine.model.XYMultipleSeriesDataset; +import org.achartengine.renderer.XYMultipleSeriesRenderer; +import org.achartengine.renderer.XYSeriesRenderer; import java.util.ArrayList; import java.util.List; diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/ProjectStatusBubbleChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/ProjectStatusBubbleChart.java index 4a390555037e8b8138a4e4bcbd092d9322e937e8..d8b13d18fb4b9270ce35bf669d36663cda96180f 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/ProjectStatusBubbleChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/ProjectStatusBubbleChart.java @@ -18,11 +18,11 @@ package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -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; +import org.achartengine.ChartFactory; +import org.achartengine.model.XYMultipleSeriesDataset; +import org.achartengine.model.XYValueSeries; +import org.achartengine.renderer.XYMultipleSeriesRenderer; +import org.achartengine.renderer.XYSeriesRenderer; /** * Project status demo bubble chart. diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/ProjectStatusChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/ProjectStatusChart.java index 40c2b6fc6ab09a7bbfdffb31d497a44ac929a1e6..6e8d25856e3ac6f06a4c75445f5f4e065696adab 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/ProjectStatusChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/ProjectStatusChart.java @@ -18,10 +18,10 @@ package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -import org.achartengine.chartdemo.demo.ChartFactory; -import com.achartengine.chart.PointStyle; -import com.achartengine.renderer.XYMultipleSeriesRenderer; -import com.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.ChartFactory; +import org.achartengine.chart.PointStyle; +import org.achartengine.renderer.XYMultipleSeriesRenderer; +import org.achartengine.renderer.XYSeriesRenderer; import java.util.ArrayList; import java.util.Date; diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesBarChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesBarChart.java index e7e0a9bf0b866fc93d410c9fd9a6f1fdbf8a610e..db4c6605c74721a2937651e47d8e58e99b44d590 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesBarChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesBarChart.java @@ -18,11 +18,11 @@ package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -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 org.achartengine.ChartFactory; +import org.achartengine.chart.BarChart.Type; +import org.achartengine.renderer.XYMultipleSeriesRenderer; +import org.achartengine.renderer.XYMultipleSeriesRenderer.Orientation; +import org.achartengine.renderer.XYSeriesRenderer; import java.util.ArrayList; import java.util.List; diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesComparisonChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesComparisonChart.java index 698fddb5875a222a112988d151547e73fdc9591c..c7bad7d8f137e050a87d9da58a88709db805c327 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesComparisonChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesComparisonChart.java @@ -18,11 +18,11 @@ package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -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 org.achartengine.ChartFactory; +import org.achartengine.chart.PointStyle; +import org.achartengine.renderer.XYMultipleSeriesRenderer; +import org.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.renderer.XYSeriesRenderer.FillOutsideLine; import java.util.ArrayList; import java.util.List; diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesGrowthChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesGrowthChart.java index c8c08aa5bb68b9837abed2e005262121363f7a6b..094ab6d19a1fcb6726ab6f0ba8a79aeb07f41628 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesGrowthChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesGrowthChart.java @@ -18,11 +18,11 @@ package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -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 org.achartengine.ChartFactory; +import org.achartengine.chart.PointStyle; +import org.achartengine.renderer.XYMultipleSeriesRenderer; +import org.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.renderer.XYSeriesRenderer.FillOutsideLine; import java.util.ArrayList; import java.util.Date; diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesStackedBarChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesStackedBarChart.java index cb1de6f588c9c163d77cd5091ab79b993de4bcfb..4cd1e42108544e7a4e8857a80fc47f2b103a53d2 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesStackedBarChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SalesStackedBarChart.java @@ -18,10 +18,10 @@ package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -import org.achartengine.chartdemo.demo.ChartFactory; -import com.achartengine.chart.BarChart.Type; -import com.achartengine.renderer.XYMultipleSeriesRenderer; -import com.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.ChartFactory; +import org.achartengine.chart.BarChart.Type; +import org.achartengine.renderer.XYMultipleSeriesRenderer; +import org.achartengine.renderer.XYSeriesRenderer; import java.util.ArrayList; import java.util.List; diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/ScatterChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/ScatterChart.java index f7b4d6fee0a68869e851da385d078b64572afb27..5859a01f81adc8e790681770beae59fa6f06c9eb 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/ScatterChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/ScatterChart.java @@ -18,10 +18,10 @@ package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -import org.achartengine.chartdemo.demo.ChartFactory; -import com.achartengine.chart.PointStyle; -import com.achartengine.renderer.XYMultipleSeriesRenderer; -import com.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.ChartFactory; +import org.achartengine.chart.PointStyle; +import org.achartengine.renderer.XYMultipleSeriesRenderer; +import org.achartengine.renderer.XYSeriesRenderer; import java.security.SecureRandom; import java.util.ArrayList; diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SensorValuesChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SensorValuesChart.java index 5be8e4889a39e922bc817f25c68e7f33ef56f71b..cc48542343d29dad25591ffd0f9977c846a0bd20 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SensorValuesChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/SensorValuesChart.java @@ -18,11 +18,11 @@ package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -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 org.achartengine.ChartFactory; +import org.achartengine.chart.PointStyle; +import org.achartengine.renderer.XYMultipleSeriesRenderer; +import org.achartengine.renderer.XYSeriesRenderer; +import org.achartengine.util.MathHelper; import java.util.ArrayList; import java.util.Date; diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/TemperatureChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/TemperatureChart.java index 24cb8a596e7cf31328fcd04d75006dfc367d0aee..999315f4f774cb7c45d50fc0e3182d539764db2c 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/TemperatureChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/TemperatureChart.java @@ -19,12 +19,12 @@ import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.agp.utils.LayoutAlignment; import ohos.app.Context; -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; +import org.achartengine.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; /** * Temperature demo range chart. diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/TrigonometricFunctionsChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/TrigonometricFunctionsChart.java index 375ff850b510ebc978e16f63ac157ffecb835b6d..54e572a438fd5f8c600a17b9adef831e37455e55 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/TrigonometricFunctionsChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/TrigonometricFunctionsChart.java @@ -18,9 +18,9 @@ package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -import org.achartengine.chartdemo.demo.ChartFactory; -import com.achartengine.chart.PointStyle; -import com.achartengine.renderer.XYMultipleSeriesRenderer; +import org.achartengine.ChartFactory; +import org.achartengine.chart.PointStyle; +import org.achartengine.renderer.XYMultipleSeriesRenderer; import java.util.ArrayList; import java.util.List; diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/WeightDialChart.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/WeightDialChart.java index 90082ea8de1c56aa4c7bc548ba0d4fa9d4b4e667..4a6cdbd041f4cc8841e8cf57a42b1eff5475886d 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/WeightDialChart.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/WeightDialChart.java @@ -18,11 +18,11 @@ package org.achartengine.chartdemo.demo.chart; import ohos.aafwk.content.Intent; import ohos.agp.utils.Color; import ohos.app.Context; -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; +import org.achartengine.ChartFactory; +import org.achartengine.model.CategorySeries; +import org.achartengine.renderer.DialRenderer; +import org.achartengine.renderer.DialRenderer.Type; +import org.achartengine.renderer.SimpleSeriesRenderer; /** * Budget demo pie chart. diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/XYChartBuilder.java b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/XYChartBuilder.java index d9050e9d34e2f8760d8ee627418b9d5469080116..5e2e84e537f85741b3d2c6843730c53621ca6a0d 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/chart/XYChartBuilder.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/chart/XYChartBuilder.java @@ -21,14 +21,14 @@ import ohos.aafwk.content.Intent; import ohos.agp.components.*; import ohos.agp.utils.Color; import ohos.agp.window.dialog.ToastDialog; -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; +import org.achartengine.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; public class XYChartBuilder extends AbilitySlice { diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/slice/GeneratedChartDemo.java b/entry/src/main/java/org/achartengine/chartdemo/demo/slice/GeneratedChartDemo.java index e924b7e04e90a0a8d965b706dae6b05b2f5c1bdc..0e79238014c0a36b0cec7ea2049e4b26ce52bfdf 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/slice/GeneratedChartDemo.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/slice/GeneratedChartDemo.java @@ -28,17 +28,17 @@ import ohos.aafwk.content.Intent; import ohos.agp.components.Component; import ohos.agp.components.ListContainer; import ohos.agp.utils.Color; -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; +import org.achartengine.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; public class GeneratedChartDemo extends AbilitySlice { diff --git a/entry/src/main/java/org/achartengine/chartdemo/demo/slice/PieChartBuilder.java b/entry/src/main/java/org/achartengine/chartdemo/demo/slice/PieChartBuilder.java index 2f3ac9a34b31a5c5cd249a08c8d2cc10b8f8c8f6..99f0285c580e6838f838588b11d5e9e91d46885e 100644 --- a/entry/src/main/java/org/achartengine/chartdemo/demo/slice/PieChartBuilder.java +++ b/entry/src/main/java/org/achartengine/chartdemo/demo/slice/PieChartBuilder.java @@ -22,12 +22,12 @@ import ohos.agp.components.*; import ohos.agp.components.element.ShapeElement; import ohos.agp.utils.Color; import ohos.agp.window.dialog.ToastDialog; -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; +import org.achartengine.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; public class PieChartBuilder extends AbilitySlice { diff --git a/achartengine/src/main/java/com/achartengine/model/CategorySeries.java b/entry/src/main/java/org/achartengine/model/CategorySeries.java similarity index 99% rename from achartengine/src/main/java/com/achartengine/model/CategorySeries.java rename to entry/src/main/java/org/achartengine/model/CategorySeries.java index 3e8b285adb5eac869031f6bb360c3d41b0c68a97..9e1d677809082e6b06b47487670113a138bf0f93 100644 --- a/achartengine/src/main/java/com/achartengine/model/CategorySeries.java +++ b/entry/src/main/java/org/achartengine/model/CategorySeries.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.model; +package org.achartengine.model; import java.io.Serializable; import java.util.ArrayList; diff --git a/achartengine/src/main/java/com/achartengine/model/MultipleCategorySeries.java b/entry/src/main/java/org/achartengine/model/MultipleCategorySeries.java similarity index 99% rename from achartengine/src/main/java/com/achartengine/model/MultipleCategorySeries.java rename to entry/src/main/java/org/achartengine/model/MultipleCategorySeries.java index 26cd2bc73ff06d724afdb95dfebde1806e87b4b2..4642aef32c7b2818423244b313ee657dd5f2d4be 100644 --- a/achartengine/src/main/java/com/achartengine/model/MultipleCategorySeries.java +++ b/entry/src/main/java/org/achartengine/model/MultipleCategorySeries.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.model; +package org.achartengine.model; import java.io.Serializable; import java.util.ArrayList; diff --git a/achartengine/src/main/java/com/achartengine/model/Point.java b/entry/src/main/java/org/achartengine/model/Point.java similarity index 97% rename from achartengine/src/main/java/com/achartengine/model/Point.java rename to entry/src/main/java/org/achartengine/model/Point.java index 8b9ca2019ccca012de200e3c84ba47609c5ed79f..eb51d918f0a24444ed94f0a33b007342f3e08569 100644 --- a/achartengine/src/main/java/com/achartengine/model/Point.java +++ b/entry/src/main/java/org/achartengine/model/Point.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.model; +package org.achartengine.model; import java.io.Serializable; diff --git a/achartengine/src/main/java/com/achartengine/model/RangeCategorySeries.java b/entry/src/main/java/org/achartengine/model/RangeCategorySeries.java similarity index 98% rename from achartengine/src/main/java/com/achartengine/model/RangeCategorySeries.java rename to entry/src/main/java/org/achartengine/model/RangeCategorySeries.java index 2c75cfb07b6d534d0dd696f70bb45b19cb98cbe2..bc18294db06f7e7493188c40f7509274fed8dad5 100644 --- a/achartengine/src/main/java/com/achartengine/model/RangeCategorySeries.java +++ b/entry/src/main/java/org/achartengine/model/RangeCategorySeries.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.model; +package org.achartengine.model; import java.util.ArrayList; import java.util.List; + /** * A series for the range category charts like the range bar. */ diff --git a/achartengine/src/main/java/com/achartengine/model/SeriesSelection.java b/entry/src/main/java/org/achartengine/model/SeriesSelection.java similarity index 97% rename from achartengine/src/main/java/com/achartengine/model/SeriesSelection.java rename to entry/src/main/java/org/achartengine/model/SeriesSelection.java index 761df57fac642addb9722244d3340b10478c553e..88fbc048cfabfbbe2a328abef58a2c46ea9e207f 100644 --- a/achartengine/src/main/java/com/achartengine/model/SeriesSelection.java +++ b/entry/src/main/java/org/achartengine/model/SeriesSelection.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.model; +package org.achartengine.model; public class SeriesSelection { private int mSeriesIndex; diff --git a/achartengine/src/main/java/com/achartengine/model/TimeSeries.java b/entry/src/main/java/org/achartengine/model/TimeSeries.java similarity index 97% rename from achartengine/src/main/java/com/achartengine/model/TimeSeries.java rename to entry/src/main/java/org/achartengine/model/TimeSeries.java index 229099c4496f28d612144c4ead463a284c7460a1..bf5eea2b3ba959c4e4f372284aa734a6605b48ec 100644 --- a/achartengine/src/main/java/com/achartengine/model/TimeSeries.java +++ b/entry/src/main/java/org/achartengine/model/TimeSeries.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.model; +package org.achartengine.model; import java.util.Date; diff --git a/achartengine/src/main/java/com/achartengine/model/XYMultipleSeriesDataset.java b/entry/src/main/java/org/achartengine/model/XYMultipleSeriesDataset.java similarity index 98% rename from achartengine/src/main/java/com/achartengine/model/XYMultipleSeriesDataset.java rename to entry/src/main/java/org/achartengine/model/XYMultipleSeriesDataset.java index aa693bc858ce84304f736069d2b1a1ff88a7fd28..1157be8dc0c188e18ba4255383f7e4c55d594988 100644 --- a/achartengine/src/main/java/com/achartengine/model/XYMultipleSeriesDataset.java +++ b/entry/src/main/java/org/achartengine/model/XYMultipleSeriesDataset.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.model; +package org.achartengine.model; import java.io.Serializable; import java.util.ArrayList; diff --git a/achartengine/src/main/java/com/achartengine/model/XYSeries.java b/entry/src/main/java/org/achartengine/model/XYSeries.java similarity index 97% rename from achartengine/src/main/java/com/achartengine/model/XYSeries.java rename to entry/src/main/java/org/achartengine/model/XYSeries.java index 61eb0776965b0fb648801121d503578e97adf345..02ac163c655bacea710c83877617ce0df3067df6 100644 --- a/achartengine/src/main/java/com/achartengine/model/XYSeries.java +++ b/entry/src/main/java/org/achartengine/model/XYSeries.java @@ -13,18 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.model; +package org.achartengine.model; + +import org.achartengine.util.IndexXYMap; +import org.achartengine.util.MathHelper; +import org.achartengine.util.XYEntry; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.SortedMap; -import java.util.TreeMap; - -import com.achartengine.util.IndexXYMap; -import com.achartengine.util.MathHelper; -import com.achartengine.util.XYEntry; +import java.util.*; /** * An XY series encapsulates values for XY charts like line, time, area, diff --git a/achartengine/src/main/java/com/achartengine/model/XYValueSeries.java b/entry/src/main/java/org/achartengine/model/XYValueSeries.java similarity index 97% rename from achartengine/src/main/java/com/achartengine/model/XYValueSeries.java rename to entry/src/main/java/org/achartengine/model/XYValueSeries.java index f647673252229dd314d7555586e2ba133bb5cfd2..c51947296651708579e4fb99664339d858121ee7 100644 --- a/achartengine/src/main/java/com/achartengine/model/XYValueSeries.java +++ b/entry/src/main/java/org/achartengine/model/XYValueSeries.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.model; +package org.achartengine.model; + +import org.achartengine.util.MathHelper; import java.util.ArrayList; import java.util.List; -import com.achartengine.util.MathHelper; - /** * An extension of the XY series which adds a third dimension. It is used for XY * charts like bubble. diff --git a/achartengine/src/main/java/com/achartengine/renderer/BasicStroke.java b/entry/src/main/java/org/achartengine/renderer/BasicStroke.java similarity index 98% rename from achartengine/src/main/java/com/achartengine/renderer/BasicStroke.java rename to entry/src/main/java/org/achartengine/renderer/BasicStroke.java index 0e9e4c0b93e777020561a9e346e8715852b2ae32..922b70e8f0f8774cb7e52818dd961dd12cf504f4 100644 --- a/achartengine/src/main/java/com/achartengine/renderer/BasicStroke.java +++ b/entry/src/main/java/org/achartengine/renderer/BasicStroke.java @@ -13,13 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.renderer; - -import java.io.Serializable; - +package org.achartengine.renderer; import ohos.agp.render.Paint; +import java.io.Serializable; + /** * A descriptor for the stroke style. */ diff --git a/achartengine/src/main/java/com/achartengine/renderer/DefaultRenderer.java b/entry/src/main/java/org/achartengine/renderer/DefaultRenderer.java similarity index 99% rename from achartengine/src/main/java/com/achartengine/renderer/DefaultRenderer.java rename to entry/src/main/java/org/achartengine/renderer/DefaultRenderer.java index 15c9638db6030bef6383e3b4b9bab229831a9871..0e2cf4465d8a540cf3455de79555e3652020b1f2 100644 --- a/achartengine/src/main/java/com/achartengine/renderer/DefaultRenderer.java +++ b/entry/src/main/java/org/achartengine/renderer/DefaultRenderer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.renderer; +package org.achartengine.renderer; import ohos.agp.utils.Color; @@ -119,7 +119,7 @@ public class DefaultRenderer implements Serializable { /** * Returns the chart title. - * + * * @return the chart title */ public String getChartTitle() { @@ -128,7 +128,7 @@ public class DefaultRenderer implements Serializable { /** * Sets the chart title. - * + * * @param title the chart title */ public void setChartTitle(String title) { @@ -137,7 +137,7 @@ public class DefaultRenderer implements Serializable { /** * Returns the chart title text size. - * + * * @return the chart title text size */ public int getChartTitleTextSize() { @@ -146,7 +146,7 @@ public class DefaultRenderer implements Serializable { /** * Sets the chart title text size. - * + * * @param textSize the chart title text size */ public void setChartTitleTextSize(int textSize) { @@ -155,7 +155,7 @@ public class DefaultRenderer implements Serializable { /** * Adds a simple renderer to the multiple renderer. - * + * * @param renderer the renderer to be added */ public void addSeriesRenderer(SimpleSeriesRenderer renderer) { @@ -164,7 +164,7 @@ public class DefaultRenderer implements Serializable { /** * Adds a simple renderer to the multiple renderer. - * + * * @param index the index in the renderers list * @param renderer the renderer to be added */ @@ -174,7 +174,7 @@ public class DefaultRenderer implements Serializable { /** * Removes a simple renderer from the multiple renderer. - * + * * @param renderer the renderer to be removed */ public void removeSeriesRenderer(SimpleSeriesRenderer renderer) { @@ -190,7 +190,7 @@ public class DefaultRenderer implements Serializable { /** * Returns the simple renderer from the multiple renderer list. - * + * * @param index the index in the simple renderers list * @return the simple renderer at the specified index */ @@ -200,7 +200,7 @@ public class DefaultRenderer implements Serializable { /** * Returns the simple renderers count in the multiple renderer list. - * + * * @return the simple renderers count */ public int getSeriesRendererCount() { @@ -209,7 +209,7 @@ public class DefaultRenderer implements Serializable { /** * Returns an array of the simple renderers in the multiple renderer list. - * + * * @return the simple renderers array */ public SimpleSeriesRenderer[] getSeriesRenderers() { diff --git a/achartengine/src/main/java/com/achartengine/renderer/DialRenderer.java b/entry/src/main/java/org/achartengine/renderer/DialRenderer.java similarity index 98% rename from achartengine/src/main/java/com/achartengine/renderer/DialRenderer.java rename to entry/src/main/java/org/achartengine/renderer/DialRenderer.java index 9bd0c2d398b2903694d0efd06f383e9fe3f5bb0a..29ea04bf3f344a6169116feb3a2d04631b408e1b 100644 --- a/achartengine/src/main/java/com/achartengine/renderer/DialRenderer.java +++ b/entry/src/main/java/org/achartengine/renderer/DialRenderer.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.renderer; +package org.achartengine.renderer; + +import org.achartengine.util.MathHelper; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.achartengine.util.MathHelper; - /** * Dial chart renderer. */ diff --git a/achartengine/src/main/java/com/achartengine/renderer/SimpleSeriesRenderer.java b/entry/src/main/java/org/achartengine/renderer/SimpleSeriesRenderer.java similarity index 99% rename from achartengine/src/main/java/com/achartengine/renderer/SimpleSeriesRenderer.java rename to entry/src/main/java/org/achartengine/renderer/SimpleSeriesRenderer.java index 08161b3b3004eee0fa43c64b8df63ba7877cd6ad..ba0f9b6349ccb5cac4f1688f118bd6bcf4260800 100644 --- a/achartengine/src/main/java/com/achartengine/renderer/SimpleSeriesRenderer.java +++ b/entry/src/main/java/org/achartengine/renderer/SimpleSeriesRenderer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.renderer; +package org.achartengine.renderer; import ohos.agp.utils.Color; @@ -21,7 +21,6 @@ import java.io.Serializable; import java.text.NumberFormat; - /** * A simple series renderer. */ diff --git a/achartengine/src/main/java/com/achartengine/renderer/XYMultipleSeriesRenderer.java b/entry/src/main/java/org/achartengine/renderer/XYMultipleSeriesRenderer.java similarity index 99% rename from achartengine/src/main/java/com/achartengine/renderer/XYMultipleSeriesRenderer.java rename to entry/src/main/java/org/achartengine/renderer/XYMultipleSeriesRenderer.java index af05b362af3f8cb2686545e5ff34e526b9a310d7..7247050453f95cd833fd16ed0a220f2af05126b5 100644 --- a/achartengine/src/main/java/com/achartengine/renderer/XYMultipleSeriesRenderer.java +++ b/entry/src/main/java/org/achartengine/renderer/XYMultipleSeriesRenderer.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.renderer; +package org.achartengine.renderer; -import com.achartengine.util.MathHelper; import ohos.agp.utils.Color; import ohos.agp.utils.LayoutAlignment; +import org.achartengine.util.MathHelper; import java.text.NumberFormat; import java.util.HashMap; diff --git a/achartengine/src/main/java/com/achartengine/renderer/XYSeriesRenderer.java b/entry/src/main/java/org/achartengine/renderer/XYSeriesRenderer.java similarity index 99% rename from achartengine/src/main/java/com/achartengine/renderer/XYSeriesRenderer.java rename to entry/src/main/java/org/achartengine/renderer/XYSeriesRenderer.java index a194b35b863916ce6f35d38268b564c4ae9c9288..70914d842d3f49a473098271882eefe6bb057a99 100644 --- a/achartengine/src/main/java/com/achartengine/renderer/XYSeriesRenderer.java +++ b/entry/src/main/java/org/achartengine/renderer/XYSeriesRenderer.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.renderer; +package org.achartengine.renderer; import ohos.agp.utils.Color; import ohos.agp.utils.TextAlignment; -import com.achartengine.chart.PointStyle; +import org.achartengine.chart.PointStyle; import java.io.Serializable; import java.util.ArrayList; diff --git a/achartengine/src/main/java/com/achartengine/tools/AbstractTool.java b/entry/src/main/java/org/achartengine/tools/AbstractTool.java similarity index 94% rename from achartengine/src/main/java/com/achartengine/tools/AbstractTool.java rename to entry/src/main/java/org/achartengine/tools/AbstractTool.java index 1cefa2d85876b85b5d1ca9cf39152ed6c4fabf0d..0e482707de399613dd163b10061d5fdaee03bb99 100644 --- a/achartengine/src/main/java/com/achartengine/tools/AbstractTool.java +++ b/entry/src/main/java/org/achartengine/tools/AbstractTool.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.tools; +package org.achartengine.tools; -import com.achartengine.chart.AbstractChart; -import com.achartengine.chart.XYChart; -import com.achartengine.renderer.XYMultipleSeriesRenderer; +import org.achartengine.chart.AbstractChart; +import org.achartengine.chart.XYChart; +import org.achartengine.renderer.XYMultipleSeriesRenderer; /** * Abstract class for being extended by graphical view tools. diff --git a/achartengine/src/main/java/com/achartengine/tools/FitZoom.java b/entry/src/main/java/org/achartengine/tools/FitZoom.java similarity index 89% rename from achartengine/src/main/java/com/achartengine/tools/FitZoom.java rename to entry/src/main/java/org/achartengine/tools/FitZoom.java index 6346879f1e61f97d443fb9dda9f7e7c137e82224..19e40ba00d8c8c6a7d27abbda343672f6c63ecee 100644 --- a/achartengine/src/main/java/com/achartengine/tools/FitZoom.java +++ b/entry/src/main/java/org/achartengine/tools/FitZoom.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.tools; +package org.achartengine.tools; -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; +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; public class FitZoom extends AbstractTool { /** diff --git a/achartengine/src/main/java/com/achartengine/tools/Pan.java b/entry/src/main/java/org/achartengine/tools/Pan.java similarity index 96% rename from achartengine/src/main/java/com/achartengine/tools/Pan.java rename to entry/src/main/java/org/achartengine/tools/Pan.java index dafe54de8152463cf45dcfff31d04a22100fb97f..89de108280c8747650db793fbbd5cd1c8c475a9f 100644 --- a/achartengine/src/main/java/com/achartengine/tools/Pan.java +++ b/entry/src/main/java/org/achartengine/tools/Pan.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.tools; +package org.achartengine.tools; + +import org.achartengine.chart.AbstractChart; +import org.achartengine.chart.RoundChart; +import org.achartengine.chart.XYChart; import java.util.ArrayList; import java.util.List; -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/com/achartengine/tools/PanListener.java b/entry/src/main/java/org/achartengine/tools/PanListener.java similarity index 95% rename from achartengine/src/main/java/com/achartengine/tools/PanListener.java rename to entry/src/main/java/org/achartengine/tools/PanListener.java index a6589e1616a62c8ed4463c9cd7720c000edb78d9..6462b7463ebfbbf6985bfb147c49cb9b6b01c135 100644 --- a/achartengine/src/main/java/com/achartengine/tools/PanListener.java +++ b/entry/src/main/java/org/achartengine/tools/PanListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.tools; +package org.achartengine.tools; /** * A pan listener. diff --git a/achartengine/src/main/java/com/achartengine/tools/Zoom.java b/entry/src/main/java/org/achartengine/tools/Zoom.java similarity index 96% rename from achartengine/src/main/java/com/achartengine/tools/Zoom.java rename to entry/src/main/java/org/achartengine/tools/Zoom.java index 55ec21421eca9856baeed699ae4079a950651128..d0413f822f6f90af1e00cd6beb1e418e450be7cd 100644 --- a/achartengine/src/main/java/com/achartengine/tools/Zoom.java +++ b/entry/src/main/java/org/achartengine/tools/Zoom.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.tools; +package org.achartengine.tools; + +import org.achartengine.chart.AbstractChart; +import org.achartengine.chart.RoundChart; +import org.achartengine.chart.XYChart; +import org.achartengine.renderer.DefaultRenderer; import java.util.ArrayList; import java.util.List; -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/com/achartengine/tools/ZoomEvent.java b/entry/src/main/java/org/achartengine/tools/ZoomEvent.java similarity index 97% rename from achartengine/src/main/java/com/achartengine/tools/ZoomEvent.java rename to entry/src/main/java/org/achartengine/tools/ZoomEvent.java index a58939726d0153eb08ffcdde7ec0e0532fa26f80..6ade31af7268f1efe93b1b575052500f056c4859 100644 --- a/achartengine/src/main/java/com/achartengine/tools/ZoomEvent.java +++ b/entry/src/main/java/org/achartengine/tools/ZoomEvent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.tools; +package org.achartengine.tools; /** diff --git a/achartengine/src/main/java/com/achartengine/tools/ZoomListener.java b/entry/src/main/java/org/achartengine/tools/ZoomListener.java similarity index 96% rename from achartengine/src/main/java/com/achartengine/tools/ZoomListener.java rename to entry/src/main/java/org/achartengine/tools/ZoomListener.java index 902481479c4259d10f61f9f48cded5f4ee50ec8f..bb60afc0c57f19bffcbca3eeef8b8c2c28f8fd0b 100644 --- a/achartengine/src/main/java/com/achartengine/tools/ZoomListener.java +++ b/entry/src/main/java/org/achartengine/tools/ZoomListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.tools; +package org.achartengine.tools; /** * A zoom listener. diff --git a/achartengine/src/main/java/com/achartengine/util/IndexXYMap.java b/entry/src/main/java/org/achartengine/util/IndexXYMap.java similarity index 98% rename from achartengine/src/main/java/com/achartengine/util/IndexXYMap.java rename to entry/src/main/java/org/achartengine/util/IndexXYMap.java index b0b365c131a423e2c45e74cb242fb0a9fe98bec0..2e17d994cc07fd099843e4962e8805ead1ce28ac 100644 --- a/achartengine/src/main/java/com/achartengine/util/IndexXYMap.java +++ b/entry/src/main/java/org/achartengine/util/IndexXYMap.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.util; +package org.achartengine.util; import java.util.ArrayList; import java.util.Collections; @@ -100,7 +100,7 @@ public class IndexXYMap extends TreeMap { /** * Removes entry from map by index - * + * * @param index * @return XYEntry */ diff --git a/achartengine/src/main/java/com/achartengine/util/MathHelper.java b/entry/src/main/java/org/achartengine/util/MathHelper.java similarity index 99% rename from achartengine/src/main/java/com/achartengine/util/MathHelper.java rename to entry/src/main/java/org/achartengine/util/MathHelper.java index a79859637fd2ec482b089204af58ba9dad078aec..96994185d9b2ce4873317d6a052189e7bf4e8743 100644 --- a/achartengine/src/main/java/com/achartengine/util/MathHelper.java +++ b/entry/src/main/java/org/achartengine/util/MathHelper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.util; +package org.achartengine.util; import java.text.NumberFormat; import java.text.ParseException; diff --git a/achartengine/src/main/java/com/achartengine/util/XYEntry.java b/entry/src/main/java/org/achartengine/util/XYEntry.java similarity index 97% rename from achartengine/src/main/java/com/achartengine/util/XYEntry.java rename to entry/src/main/java/org/achartengine/util/XYEntry.java index 17ce688512d4c8b3d966820b35f28a1c99860637..a84b15d568d1a0ae5595cdacc8e1550b0eb5df00 100644 --- a/achartengine/src/main/java/com/achartengine/util/XYEntry.java +++ b/entry/src/main/java/org/achartengine/util/XYEntry.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.achartengine.util; +package org.achartengine.util; import java.util.Map.Entry; diff --git a/entry/src/main/resources/base/element/string.json b/entry/src/main/resources/base/element/string.json index ef87befd6f759dcc3c13621a792e1608d2b43c34..9813c005d233c91724aa12fbf44d9f0bd421eaf0 100644 --- a/entry/src/main/resources/base/element/string.json +++ b/entry/src/main/resources/base/element/string.json @@ -7,6 +7,26 @@ { "name": "mainability_description", "value": "Java_Phone_Empty Feature Ability" + }, + { + "name": "add_values", + "value": "Add values to the chart" + }, + { + "name": "x", + "value": "X" + }, + { + "name": "y", + "value": "Y" + }, + { + "name": "add", + "value": "Add" + }, + { + "name": "new_series", + "value": "New series" } ] } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 361de87ba03cae04c3636ee1326da2d9d137d831..4773db73233a570c2d0c01a22e75321acfbf7a07 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':entry', ':achartengine' +include ':entry'