From 4d17eb1de170a6858c60ac5abf431ec2f76f41a1 Mon Sep 17 00:00:00 2001
From: Clicker <pavel.shchelkun@gmail.com>
Date: Sat, 23 Feb 2013 23:46:38 +0200
Subject: [PATCH 01/12] Getting started.

---
 .idea/codeStyleSettings.xml | 6 +++++-
 rentalStore.iml             | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 1129f00..9178b38 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -2,7 +2,11 @@
 <project version="4">
   <component name="ProjectCodeStyleSettingsManager">
     <option name="PER_PROJECT_SETTINGS">
-      <value />
+      <value>
+        <XML>
+          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
+        </XML>
+      </value>
     </option>
   </component>
 </project>
diff --git a/rentalStore.iml b/rentalStore.iml
index c7fac17..873c6e9 100644
--- a/rentalStore.iml
+++ b/rentalStore.iml
@@ -5,8 +5,8 @@
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>

From 1aeaef207ff67f5b98375c12eff71e46f004eea2 Mon Sep 17 00:00:00 2001
From: Clicker <pavel.shchelkun@gmail.com>
Date: Sun, 24 Feb 2013 19:41:43 +0200
Subject: [PATCH 02/12] Replace temp with query.

---
 .idea/codeStyleSettings.xml                   |  1 +
 rentalStore.iml                               |  1 -
 .../org/kranonit/rentalStore/Customer.java    |  5 +--
 .../java/org/kranonit/rentalStore/Movie.java  |  2 +
 .../java/org/kranonit/rentalStore/Rental.java | 43 +++++++++----------
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 9178b38..c4deb56 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -8,6 +8,7 @@
         </XML>
       </value>
     </option>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
   </component>
 </project>
 
