Binary files VideoStock1.1.beta/Customers.class and VideoStock1.1/Customers.class differ
diff -r VideoStock1.1.beta/Customers.java VideoStock1.1/Customers.java
21a22
>
24,25d24
< double totalAmount = 0;
< int frequentRenterPoints = 0;
30d28
< double thisAmount=0;
32,56c30,31
< switch (each.getMovie().getPriceCode())
< {
< case Movie.REGULAR:
< thisAmount+=2;
< if (each.getDaysRented()>2)
< {
< thisAmount+=(each.getDaysRented()-2)*1.5;
< }
< break;
< case Movie.NEW_RELEASE:
< thisAmount += each.getDaysRented()*3;
< break;
< case Movie.CHILDRENS:
< thisAmount += 1.5;
< if(each.getDaysRented() > 3)
< thisAmount+= (each.getDaysRented()-3)*1.5;
< break;
< }
< frequentRenterPoints++;
< if( (each.getMovie().getPriceCode()== Movie.NEW_RELEASE)
< && (each.getDaysRented()>1))
< frequentRenterPoints++;
< result +="\t" + each.getMovie().getTitle()+"\t"+
< String.valueOf(thisAmount) +" \n";
< totalAmount+=thisAmount;
---
> result +="\t" + each.getMovie().getTitle()+"\t"+
> String.valueOf(each.getCharge()) +" \n";
58c33
< result += "Amount owned is " + String.valueOf(totalAmount) +
---
> result += "Amount owned is " + String.valueOf(getTotalCharge()) +
60c35
< result += "You earned " + String.valueOf(frequentRenterPoints) +
---
> result += "You earned " + String.valueOf(getTotalFrequentRenterPoints()) +
63d37
<
68,69d41
< double totalAmount = 0;
< int frequentRenterPoints = 0;
74d45
< double thisAmount=0;
76,100c47,48
< switch (each.getMovie().getPriceCode())
< {
< case Movie.REGULAR:
< thisAmount+=2;
< if (each.getDaysRented()>2)
< {
< thisAmount+=(each.getDaysRented()-2)*1.5;
< }
< break;
< case Movie.NEW_RELEASE:
< thisAmount += each.getDaysRented()*3;
< break;
< case Movie.CHILDRENS:
< thisAmount += 1.5;
< if(each.getDaysRented() > 3)
< thisAmount+= (each.getDaysRented()-3)*1.5;
< break;
< }
< frequentRenterPoints++;
< if( (each.getMovie().getPriceCode()== Movie.NEW_RELEASE)
< && (each.getDaysRented()>1))
< frequentRenterPoints++;
< result +=each.getMovie().getTitle()+": "+
< String.valueOf(thisAmount) +"
\n";
< totalAmount+=thisAmount;
---
> result +=each.getMovie().getTitle()+": "+
> String.valueOf(each.getCharge()) +"
\n";
102c50
< result += "
Amount owned is " + String.valueOf(totalAmount) +
---
> result += " Amount owned is " + String.valueOf(getTotalCharge()) +
104,105c52,66
< result += "You earned " + String.valueOf(frequentRenterPoints) +
< " frequent renter points ";
---
> result += "You earned " + String.valueOf(getTotalFrequentRenterPoints()) +
> " frequent renter points ";
> return result;
> }
>
>
> private double getTotalCharge()
> {
> double result=0;
> Enumeration rentals=_rentals.elements();
> while (rentals.hasMoreElements())
> {
> Rental each=(Rental) rentals.nextElement();
> result+=each.getCharge();
> }
107d67
<
110a71,81
> private int getTotalFrequentRenterPoints()
> {
> int result=0;
> Enumeration rentals=_rentals.elements();
> while (rentals.hasMoreElements())
> {
> Rental each=(Rental) rentals.nextElement();
> result+=each.getFrequentRenterPoints();
> }
> return result;
> }
111a83,89
>
>
>
>
>
>
>
Binary files VideoStock1.1.beta/Rental.class and VideoStock1.1/Rental.class differ
diff -r VideoStock1.1.beta/Rental.java VideoStock1.1/Rental.java
18a19,50
> public double getCharge()
> {
> double result=0;
> 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;
> }
>
> public int getFrequentRenterPoints()
> {
> if( (getMovie().getPriceCode()== Movie.NEW_RELEASE)
> && (getDaysRented()>1))
> return 2;
> else
> return 1;
> }
19a52
>
Only in VideoStock1.1.beta: VideoStock1.1.beta.ps
Only in VideoStock1.1: VideoStock1.1.ps