Chore: use compiled pattern instead of regular expression that needs …

…to be regenerated each time (#1916) * Chore: use compiled pattern instead of regular expression that needs to be regenerated each time * Chore: format code
informatici · Dec 26, 2023 · d6637e7 · d6637e7
1 parent 824ae9a
commit d6637e7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/src/main/java/org/isf/admission/gui/AdmittedPatientBrowser.java b/src/main/java/org/isf/admission/gui/AdmittedPatientBrowser.java
@@ -39,6 +39,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.regex.Pattern;
 
 import javax.swing.BorderFactory;
 import javax.swing.BoxLayout;
@@ -124,6 +125,7 @@ public class AdmittedPatientBrowser extends ModalJFrame implements PatientInsert
 	private static final long serialVersionUID = 1L;
 
 	private static final int PANEL_WIDTH = 240;
+	private static final Pattern DIGIT_PATTERN = Pattern.compile("\\d+");
 
 	private PatientHistoryManager patientHistoryManager = Context.getApplicationContext().getBean(PatientHistoryManager.class);
 
@@ -1189,15 +1191,15 @@ else if (patientClassBox.getSelectedItem().equals(patientClassItems[1])) {
 
 				// lower age limit
 				String ageLimit = patientAgeFromTextField.getText();
-				if (ageLimit.matches("\\d+")) {
+				if (DIGIT_PATTERN.matcher(ageLimit).matches()) {
 					if (!(ap.getPatient().getAge() >= Integer.parseInt(ageLimit))) {
 						continue;
 					}
 				}
 
 				// upper age limit
 				ageLimit = patientAgeToTextField.getText();
-				if (ageLimit.matches("\\d+")) {
+				if (DIGIT_PATTERN.matcher(ageLimit).matches()) {
 					if (!(ap.getPatient().getAge() <= Integer.parseInt(ageLimit))) {
 						continue;
 					}

diff --git a/src/main/java/org/isf/sms/gui/SmsEdit.java b/src/main/java/org/isf/sms/gui/SmsEdit.java
@@ -31,6 +31,7 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 import java.time.LocalDateTime;
+import java.util.regex.Pattern;
 
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
@@ -65,6 +66,7 @@
 public class SmsEdit extends JDialog implements SelectionListener {
 
 	private static final long serialVersionUID = 1L;
+	private static final Pattern SPACE_PATTERN = Pattern.compile(" ");
 
 	private JPanel jCenterPanel;
 	private JPanel jButtonPanel;
@@ -231,7 +233,7 @@ private JButton getJOkButton() {
 			jOkButton = new JButton(MessageBundle.getMessage("angal.common.ok.btn"));
 			jOkButton.setMnemonic(MessageBundle.getMnemonic("angal.common.ok.btn.key"));
 			jOkButton.addActionListener(actionEvent -> {
-				String number = jNumberTextField.getText().replaceAll(" ", "").trim();
+				String number = SPACE_PATTERN.matcher(jNumberTextField.getText()).replaceAll("").trim();
 				String text = jTextArea.getText();
 				LocalDateTime schedDate = jSchedDateChooser.getLocalDateTime();
 				if (schedDate == null) {

diff --git a/src/main/java/org/isf/utils/jobjects/VoDoubleTextField.java b/src/main/java/org/isf/utils/jobjects/VoDoubleTextField.java
@@ -21,6 +21,8 @@
  */
 package org.isf.utils.jobjects;
 
+import java.util.regex.Pattern;
+
 import javax.swing.JTextField;
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
@@ -33,6 +35,7 @@
 public class VoDoubleTextField extends JTextField {
 
 	private static final long serialVersionUID = 1L;
+	private static final Pattern ALPHA_NUMERIC_PATTERN = Pattern.compile("^[a-zA-Z0-9]*$");
 
 	/**
 	 * @param defval - default value
@@ -70,7 +73,7 @@ public void insertString(int offs, String str, AttributeSet a) throws BadLocatio
 				Double.parseDouble(newString + '0');
 				super.insertString(offs, str, a);
 			} catch (NumberFormatException e) {
-				if (!str.matches("^[a-zA-Z0-9]*$")) {
+				if (!ALPHA_NUMERIC_PATTERN.matcher(str).matches()) {
 					super.insertString(offs, ".", a);
 				}
 			}

diff --git a/src/main/java/org/isf/utils/jobjects/VoFloatTextField.java b/src/main/java/org/isf/utils/jobjects/VoFloatTextField.java
@@ -21,6 +21,8 @@
  */
 package org.isf.utils.jobjects;
 
+import java.util.regex.Pattern;
+
 import javax.swing.JTextField;
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
@@ -33,6 +35,7 @@
 public class VoFloatTextField extends JTextField {
 
 	private static final long serialVersionUID = 1L;
+	private static final Pattern ALPHA_NUMERIC_PATTERN = Pattern.compile("^[a-zA-Z0-9]*$");
 
 	/**
 	 * @param defval - default value
@@ -75,7 +78,7 @@ public void insertString(int offs, String str, AttributeSet a) throws BadLocatio
 				Float.parseFloat(newString + '0');
 				super.insertString(offs, str, a);
 			} catch (NumberFormatException e) {
-				if (!str.matches("^[a-zA-Z0-9]*$")) {
+				if (!ALPHA_NUMERIC_PATTERN.matcher(str).matches()) {
 					super.insertString(offs, ".", a);
 				}
 			}