diff --git a/rentalStore.iml b/rentalStore.iml
index 873c6e9..93a882e 100644
--- a/rentalStore.iml
+++ b/rentalStore.iml
@@ -3,7 +3,6 @@
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
diff --git a/src/main/java/org/kranonit/rentalStore/Customer.java b/src/main/java/org/kranonit/rentalStore/Customer.java
index c901a9a..3ebc77a 100644
--- a/src/main/java/org/kranonit/rentalStore/Customer.java
+++ b/src/main/java/org/kranonit/rentalStore/Customer.java
@@ -25,7 +25,6 @@ public String statement() {
         String result = "Rental Record for " + getName() + "\n";
         while (rentals.hasMoreElements()) {
             Rental each = (Rental) rentals.nextElement();
-			double thisAmount = each.getCharge();
             // add frequent renter points
             frequentRenterPoints++;
             // add bonus for a two day new release rental
@@ -34,8 +33,8 @@ public String statement() {
                 frequentRenterPoints++;
             // show figures for this rental
             result += "\t" + each.getMovie().getTitle() + "\t"
-                    + String.valueOf(thisAmount) + "\n";
-            totalAmount += thisAmount;
+                    + String.valueOf(each.getCharge()) + "\n";
+            totalAmount += each.getCharge();
         }
         // add footer lines
         result += "Amount owed is " + String.valueOf(totalAmount) + "\n";
diff --git a/src/main/java/org/kranonit/rentalStore/Movie.java b/src/main/java/org/kranonit/rentalStore/Movie.java
index f866a27..26dc370 100644
--- a/src/main/java/org/kranonit/rentalStore/Movie.java
+++ b/src/main/java/org/kranonit/rentalStore/Movie.java
@@ -1,9 +1,11 @@
 package org.kranonit.rentalStore;
 
 public class Movie {
+
     public static final int CHILDRENS = 2;
     public static final int REGULAR = 0;
     public static final int NEW_RELEASE = 1;
+
     private String _title;
     private int _priceCode;
 
diff --git a/src/main/java/org/kranonit/rentalStore/Rental.java b/src/main/java/org/kranonit/rentalStore/Rental.java
index 0769fe7..4b472f8 100644
--- a/src/main/java/org/kranonit/rentalStore/Rental.java
+++ b/src/main/java/org/kranonit/rentalStore/Rental.java
@@ -3,7 +3,6 @@
 class Rental {
 
     private Movie _movie;
-
     private int _daysRented;
 
     public Rental(Movie movie, int daysRented) {
@@ -11,27 +10,6 @@ public Rental(Movie movie, int daysRented) {
         _daysRented = daysRented;
     }
 
-	public double getCharge() {
-		double thisAmount = 0;
-		// determine amounts for each line
-		switch (getMovie().getPriceCode()) {
-			case Movie.REGULAR:
-				thisAmount += 2;
-				if (getDaysRented() > 2)
-					thisAmount += (getDaysRented() - 2) * 1.5;
-				break;
-			case Movie.NEW_RELEASE:
-				thisAmount += getDaysRented() * 3;
-				break;
-			case Movie.CHILDRENS:
-				thisAmount += 1.5;
-				if (getDaysRented() > 3)
-					thisAmount += (getDaysRented() - 3) * 1.5;
-				break;
-		}
-		return thisAmount;
-	}
-
 	public int getDaysRented() {
         return _daysRented;
     }
@@ -39,4 +17,25 @@ public int getDaysRented() {
     public Movie getMovie() {
         return _movie;
     }
+
+    public double getCharge() {
+        double result = 0;
+        // determine amounts for each line
+        switch (getMovie().getPriceCode()) {
+            case Movie.REGULAR:
+                result += 2;
+                if (getDaysRented() > 2)
+                    result += (getDaysRented() - 2) * 1.5;
+                break;
+            case Movie.NEW_RELEASE:
+                result += getDaysRented() * 3;
+                break;
+            case Movie.CHILDRENS:
+                result += 1.5;
+                if (getDaysRented() > 3)
+                    result += (getDaysRented() - 3) * 1.5;
+                break;
+        }
+        return result;
+    }
 }
\ No newline at end of file

From 54b400b1016e245b859efb4e40573aec9822538c Mon Sep 17 00:00:00 2001
From: Clicker <pavel.shchelkun@gmail.com>
Date: Sun, 24 Feb 2013 19:56:46 +0200
Subject: [PATCH 03/12] Extract Method.

---
 src/main/java/org/kranonit/rentalStore/Customer.java | 6 +-----
 src/main/java/org/kranonit/rentalStore/Rental.java   | 7 +++++++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/kranonit/rentalStore/Customer.java b/src/main/java/org/kranonit/rentalStore/Customer.java
index 3ebc77a..cdacaf2 100644
--- a/src/main/java/org/kranonit/rentalStore/Customer.java
+++ b/src/main/java/org/kranonit/rentalStore/Customer.java
@@ -26,11 +26,7 @@ public String statement() {
         while (rentals.hasMoreElements()) {
             Rental each = (Rental) rentals.nextElement();
             // add frequent renter points
-            frequentRenterPoints++;
-            // add bonus for a two day new release rental
-            if ((each.getMovie().getPriceCode() == Movie.NEW_RELEASE)
-                    && each.getDaysRented() > 1)
-                frequentRenterPoints++;
+            frequentRenterPoints += each.getFrequentedRenterPoints();
             // show figures for this rental
             result += "\t" + each.getMovie().getTitle() + "\t"
                     + String.valueOf(each.getCharge()) + "\n";
diff --git a/src/main/java/org/kranonit/rentalStore/Rental.java b/src/main/java/org/kranonit/rentalStore/Rental.java
index 4b472f8..dee4150 100644
--- a/src/main/java/org/kranonit/rentalStore/Rental.java
+++ b/src/main/java/org/kranonit/rentalStore/Rental.java
@@ -38,4 +38,11 @@ public double getCharge() {
         }
         return result;
     }
+
+    public int getFrequentedRenterPoints() {
+        if ((getMovie().getPriceCode() == Movie.NEW_RELEASE) && getDaysRented() > 1)
+            return 2;
+        else
+            return 1;
+    }
 }
\ No newline at end of file

From a2b6e08c712febcf557c98151cfb72efa1eed888 Mon Sep 17 00:00:00 2001
From: Clicker <pavel.shchelkun@gmail.com>
Date: Sun, 24 Feb 2013 20:43:35 +0200
Subject: [PATCH 04/12] Replace temp with query.

---
 .../java/org/kranonit/rentalStore/Customer.java    | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/kranonit/rentalStore/Customer.java b/src/main/java/org/kranonit/rentalStore/Customer.java
index cdacaf2..39ac63b 100644
--- a/src/main/java/org/kranonit/rentalStore/Customer.java
+++ b/src/main/java/org/kranonit/rentalStore/Customer.java
@@ -20,7 +20,7 @@ public String getName() {
     }
 
     public String statement() {
-        double totalAmount = 0; int frequentRenterPoints = 0;
+        int frequentRenterPoints = 0;
    		Enumeration<Rental> rentals = _rentals.elements();
         String result = "Rental Record for " + getName() + "\n";
         while (rentals.hasMoreElements()) {
@@ -30,13 +30,21 @@ public String statement() {
             // show figures for this rental
             result += "\t" + each.getMovie().getTitle() + "\t"
                     + String.valueOf(each.getCharge()) + "\n";
-            totalAmount += each.getCharge();
         }
         // add footer lines
-        result += "Amount owed is " + String.valueOf(totalAmount) + "\n";
+        result += "Amount owed is " + String.valueOf(getTotalCharge()) + "\n";
         result += "You earned " + String.valueOf(frequentRenterPoints)
                 + " frequent renter points";
         return result;
     }
 
+    public double getTotalCharge() {
+        double result = 0;
+        Enumeration<Rental> rentals = _rentals.elements();
+        while (rentals.hasMoreElements()) {
+            Rental each = (Rental) rentals.nextElement();
+            result += each.getCharge();
+        }
+        return result;
+    }
 }
\ No newline at end of file

From 6094fcd44563894f29a011ed6b6c1311fcdf2e07 Mon Sep 17 00:00:00 2001
From: Clicker <pavel.shchelkun@gmail.com>
Date: Sun, 24 Feb 2013 21:33:14 +0200
Subject: [PATCH 05/12] Extract Method. Move Method. Add New Method. Add Test.

---
 .../org/kranonit/rentalStore/Customer.java    | 33 ++++++++++++++++---
 .../java/org/kranonit/rentalStore/Movie.java  | 21 ++++++++++++
 .../java/org/kranonit/rentalStore/Rental.java | 21 ++----------
 .../kranonit/rentalStore/CustomerTest.java    | 23 +++++++++++++
 4 files changed, 74 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/kranonit/rentalStore/Customer.java b/src/main/java/org/kranonit/rentalStore/Customer.java
index 39ac63b..537b5f4 100644
--- a/src/main/java/org/kranonit/rentalStore/Customer.java
+++ b/src/main/java/org/kranonit/rentalStore/Customer.java
@@ -20,25 +20,37 @@ public String getName() {
     }
 
     public String statement() {
-        int frequentRenterPoints = 0;
    		Enumeration<Rental> rentals = _rentals.elements();
         String result = "Rental Record for " + getName() + "\n";
         while (rentals.hasMoreElements()) {
             Rental each = (Rental) rentals.nextElement();
-            // add frequent renter points
-            frequentRenterPoints += each.getFrequentedRenterPoints();
             // show figures for this rental
             result += "\t" + each.getMovie().getTitle() + "\t"
                     + String.valueOf(each.getCharge()) + "\n";
         }
         // add footer lines
         result += "Amount owed is " + String.valueOf(getTotalCharge()) + "\n";
-        result += "You earned " + String.valueOf(frequentRenterPoints)
+        result += "You earned " + String.valueOf(getTotalFrequentRenterPoints())
                 + " frequent renter points";
         return result;
     }
 
-    public double getTotalCharge() {
+    public String htmlStatement() {
+        Enumeration<Rental> rentals = _rentals.elements();
+        String result = "<H1>Rental Record for <EM>" + getName() + "</EM></H1><P>\n";
+        while (rentals.hasMoreElements()) {
+            Rental each = (Rental) rentals.nextElement();
+            // show figures for this rental
+            result += each.getMovie().getTitle() + ": " + String.valueOf(each.getCharge()) + "<BR>\n";
+        }
+        // add footer lines
+        result += "<P>Amount owed is <EM>" + String.valueOf(getTotalCharge()) + "</EM><P>\n";
+        result += "You earned <EM>" + String.valueOf(getTotalFrequentRenterPoints())
+                + "</EM> frequent renter points<P>";
+        return result;
+    }
+
+    private double getTotalCharge() {
         double result = 0;
         Enumeration<Rental> rentals = _rentals.elements();
         while (rentals.hasMoreElements()) {
@@ -47,4 +59,15 @@ public double getTotalCharge() {
         }
         return result;
     }
+
+    private int getTotalFrequentRenterPoints() {
+        int result = 0;
+        Enumeration<Rental> rentals = _rentals.elements();
+        while (rentals.hasMoreElements()) {
+            Rental each = (Rental) rentals.nextElement();
+            result += each.getFrequentRenterPoints();
+        }
+        return result;
+
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/kranonit/rentalStore/Movie.java b/src/main/java/org/kranonit/rentalStore/Movie.java
index 26dc370..2c60a5b 100644
--- a/src/main/java/org/kranonit/rentalStore/Movie.java
+++ b/src/main/java/org/kranonit/rentalStore/Movie.java
@@ -25,4 +25,25 @@ public void setPriceCode(int arg) {
     public String getTitle() {
         return _title;
     }
+
+    public double getCharge(int daysRented) {
+        double result = 0;
+        // determine amounts for each line
+        switch (getPriceCode()) {
+            case Movie.REGULAR:
+                result += 2;
+                if (daysRented > 2)
+                    result += (daysRented - 2) * 1.5;
+                break;
+            case Movie.NEW_RELEASE:
+                result += daysRented * 3;
+                break;
+            case Movie.CHILDRENS:
+                result += 1.5;
+                if (daysRented > 3)
+                    result += (daysRented - 3) * 1.5;
+                break;
+        }
+        return result;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/kranonit/rentalStore/Rental.java b/src/main/java/org/kranonit/rentalStore/Rental.java
index dee4150..13ac35e 100644
--- a/src/main/java/org/kranonit/rentalStore/Rental.java
+++ b/src/main/java/org/kranonit/rentalStore/Rental.java
@@ -19,27 +19,10 @@ public Movie getMovie() {
     }
 
     public double getCharge() {
-        double result = 0;
-        // determine amounts for each line
-        switch (getMovie().getPriceCode()) {
-            case Movie.REGULAR:
-                result += 2;
-                if (getDaysRented() > 2)
-                    result += (getDaysRented() - 2) * 1.5;
-                break;
-            case Movie.NEW_RELEASE:
-                result += getDaysRented() * 3;
-                break;
-            case Movie.CHILDRENS:
-                result += 1.5;
-                if (getDaysRented() > 3)
-                    result += (getDaysRented() - 3) * 1.5;
-                break;
-        }
-        return result;
+        return _movie.getCharge(_daysRented);
     }
 
-    public int getFrequentedRenterPoints() {
+    public int getFrequentRenterPoints() {
         if ((getMovie().getPriceCode() == Movie.NEW_RELEASE) && getDaysRented() > 1)
             return 2;
         else
diff --git a/src/test/java/org/kranonit/rentalStore/CustomerTest.java b/src/test/java/org/kranonit/rentalStore/CustomerTest.java
index 3d7175b..b424b49 100644
--- a/src/test/java/org/kranonit/rentalStore/CustomerTest.java
+++ b/src/test/java/org/kranonit/rentalStore/CustomerTest.java
@@ -31,4 +31,27 @@ public void testStatement() throws Exception {
 				"Amount owed is 38.0\n" +
 				"You earned 6 frequent renter points", statementResult);
 	}
+
+    @Test
+    public void testHtmlStatement() throws Exception {
+        Movie m1 = new Movie("За двумя зайцами", Movie.REGULAR);
+        Movie m2 = new Movie("Всё просто", Movie.NEW_RELEASE);
+        Movie m3 = new Movie("Хоббит", Movie.CHILDRENS);
+        Movie m4 = new Movie("Альф", Movie.NEW_RELEASE);
+
+        Customer c = new Customer("stokito");
+        c.addRental(new Rental(m1, 3));
+        c.addRental(new Rental(m2, 4));
+        c.addRental(new Rental(m3, 5));
+        c.addRental(new Rental(m4, 6));
+        String statementResult = c.htmlStatement();
+        System.out.print(statementResult);
+        Assert.assertEquals("<H1>Rental Record for <EM>stokito</EM></H1><P>\n" +
+                "За двумя зайцами: 3.5<BR>\n" +
+                "Всё просто: 12.0<BR>\n" +
+                "Хоббит: 4.5<BR>\n" +
+                "Альф: 18.0<BR>\n" +
+                "<P>Amount owed is <EM>38.0</EM><P>\n" +
+                "You earned <EM>6</EM> frequent renter points<P>", statementResult);
+    }
 }

From c9af98f013ae4f66292fbf43f1f06e0fa78bdb17 Mon Sep 17 00:00:00 2001
From: Clicker <pavel.shchelkun@gmail.com>
Date: Sun, 24 Feb 2013 21:36:29 +0200
Subject: [PATCH 06/12] Move Method.

---
 src/main/java/org/kranonit/rentalStore/Movie.java  | 7 +++++++
 src/main/java/org/kranonit/rentalStore/Rental.java | 5 +----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/kranonit/rentalStore/Movie.java b/src/main/java/org/kranonit/rentalStore/Movie.java
index 2c60a5b..2bba8e0 100644
--- a/src/main/java/org/kranonit/rentalStore/Movie.java
+++ b/src/main/java/org/kranonit/rentalStore/Movie.java
@@ -46,4 +46,11 @@ public double getCharge(int daysRented) {
         }
         return result;
     }
+
+    public int getFrequentRenterPoints(int daysRented) {
+        if ((getPriceCode() == Movie.NEW_RELEASE) && daysRented > 1)
+            return 2;
+        else
+            return 1;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/org/kranonit/rentalStore/Rental.java b/src/main/java/org/kranonit/rentalStore/Rental.java
index 13ac35e..57fb2b3 100644
--- a/src/main/java/org/kranonit/rentalStore/Rental.java
+++ b/src/main/java/org/kranonit/rentalStore/Rental.java
@@ -23,9 +23,6 @@ public double getCharge() {
     }
 
     public int getFrequentRenterPoints() {
-        if ((getMovie().getPriceCode() == Movie.NEW_RELEASE) && getDaysRented() > 1)
-            return 2;
-        else
-            return 1;
+        return _movie.getFrequentRenterPoints(_daysRented);
     }
 }
\ No newline at end of file

From cbd8bc45b4a2d6eadad57060e20414a721458350 Mon Sep 17 00:00:00 2001
From: Clicker <pavel.shchelkun@gmail.com>
Date: Wed, 27 Feb 2013 23:58:38 +0200
Subject: [PATCH 07/12] Added Price classes.

---
 .../java/org/kranonit/rentalStore/ChildrensPrice.java     | 8 ++++++++
 src/main/java/org/kranonit/rentalStore/Movie.java         | 2 +-
 .../java/org/kranonit/rentalStore/NewReleasePrice.java    | 8 ++++++++
 src/main/java/org/kranonit/rentalStore/Price.java         | 5 +++++
 src/main/java/org/kranonit/rentalStore/RegularPrice.java  | 8 ++++++++
 5 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/kranonit/rentalStore/ChildrensPrice.java
 create mode 100644 src/main/java/org/kranonit/rentalStore/NewReleasePrice.java
 create mode 100644 src/main/java/org/kranonit/rentalStore/Price.java
 create mode 100644 src/main/java/org/kranonit/rentalStore/RegularPrice.java

diff --git a/src/main/java/org/kranonit/rentalStore/ChildrensPrice.java b/src/main/java/org/kranonit/rentalStore/ChildrensPrice.java
new file mode 100644
index 0000000..b39e364
--- /dev/null
+++ b/src/main/java/org/kranonit/rentalStore/ChildrensPrice.java
@@ -0,0 +1,8 @@
+package org.kranonit.rentalStore;
+
+class ChildrensPrice extends Price {
+    @Override
+    int getPriceCode(){
+        return Movie.CHILDRENS;
+    }
+}
diff --git a/src/main/java/org/kranonit/rentalStore/Movie.java b/src/main/java/org/kranonit/rentalStore/Movie.java
index 2bba8e0..b1c2499 100644
--- a/src/main/java/org/kranonit/rentalStore/Movie.java
+++ b/src/main/java/org/kranonit/rentalStore/Movie.java
@@ -11,7 +11,7 @@ public class Movie {
 
     public Movie(String title, int priceCode) {
         _title = title;
-        _priceCode = priceCode;
+        setPriceCode(priceCode);
     }
 
     public int getPriceCode() {
diff --git a/src/main/java/org/kranonit/rentalStore/NewReleasePrice.java b/src/main/java/org/kranonit/rentalStore/NewReleasePrice.java
new file mode 100644
index 0000000..84ba613
--- /dev/null
+++ b/src/main/java/org/kranonit/rentalStore/NewReleasePrice.java
@@ -0,0 +1,8 @@
+package org.kranonit.rentalStore;
+
+public class NewReleasePrice extends Price {
+    @Override
+    int getPriceCode() {
+        return Movie.NEW_RELEASE;
+    }
+}
diff --git a/src/main/java/org/kranonit/rentalStore/Price.java b/src/main/java/org/kranonit/rentalStore/Price.java
new file mode 100644
index 0000000..afff28f
--- /dev/null
+++ b/src/main/java/org/kranonit/rentalStore/Price.java
@@ -0,0 +1,5 @@
+package org.kranonit.rentalStore;
+
+abstract class Price {
+    abstract int getPriceCode();
+}
diff --git a/src/main/java/org/kranonit/rentalStore/RegularPrice.java b/src/main/java/org/kranonit/rentalStore/RegularPrice.java
new file mode 100644
index 0000000..0f51cf3
--- /dev/null
+++ b/src/main/java/org/kranonit/rentalStore/RegularPrice.java
@@ -0,0 +1,8 @@
+package org.kranonit.rentalStore;
+
+public class RegularPrice extends  Price {
+    @Override
+    int getPriceCode() {
+        return Movie.REGULAR;
+    }
+}

From 9481549b4c1fdac061a27522802c597eec46600f Mon Sep 17 00:00:00 2001
From: Clicker <pavel.shchelkun@gmail.com>
Date: Thu, 28 Feb 2013 00:05:35 +0200
Subject: [PATCH 08/12] Replace Type Code with State/Strategy

---
 .../java/org/kranonit/rentalStore/Movie.java   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/kranonit/rentalStore/Movie.java b/src/main/java/org/kranonit/rentalStore/Movie.java
index b1c2499..312c064 100644
--- a/src/main/java/org/kranonit/rentalStore/Movie.java
+++ b/src/main/java/org/kranonit/rentalStore/Movie.java
@@ -7,7 +7,7 @@ public class Movie {
     public static final int NEW_RELEASE = 1;
 
     private String _title;
-    private int _priceCode;
+    private Price _price;
 
     public Movie(String title, int priceCode) {
         _title = title;
@@ -15,11 +15,23 @@ public Movie(String title, int priceCode) {
     }
 
     public int getPriceCode() {
-        return _priceCode;
+        return _price.getPriceCode();
     }
 
     public void setPriceCode(int arg) {
-        _priceCode = arg;
+        switch (arg) {
+            case REGULAR:
+                _price = new RegularPrice();
+                break;
+            case CHILDRENS:
+                _price = new ChildrensPrice();
+                break;
+            case NEW_RELEASE:
+                _price = new NewReleasePrice();
+                break;
+            default:
+                throw new IllegalArgumentException("Incorrect Price Code");
+        }
     }
 
     public String getTitle() {

From b8cc7300c02e963cb2085a1b14b1e6353172961d Mon Sep 17 00:00:00 2001
From: Clicker <pavel.shchelkun@gmail.com>
Date: Thu, 28 Feb 2013 00:22:18 +0200
Subject: [PATCH 09/12] Move Method.

---
 .../java/org/kranonit/rentalStore/Movie.java  | 19 +-----------------
 .../java/org/kranonit/rentalStore/Price.java  | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/kranonit/rentalStore/Movie.java b/src/main/java/org/kranonit/rentalStore/Movie.java
index 312c064..3186bc9 100644
--- a/src/main/java/org/kranonit/rentalStore/Movie.java
+++ b/src/main/java/org/kranonit/rentalStore/Movie.java
@@ -39,24 +39,7 @@ public String getTitle() {
     }
 
     public double getCharge(int daysRented) {
-        double result = 0;
-        // determine amounts for each line
-        switch (getPriceCode()) {
-            case Movie.REGULAR:
-                result += 2;
-                if (daysRented > 2)
-                    result += (daysRented - 2) * 1.5;
-                break;
-            case Movie.NEW_RELEASE:
-                result += daysRented * 3;
-                break;
-            case Movie.CHILDRENS:
-                result += 1.5;
-                if (daysRented > 3)
-                    result += (daysRented - 3) * 1.5;
-                break;
-        }
-        return result;
+        return _price.getCharge(daysRented);
     }
 
     public int getFrequentRenterPoints(int daysRented) {
diff --git a/src/main/java/org/kranonit/rentalStore/Price.java b/src/main/java/org/kranonit/rentalStore/Price.java
index afff28f..f3dd3de 100644
--- a/src/main/java/org/kranonit/rentalStore/Price.java
+++ b/src/main/java/org/kranonit/rentalStore/Price.java
@@ -2,4 +2,24 @@
 
 abstract class Price {
     abstract int getPriceCode();
+
+    public double getCharge(int daysRented) {
+        double result = 0;
+        switch (getPriceCode()) {
+            case Movie.REGULAR:
+                result += 2;
+                if (daysRented > 2)
+                    result += (daysRented - 2) * 1.5;
+                break;
+            case Movie.NEW_RELEASE:
+                result += daysRented * 3;
+                break;
+            case Movie.CHILDRENS:
+                result += 1.5;
+                if (daysRented > 3)
+                    result += (daysRented - 3) * 1.5;
+                break;
+        }
+        return result;
+    }
 }

From f7324c9ee4f4e4e6002d899d94c054f551987339 Mon Sep 17 00:00:00 2001
From: Clicker <pavel.shchelkun@gmail.com>
Date: Thu, 28 Feb 2013 00:35:27 +0200
Subject: [PATCH 10/12] Replace Conditional with Polymorphism.

---
 .../kranonit/rentalStore/ChildrensPrice.java  |  7 +++++++
 .../java/org/kranonit/rentalStore/Movie.java  |  4 ++--
 .../kranonit/rentalStore/NewReleasePrice.java |  4 ++++
 .../java/org/kranonit/rentalStore/Price.java  | 21 +------------------
 .../kranonit/rentalStore/RegularPrice.java    |  7 +++++++
 .../java/org/kranonit/rentalStore/Rental.java |  4 ++--
 6 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/main/java/org/kranonit/rentalStore/ChildrensPrice.java b/src/main/java/org/kranonit/rentalStore/ChildrensPrice.java
index b39e364..3906d11 100644
--- a/src/main/java/org/kranonit/rentalStore/ChildrensPrice.java
+++ b/src/main/java/org/kranonit/rentalStore/ChildrensPrice.java
@@ -5,4 +5,11 @@ class ChildrensPrice extends Price {
     int getPriceCode(){
         return Movie.CHILDRENS;
     }
+
+    double getCharge(int daysRented){
+        double result = 1.5;
+        if (daysRented > 3)
+            result += (daysRented - 3) * 1.5;
+        return result;
+    }
 }
diff --git a/src/main/java/org/kranonit/rentalStore/Movie.java b/src/main/java/org/kranonit/rentalStore/Movie.java
index 3186bc9..49f2e80 100644
--- a/src/main/java/org/kranonit/rentalStore/Movie.java
+++ b/src/main/java/org/kranonit/rentalStore/Movie.java
@@ -38,11 +38,11 @@ public String getTitle() {
         return _title;
     }
 
-    public double getCharge(int daysRented) {
+    double getCharge(int daysRented) {
         return _price.getCharge(daysRented);
     }
 
-    public int getFrequentRenterPoints(int daysRented) {
+    int getFrequentRenterPoints(int daysRented) {
         if ((getPriceCode() == Movie.NEW_RELEASE) && daysRented > 1)
             return 2;
         else
diff --git a/src/main/java/org/kranonit/rentalStore/NewReleasePrice.java b/src/main/java/org/kranonit/rentalStore/NewReleasePrice.java
index 84ba613..1a05bb6 100644
--- a/src/main/java/org/kranonit/rentalStore/NewReleasePrice.java
+++ b/src/main/java/org/kranonit/rentalStore/NewReleasePrice.java
@@ -5,4 +5,8 @@ public class NewReleasePrice extends Price {
     int getPriceCode() {
         return Movie.NEW_RELEASE;
     }
+
+    double getCharge(int daysRented){
+        return daysRented * 3;
+    }
 }
diff --git a/src/main/java/org/kranonit/rentalStore/Price.java b/src/main/java/org/kranonit/rentalStore/Price.java
index f3dd3de..6443731 100644
--- a/src/main/java/org/kranonit/rentalStore/Price.java
+++ b/src/main/java/org/kranonit/rentalStore/Price.java
@@ -2,24 +2,5 @@
 
 abstract class Price {
     abstract int getPriceCode();
-
-    public double getCharge(int daysRented) {
-        double result = 0;
-        switch (getPriceCode()) {
-            case Movie.REGULAR:
-                result += 2;
-                if (daysRented > 2)
-                    result += (daysRented - 2) * 1.5;
-                break;
-            case Movie.NEW_RELEASE:
-                result += daysRented * 3;
-                break;
-            case Movie.CHILDRENS:
-                result += 1.5;
-                if (daysRented > 3)
-                    result += (daysRented - 3) * 1.5;
-                break;
-        }
-        return result;
-    }
+    abstract double getCharge(int daysRented);
 }
diff --git a/src/main/java/org/kranonit/rentalStore/RegularPrice.java b/src/main/java/org/kranonit/rentalStore/RegularPrice.java
index 0f51cf3..0adf24e 100644
--- a/src/main/java/org/kranonit/rentalStore/RegularPrice.java
+++ b/src/main/java/org/kranonit/rentalStore/RegularPrice.java
@@ -5,4 +5,11 @@ public class RegularPrice extends  Price {
     int getPriceCode() {
         return Movie.REGULAR;
     }
+
+    double getCharge(int daysRented){
+        double result = 2;
+        if (daysRented > 2)
+            result += (daysRented - 2) * 1.5;
+        return result;
+    }
 }
diff --git a/src/main/java/org/kranonit/rentalStore/Rental.java b/src/main/java/org/kranonit/rentalStore/Rental.java
index 57fb2b3..5cee7c4 100644
--- a/src/main/java/org/kranonit/rentalStore/Rental.java
+++ b/src/main/java/org/kranonit/rentalStore/Rental.java
@@ -18,11 +18,11 @@ public Movie getMovie() {
         return _movie;
     }
 
-    public double getCharge() {
+    double getCharge() {
         return _movie.getCharge(_daysRented);
     }
 
-    public int getFrequentRenterPoints() {
+    int getFrequentRenterPoints() {
         return _movie.getFrequentRenterPoints(_daysRented);
     }
 }
\ No newline at end of file

From 72b84acb6b0bb7abe56a9b53ab0a7ca4624d255b Mon Sep 17 00:00:00 2001
From: Clicker <pavel.shchelkun@gmail.com>
Date: Thu, 28 Feb 2013 00:44:38 +0200
Subject: [PATCH 11/12] Replace Conditional with Polymorphism.

---
 src/main/java/org/kranonit/rentalStore/ChildrensPrice.java  | 1 +
 src/main/java/org/kranonit/rentalStore/Movie.java           | 5 +----
 src/main/java/org/kranonit/rentalStore/NewReleasePrice.java | 6 ++++++
 src/main/java/org/kranonit/rentalStore/Price.java           | 4 ++++
 src/main/java/org/kranonit/rentalStore/RegularPrice.java    | 1 +
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/kranonit/rentalStore/ChildrensPrice.java b/src/main/java/org/kranonit/rentalStore/ChildrensPrice.java
index 3906d11..bc6e8d7 100644
--- a/src/main/java/org/kranonit/rentalStore/ChildrensPrice.java
+++ b/src/main/java/org/kranonit/rentalStore/ChildrensPrice.java
@@ -6,6 +6,7 @@ int getPriceCode(){
         return Movie.CHILDRENS;
     }
 
+    @Override
     double getCharge(int daysRented){
         double result = 1.5;
         if (daysRented > 3)
diff --git a/src/main/java/org/kranonit/rentalStore/Movie.java b/src/main/java/org/kranonit/rentalStore/Movie.java
index 49f2e80..02b792a 100644
--- a/src/main/java/org/kranonit/rentalStore/Movie.java
+++ b/src/main/java/org/kranonit/rentalStore/Movie.java
@@ -43,9 +43,6 @@ public String getTitle() {
     }
 
     int getFrequentRenterPoints(int daysRented) {
-        if ((getPriceCode() == Movie.NEW_RELEASE) && daysRented > 1)
-            return 2;
-        else
-            return 1;
+        return _price.getFrequentRenterPoints(daysRented);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/org/kranonit/rentalStore/NewReleasePrice.java b/src/main/java/org/kranonit/rentalStore/NewReleasePrice.java
index 1a05bb6..00f65a9 100644
--- a/src/main/java/org/kranonit/rentalStore/NewReleasePrice.java
+++ b/src/main/java/org/kranonit/rentalStore/NewReleasePrice.java
@@ -6,7 +6,13 @@ int getPriceCode() {
         return Movie.NEW_RELEASE;
     }
 
+    @Override
     double getCharge(int daysRented){
         return daysRented * 3;
     }
+
+    @Override
+    int getFrequentRenterPoints(int daysRented) {
+        return (daysRented > 1) ? 2: 1;
+    }
 }
diff --git a/src/main/java/org/kranonit/rentalStore/Price.java b/src/main/java/org/kranonit/rentalStore/Price.java
index 6443731..49a81e4 100644
--- a/src/main/java/org/kranonit/rentalStore/Price.java
+++ b/src/main/java/org/kranonit/rentalStore/Price.java
@@ -3,4 +3,8 @@
 abstract class Price {
     abstract int getPriceCode();
     abstract double getCharge(int daysRented);
+
+    int getFrequentRenterPoints(int daysRented) {
+        return 1;
+    }
 }
diff --git a/src/main/java/org/kranonit/rentalStore/RegularPrice.java b/src/main/java/org/kranonit/rentalStore/RegularPrice.java
index 0adf24e..cf411ae 100644
--- a/src/main/java/org/kranonit/rentalStore/RegularPrice.java
+++ b/src/main/java/org/kranonit/rentalStore/RegularPrice.java
@@ -6,6 +6,7 @@ int getPriceCode() {
         return Movie.REGULAR;
     }
 
+    @Override
     double getCharge(int daysRented){
         double result = 2;
         if (daysRented > 2)

From 9acd2d20fef8cac3c7b5cb7d9ea549196c7575a2 Mon Sep 17 00:00:00 2001
From: Clicker <pavel.shchelkun@gmail.com>
Date: Thu, 28 Feb 2013 23:51:45 +0200
Subject: [PATCH 12/12] Rental and Movie are covered with some tests.

---
 .../org/kranonit/rentalStore/MovieTest.java   | 25 +++++++++++++++++
 .../org/kranonit/rentalStore/RentalTest.java  | 28 +++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 src/test/java/org/kranonit/rentalStore/MovieTest.java
 create mode 100644 src/test/java/org/kranonit/rentalStore/RentalTest.java

diff --git a/src/test/java/org/kranonit/rentalStore/MovieTest.java b/src/test/java/org/kranonit/rentalStore/MovieTest.java
new file mode 100644
index 0000000..56b9ee0
--- /dev/null
+++ b/src/test/java/org/kranonit/rentalStore/MovieTest.java
@@ -0,0 +1,25 @@
+package org.kranonit.rentalStore;
+
+import junit.framework.Assert;
+import org.junit.Test;
+
+public class MovieTest {
+
+    @Test
+    public void testGetPriceCode() throws Exception {
+        Movie aMovie = new Movie("Die Hard", 2);
+        Assert.assertEquals(Movie.CHILDRENS, aMovie.getPriceCode());
+    }
+
+    @Test
+    public void testGetCharge() throws Exception {
+        Movie aMovie = new Movie("Die Hard", Movie.NEW_RELEASE);
+        Assert.assertEquals(15d, aMovie.getCharge(5));
+    }
+
+    @Test
+    public void testGetFrequentRenterPoints() throws Exception {
+        Movie aMovie = new Movie("Die Hard", Movie.REGULAR);
+        Assert.assertEquals(1, aMovie.getFrequentRenterPoints(6));
+    }
+}
diff --git a/src/test/java/org/kranonit/rentalStore/RentalTest.java b/src/test/java/org/kranonit/rentalStore/RentalTest.java
new file mode 100644
index 0000000..f215378
--- /dev/null
+++ b/src/test/java/org/kranonit/rentalStore/RentalTest.java
@@ -0,0 +1,28 @@
+package org.kranonit.rentalStore;
+
+import junit.framework.Assert;
+import org.junit.Test;
+
+public class RentalTest {
+
+    @Test
+    public void testGetDaysRented() throws Exception {
+        Movie aMovie = new Movie("Die Hard", Movie.REGULAR);
+        Rental aRental = new Rental(aMovie, 4);
+        Assert.assertEquals(4, aRental.getDaysRented());
+    }
+
+    @Test
+    public void testGetCharge() throws Exception {
+        Movie aMovie = new Movie("Life of Pi", Movie.NEW_RELEASE);
+        Rental aRental = new Rental(aMovie, 2);
+        Assert.assertEquals(6d, aRental.getCharge());
+    }
+
+    @Test
+    public void testFrequentRenterPoints() throws Exception {
+        Movie aMovie = new Movie("Panda Kung-Fu", Movie.CHILDRENS);
+        Rental aRental = new Rental(aMovie, 3);
+        Assert.assertEquals(1, aRental.getFrequentRenterPoints());
+    }
+}