diff --git a/chart_inheritance/pom.xml b/chart_inheritance/pom.xml index 7eda3536d9f0c99a60165aef68ebbe18dcf93246..22104baf2c58c85a0023cc00f2602a2742702028 100644 --- a/chart_inheritance/pom.xml +++ b/chart_inheritance/pom.xml @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <groupId>edu.unl.cse.soft160.chart_inheritance</groupId> + <groupId>edu.unl.cse.soft161.chart_inheritance</groupId> <artifactId>chart_inheritance</artifactId> <packaging>jar</packaging> <version>1.0-SNAPSHOT</version> diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/App.java b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/App.java similarity index 76% rename from chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/App.java rename to chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/App.java index 0f4d2e3ceadf0eed3bd42178e0b0d0bfd6764439..a727c66d225f7cb54936dd4e3b0003350b64140d 100644 --- a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/App.java +++ b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/App.java @@ -1,4 +1,4 @@ -package edu.unl.cse.soft160.chart_inheritance; +package edu.unl.cse.soft161.chart_inheritance; import java.awt.Color; import java.awt.Font; @@ -16,12 +16,12 @@ import javax.swing.JFrame; * choose one type of chart to display; that chart will be populated with sample * data. * - * @see edu.unl.cse.soft160.chart_inheritance.a.BarChart - * @see edu.unl.cse.soft160.chart_inheritance.a.LineChart - * @see edu.unl.cse.soft160.chart_inheritance.b.BarChart - * @see edu.unl.cse.soft160.chart_inheritance.b.CategoryChart - * @see edu.unl.cse.soft160.chart_inheritance.c.RadarChart - * @see edu.unl.cse.soft160.chart_inheritance.c.ScatterChart + * @see edu.unl.cse.soft161.chart_inheritance.a.BarChart + * @see edu.unl.cse.soft161.chart_inheritance.a.LineChart + * @see edu.unl.cse.soft161.chart_inheritance.b.BarChart + * @see edu.unl.cse.soft161.chart_inheritance.b.CategoryChart + * @see edu.unl.cse.soft161.chart_inheritance.c.RadarChart + * @see edu.unl.cse.soft161.chart_inheritance.c.ScatterChart */ public class App extends JFrame { private static final long serialVersionUID = -7456297737056197824L; @@ -68,12 +68,12 @@ public class App extends JFrame { PolarPoint[] polarData = { new PolarPoint(1.3, 7), new PolarPoint(2.2, 9), new PolarPoint(3.5, 4), new PolarPoint(4.9, 6) }; - Object[] charts = { new edu.unl.cse.soft160.chart_inheritance.a.BarChart(data), - new edu.unl.cse.soft160.chart_inheritance.a.LineChart(data), - new edu.unl.cse.soft160.chart_inheritance.b.BarChart(data), - new edu.unl.cse.soft160.chart_inheritance.b.CategoryChart(labels, data), - new edu.unl.cse.soft160.chart_inheritance.c.RadarChart(polarData), - new edu.unl.cse.soft160.chart_inheritance.c.ScatterChart(cartesianData), }; + Object[] charts = { new edu.unl.cse.soft161.chart_inheritance.a.BarChart(data), + new edu.unl.cse.soft161.chart_inheritance.a.LineChart(data), + new edu.unl.cse.soft161.chart_inheritance.b.BarChart(data), + new edu.unl.cse.soft161.chart_inheritance.b.CategoryChart(labels, data), + new edu.unl.cse.soft161.chart_inheritance.c.RadarChart(polarData), + new edu.unl.cse.soft161.chart_inheritance.c.ScatterChart(cartesianData), }; System.out.println("Choose a chart type:"); for (int i = 0; i < charts.length; ++i) { diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/CartesianPoint.java b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/CartesianPoint.java similarity index 87% rename from chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/CartesianPoint.java rename to chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/CartesianPoint.java index 507d68e6560542251747d30024ca912ab415c0ad..228ccc2be8eaa5978db0758bc88750d9722d22b6 100644 --- a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/CartesianPoint.java +++ b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/CartesianPoint.java @@ -1,4 +1,4 @@ -package edu.unl.cse.soft160.chart_inheritance; +package edu.unl.cse.soft161.chart_inheritance; /** * This class represents a point in Cartesian coordinates. It would likely be diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/ChartCanvas.java b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/ChartCanvas.java similarity index 97% rename from chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/ChartCanvas.java rename to chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/ChartCanvas.java index 0a69455801dc2697e50c8a9988ff20be3809f629..c952ad480f8ad285a8b79669969d16267eb0262f 100644 --- a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/ChartCanvas.java +++ b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/ChartCanvas.java @@ -1,4 +1,4 @@ -package edu.unl.cse.soft160.chart_inheritance; +package edu.unl.cse.soft161.chart_inheritance; import java.awt.Graphics2D; import java.awt.Rectangle; diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/PackageADemo.java b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageADemo.java similarity index 64% rename from chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/PackageADemo.java rename to chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageADemo.java index ba48d27d00812467abd3e58cbaae77dc6b232c95..9be12398e58483410e83285a4575083709303649 100644 --- a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/PackageADemo.java +++ b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageADemo.java @@ -1,16 +1,16 @@ -package edu.unl.cse.soft160.chart_inheritance; +package edu.unl.cse.soft161.chart_inheritance; import java.awt.Point; -import edu.unl.cse.soft160.chart_inheritance.a.BarChart; -import edu.unl.cse.soft160.chart_inheritance.a.LineChart; +import edu.unl.cse.soft161.chart_inheritance.a.BarChart; +import edu.unl.cse.soft161.chart_inheritance.a.LineChart; /** * This class, when run as the main class, uses sample data to display the two * charts in the <code>a</code> package. * - * @see edu.unl.cse.soft160.chart_inheritance.a.BarChart - * @see edu.unl.cse.soft160.chart_inheritance.a.LineChart + * @see edu.unl.cse.soft161.chart_inheritance.a.BarChart + * @see edu.unl.cse.soft161.chart_inheritance.a.LineChart */ public class PackageADemo { public static void main(String... arguments) { diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/PackageBDemo.java b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageBDemo.java similarity index 67% rename from chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/PackageBDemo.java rename to chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageBDemo.java index 05802fc27e5249ac4920a9317dc00b1ebdd268ec..946631160998915f2033d32406f797be2333d8b4 100644 --- a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/PackageBDemo.java +++ b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageBDemo.java @@ -1,16 +1,16 @@ -package edu.unl.cse.soft160.chart_inheritance; +package edu.unl.cse.soft161.chart_inheritance; import java.awt.Point; -import edu.unl.cse.soft160.chart_inheritance.b.BarChart; -import edu.unl.cse.soft160.chart_inheritance.b.CategoryChart; +import edu.unl.cse.soft161.chart_inheritance.b.BarChart; +import edu.unl.cse.soft161.chart_inheritance.b.CategoryChart; /** * This class, when run as the main class, uses sample data to display the two * charts in the <code>b</code> package. * - * @see edu.unl.cse.soft160.chart_inheritance.b.BarChart - * @see edu.unl.cse.soft160.chart_inheritance.b.CategoryChart + * @see edu.unl.cse.soft161.chart_inheritance.b.BarChart + * @see edu.unl.cse.soft161.chart_inheritance.b.CategoryChart */ public class PackageBDemo { public static void main(String... arguments) { diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/PackageCDemo.java b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageCDemo.java similarity index 72% rename from chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/PackageCDemo.java rename to chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageCDemo.java index a48f464b9bf2bf0d3303561ebd59d1b0f6a6026c..73ed89842b7273e107cb4eec1a552855ff5eedad 100644 --- a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/PackageCDemo.java +++ b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/PackageCDemo.java @@ -1,16 +1,16 @@ -package edu.unl.cse.soft160.chart_inheritance; +package edu.unl.cse.soft161.chart_inheritance; import java.awt.Point; -import edu.unl.cse.soft160.chart_inheritance.c.RadarChart; -import edu.unl.cse.soft160.chart_inheritance.c.ScatterChart; +import edu.unl.cse.soft161.chart_inheritance.c.RadarChart; +import edu.unl.cse.soft161.chart_inheritance.c.ScatterChart; /** * This class, when run as the main class, uses sample data to display the two * charts in the <code>c</code> package. * - * @see edu.unl.cse.soft160.chart_inheritance.c.RadarChart - * @see edu.unl.cse.soft160.chart_inheritance.c.ScatterChart + * @see edu.unl.cse.soft161.chart_inheritance.c.RadarChart + * @see edu.unl.cse.soft161.chart_inheritance.c.ScatterChart */ public class PackageCDemo { public static void main(String... arguments) { diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/PolarPoint.java b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/PolarPoint.java similarity index 82% rename from chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/PolarPoint.java rename to chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/PolarPoint.java index 6398f19d795d93d44b719389c067bc9b2d9bde98..8d9fa67664136b9efbf23bdb7cd55e16d52a8420 100644 --- a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/PolarPoint.java +++ b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/PolarPoint.java @@ -1,4 +1,4 @@ -package edu.unl.cse.soft160.chart_inheritance; +package edu.unl.cse.soft161.chart_inheritance; /** * This class represents a point in polar coordinates. diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/b/BarChart.java b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/a/BarChart.java similarity index 94% rename from chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/b/BarChart.java rename to chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/a/BarChart.java index a2f67a9c67e8ea8769a9a1ce3aa800cd16bfb939..88815669c482ec4a5a4b6e47a1a06d74b71fc103 100644 --- a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/b/BarChart.java +++ b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/a/BarChart.java @@ -1,8 +1,8 @@ -package edu.unl.cse.soft160.chart_inheritance.b; +package edu.unl.cse.soft161.chart_inheritance.a; import java.awt.Graphics2D; -import edu.unl.cse.soft160.chart_inheritance.ChartCanvas; +import edu.unl.cse.soft161.chart_inheritance.ChartCanvas; /** * This class is a bare-bones bar chart, providing just enough functionality to diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/a/LineChart.java b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/a/LineChart.java similarity index 94% rename from chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/a/LineChart.java rename to chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/a/LineChart.java index 8e68c52a08fa5865c1af90ea5609e433db98a971..38be0be51317eb6c0c07ec2d4c58463d7691d5c6 100644 --- a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/a/LineChart.java +++ b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/a/LineChart.java @@ -1,8 +1,8 @@ -package edu.unl.cse.soft160.chart_inheritance.a; +package edu.unl.cse.soft161.chart_inheritance.a; import java.awt.Graphics2D; -import edu.unl.cse.soft160.chart_inheritance.ChartCanvas; +import edu.unl.cse.soft161.chart_inheritance.ChartCanvas; /** * This class is a bare-bones line chart, providing just enough functionality to diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/a/BarChart.java b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/b/BarChart.java similarity index 94% rename from chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/a/BarChart.java rename to chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/b/BarChart.java index 2f83c41a75fec9af8a081948fbca9995c19ae910..aa156497e82d73d23464f2d67a8ba09fc0d8a2ae 100644 --- a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/a/BarChart.java +++ b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/b/BarChart.java @@ -1,8 +1,8 @@ -package edu.unl.cse.soft160.chart_inheritance.a; +package edu.unl.cse.soft161.chart_inheritance.b; import java.awt.Graphics2D; -import edu.unl.cse.soft160.chart_inheritance.ChartCanvas; +import edu.unl.cse.soft161.chart_inheritance.ChartCanvas; /** * This class is a bare-bones bar chart, providing just enough functionality to diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/b/CategoryChart.java b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/b/CategoryChart.java similarity index 95% rename from chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/b/CategoryChart.java rename to chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/b/CategoryChart.java index 51de75d01b53025cc0a5b4601dabdc2bb1f09945..0dae6f54ac44ad107dc92d838b3c09609ce8bb65 100644 --- a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/b/CategoryChart.java +++ b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/b/CategoryChart.java @@ -1,8 +1,8 @@ -package edu.unl.cse.soft160.chart_inheritance.b; +package edu.unl.cse.soft161.chart_inheritance.b; import java.awt.Graphics2D; -import edu.unl.cse.soft160.chart_inheritance.ChartCanvas; +import edu.unl.cse.soft161.chart_inheritance.ChartCanvas; /** * This class is a bare-bones bar chart, providing just enough functionality to diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/c/RadarChart.java b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/c/RadarChart.java similarity index 91% rename from chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/c/RadarChart.java rename to chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/c/RadarChart.java index 7206c9fd739bd62bfb998619ec87fdf700882384..5a85403d359ba1177794611258bb349a3b7aeaa2 100644 --- a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/c/RadarChart.java +++ b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/c/RadarChart.java @@ -1,9 +1,9 @@ -package edu.unl.cse.soft160.chart_inheritance.c; +package edu.unl.cse.soft161.chart_inheritance.c; import java.awt.Graphics2D; -import edu.unl.cse.soft160.chart_inheritance.ChartCanvas; -import edu.unl.cse.soft160.chart_inheritance.PolarPoint; +import edu.unl.cse.soft161.chart_inheritance.ChartCanvas; +import edu.unl.cse.soft161.chart_inheritance.PolarPoint; /** * This class is a bare-bones radar (cobweb) chart, providing just enough diff --git a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/c/ScatterChart.java b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/c/ScatterChart.java similarity index 91% rename from chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/c/ScatterChart.java rename to chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/c/ScatterChart.java index 780571df39282a5c6e5e6a8eb23ad32c7f913688..47e42ca5cdf367e06a01142060cc8d10efb659c8 100644 --- a/chart_inheritance/src/main/java/edu/unl/cse/soft160/chart_inheritance/c/ScatterChart.java +++ b/chart_inheritance/src/main/java/edu/unl/cse/soft161/chart_inheritance/c/ScatterChart.java @@ -1,9 +1,9 @@ -package edu.unl.cse.soft160.chart_inheritance.c; +package edu.unl.cse.soft161.chart_inheritance.c; import java.awt.Graphics2D; -import edu.unl.cse.soft160.chart_inheritance.CartesianPoint; -import edu.unl.cse.soft160.chart_inheritance.ChartCanvas; +import edu.unl.cse.soft161.chart_inheritance.CartesianPoint; +import edu.unl.cse.soft161.chart_inheritance.ChartCanvas; /** * This class is a bare-bones scatter chart, providing just enough functionality