Move into correct package

xdev-software · May 4, 2023 · 28c367f · 28c367f
1 parent 774ff27
commit 28c367f
Show file tree

Hide file tree

Showing 111 changed files with 298 additions and 300 deletions.
diff --git a/chartjs-java-model-demo/src/main/java/software/xdev/Application.java b/chartjs-java-model-demo/src/main/java/software/xdev/Application.java
@@ -6,11 +6,11 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import software.xdev.chart_java.charts.BarChart;
-import software.xdev.chart_java.charts.Chart;
-import software.xdev.chart_java.data.BarData;
-import software.xdev.chart_java.dataset.BarDataset;
-import software.xdev.chart_java.options.BarOptions;
+import software.xdev.chartjs.model.charts.BarChart;
+import software.xdev.chartjs.model.charts.Chart;
+import software.xdev.chartjs.model.data.BarData;
+import software.xdev.chartjs.model.dataset.BarDataset;
+import software.xdev.chartjs.model.options.BarOptions;
 
 
 public final class Application

diff --git a/...xdev/chart_java/charts/AbstractChart.java → ...v/chartjs/model/charts/AbstractChart.java b/...xdev/chart_java/charts/AbstractChart.java → ...v/chartjs/model/charts/AbstractChart.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.charts;
+package software.xdev.chartjs.model.charts;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -22,8 +22,8 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 
-import software.xdev.chart_java.data.Data;
-import software.xdev.chart_java.options.Options;
+import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.options.Options;
 
 
 public abstract class AbstractChart<T, O extends Options<O, ?>, D extends Data<D, ?, ?>>

diff --git a/...ware/xdev/chart_java/charts/BarChart.java → ...e/xdev/chartjs/model/charts/BarChart.java b/...ware/xdev/chart_java/charts/BarChart.java → ...e/xdev/chartjs/model/charts/BarChart.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.charts;
+package software.xdev.chartjs.model.charts;
 
-import software.xdev.chart_java.data.BarData;
-import software.xdev.chart_java.data.Data;
-import software.xdev.chart_java.dataset.BarDataset;
-import software.xdev.chart_java.options.BarOptions;
-import software.xdev.chart_java.options.Options;
+import software.xdev.chartjs.model.data.BarData;
+import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.dataset.BarDataset;
+import software.xdev.chartjs.model.options.BarOptions;
+import software.xdev.chartjs.model.options.Options;
 
 
 public class BarChart extends AbstractChart<BarChart, BarOptions, BarData>

diff --git a/...e/xdev/chart_java/charts/BubbleChart.java → ...dev/chartjs/model/charts/BubbleChart.java b/...e/xdev/chart_java/charts/BubbleChart.java → ...dev/chartjs/model/charts/BubbleChart.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.charts;
+package software.xdev.chartjs.model.charts;
 
-import software.xdev.chart_java.data.BubbleData;
-import software.xdev.chart_java.data.Data;
-import software.xdev.chart_java.options.BubbleOptions;
-import software.xdev.chart_java.options.Options;
+import software.xdev.chartjs.model.data.BubbleData;
+import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.options.BubbleOptions;
+import software.xdev.chartjs.model.options.Options;
 
 
 public class BubbleChart extends AbstractChart<BubbleChart, BubbleOptions, BubbleData>

diff --git a/...oftware/xdev/chart_java/charts/Chart.java → ...ware/xdev/chartjs/model/charts/Chart.java b/...oftware/xdev/chart_java/charts/Chart.java → ...ware/xdev/chartjs/model/charts/Chart.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.charts;
+package software.xdev.chartjs.model.charts;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-import software.xdev.chart_java.data.Data;
-import software.xdev.chart_java.options.Options;
+import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.options.Options;
 
 
 public interface Chart<SELF, O extends Options<O, ?>, D extends Data<D, ?, ?>>

diff --git a/...xdev/chart_java/charts/DoughnutChart.java → ...v/chartjs/model/charts/DoughnutChart.java b/...xdev/chart_java/charts/DoughnutChart.java → ...v/chartjs/model/charts/DoughnutChart.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.charts;
+package software.xdev.chartjs.model.charts;
 
