Merge branch 'master' of https://github.com/java-tester-x/JavaExercises4

java-tester-x · java-tester-x · commit 30674be958a1 · 2014-09-12T07:15:22.000+03:00
Conflicts:
	src/ex7/CustomerTest.java
	src/ex7/Discount.java
	src/ex7/DiscountSystem/CustomerTest.java
	src/ex7/VisitTest.java
diff --git a/src/ex7/Discount.java b/src/ex7/Discount.java
@@ -12,7 +12,7 @@ public class Discount
     private static double productDiscountPremium = 0.1;
     private static double productDiscountGold    = 0.1;
     private static double productDiscountSilver  = 0.1;
-    
+
     public static double getServiceDiscountRate(String type) {
         switch(type.toUpperCase()) {
             case "PREMIUM": return serviceDiscountPremium;
diff --git a/src/ex8/Point.java b/src/ex8/Point.java
@@ -0,0 +1,16 @@
+package src.ex8;
+
+public class Point {
+
+    private int x;
+    private int y;
+
+    public Point(int x, int y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    public String toString() {
+        return String.format("Point (%1$d, %2$d)", x, y);
+    }
+}
diff --git a/src/ex8/PolyLine.java b/src/ex8/PolyLine.java
@@ -0,0 +1,37 @@
+package src.ex8;
+
+import java.util.List;
+import java.util.ArrayList;
+
+public class PolyLine {
+
+    private List<Point> points = new ArrayList<Point>();
+
+    public PolyLine() { }   // default constructor
+
+    public PolyLine(List<Point> points) {
+        this.points = points;
+    }
+
+    public void appendPoint(Point point) {
+        points.add(point);
+    }
+
+    public void appendPoint(int x, int y) {
+        points.add(new Point(x, y));
+    }
+
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+        int i = 0;
+        for (Point aPoint : points) {
+            if (i != 0) {
+                sb.append(", ");
+            }
+            sb.append(aPoint.toString());
+            i++;
+        }
+        return sb.toString();
+    }
+}
diff --git a/src/ex8/TestPolyLine.java b/src/ex8/TestPolyLine.java
@@ -0,0 +1,15 @@
+package src.ex8;
+
+public class TestPolyLine {
+
+    public static void main(String[] args)
+    {
+        PolyLine l1 = new PolyLine();
+        System.out.println(l1);    // empty
+    
+        l1.appendPoint(new Point(1, 1));
+        l1.appendPoint(2, 2);
+        l1.appendPoint(3, 3);
+        System.out.println(l1);    // (1,1)(2,2)(3,3)
+    }
+}
