Applying suggestion to change

informatici · Nov 25, 2024 · 2febb59 · 2febb59
1 parent 65d64e8
commit 2febb59
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/org/isf/medicalinventory/gui/InventoryWardEdit.java b/src/main/java/org/isf/medicalinventory/gui/InventoryWardEdit.java
@@ -1041,7 +1041,7 @@ private boolean existInInventorySearchList(MedicalInventoryRow inventoryRow) {
 
     private JRadioButton getSpecificRadio() {
         if (specificRadio == null) {
-            specificRadio = new JRadioButton(MessageBundle.getMessage("angal.inventory.specificproduct.radio"));
+            specificRadio = new JRadioButton(MessageBundle.getMessage("angal.inventory.specificproduct.btn"));
             specificRadio.addActionListener(actionEvent -> {
                 if (specificRadio.isSelected()) {
                     codeTextField.setEnabled(true);
@@ -1055,7 +1055,7 @@ private JRadioButton getSpecificRadio() {
 
     private JRadioButton getAllRadio() {
         if (allRadio == null) {
-            allRadio = new JRadioButton(MessageBundle.getMessage("angal.inventory.allproduct.radio"));
+            allRadio = new JRadioButton(MessageBundle.getMessage("angal.inventory.allproduct.btn"));
             allRadio.setSelected(inventory != null);
             specificRadio.setSelected(inventory == null);
             allRadio.addActionListener(actionEvent -> {
@@ -1198,7 +1198,7 @@ private Medical chooseMedical(String text) throws OHServiceException {
             key = med.getCode().toString().toLowerCase();
             medicalMap.put(key, med);
         }
-        ArrayList<Medical> medList = new ArrayList<>();
+        List<Medical> medList = new ArrayList<>();
         for (Medical aMed : medicalMap.values()) {
             if (NormalizeString.normalizeContains(aMed.getDescription().toLowerCase(), text)) {
                 medList.add(aMed);
@@ -1341,7 +1341,7 @@ private JComboBox<Ward> getWardComboBox() {
                         }
 
                         if (medicalWardInventoryDraft.isEmpty() && medicalWardInventoryValidated.isEmpty()) {
-                            activedSomeComponents();
+                            activateSomeComponents();
                         } else {
                             MessageDialog.error(this,
                                     "angal.inventory.cannotcreateanotherinventorywithotherinprogressinthisward.msg");
@@ -1402,7 +1402,7 @@ private void disabledSomeComponents() {
         deleteButton.setEnabled(false);
     }
 
-    private void activedSomeComponents() {
+    private void activateSomeComponents() {
         jCalendarInventory.setEnabled(true);
         specificRadio.setEnabled(true);
         codeTextField.setEnabled(true);

diff --git a/src/main/java/org/isf/medicalinventory/gui/StockMedModel.java b/src/main/java/org/isf/medicalinventory/gui/StockMedModel.java
@@ -23,6 +23,7 @@
 
 import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 
 import javax.swing.table.DefaultTableModel;
 
@@ -33,10 +34,10 @@
 public class StockMedModel extends DefaultTableModel {
 
     private static final long serialVersionUID = 1L;
-    private ArrayList<Medical> medList;
-    private ArrayList<Medical> initList = new ArrayList<Medical>();
+    private List<Medical> medList;
+    private List<Medical> initList = new ArrayList<Medical>();
 
-    public StockMedModel(ArrayList<Medical> meds) {
+    public StockMedModel(List<Medical> meds) {
         medList = meds;
         initList.addAll(medList);
     }