Skip to content

Update Vehicle.java #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gustavotavaresdias wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Vehicle.java #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 73 additions & 5 deletions Vehicle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
public class Vehicle {
private String manufacturer;
private String model;
private int makeYear;

private int makeYear;
private Journey journey;

@SuppressWarnings("unused")
private FuelPurchase fuelPurchase;
private Service service;
private PerKmRental perKmRental;
private PerDayRental perDayRental;
private boolean isDayRental;

/**
* Class constructor
Expand All @@ -18,6 +21,9 @@ public Vehicle() {
this.makeYear = 2014;
journey = new Journey();
fuelPurchase = new FuelPurchase(125.6);
service = new Service();
isDayRental = false;
perKmRental = new PerKmRental();
}

/**
Expand All @@ -28,12 +34,21 @@ public Vehicle() {
* @param model
* @param makeYear
*/
public Vehicle(String manufacturer, String model, int makeYear) {
this.manufacturer = manufacturer;
public Vehicle(String manufacturer, String model, int makeYear, boolean isDayRental) {

this.manufacturer = manufacturer;
this.model = model;
this.makeYear = makeYear;
journey = new Journey();
fuelPurchase = new FuelPurchase(125.6);
this.isDayRental = isDayRental;
service = new Service();
if (isDayRental){
perDayRental = new PerDayRental();
}
else{
perKmRental = new PerKmRental();}

}

/**
Expand All @@ -44,8 +59,23 @@ public void printDetails() {
System.out.println("Model: " + model);
System.out.println("Make Year: " + makeYear);
System.out.println("Total Kilometers Travelled: " + journey.getKilometers());
System.out.println("Total Services: " + journey.getTotalServices());
System.out.println("Total Services: " + journey.getTotalServices());
}

public void print()
{
System.out.println("Vehicle: " + manufacturer + " " + model + "(" + makeYear + " model)");

if (service.getKmTraveled() <= 0){
System.out.println("No travel has been recorded yet.");
} else{
System.out.printf("%.2f km travelled raising $%.2f%n",service.getKmTraveled(),getRevenue());
}

System.out.println("The vehicle has not yet been serviced");

}


/**
* Appends the distance parameter to {@link Journey#getKilometers()}
Expand All @@ -56,5 +86,43 @@ public void printDetails() {
public void addKilometers(double distance) {
journey.addKilometers(distance);
}

/**
* Added Method, James
*
* Replaces the current Journey object
*
* @param journey
*
*/
public void newJourney(Journey journey)
{
this.journey = journey;
}

/*
* New Method, James
*
* Replaces current FuelPurchase object
*
* @param fuelPurchase
*
*/
public void newFuelPurchase(FuelPurchase fuelPurchase)
{
this.fuelPurchase = fuelPurchase;
}

private double getRevenue()
{

if (isDayRental)
{
return perDayRental.getTotalCost();
}else
{
return perKmRental.getTotalCost();
}
}

}