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..97ea8c2 100644 --- a/_01_02b/Employee.java +++ b/_01_02b/Employee.java @@ -5,35 +5,39 @@ 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. +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. + // 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..c818048 100644 --- a/_01_04/MenuBuilder.java +++ b/_01_04/MenuBuilder.java @@ -7,26 +7,31 @@ 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("lasanya"); // 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("Apple"); // Add the dessert variable to the ArrayList called menu. - +menu.add(dessert); // Print the menu variable to the console. + + System.out.println(menu); } } diff --git a/_02_05b/Ticket.java b/_02_05b/Ticket.java index 339f8a0..3fbac11 100644 --- a/_02_05b/Ticket.java +++ b/_02_05b/Ticket.java @@ -12,8 +12,29 @@ public Ticket() { // Add three public methods to set the value of each field, called // setDestination, setPrice and setIsReturn. +public void setDestination(String destination){ - // Add three public methods to get the value of each field, called + this.destination= destination; +} + +public void setPrice(double price){ + this.price=price; +} + +public void setIsReturn(boolean isReturn){ + this.isReturn=isReturn; +} + //Add three public methods to get the value of each field, called // getDestination, getPrice and getIsReturn. + public String getDestination(){ + + return destination; + } + public double getPrice(){ + return price; + } + public boolean getIsReturn(){ + return isReturn; + } } diff --git a/_02_07b/TicketMachine.java b/_02_07b/TicketMachine.java index 77398c3..96a2057 100644 --- a/_02_07b/TicketMachine.java +++ b/_02_07b/TicketMachine.java @@ -4,19 +4,19 @@ public class TicketMachine { public static void main(String[] args) { // Create an object called ticket of type Ticket - +Ticket ticket = new Ticket(); // Set the destination of the ticket to New York - +ticket.setDestination("New York"); // Set the price of the ticket to 15.30 - +ticket.setPrice(15.30); // Set the isReturn value to true - +ticket.setIsReturn(true); // Print the ticket's destination to the console - +System.out.println(ticket.getDestination()); // Print the ticket's price to the console - +System.out.println(ticket.getPrice()); // Print the ticket's isReturn value to the console - +System.out.println(ticket.getIsReturn()); }