From 951713411f7fd398c1390f70f17e0cd45d6565df Mon Sep 17 00:00:00 2001 From: ChuckUFarley Date: Thu, 3 Apr 2014 19:09:39 +0800 Subject: [PATCH 1/3] Create README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..92bfd60 --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ +OpenSource_AssessmentTwo +======================== + +cert4_open_source_ass_2 + +contenct TBD From 41af19e2dace4885b285014403b7ca4626f43f3d Mon Sep 17 00:00:00 2001 From: ChuckUFarley Date: Thu, 3 Apr 2014 19:15:05 +0800 Subject: [PATCH 2/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 92bfd60..1d82b81 100644 --- a/README.md +++ b/README.md @@ -3,4 +3,4 @@ OpenSource_AssessmentTwo cert4_open_source_ass_2 -contenct TBD +content TBD From bbac57339bb357ad887ee6d4caf6e708ebc2570a Mon Sep 17 00:00:00 2001 From: ChuckUFarley Date: Thu, 5 Jun 2014 15:14:50 +0800 Subject: [PATCH 3/3] Update Vehicle.java added short method (getFuelUsed()) to calculate fuel used, and called this method in printDetails() method. --- Vehicle.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Vehicle.java b/Vehicle.java index d72a0bb..285c7f2 100644 --- a/Vehicle.java +++ b/Vehicle.java @@ -44,6 +44,7 @@ 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("Fuel used: " + getFuelUsed()); System.out.println("Total Services: " + journey.getTotalServices()); } @@ -56,5 +57,10 @@ public void printDetails() { public void addKilometers(double distance) { journey.addKilometers(distance); } + + public double getFuelUsed(){ + return ((journey.getKilometers()/100) * fuelPurchase.getFuelEconomy()); + //according to 'phase 2' doc, fuelEconomy represents litres of fuel required per 100kms + } }