-import software.xdev.chart_java.data.Data;
-import software.xdev.chart_java.data.DoughnutData;
-import software.xdev.chart_java.options.DoughnutOptions;
-import software.xdev.chart_java.options.Options;
+import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.DoughnutData;
+import software.xdev.chartjs.model.options.DoughnutOptions;
+import software.xdev.chartjs.model.options.Options;
 
 
 public class DoughnutChart extends AbstractChart<DoughnutChart, DoughnutOptions, DoughnutData>

diff --git a/...are/xdev/chart_java/charts/LineChart.java → .../xdev/chartjs/model/charts/LineChart.java b/...are/xdev/chart_java/charts/LineChart.java → .../xdev/chartjs/model/charts/LineChart.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.charts;
+package software.xdev.chartjs.model.charts;
 
-import software.xdev.chart_java.data.Data;
-import software.xdev.chart_java.data.LineData;
-import software.xdev.chart_java.dataset.LineDataset;
-import software.xdev.chart_java.options.LineOptions;
-import software.xdev.chart_java.options.Options;
+import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.LineData;
+import software.xdev.chartjs.model.dataset.LineDataset;
+import software.xdev.chartjs.model.options.LineOptions;
+import software.xdev.chartjs.model.options.Options;
 
 
 public class LineChart extends AbstractChart<LineChart, LineOptions, LineData>

diff --git a/...ware/xdev/chart_java/charts/PieChart.java → ...e/xdev/chartjs/model/charts/PieChart.java b/...ware/xdev/chart_java/charts/PieChart.java → ...e/xdev/chartjs/model/charts/PieChart.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.charts;
+package software.xdev.chartjs.model.charts;
 
-import software.xdev.chart_java.data.Data;
-import software.xdev.chart_java.data.PieData;
-import software.xdev.chart_java.dataset.PieDataset;
-import software.xdev.chart_java.options.Options;
-import software.xdev.chart_java.options.PieOptions;
+import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.PieData;
+import software.xdev.chartjs.model.dataset.PieDataset;
+import software.xdev.chartjs.model.options.Options;
+import software.xdev.chartjs.model.options.PieOptions;
 
 
 public class PieChart extends AbstractChart<PieChart, PieOptions, PieData>

diff --git a/...re/xdev/chart_java/charts/PolarChart.java → ...xdev/chartjs/model/charts/PolarChart.java b/...re/xdev/chart_java/charts/PolarChart.java → ...xdev/chartjs/model/charts/PolarChart.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.charts;
+package software.xdev.chartjs.model.charts;
 
-import software.xdev.chart_java.data.Data;
-import software.xdev.chart_java.data.PolarData;
-import software.xdev.chart_java.dataset.PolarDataset;
-import software.xdev.chart_java.options.Options;
-import software.xdev.chart_java.options.PolarOptions;
+import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.PolarData;
+import software.xdev.chartjs.model.dataset.PolarDataset;
+import software.xdev.chartjs.model.options.Options;
+import software.xdev.chartjs.model.options.PolarOptions;
 
 
 public class PolarChart extends AbstractChart<PolarChart, PolarOptions, PolarData>

diff --git a/...re/xdev/chart_java/charts/RadarChart.java → ...xdev/chartjs/model/charts/RadarChart.java b/...re/xdev/chart_java/charts/RadarChart.java → ...xdev/chartjs/model/charts/RadarChart.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.charts;
+package software.xdev.chartjs.model.charts;
 
-import software.xdev.chart_java.data.Data;
-import software.xdev.chart_java.data.RadarData;
-import software.xdev.chart_java.dataset.RadarDataset;
-import software.xdev.chart_java.options.Options;
-import software.xdev.chart_java.options.RadarOptions;
+import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.RadarData;
+import software.xdev.chartjs.model.dataset.RadarDataset;
+import software.xdev.chartjs.model.options.Options;
+import software.xdev.chartjs.model.options.RadarOptions;
 
 
 public class RadarChart extends AbstractChart<RadarChart, RadarOptions, RadarData>

