UOCL-315: improve formatting to start

.gitignore

@@ -7,4 +7,7 @@ nbactions.xml
 *.log
 docker.sock
 .DS_Store
-
+.settings/
+.classpath
+.factorypath
+.project

src/main/java/com/unicenta/pos/ticket/TicketInfo.java

@@ -48,7 +48,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public static final int RECEIPT_PAYMENT = 2;
   public static final int RECEIPT_NOSALE = 3;
 
-// JG Jun 2017 - contain partial/full refunds    
+  // JG Jun 2017 - contain partial/full refunds
   public static final int REFUND_NOT = 0; // is a non-refunded ticket
   public static final int REFUND_PARTIAL = 1;
   public static final int REFUND_ALL = 2;
@@ -82,7 +82,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   private static String hostname;
 
   public static void setHostname(String name) {
-        hostname =name;
+    hostname = name;
   }
 
   public static String getHostname() {
@@ -103,7 +103,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     payments = new ArrayList<>();
     taxes = null;
     m_sResponse = null;
-        oldTicket=false;
+    oldTicket = false;
 
     AppConfig config = new AppConfig(new File(new File(
         System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
@@ -197,7 +197,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     payments.forEach((p) -> {
       t.payments.add(p.copyPayment());
     });
-        t.oldTicket=oldTicket;
+    t.oldTicket = oldTicket;
     // taxes are not copied, must be calculated again.
 
     t.ticketstatus = ticketstatus;
@@ -212,6 +212,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public int getTicketType() {
     return tickettype;
   }
+
   public void setTicketType(int tickettype) {
     this.tickettype = tickettype;
   }
@@ -219,6 +220,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public int getTicketId() {
     return m_iTicketId;
   }
+
   public void setTicketId(int iTicketId) {
     m_iTicketId = iTicketId;
   }
@@ -226,10 +228,11 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public int getTicketStatus() {
     return ticketstatus;
   }
+
   public void setTicketStatus(int ticketstatus) {
-        if (m_iTicketId >0) {
+    if (m_iTicketId > 0) {
       this.ticketstatus = m_iTicketId;
-        }else{
+    } else {
       this.ticketstatus = ticketstatus;
     }
   }
@@ -243,7 +246,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public String getName(Object info) {
-// JG Aug 2014 - Add User info
+    // JG Aug 2014 - Add User info
     List<String> name = new ArrayList<>();
 
     String nameprop = getProperty("name");
@@ -289,7 +292,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     AppConfig m_config_host = new AppConfig(new File((System.getProperty("user.home")),
         AppLocal.APP_ID + ".properties"));
     m_config_host.load();
-      String machineHostname =(m_config_host.getProperty("machine.hostname"));
+    String machineHostname = (m_config_host.getProperty("machine.hostname"));
     m_config_host = null;
     return machineHostname;
   }
@@ -318,15 +321,15 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     }
   }
 
-    public String getTransactionID(){
-        return (getPayments().size()>0)
-            ? ( getPayments().get(getPayments().size()-1) ).getTransactionID()
-            : StringUtils.getCardNumber(); //random transaction ID
+  public String getTransactionID() {
+    return (getPayments().size() > 0)
+        ? (getPayments().get(getPayments().size() - 1)).getTransactionID()
+        : StringUtils.getCardNumber(); // random transaction ID
   }
 
-    public String getReturnMessage(){
-        return ( (getPayments().get(getPayments().size()-1)) instanceof PaymentInfoMagcard )
-            ? ((PaymentInfoMagcard)(getPayments().get(getPayments().size()-1))).getReturnMessage()
+  public String getReturnMessage() {
+    return ((getPayments().get(getPayments().size() - 1)) instanceof PaymentInfoMagcard)
+        ? ((PaymentInfoMagcard) (getPayments().get(getPayments().size() - 1))).getReturnMessage()
         : LocalRes.getIntString("button.OK");
   }
 
@@ -403,9 +406,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
 
   public double getSubTotal() {
     double sum = 0.0;
-        sum = m_aLines.stream().map((line) -> 
-                line.getSubValue()).reduce(sum, (accumulator, _item) -> 
-                        accumulator + _item);
+    sum = m_aLines.stream().map((line) -> line.getSubValue()).reduce(sum, (accumulator, _item) -> accumulator + _item);
     return sum;
   }
 
@@ -418,9 +419,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
         nsum = sum;
       }
     } else {
-            sum = m_aLines.stream().map((line) -> 
-                    line.getTax()).reduce(sum, (accumulator, _item) -> 
-                            accumulator + _item);
+      sum = m_aLines.stream().map((line) -> line.getTax()).reduce(sum, (accumulator, _item) -> accumulator + _item);
     }
     return sum;
   }
@@ -437,10 +436,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
 
   public double getTotalPaid() {
     double sum = 0.0;
-        sum = payments.stream().filter((p) -> 
-                (!"debtpaid".equals(p.getName()))).map((p) -> 
-                        p.getTotal()).reduce(sum, (accumulator, _item) -> 
-                                accumulator + _item);
+    sum = payments.stream().filter((p) -> (!"debtpaid".equals(p.getName()))).map((p) -> p.getTotal()).reduce(sum,
+        (accumulator, _item) -> accumulator + _item);
     return sum;
   }
 
@@ -533,24 +530,24 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     AppConfig m_config = new AppConfig(new File(
         (System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
     m_config.load();
-      String receiptSize =(m_config.getProperty("till.receiptsize"));
-      String receiptPrefix =(m_config.getProperty("till.receiptprefix"));
+    String receiptSize = (m_config.getProperty("till.receiptsize"));
+    String receiptPrefix = (m_config.getProperty("till.receiptprefix"));
 
-      m_config =null;
+    m_config = null;
 
     if (m_iTicketId > 0) {
-            String tmpTicketId=Integer.toString(m_iTicketId);
-            if (receiptSize == null || (Integer.parseInt(receiptSize) <= tmpTicketId.length())){
-                if (receiptPrefix != null){
-                    tmpTicketId=receiptPrefix+tmpTicketId;
+      String tmpTicketId = Integer.toString(m_iTicketId);
+      if (receiptSize == null || (Integer.parseInt(receiptSize) <= tmpTicketId.length())) {
+        if (receiptPrefix != null) {
+          tmpTicketId = receiptPrefix + tmpTicketId;
         }
         return tmpTicketId;
       }
-            while (tmpTicketId.length()<Integer.parseInt(receiptSize)){
-                tmpTicketId="0"+tmpTicketId;
+      while (tmpTicketId.length() < Integer.parseInt(receiptSize)) {
+        tmpTicketId = "0" + tmpTicketId;
       }
-            if (receiptPrefix != null){
-                    tmpTicketId=receiptPrefix+tmpTicketId;
+      if (receiptPrefix != null) {
+        tmpTicketId = receiptPrefix + tmpTicketId;
       }
       return tmpTicketId;
     } else {
@@ -571,29 +568,28 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     return m_sHost;
   }
 
-    
-// Added JDL 28.05.13 for loyalty card functions
+  // Added JDL 28.05.13 for loyalty card functions
 
   /**
    *
    */
-        public void clearCardNumber(){
-        loyaltyCardNumber=null;
+  public void clearCardNumber() {
+    loyaltyCardNumber = null;
   }
 
   /**
    *
    * @param cardNumber
    */
-    public void setLoyaltyCardNumber(String cardNumber){
-        loyaltyCardNumber=cardNumber;
+  public void setLoyaltyCardNumber(String cardNumber) {
+    loyaltyCardNumber = cardNumber;
   }
 
   /**
    *
    * @return
    */
-    public String getLoyaltyCardNumber(){
+  public String getLoyaltyCardNumber() {
     return (loyaltyCardNumber);
   }
 
@@ -629,8 +625,8 @@ public final class TicketInfo implements SerializableRead, Externalizable {
     return Formats.CURRENCY.formatValue(getTendered());
   }
 
-    public String VoucherReturned(){
-        return Formats.CURRENCY.formatValue(getTotalPaid()- getTotal());
+  public String VoucherReturned() {
+    return Formats.CURRENCY.formatValue(getTotalPaid() - getTotal());
   }
 
   public boolean getOldTicket() {
@@ -642,28 +638,27 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   }
 
   public String getTicketHeaderFooterData(String data) {
-        AppConfig m_config = new AppConfig(new File((System.getProperty("user.home"))
-                , AppLocal.APP_ID + ".properties"));        
+    AppConfig m_config = new AppConfig(new File((System.getProperty("user.home")), AppLocal.APP_ID + ".properties"));
     m_config.load();
-        String row =(m_config.getProperty("tkt."+data));
+    String row = (m_config.getProperty("tkt." + data));
 
     return row;
   }
 
-    public String printQRCode(String nameHeader, String vatHeader, String vatLabel){
+  public String printQRCode(String nameHeader, String vatHeader, String vatLabel) {
     String name = getTicketHeaderFooterData(nameHeader);
     String vatNumberHeader = getTicketHeaderFooterData(vatHeader);
     String vatNumber = vatNumberHeader.split(vatLabel)[1];
     String date = new SimpleDateFormat("yyyy-mm-dd hh:mm:ss").format(getDate());
     String total = String.valueOf(getTotal());
     String vatValue = String.valueOf(getTax());
-        return name+","+vatNumber+","+date+","+total+","+vatValue;
+    return name + "," + vatNumber + "," + date + "," + total + "," + vatValue;
   }
 
   public String printTicketHeaderLine1() {
     String lineData = getTicketHeaderFooterData("header1");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -673,7 +668,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketHeaderLine2() {
     String lineData = getTicketHeaderFooterData("header2");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -683,7 +678,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketHeaderLine3() {
     String lineData = getTicketHeaderFooterData("header3");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -693,7 +688,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketHeaderLine4() {
     String lineData = getTicketHeaderFooterData("header4");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -703,7 +698,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketHeaderLine5() {
     String lineData = getTicketHeaderFooterData("header5");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -713,7 +708,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketHeaderLine6() {
     String lineData = getTicketHeaderFooterData("header6");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -723,7 +718,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketFooterLine1() {
     String lineData = getTicketHeaderFooterData("footer1");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -733,7 +728,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketFooterLine2() {
     String lineData = getTicketHeaderFooterData("footer2");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -743,7 +738,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketFooterLine3() {
     String lineData = getTicketHeaderFooterData("footer3");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -753,7 +748,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketFooterLine4() {
     String lineData = getTicketHeaderFooterData("footer4");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -763,7 +758,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketFooterLine5() {
     String lineData = getTicketHeaderFooterData("footer5");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";
@@ -773,7 +768,7 @@ public final class TicketInfo implements SerializableRead, Externalizable {
   public String printTicketFooterLine6() {
     String lineData = getTicketHeaderFooterData("footer6");
 
-        if(lineData != null) {
+    if (lineData != null) {
       return lineData;
     } else {
       return "";