diff --git a/.vscode/settings.json b/.vscode/settings.json index 3fe1f5c..de48ede 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -18,7 +18,6 @@ "files.autoSave": "afterDelay", "screencastMode.onlyKeyboardShortcuts": true, "terminal.integrated.fontSize": 18, - "workbench.activityBar.visible": true, "workbench.colorTheme": "Visual Studio Dark", "workbench.fontAliasing": "antialiased", "workbench.statusBar.visible": true, diff --git a/_01_02b/Employee.java b/_01_02b/Employee.java index 12928d5..dc957c1 100644 --- a/_01_02b/Employee.java +++ b/_01_02b/Employee.java @@ -5,17 +5,24 @@ public class Employee { public static void main(String[] args) { // Create a variable called age of type int and assign it the value 29. + int age = 29; // Print the age variable to the console. + System.out.println(age); // Create a variable called isAManager of type boolean and assign it the value // true. + boolean isAManager = true; + // Print the isAManager variable to the console. + System.out.println(isAManager); // Create a variable called yearsOfService of type double and assign it the // value 2.5. + + // Print the yearsOfService variable to the console. // Create a variable called baseSalary of type int and assign it the value 3000. diff --git a/_01_02e/Employee.java b/_01_02e/Employee.java index 3590ea3..f90758e 100644 --- a/_01_02e/Employee.java +++ b/_01_02e/Employee.java @@ -17,25 +17,36 @@ public static void main(String[] args) { // Create a variable called yearsOfService of type double and assign it the // value 2.5. + double yearsOfService = 2.5; // Print the yearsOfService variable to the console. + System.out.println(yearsOfService); // Create a variable called baseSalary of type int and assign it the value 3000. + int baseSalary = 3000; // Create a variable called overtimePayment of type int and assign it the value // 40. + int overtimePayment = 40; + + // Create a variable called totalPayment of type int and assign it to the value // of baseSalary added to overtimePayment. + int totalPayment = baseSalary + overtimePayment; // Print the totalPayment variable to the console. + System.out.println(totalPayment); // Create three variables all of type double on a single line. + // They should be called firstBonus, secondBonus and thirdBonus and they should // be assigned the values 10.00, 22.00 and 35.00. + double firstBonus = 10.00, secondBonus = 22.00 , thirdBonus = 35.00; // Print out the sum of the variables called firstBonus, secondBonus and // thirdBonus. + System.out.println(firstBonus + secondBonus + thirdBonus); } diff --git a/_01_04/MenuBuilder.java b/_01_04/MenuBuilder.java index aeaebc5..29d2547 100644 --- a/_01_04/MenuBuilder.java +++ b/_01_04/MenuBuilder.java @@ -7,26 +7,37 @@ public static void main(String[] args) { // Create a variable called menuTitle of type String and assign it the value "My // Dream Menu:". - + String menuTitle = "My Dream Menu"; // Print the menuTitle variable to the console. + System.out.println(menuTitle); // Create a variable called menu of type ArrayList. + ArrayList menu = new ArrayList<>(); // Create a variable called starter of type MenuItem and pass in the name of // your favourite starter. + MenuItem starter = new MenuItem("Calamari"); + // Add the starter variable to the ArrayList called menu. + menu.add(starter); // Create a variable called mainCourse of type MenuItem and pass in the name of // your favourite main course. + MenuItem mainCourse = new MenuItem("Lasagne"); // Add the mainCourse variable to the ArrayList called menu. + menu.add(mainCourse); + // Create a variable called dessert of type MenuItem and pass in the name of // your favourite dessert. + MenuItem dessert = new MenuItem("Banoffee pie"); // Add the dessert variable to the ArrayList called menu. + menu.add(dessert); // Print the menu variable to the console. + System.out.println(menu); } }