From ea02af7b9527faed407e41d79599af496b93e8ea Mon Sep 17 00:00:00 2001 From: Andrei Jiroh Halili Date: Sat, 3 Oct 2026 02:35:56 +0000 Subject: [PATCH] done fixing those wild package name mishaps and another round of debugging hell oh lord let me innnnn Signed-off-by: Andrei Jiroh Halili --- .../oopLabs/handsOnActivity0601/Employee.java | 2 +- .../oopLabs/handsOnActivity0601/Faculty.java | 2 +- .../oopLabs/handsOnActivity0601/Person.java | 2 +- .../handsOnActivity0601/promptTooling.java | 47 +++++++++++++------ 4 files changed, 35 insertions(+), 18 deletions(-) diff --git a/java/src/dev/andreijiroh/studentops/projects/oopLabs/handsOnActivity0601/Employee.java b/java/src/dev/andreijiroh/studentops/projects/oopLabs/handsOnActivity0601/Employee.java index 23c9fd5..a5fe427 100644 --- a/java/src/dev/andreijiroh/studentops/projects/oopLabs/handsOnActivity0601/Employee.java +++ b/java/src/dev/andreijiroh/studentops/projects/oopLabs/handsOnActivity0601/Employee.java @@ -1,4 +1,4 @@ -package dev.andreijiroh.studentops.projects.oopLabs; +package dev.andreijiroh.studentops.projects.oopLabs.handsOnActivity0601; /** * 06 Hands-on Activity 1 - Object-Oriented Programming diff --git a/java/src/dev/andreijiroh/studentops/projects/oopLabs/handsOnActivity0601/Faculty.java b/java/src/dev/andreijiroh/studentops/projects/oopLabs/handsOnActivity0601/Faculty.java index f3ab740..e8b6047 100644 --- a/java/src/dev/andreijiroh/studentops/projects/oopLabs/handsOnActivity0601/Faculty.java +++ b/java/src/dev/andreijiroh/studentops/projects/oopLabs/handsOnActivity0601/Faculty.java @@ -1,4 +1,4 @@ -package dev.andreijiroh.studentops.projects.oopLabs; +package dev.andreijiroh.studentops.projects.oopLabs.handsOnActivity0601; /** * 06 Hands-on Activity 1 - Object-Oriented Programming diff --git a/java/src/dev/andreijiroh/studentops/projects/oopLabs/handsOnActivity0601/Person.java b/java/src/dev/andreijiroh/studentops/projects/oopLabs/handsOnActivity0601/Person.java index 7dfd9b4..e1e3abd 100644 --- a/java/src/dev/andreijiroh/studentops/projects/oopLabs/handsOnActivity0601/Person.java +++ b/java/src/dev/andreijiroh/studentops/projects/oopLabs/handsOnActivity0601/Person.java @@ -1,4 +1,4 @@ -package dev.andreijiroh.studentops.projects.oopLabs; +package dev.andreijiroh.studentops.projects.oopLabs.handsOnActivity0601; /** * 06 Hands-on Activity 1 - Object-Oriented Programming diff --git a/java/src/dev/andreijiroh/studentops/projects/oopLabs/handsOnActivity0601/promptTooling.java b/java/src/dev/andreijiroh/studentops/projects/oopLabs/handsOnActivity0601/promptTooling.java index 35718f6..35acec1 100644 --- a/java/src/dev/andreijiroh/studentops/projects/oopLabs/handsOnActivity0601/promptTooling.java +++ b/java/src/dev/andreijiroh/studentops/projects/oopLabs/handsOnActivity0601/promptTooling.java @@ -1,10 +1,5 @@ package dev.andreijiroh.studentops.projects.oopLabs.handsOnActivity0601; import java.util.Scanner; -import java.util.regex.Matcher; -import java.util.regex.Pattern - -import dev.andreijiroh.studentops.projects.oopLabs.Employee; -import dev.andreijiroh.studentops.projects.oopLabs.Faculty; /** * 06 Hands-on Activity 1 - Object-Oriented Programming @@ -31,32 +26,50 @@ public class promptTooling { staffData.setSalary(salary); staffData.setDepartment(department); - System.out.println(staffData); + System.out.println("------------------------------"); + System.out.println("Name: "+staffData.getName()); + System.out.println("Contact Number: "+staffData.getContactNum()); + System.out.println("Salary: "+staffData.getSalary()); + System.out.println("Department: "+staffData.getDepartment()); } public static void handleFaculty(Scanner input) { - final String regexForTrue = "true|yes|y|t"; - final Pattern pattern = Pattern.compile(regex, Pattern.MULTILINE); - Faculty facultyData = new Faculty(); System.out.println("Type faculty's name, contact number, salary, and department and whethever they are regular or not. Press Enter after every input."); String name = input.nextLine(); String contactNum = input.nextLine(); double salary = input.nextDouble(); String department = input.nextLine(); - System.out.println("Is the faculty tenured?"); + System.out.print("Is the faculty tenured? "); String isRegular = input.nextLine(); - final Matcher isRegularMatcher = pattern.matcher(isRegular); - boolean isTenured = isRegularMatcher.find(); + switch (isRegular.toLowerCase()) { + case "yes": + facultyData.setStatus(true); + break; + case "no": + facultyData.setStatus(false); + break; + default: + facultyData.setStatus(false); + break; + } facultyData.setName(name); facultyData.setContactNum(contactNum); facultyData.setSalary(salary); facultyData.setDepartment(department); - facultyData.setStatus(isTenured); - System.out.println(facultyData); + System.out.println("------------------------------"); + System.out.println("Name: "+facultyData.getName()); + System.out.println("Contact Number: "+facultyData.getContactNum()); + System.out.println("Salary: "+facultyData.getSalary()); + System.out.println("Department: "+facultyData.getDepartment()); + if (facultyData.isRegular() == true) { + System.out.println("Is tenured?: Yes"); + } else if (facultyData.isRegular() == false) { + System.out.println("Is tenured?: false"); + } } public static void handleStudent(Scanner input) { @@ -72,6 +85,10 @@ public class promptTooling { studentData.setProgram(program); studentData.setYearLevel(yearLevel); - System.out.println(studentData); + System.out.println("------------------------------"); + System.out.println("Name: "+studentData.getName()); + System.out.println("Contact Number: "+studentData.getContactNum()); + System.out.println("Program: "+studentData.getProgram()); + System.out.println("Year Level: "+studentData.getYearLevel()); } } -- 2.51.2