diff --git a/.../xdev/chart_java/charts/ScatterChart.java → ...ev/chartjs/model/charts/ScatterChart.java b/.../xdev/chart_java/charts/ScatterChart.java → ...ev/chartjs/model/charts/ScatterChart.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.charts;
+package software.xdev.chartjs.model.charts;
 
-import software.xdev.chart_java.data.Data;
-import software.xdev.chart_java.data.ScatterData;
-import software.xdev.chart_java.dataset.ScatterDataset;
-import software.xdev.chart_java.options.LineOptions;
-import software.xdev.chart_java.options.Options;
+import software.xdev.chartjs.model.data.Data;
+import software.xdev.chartjs.model.data.ScatterData;
+import software.xdev.chartjs.model.dataset.ScatterDataset;
+import software.xdev.chartjs.model.options.LineOptions;
+import software.xdev.chartjs.model.options.Options;
 
 
 public class ScatterChart extends AbstractChart<ScatterChart, LineOptions, ScatterData>

diff --git a/...software/xdev/chart_java/color/Color.java → ...tware/xdev/chartjs/model/color/Color.java b/...software/xdev/chart_java/color/Color.java → ...tware/xdev/chartjs/model/color/Color.java
@@ -28,7 +28,7 @@
 	See the License for the specific language governing permissions and
 	limitations under the License.
  */
-package software.xdev.chart_java.color;
+package software.xdev.chartjs.model.color;
 
 import java.security.SecureRandom;
 import java.util.Locale;

diff --git a/...oftware/xdev/chart_java/data/BarData.java → ...ware/xdev/chartjs/model/data/BarData.java b/...oftware/xdev/chart_java/data/BarData.java → ...ware/xdev/chartjs/model/data/BarData.java
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.data;
+package software.xdev.chartjs.model.data;
 
 import java.math.BigDecimal;
 
