OP-1157 use enhanced switch (JDK 14)

dbmalkovsky · Nov 8, 2024 · b618a7c · b618a7c
1 parent b9faed4
commit b618a7c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 46 deletions.
diff --git a/src/main/java/org/isf/accounting/gui/BillDataLoader.java b/src/main/java/org/isf/accounting/gui/BillDataLoader.java
@@ -47,19 +47,12 @@ public BillDataLoader(List<Bill> billPeriod, List<Bill> billFromPayments, Patien
 	}
 
 	public List<Bill> loadBills(String status, String username) throws OHServiceException {
-		List<Bill> tableArray = new ArrayList<>();
-
-		switch (status) {
-			case "O":
-				tableArray = getPendingBills(status, username);
-				break;
-			case "ALL":
-				tableArray = getAllBills(username);
-				break;
-			case "C":
-				tableArray = getClosedBills(status, username);
-				break;
-		}
+		List<Bill> tableArray = switch (status) {
+			case "O" -> getPendingBills(status, username);
+			case "ALL" -> getAllBills(username);
+			case "C" -> getClosedBills(status, username);
+			default -> new ArrayList<>();
+		};
 
 		tableArray.sort(Collections.reverseOrder());
 		return tableArray;

diff --git a/src/main/java/org/isf/admission/gui/AdmittedPatientBrowser.java b/src/main/java/org/isf/admission/gui/AdmittedPatientBrowser.java
@@ -1206,15 +1206,11 @@ else if (patientClassBox.getSelectedItem().equals(patientClassItems[1])) {
 				}
 
 				// sex patient type
-				Character sex = null;
-				switch (patientSexBox.getSelectedIndex()) {
-				case 1:
-					sex = 'M';
-					break;
-				case 2:
-					sex = 'F';
-					break;
-				}
+				Character sex = switch (patientSexBox.getSelectedIndex()) {
+					case 1 -> 'M';
+					case 2 -> 'F';
+					default -> null;
+				};
 
 				if (sex != null && !sex.equals(ap.getPatient().getSex())) {
 					continue;

diff --git a/src/main/java/org/isf/patient/gui/PatientInsert.java b/src/main/java/org/isf/patient/gui/PatientInsert.java
@@ -263,14 +263,11 @@ private JButton getJOkButton() {
 								String name = jFirstNameTextField.getText() + ' ' + jSecondNameTextField.getText();
 								try {
 									if (patientBrowserManager.isNamePresent(name)) {
-										switch (MessageDialog.yesNo(null, "angal.patient.thepatientisalreadypresent.msg")) {
-											case JOptionPane.OK_OPTION:
-												ok = true;
-												break;
-											case JOptionPane.NO_OPTION:
-												ok = false;
-												break;
-										}
+										ok = switch (MessageDialog.yesNo(null, "angal.patient.thepatientisalreadypresent.msg")) {
+											case JOptionPane.OK_OPTION -> true;
+											case JOptionPane.NO_OPTION -> false;
+											default -> ok;
+										};
 									}
 								} catch (OHServiceException ex) {
 									OHServiceExceptionUtil.showMessages(ex);
@@ -320,14 +317,11 @@ private JButton getJOkButton() {
 					if (!patient.getName().equals(name)) {
 						try {
 							if (patientBrowserManager.isNamePresent(name)) {
-								switch (MessageDialog.yesNo(null, "angal.patient.thepatientisalreadypresent.msg")) {
-									case JOptionPane.OK_OPTION:
-										ok = true;
-										break;
-									case JOptionPane.NO_OPTION:
-										ok = false;
-										break;
-								}
+								ok = switch (MessageDialog.yesNo(null, "angal.patient.thepatientisalreadypresent.msg")) {
+									case JOptionPane.OK_OPTION -> true;
+									case JOptionPane.NO_OPTION -> false;
+									default -> ok;
+								};
 							}
 						} catch (OHServiceException ex) {
 							OHServiceExceptionUtil.showMessages(ex);

diff --git a/src/main/java/org/isf/patient/gui/PatientInsertExtended.java b/src/main/java/org/isf/patient/gui/PatientInsertExtended.java
@@ -444,14 +444,11 @@ private JButton getJOkButton() {
 					String name = firstName + ' ' + secondName;
 					try {
 						if (patientBrowserManager.isNamePresent(name)) {
-							switch (MessageDialog.yesNo(null, "angal.patient.thepatientisalreadypresent.msg")) {
-							case JOptionPane.OK_OPTION:
-								ok = true;
-								break;
-							case JOptionPane.NO_OPTION:
-								ok = false;
-								break;
-							}
+							ok = switch (MessageDialog.yesNo(null, "angal.patient.thepatientisalreadypresent.msg")) {
+								case JOptionPane.OK_OPTION -> true;
+								case JOptionPane.NO_OPTION -> false;
+								default -> ok;
+							};
 						}
 					} catch (OHServiceException ex) {
 						OHServiceExceptionUtil.showMessages(ex);