From 540764999ec59e718e52bdb26f9f6ce6b88cbf10 Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Mon, 5 Oct 2015 12:40:01 -0700 Subject: [PATCH 01/27] submit point assignment --- src/Point.java | 16 ++++++++++++++++ src/PointTester.java | 19 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 src/Point.java create mode 100644 src/PointTester.java diff --git a/src/Point.java b/src/Point.java new file mode 100644 index 0000000..1e37207 --- /dev/null +++ b/src/Point.java @@ -0,0 +1,16 @@ +import java.util.*; + +public class Point { + + public int x; + public int y; + + public Point (int x, int y) { + this.x = x; + this.y = y; + } + + public double distance (Point otherPoint) { + return(Math.sqrt(Math.pow(this.x-otherPoint.x, 2)+Math.pow(this.y-otherPoint.y, 2))); + } +} diff --git a/src/PointTester.java b/src/PointTester.java new file mode 100644 index 0000000..3d9feb4 --- /dev/null +++ b/src/PointTester.java @@ -0,0 +1,19 @@ +import java.util.*; + +public class PointTester { + public static void main (String args[]) { + Scanner s = new Scanner (System.in); + System.out.print("Please enter the x coordinate of the first point: "); + int x = s.nextInt(); + System.out.print("Please enter the y coordinate of the first point: "); + int y = s.nextInt(); + Point firstPoint = new Point (x,y); + System.out.print("Please enter the x coordinate of the second point: "); + x = s.nextInt(); + System.out.print("Please enter the y coordinate of the second point: "); + y = s.nextInt(); + Point secondPoint = new Point (x,y); + System.out.println("The distance between the two points is: "+firstPoint.distance(secondPoint)); + + } +} From a43c84ab564d4d267b15b3d6bde152bd621766cb Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Mon, 5 Oct 2015 12:41:31 -0700 Subject: [PATCH 02/27] fix error --- src/MasterTester.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MasterTester.java b/src/MasterTester.java index ba427ea..c27fa4f 100644 --- a/src/MasterTester.java +++ b/src/MasterTester.java @@ -1,6 +1,6 @@ import java.util.*; -public class PointTester { +public class MasterTester { public static void main (String args[]) { Scanner s = new Scanner (System.in); Point firstPoint = new Point (0,1); From ea63e71938f26c836fe91f625c3b6c3503f3a012 Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Mon, 5 Oct 2015 16:25:03 -0700 Subject: [PATCH 03/27] Create IncorrectlyCompletedException.java --- src/IncorrectlyCompletedException.java | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/IncorrectlyCompletedException.java diff --git a/src/IncorrectlyCompletedException.java b/src/IncorrectlyCompletedException.java new file mode 100644 index 0000000..752ca25 --- /dev/null +++ b/src/IncorrectlyCompletedException.java @@ -0,0 +1,6 @@ +public class IncorrectlyCompletedException extends Exception { + public IncorrectlyCompletedException() { super(); } + public IncorrectlyCompletedException(String message) { super(message); } + public IncorrectlyCompletedException(String message, Throwable cause) { super(message, cause); } + public IncorrectlyCompletedException(Throwable cause) { super(cause); } +} From 16a8006caf70a5feca19024a8aae9bf6957013f0 Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Mon, 5 Oct 2015 16:25:15 -0700 Subject: [PATCH 04/27] Update MasterTester.java --- src/MasterTester.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/MasterTester.java b/src/MasterTester.java index c27fa4f..71a84c2 100644 --- a/src/MasterTester.java +++ b/src/MasterTester.java @@ -6,5 +6,6 @@ public static void main (String args[]) { Point firstPoint = new Point (0,1); Point secondPoint = new Point (0,0); System.out.println(firstPoint.distance(secondPoint)); + throw new IncorrectlyCompletedException(); } } From def6b3ea7aec66c69fd42607f326e1cb95bc55ea Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Mon, 5 Oct 2015 16:27:36 -0700 Subject: [PATCH 05/27] Update MasterTester.java --- src/MasterTester.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MasterTester.java b/src/MasterTester.java index 71a84c2..88c9ceb 100644 --- a/src/MasterTester.java +++ b/src/MasterTester.java @@ -5,7 +5,7 @@ public static void main (String args[]) { Scanner s = new Scanner (System.in); Point firstPoint = new Point (0,1); Point secondPoint = new Point (0,0); - System.out.println(firstPoint.distance(secondPoint)); - throw new IncorrectlyCompletedException(); + if(firstPoint.distance(secondPoint)!=1) + throw new IncorrectlyCompletedException(); } } From 4c7695e136fc5ee0b510056bc79e90b74c3bbcfc Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Mon, 5 Oct 2015 16:35:10 -0700 Subject: [PATCH 06/27] Update MasterTester.java --- src/MasterTester.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MasterTester.java b/src/MasterTester.java index 88c9ceb..17f7dc5 100644 --- a/src/MasterTester.java +++ b/src/MasterTester.java @@ -1,7 +1,7 @@ import java.util.*; public class MasterTester { - public static void main (String args[]) { + public static void main (String args[]) throws Exception { Scanner s = new Scanner (System.in); Point firstPoint = new Point (0,1); Point secondPoint = new Point (0,0); From 36c8ee256202e76fd2fd3f9e80247ef997eeaac8 Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Mon, 5 Oct 2015 16:39:11 -0700 Subject: [PATCH 07/27] force build --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1df7f8e..5958a7e 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ # point + From afa6ba01b87256a92b3cf29a5d64ea540ae83a19 Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Mon, 5 Oct 2015 16:56:07 -0700 Subject: [PATCH 08/27] Update README.md --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5958a7e..646c685 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,7 @@ -# point +# Point +Create a Point class which has two instance variable for the x and y coordinates. +Write a constructor and one method called distance(Point otherPoint), which returns the distance between this point and otherPoint. +Write a PointTester class which asks for two points and prints the distance between them. + +Save these classes in the src folder, and make a pull request when you are ready to submit. From 72b8184c54d333eafa18ca2aa043fa81dfcf7000 Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Tue, 6 Oct 2015 11:41:48 -0700 Subject: [PATCH 09/27] update gitignore and add changes from class --- .gitignore | 1 + src/APLine.java | 67 +++++++++++++++++++++++++++++++++++++++++++ src/MasterTester.java | 2 ++ src/Point.java | 22 +++++++++----- src/PointTester.java | 4 ++- src/Triangle.java | 57 ++++++++++++++++++++++++++++++++++++ 6 files changed, 145 insertions(+), 8 deletions(-) create mode 100644 src/APLine.java create mode 100644 src/Triangle.java diff --git a/.gitignore b/.gitignore index ae565c3..4b1dc39 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ hs_err_pid* *.html *.css *.ctext +*.ctxt diff --git a/src/APLine.java b/src/APLine.java new file mode 100644 index 0000000..b3b094d --- /dev/null +++ b/src/APLine.java @@ -0,0 +1,67 @@ +package src; + +public class APLine +{ + //instance variables + double a; + double b; + double c; + + //constructors + public APLine(double a, double b, double c) + { + this.a = a; + this.b = b; + this.c = c; + } + + //methods + public double getSlope() + { + return -a/b; + } + + public boolean isOnLine(int x, int y) + { + if(this.a * x + this.b *y + this.c == 0) + { + return true; + } + else + { + return false; + } + } + + //setters and getters + public double getA() + { + return this.a; + } + + public double getB() + { + return this.b; + } + + public double getC() + { + return this.c; + } + + public void setA(int a) + { + this.a = a; + } + + public void setB(int b) + { + this.b = b; + } + + public void setC(int c) + { + this.c = c; + } + +} \ No newline at end of file diff --git a/src/MasterTester.java b/src/MasterTester.java index 17f7dc5..0276721 100644 --- a/src/MasterTester.java +++ b/src/MasterTester.java @@ -1,3 +1,5 @@ +package src; + import java.util.*; public class MasterTester { diff --git a/src/Point.java b/src/Point.java index 1e37207..58f6610 100644 --- a/src/Point.java +++ b/src/Point.java @@ -1,16 +1,24 @@ +package src; + import java.util.*; public class Point { - public int x; - public int y; + private double x; + private double y; - public Point (int x, int y) { + public Point (double x, double y) { this.x = x; this.y = y; } - - public double distance (Point otherPoint) { - return(Math.sqrt(Math.pow(this.x-otherPoint.x, 2)+Math.pow(this.y-otherPoint.y, 2))); - } + + public double getDistance (Point otherPoint) { return(Math.sqrt(Math.pow(this.x-otherPoint.getX(), 2)+Math.pow(this.y-otherPoint.getY(), 2))); } + + public double getX() { return(x); } + + public double getY() { return(y); } + + public void setX() { this.x = x; } + + public void setY() { this.y = y; } } diff --git a/src/PointTester.java b/src/PointTester.java index 3d9feb4..d7c8b64 100644 --- a/src/PointTester.java +++ b/src/PointTester.java @@ -1,3 +1,5 @@ +package src; + import java.util.*; public class PointTester { @@ -13,7 +15,7 @@ public static void main (String args[]) { System.out.print("Please enter the y coordinate of the second point: "); y = s.nextInt(); Point secondPoint = new Point (x,y); - System.out.println("The distance between the two points is: "+firstPoint.distance(secondPoint)); + System.out.println("The distance between the two points is: "+firstPoint.getDistance(secondPoint)); } } diff --git a/src/Triangle.java b/src/Triangle.java new file mode 100644 index 0000000..0d29e9b --- /dev/null +++ b/src/Triangle.java @@ -0,0 +1,57 @@ +package src; + + +public class Triangle +{ + //instance variables + double side1; + double side2; + double side3; + + //constructors + public Triangle(int side1, int side2, int side3) + { + this.side1 = side1; + this.side2 = side2; + this.side3 = side3; + } + + //methods + public double computePerimeter() + { + return side1+side2+side3; + } + + //getters and setters + + public double getSide1() + { + return side1; + } + + public double getSide2() + { + return side2; + } + + public double getSide3() + { + return side3; + } + + public void setSide1(int value) + { + this.side1 = value; + } + + public void setSide2(int value) + { + this.side2 = value; + } + + public void setSide3(int value) + { + this.side3 = value; + } +} + \ No newline at end of file From cea6bdd07224faeea433ef37233da9335e054556 Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Tue, 6 Oct 2015 11:43:25 -0700 Subject: [PATCH 10/27] update master tester to reflect changes in point class --- src/MasterTester.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MasterTester.java b/src/MasterTester.java index 0276721..35403d3 100644 --- a/src/MasterTester.java +++ b/src/MasterTester.java @@ -7,7 +7,7 @@ public static void main (String args[]) throws Exception { Scanner s = new Scanner (System.in); Point firstPoint = new Point (0,1); Point secondPoint = new Point (0,0); - if(firstPoint.distance(secondPoint)!=1) + if(firstPoint.getDistance(secondPoint)!=1) throw new IncorrectlyCompletedException(); } } From 0124086c63e678c4c0a1c464000376ca78380ffa Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Tue, 6 Oct 2015 11:45:51 -0700 Subject: [PATCH 11/27] add incorrectlycompletedexception to src package --- src/IncorrectlyCompletedException.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/IncorrectlyCompletedException.java b/src/IncorrectlyCompletedException.java index 752ca25..f9b2dc6 100644 --- a/src/IncorrectlyCompletedException.java +++ b/src/IncorrectlyCompletedException.java @@ -1,3 +1,5 @@ +package src; + public class IncorrectlyCompletedException extends Exception { public IncorrectlyCompletedException() { super(); } public IncorrectlyCompletedException(String message) { super(message); } From 9bb3cbc1a9b20d10b48a0515c6e0f77bd69227b6 Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Tue, 6 Oct 2015 11:48:36 -0700 Subject: [PATCH 12/27] get rid of src packages --- src/APLine.java | 24 +++++++++++------------- src/IncorrectlyCompletedException.java | 2 -- src/MasterTester.java | 2 -- src/Point.java | 11 +++++------ src/PointTester.java | 2 -- src/Triangle.java | 22 +++++++++------------- 6 files changed, 25 insertions(+), 38 deletions(-) diff --git a/src/APLine.java b/src/APLine.java index b3b094d..46d9c3e 100644 --- a/src/APLine.java +++ b/src/APLine.java @@ -1,12 +1,10 @@ -package src; - public class APLine { //instance variables double a; double b; double c; - + //constructors public APLine(double a, double b, double c) { @@ -14,13 +12,13 @@ public APLine(double a, double b, double c) this.b = b; this.c = c; } - + //methods public double getSlope() { return -a/b; } - + public boolean isOnLine(int x, int y) { if(this.a * x + this.b *y + this.c == 0) @@ -32,36 +30,36 @@ public boolean isOnLine(int x, int y) return false; } } - + //setters and getters public double getA() { return this.a; } - + public double getB() { return this.b; } - + public double getC() { return this.c; } - + public void setA(int a) { this.a = a; } - + public void setB(int b) { this.b = b; } - + public void setC(int c) { this.c = c; } - -} \ No newline at end of file + +} diff --git a/src/IncorrectlyCompletedException.java b/src/IncorrectlyCompletedException.java index f9b2dc6..752ca25 100644 --- a/src/IncorrectlyCompletedException.java +++ b/src/IncorrectlyCompletedException.java @@ -1,5 +1,3 @@ -package src; - public class IncorrectlyCompletedException extends Exception { public IncorrectlyCompletedException() { super(); } public IncorrectlyCompletedException(String message) { super(message); } diff --git a/src/MasterTester.java b/src/MasterTester.java index 35403d3..38aba17 100644 --- a/src/MasterTester.java +++ b/src/MasterTester.java @@ -1,5 +1,3 @@ -package src; - import java.util.*; public class MasterTester { diff --git a/src/Point.java b/src/Point.java index 58f6610..1d0eac7 100644 --- a/src/Point.java +++ b/src/Point.java @@ -1,4 +1,3 @@ -package src; import java.util.*; @@ -11,14 +10,14 @@ public Point (double x, double y) { this.x = x; this.y = y; } - + public double getDistance (Point otherPoint) { return(Math.sqrt(Math.pow(this.x-otherPoint.getX(), 2)+Math.pow(this.y-otherPoint.getY(), 2))); } - + public double getX() { return(x); } - + public double getY() { return(y); } - + public void setX() { this.x = x; } - + public void setY() { this.y = y; } } diff --git a/src/PointTester.java b/src/PointTester.java index d7c8b64..83adb3e 100644 --- a/src/PointTester.java +++ b/src/PointTester.java @@ -1,5 +1,3 @@ -package src; - import java.util.*; public class PointTester { diff --git a/src/Triangle.java b/src/Triangle.java index 0d29e9b..273d231 100644 --- a/src/Triangle.java +++ b/src/Triangle.java @@ -1,13 +1,10 @@ -package src; - - public class Triangle { //instance variables double side1; double side2; double side3; - + //constructors public Triangle(int side1, int side2, int side3) { @@ -15,43 +12,42 @@ public Triangle(int side1, int side2, int side3) this.side2 = side2; this.side3 = side3; } - + //methods public double computePerimeter() { return side1+side2+side3; } - + //getters and setters - + public double getSide1() { return side1; } - + public double getSide2() { return side2; } - + public double getSide3() { return side3; } - + public void setSide1(int value) { this.side1 = value; } - + public void setSide2(int value) { this.side2 = value; } - + public void setSide3(int value) { this.side3 = value; } } - \ No newline at end of file From 3e200f010b35a902838fea3da2db42dfe90cece5 Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Tue, 6 Oct 2015 11:52:58 -0700 Subject: [PATCH 13/27] force build From fb4acbca7e685b90a4bd29d1061adb60051d2cdf Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Tue, 6 Oct 2015 11:56:56 -0700 Subject: [PATCH 14/27] force build part 2 From 7f282b24a4ddc47bd7141a417847f6df6f74c7e7 Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Tue, 6 Oct 2015 11:59:56 -0700 Subject: [PATCH 15/27] update point class --- src/APLine.java | 12 ++++++++++++ src/Point.java | 8 +++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/APLine.java b/src/APLine.java index 46d9c3e..32d35e8 100644 --- a/src/APLine.java +++ b/src/APLine.java @@ -31,6 +31,18 @@ public boolean isOnLine(int x, int y) } } + public boolean isOnLine(Point point) + { + if(this.a * point.getX() + this.b * point.getY() + this.c == 0) + { + return true; + } + else + { + return false; + } + } + //setters and getters public double getA() { diff --git a/src/Point.java b/src/Point.java index 1d0eac7..fe0834d 100644 --- a/src/Point.java +++ b/src/Point.java @@ -11,13 +11,15 @@ public Point (double x, double y) { this.y = y; } - public double getDistance (Point otherPoint) { return(Math.sqrt(Math.pow(this.x-otherPoint.getX(), 2)+Math.pow(this.y-otherPoint.getY(), 2))); } + public double getDistance (Point otherPoint) { return(Math.sqrt(Math.pow(this.x-otherPoint.getX(), 2)+Math.pow(this.y-otherPoint.getY(), 2))); } + + public double getSlope (Point otherPoint) { return((this.x-otherPoint.getX())/(this.y-otherPoint.getY())); } public double getX() { return(x); } public double getY() { return(y); } - public void setX() { this.x = x; } + public void setX() { this.x = x; } - public void setY() { this.y = y; } + public void setY() { this.y = y; } } From 75dc601f666a50d693255cf58bd0784c30949b35 Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Tue, 6 Oct 2015 12:05:58 -0700 Subject: [PATCH 16/27] finish AP Line in-class portion --- src/APLine.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/APLine.java b/src/APLine.java index 32d35e8..09e5bb4 100644 --- a/src/APLine.java +++ b/src/APLine.java @@ -13,6 +13,13 @@ public APLine(double a, double b, double c) this.c = c; } + public APLine(Point point1, Point point2) { + double slope = point1.getSlope(point2); + this.a = - slope; + this.b = 1; + this.c = slope * point1.getX() - point1.getY(); + } + //methods public double getSlope() { From 96ebb238b69053641f3b3f2cd33247091a049473 Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Tue, 6 Oct 2015 20:57:36 -0700 Subject: [PATCH 17/27] add src package, see if this works --- src/APLine.java | 2 ++ src/IncorrectlyCompletedException.java | 2 ++ src/MasterTester.java | 2 ++ src/Point.java | 2 ++ src/PointTester.java | 2 ++ src/Triangle.java | 2 ++ 6 files changed, 12 insertions(+) diff --git a/src/APLine.java b/src/APLine.java index 09e5bb4..b48836b 100644 --- a/src/APLine.java +++ b/src/APLine.java @@ -1,3 +1,5 @@ +package src; + public class APLine { //instance variables diff --git a/src/IncorrectlyCompletedException.java b/src/IncorrectlyCompletedException.java index 752ca25..f9b2dc6 100644 --- a/src/IncorrectlyCompletedException.java +++ b/src/IncorrectlyCompletedException.java @@ -1,3 +1,5 @@ +package src; + public class IncorrectlyCompletedException extends Exception { public IncorrectlyCompletedException() { super(); } public IncorrectlyCompletedException(String message) { super(message); } diff --git a/src/MasterTester.java b/src/MasterTester.java index 38aba17..35403d3 100644 --- a/src/MasterTester.java +++ b/src/MasterTester.java @@ -1,3 +1,5 @@ +package src; + import java.util.*; public class MasterTester { diff --git a/src/Point.java b/src/Point.java index fe0834d..6a54081 100644 --- a/src/Point.java +++ b/src/Point.java @@ -1,3 +1,5 @@ +package src; + import java.util.*; diff --git a/src/PointTester.java b/src/PointTester.java index 83adb3e..d7c8b64 100644 --- a/src/PointTester.java +++ b/src/PointTester.java @@ -1,3 +1,5 @@ +package src; + import java.util.*; public class PointTester { diff --git a/src/Triangle.java b/src/Triangle.java index 273d231..f5633f9 100644 --- a/src/Triangle.java +++ b/src/Triangle.java @@ -1,3 +1,5 @@ +package src; + public class Triangle { //instance variables From 942ae8dcdd2d4f01b2f23f49348d4621e9be2a3d Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Tue, 6 Oct 2015 20:59:58 -0700 Subject: [PATCH 18/27] force build --- src/Point.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Point.java b/src/Point.java index 6a54081..f88fe57 100644 --- a/src/Point.java +++ b/src/Point.java @@ -24,4 +24,4 @@ public Point (double x, double y) { public void setX() { this.x = x; } public void setY() { this.y = y; } -} +} \ No newline at end of file From 0303d9d6a6c51fb5feb659e1a26a600229aa908c Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Tue, 6 Oct 2015 21:03:05 -0700 Subject: [PATCH 19/27] Revert "finish AP Line in-class portion" This reverts commit 75dc601f666a50d693255cf58bd0784c30949b35. --- src/APLine.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/APLine.java b/src/APLine.java index b48836b..096893b 100644 --- a/src/APLine.java +++ b/src/APLine.java @@ -15,13 +15,6 @@ public APLine(double a, double b, double c) this.c = c; } - public APLine(Point point1, Point point2) { - double slope = point1.getSlope(point2); - this.a = - slope; - this.b = 1; - this.c = slope * point1.getX() - point1.getY(); - } - //methods public double getSlope() { From 1185aca9333f94bd00fecff747ea44b718b9bbb5 Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Tue, 6 Oct 2015 21:04:19 -0700 Subject: [PATCH 20/27] get rid of src package --- src/APLine.java | 1 - src/IncorrectlyCompletedException.java | 1 - src/MasterTester.java | 1 - src/Point.java | 3 +-- src/PointTester.java | 1 - src/Triangle.java | 1 - 6 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/APLine.java b/src/APLine.java index 096893b..84a0206 100644 --- a/src/APLine.java +++ b/src/APLine.java @@ -1,4 +1,3 @@ -package src; public class APLine { diff --git a/src/IncorrectlyCompletedException.java b/src/IncorrectlyCompletedException.java index f9b2dc6..0261b59 100644 --- a/src/IncorrectlyCompletedException.java +++ b/src/IncorrectlyCompletedException.java @@ -1,4 +1,3 @@ -package src; public class IncorrectlyCompletedException extends Exception { public IncorrectlyCompletedException() { super(); } diff --git a/src/MasterTester.java b/src/MasterTester.java index 35403d3..a8f6ffc 100644 --- a/src/MasterTester.java +++ b/src/MasterTester.java @@ -1,4 +1,3 @@ -package src; import java.util.*; diff --git a/src/Point.java b/src/Point.java index f88fe57..cbc2ba0 100644 --- a/src/Point.java +++ b/src/Point.java @@ -1,4 +1,3 @@ -package src; import java.util.*; @@ -24,4 +23,4 @@ public Point (double x, double y) { public void setX() { this.x = x; } public void setY() { this.y = y; } -} \ No newline at end of file +} diff --git a/src/PointTester.java b/src/PointTester.java index d7c8b64..4ead88b 100644 --- a/src/PointTester.java +++ b/src/PointTester.java @@ -1,4 +1,3 @@ -package src; import java.util.*; diff --git a/src/Triangle.java b/src/Triangle.java index f5633f9..1ac404c 100644 --- a/src/Triangle.java +++ b/src/Triangle.java @@ -1,4 +1,3 @@ -package src; public class Triangle { From f4791545c925d1e4e4a40a6c2016f5b597cb0034 Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Tue, 6 Oct 2015 21:07:00 -0700 Subject: [PATCH 21/27] move everything, update build file --- src/APLine.java => APLine.java | 0 ...ompletedException.java => IncorrectlyCompletedException.java | 0 src/MasterTester.java => MasterTester.java | 0 src/Point.java => Point.java | 0 src/PointTester.java => PointTester.java | 0 src/Triangle.java => Triangle.java | 0 build.xml | 2 +- 7 files changed, 1 insertion(+), 1 deletion(-) rename src/APLine.java => APLine.java (100%) rename src/IncorrectlyCompletedException.java => IncorrectlyCompletedException.java (100%) rename src/MasterTester.java => MasterTester.java (100%) rename src/Point.java => Point.java (100%) rename src/PointTester.java => PointTester.java (100%) rename src/Triangle.java => Triangle.java (100%) diff --git a/src/APLine.java b/APLine.java similarity index 100% rename from src/APLine.java rename to APLine.java diff --git a/src/IncorrectlyCompletedException.java b/IncorrectlyCompletedException.java similarity index 100% rename from src/IncorrectlyCompletedException.java rename to IncorrectlyCompletedException.java diff --git a/src/MasterTester.java b/MasterTester.java similarity index 100% rename from src/MasterTester.java rename to MasterTester.java diff --git a/src/Point.java b/Point.java similarity index 100% rename from src/Point.java rename to Point.java diff --git a/src/PointTester.java b/PointTester.java similarity index 100% rename from src/PointTester.java rename to PointTester.java diff --git a/src/Triangle.java b/Triangle.java similarity index 100% rename from src/Triangle.java rename to Triangle.java diff --git a/build.xml b/build.xml index d56fa59..2c8c5af 100644 --- a/build.xml +++ b/build.xml @@ -1,5 +1,5 @@ - + From 90b030fda3e175f8d130e50faf7bc9840637155a Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Tue, 6 Oct 2015 21:08:35 -0700 Subject: [PATCH 22/27] try to get xml to recognize root directory --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 2c8c5af..1571ba7 100644 --- a/build.xml +++ b/build.xml @@ -1,5 +1,5 @@ - + From 264c27d5ba8f5c49e4bfa87d5b36d27f5d9baee3 Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Tue, 6 Oct 2015 21:09:44 -0700 Subject: [PATCH 23/27] move all back to source directory --- APLine.java => src/APLine.java | 0 .../IncorrectlyCompletedException.java | 0 MasterTester.java => src/MasterTester.java | 0 Point.java => src/Point.java | 0 PointTester.java => src/PointTester.java | 0 Triangle.java => src/Triangle.java | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename APLine.java => src/APLine.java (100%) rename IncorrectlyCompletedException.java => src/IncorrectlyCompletedException.java (100%) rename MasterTester.java => src/MasterTester.java (100%) rename Point.java => src/Point.java (100%) rename PointTester.java => src/PointTester.java (100%) rename Triangle.java => src/Triangle.java (100%) diff --git a/APLine.java b/src/APLine.java similarity index 100% rename from APLine.java rename to src/APLine.java diff --git a/IncorrectlyCompletedException.java b/src/IncorrectlyCompletedException.java similarity index 100% rename from IncorrectlyCompletedException.java rename to src/IncorrectlyCompletedException.java diff --git a/MasterTester.java b/src/MasterTester.java similarity index 100% rename from MasterTester.java rename to src/MasterTester.java diff --git a/Point.java b/src/Point.java similarity index 100% rename from Point.java rename to src/Point.java diff --git a/PointTester.java b/src/PointTester.java similarity index 100% rename from PointTester.java rename to src/PointTester.java diff --git a/Triangle.java b/src/Triangle.java similarity index 100% rename from Triangle.java rename to src/Triangle.java From a2823f52167733092bfab209dc3ff3f96461a9ff Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Tue, 6 Oct 2015 21:11:30 -0700 Subject: [PATCH 24/27] fix build.xml --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 1571ba7..d56fa59 100644 --- a/build.xml +++ b/build.xml @@ -1,5 +1,5 @@ - + From 44d1f1a8c0254f3ef8a491f26556d3fce5f15d20 Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Tue, 6 Oct 2015 21:12:23 -0700 Subject: [PATCH 25/27] get rid of spaces --- src/IncorrectlyCompletedException.java | 1 - src/MasterTester.java | 1 - 2 files changed, 2 deletions(-) diff --git a/src/IncorrectlyCompletedException.java b/src/IncorrectlyCompletedException.java index 0261b59..752ca25 100644 --- a/src/IncorrectlyCompletedException.java +++ b/src/IncorrectlyCompletedException.java @@ -1,4 +1,3 @@ - public class IncorrectlyCompletedException extends Exception { public IncorrectlyCompletedException() { super(); } public IncorrectlyCompletedException(String message) { super(message); } diff --git a/src/MasterTester.java b/src/MasterTester.java index a8f6ffc..38aba17 100644 --- a/src/MasterTester.java +++ b/src/MasterTester.java @@ -1,4 +1,3 @@ - import java.util.*; public class MasterTester { From 4413290aee45f45aaedd384859f5a92e2733b18f Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Tue, 6 Oct 2015 21:15:27 -0700 Subject: [PATCH 26/27] test to see if travis won't compile when branches can't be merged --- src/IncorrectlyCompletedException.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/IncorrectlyCompletedException.java b/src/IncorrectlyCompletedException.java index 752ca25..0261b59 100644 --- a/src/IncorrectlyCompletedException.java +++ b/src/IncorrectlyCompletedException.java @@ -1,3 +1,4 @@ + public class IncorrectlyCompletedException extends Exception { public IncorrectlyCompletedException() { super(); } public IncorrectlyCompletedException(String message) { super(message); } From 5b1f1b1f58ec3f814a99956cbf573d35428f2938 Mon Sep 17 00:00:00 2001 From: Jonathan Damico Date: Tue, 6 Oct 2015 21:16:12 -0700 Subject: [PATCH 27/27] ...which it doesn't --- src/IncorrectlyCompletedException.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/IncorrectlyCompletedException.java b/src/IncorrectlyCompletedException.java index 0261b59..752ca25 100644 --- a/src/IncorrectlyCompletedException.java +++ b/src/IncorrectlyCompletedException.java @@ -1,4 +1,3 @@ - public class IncorrectlyCompletedException extends Exception { public IncorrectlyCompletedException() { super(); } public IncorrectlyCompletedException(String message) { super(message); }