-import software.xdev.chart_java.dataset.BarDataset;
+import software.xdev.chartjs.model.dataset.BarDataset;
+
 
 public class BarData extends Data<BarData, BarDataset, BigDecimal>
 {

diff --git a/...ware/xdev/chart_java/data/BubbleData.java → ...e/xdev/chartjs/model/data/BubbleData.java b/...ware/xdev/chart_java/data/BubbleData.java → ...e/xdev/chartjs/model/data/BubbleData.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.data;
+package software.xdev.chartjs.model.data;
 
-import software.xdev.chart_java.datapoint.BubbleDataPoint;
-import software.xdev.chart_java.dataset.BubbleDataset;
+import software.xdev.chartjs.model.datapoint.BubbleDataPoint;
+import software.xdev.chartjs.model.dataset.BubbleDataset;
 
 
 public class BubbleData extends Data<BubbleData, BubbleDataset, BubbleDataPoint>

diff --git a/...a/software/xdev/chart_java/data/Data.java → ...oftware/xdev/chartjs/model/data/Data.java b/...a/software/xdev/chart_java/data/Data.java → ...oftware/xdev/chartjs/model/data/Data.java
@@ -13,15 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.data;
+package software.xdev.chartjs.model.data;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import software.xdev.chart_java.dataset.Dataset;
+import software.xdev.chartjs.model.dataset.Dataset;
+
 
 public class Data<D extends Data<D, T, O>, T extends Dataset<T, O>, O>
 {

diff --git a/...re/xdev/chart_java/data/DoughnutData.java → ...xdev/chartjs/model/data/DoughnutData.java b/...re/xdev/chart_java/data/DoughnutData.java → ...xdev/chartjs/model/data/DoughnutData.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.data;
+package software.xdev.chartjs.model.data;
 
 import java.math.BigDecimal;
 
-import software.xdev.chart_java.dataset.DoughnutDataset;
+import software.xdev.chartjs.model.dataset.DoughnutDataset;
 
 
 public class DoughnutData extends Data<DoughnutData, DoughnutDataset, BigDecimal>

diff --git a/...ftware/xdev/chart_java/data/LineData.java → ...are/xdev/chartjs/model/data/LineData.java b/...ftware/xdev/chart_java/data/LineData.java → ...are/xdev/chartjs/model/data/LineData.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.data;
+package software.xdev.chartjs.model.data;
 
 import java.math.BigDecimal;
 
-import software.xdev.chart_java.dataset.LineDataset;
+import software.xdev.chartjs.model.dataset.LineDataset;
 
 
 public class LineData extends Data<LineData, LineDataset, BigDecimal>

diff --git a/...oftware/xdev/chart_java/data/PieData.java → ...ware/xdev/chartjs/model/data/PieData.java b/...oftware/xdev/chart_java/data/PieData.java → ...ware/xdev/chartjs/model/data/PieData.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.data;
+package software.xdev.chartjs.model.data;
 
 import java.math.BigDecimal;
 
-import software.xdev.chart_java.dataset.PieDataset;
+import software.xdev.chartjs.model.dataset.PieDataset;
 
 
 public class PieData extends Data<PieData, PieDataset, BigDecimal>

diff --git a/...tware/xdev/chart_java/data/PolarData.java → ...re/xdev/chartjs/model/data/PolarData.java b/...tware/xdev/chart_java/data/PolarData.java → ...re/xdev/chartjs/model/data/PolarData.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.data;
+package software.xdev.chartjs.model.data;
 
 import java.math.BigDecimal;
 
-import software.xdev.chart_java.dataset.PolarDataset;
+import software.xdev.chartjs.model.dataset.PolarDataset;
 
 
 public class PolarData extends Data<PolarData, PolarDataset, BigDecimal>

diff --git a/...tware/xdev/chart_java/data/RadarData.java → ...re/xdev/chartjs/model/data/RadarData.java b/...tware/xdev/chart_java/data/RadarData.java → ...re/xdev/chartjs/model/data/RadarData.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.data;
+package software.xdev.chartjs.model.data;
 
 import java.math.BigDecimal;
 
-import software.xdev.chart_java.dataset.RadarDataset;
+import software.xdev.chartjs.model.dataset.RadarDataset;
 
 
 public class RadarData extends Data<RadarData, RadarDataset, BigDecimal>

diff --git a/...are/xdev/chart_java/data/ScatterData.java → .../xdev/chartjs/model/data/ScatterData.java b/...are/xdev/chart_java/data/ScatterData.java → .../xdev/chartjs/model/data/ScatterData.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.data;
+package software.xdev.chartjs.model.data;
 
-import software.xdev.chart_java.datapoint.ScatterDataPoint;
-import software.xdev.chart_java.dataset.ScatterDataset;
+import software.xdev.chartjs.model.datapoint.ScatterDataPoint;
+import software.xdev.chartjs.model.dataset.ScatterDataset;
 
 
 public class ScatterData extends Data<ScatterData, ScatterDataset, ScatterDataPoint>

diff --git a/...chart_java/datapoint/BubbleDataPoint.java → ...rtjs/model/datapoint/BubbleDataPoint.java b/...chart_java/datapoint/BubbleDataPoint.java → ...rtjs/model/datapoint/BubbleDataPoint.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.datapoint;
+package software.xdev.chartjs.model.datapoint;
 
 import java.math.BigDecimal;
 

diff --git a/...hart_java/datapoint/ScatterDataPoint.java → ...tjs/model/datapoint/ScatterDataPoint.java b/...hart_java/datapoint/ScatterDataPoint.java → ...tjs/model/datapoint/ScatterDataPoint.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.datapoint;
+package software.xdev.chartjs.model.datapoint;
 
 import java.math.BigDecimal;
 

diff --git a/...dataset/BackgroundBorderHoverDataset.java → ...dataset/BackgroundBorderHoverDataset.java b/...dataset/BackgroundBorderHoverDataset.java → ...dataset/BackgroundBorderHoverDataset.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.chart_java.dataset;
+package software.xdev.chartjs.model.dataset;
 
 import java.util.Arrays;
 import java.util.List;
 
-import software.xdev.chart_java.color.Color;
-import software.xdev.chart_java.objects.OptionalArray;
+import software.xdev.chartjs.model.color.Color;
+import software.xdev.chartjs.model.objects.OptionalArray;
 
 
 public abstract class BackgroundBorderHoverDataset<T extends BackgroundBorderHoverDataset<T, O>, O>