Revert "UOCL-285: payment screen hanging (#42)"

This reverts commit 0c6b84dd5f.

src/main/java/com/unicenta/pos/forms/AppLocal.java

@@ -30,7 +30,7 @@ public class AppLocal {
 
     public static final String APP_NAME = "uniCenta oPOS";
     public static final String APP_ID = "unicentaopos";
-    public static final String APP_VERSION = "5.3.2";
+    public static final String APP_VERSION = "5.3.1";
 
     private static final LocaleResources m_resources;
 

src/main/java/com/unicenta/pos/imports/CustomerCSVImport.java

@@ -41,8 +41,6 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 
 /**
@@ -278,7 +276,6 @@ public class CustomerCSVImport extends JPanel implements JPanelView {
    * the UI responsiveness.
    */
   private void setWorker() {
-    ExecutorService customExecutor = Executors.newCachedThreadPool();
     progress = 0;
     webPBar.setStringPainted(true);
 
@@ -307,8 +304,7 @@ public class CustomerCSVImport extends JPanel implements JPanelView {
         }
       }
     };
-    // pbWorker.execute();
-    customExecutor.submit(pbWorker);
+    pbWorker.execute();
   }
 
   /**

src/main/java/com/unicenta/pos/imports/JPanelCSVImport.java

@@ -44,8 +44,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 
 /**
@@ -294,7 +292,6 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
      * the UI responsiveness.
     */
     private void setWorker() {
-        ExecutorService customExecutor = Executors.newCachedThreadPool();
         progress = 0;
         webPBar.setStringPainted(true);
 
@@ -323,8 +320,7 @@ public class JPanelCSVImport extends JPanel implements JPanelView {
                 }    
             }
         };
-        //pbWorker.execute();
-        customExecutor.submit(pbWorker);
+        pbWorker.execute();
     }
 
     /**

src/main/java/com/unicenta/pos/imports/StockQtyImport.java

@@ -43,8 +43,6 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.Properties;
 import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 
 /**
@@ -513,7 +511,6 @@ public class StockQtyImport extends JPanel implements JPanelView {
    * the UI responsiveness.
    */
   private void setWorker() {
-    ExecutorService customExecutor = Executors.newCachedThreadPool();
     progress = 0;
     webPBar.setStringPainted(true);
 
@@ -542,8 +539,7 @@ public class StockQtyImport extends JPanel implements JPanelView {
         }
       }
     };
-    //pbWorker.execute();
-    customExecutor.submit(pbWorker);
+    pbWorker.execute();
   }
 
   /**

src/main/java/com/unicenta/pos/payment/JPaymentSelect.java

@@ -749,7 +749,7 @@ public abstract class JPaymentSelect extends javax.swing.JDialog
             };
 
             //worker.execute();
-            customExecutor.submit(worker);
+            customExecutor.execute(worker);
         }
         catch (Exception ex) {
             System.out.println(ex.getMessage());

src/main/java/com/unicenta/pos/sales/shared/JTicketsBagShared.java

@@ -37,8 +37,6 @@ import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import javax.swing.*;
 
 /**
@@ -80,7 +78,6 @@ public class JTicketsBagShared extends JTicketsBag {
 
         log.debug("Loading Sales screen! "+this.getClass());
 
-        ExecutorService customExecutor = Executors.newCachedThreadPool();
         SwingWorker<String, String> reloadLayaway = new SwingWorker<>() {
             @Override
             protected String doInBackground() throws Exception {
@@ -94,8 +91,7 @@ public class JTicketsBagShared extends JTicketsBag {
             }
         };
 
-        //reloadLayaway.execute();
-        customExecutor.submit(reloadLayaway);
+        reloadLayaway.execute();
 
         
         m_sCurrentTicket = null;

src/main/java/com/unicenta/pos/transfer/Transfer.java

@@ -43,8 +43,6 @@ import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.regex.Matcher;
 
 /**
@@ -2723,7 +2721,6 @@ public final class Transfer extends JPanel implements JPanelView {
             JOptionPane.YES_NO_OPTION,
             JOptionPane.QUESTION_MESSAGE) == JOptionPane.YES_OPTION) {
 
-      ExecutorService customExecutor = Executors.newCachedThreadPool();
       SwingWorker<Void, Void> worker = new SwingWorker<Void, Void>() {
 
         @Override
@@ -2734,8 +2731,7 @@ public final class Transfer extends JPanel implements JPanelView {
         }
       };
 
-      //worker.execute();
-      customExecutor.submit(worker);
+      worker.execute();
 
     }
     System.gc();