Bug Fixes

Some bugs fixed:
- Startup scripts for Linux and Windows changed to ensure that Jpos116Dummy.jar is always before javapos jar file, if present.
- Device classes sorted case insensitive now.
- PointCardRD added to device class list on startup screen.
- New writable properties for POSPower added.
- Error handling added for Lights and POSPower methods which are new in UPOS 1.16

Author: mjpcger

JavaPOS-SPF-Test.cmd

@@ -72,9 +72,11 @@ if exist jpos.xml if exist jpos\res\jpos.properties goto :AddExternals
 rem ****************************************************************
 rem * Add jpos115 and all other necessary jar files from           *
 rem * sub-folder jar                                               *
+rem * Jpos116Dummy must be added to class path first, if present   *
 rem ****************************************************************
 
-for %%k in (jar\*.jar) do call :addtoclasspath %%~dpfk
+for %%k in (jar\Jpos116Dummy.jar) do call :addtoclasspath %%~dpfk
+for %%k in (jar\*.jar) do if not %%k==jar\Jpos116Dummy.jar call :addtoclasspath %%~dpfk
 
 rem ****************************************************************
 rem * Now call the Java command                                    *

JavaPOS-SPF-Test.sh

@@ -23,9 +23,10 @@ else
   fi
 fi
 classpath=$(pwd)
+test -f jar/Jpos116Dummy.jar && classpath="$classpath:$i"
 for i in $(pwd)/jar/*.jar
 do
-	classpath="$classpath:$i"
+	test $i = "jar/Jpos116Dummy.jar" || classpath="$classpath:$i"
 done
 echo "java $VM_Flags -cp $classpath SPF_Test.Main"
 java $VM_Flags -cp $classpath SPF_Test.Main || error "Press Enter to continue"

src/SPF_Test/Controller.java

@@ -28,6 +28,7 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.ResourceBundle;
 
 /**
@@ -48,7 +49,12 @@ public class Controller implements Initializable {
     public void initialize(URL url, ResourceBundle resourceBundle) {
         DeviceControl.loadDevices("jpos.xml", this);
         ArrayList<String> categories = DeviceControl.getCategories();
-        Collections.sort(categories);
+        Collections.sort(categories, new Comparator<String>() {
+            @Override
+            public int compare(String o1, String o2) {
+                return o1.toLowerCase().compareTo(o2.toLowerCase());
+            }
+        });
         DeviceCategory.setItems(FXCollections.observableList(categories));
         DeviceCategory.setVisibleRowCount(categories.size());
         DeviceCategory.setOnAction(new EventHandler<ActionEvent>() {

src/SPF_Test/LightsController.java

@@ -187,7 +187,7 @@ public void SwitchOnMultiple(ActionEvent actionEvent) {
         })){
             try {
                 TheLights.switchOnMultiple(lights, blinkOnCycle, blinkOffCycle, color, alarm);
-            } catch (JposException e) {
+            } catch (Throwable e) {
                 getFullErrorMessageAndPrintTrace(e);
             }
         }
@@ -200,10 +200,10 @@ public void switchOnPattern(ActionEvent actionEvent) {
         if (validate(new Object[]{
                 pattern, "pattern",
                 alarm, "alarm"
-        })){
+        })) {
             try {
                 TheLights.switchOnPattern(pattern, alarm);
-            } catch (JposException e) {
+            } catch (Throwable e) {
                 getFullErrorMessageAndPrintTrace(e);
             }
         }
@@ -213,7 +213,7 @@ public void switchOnPattern(ActionEvent actionEvent) {
     public void switchOffPattern(ActionEvent actionEvent) {
         try {
             TheLights.switchOffPattern();
-        } catch (JposException e) {
+        } catch (Throwable e) {
             getFullErrorMessageAndPrintTrace(e);
         }
         updateGui();

src/SPF_Test/POSPower.fxml

@@ -59,12 +59,16 @@
     <TextArea fx:id="_statisticsBuffer" layoutX="330" layoutY="200" prefWidth="350" prefHeight="75" promptText="statisticsBuffer"/>
     <Separator layoutX="0" layoutY="280" prefWidth="980" orientation="HORIZONTAL"/>
     <Label text="Specific Properties And Methods" layoutX="10" layoutY="285" underline="true"/>
-    <Label text="BatteryCriticallyLowThreshold" layoutX="0" layoutY="320" alignment="CENTER_RIGHT" prefWidth="150"/>
-    <TextField fx:id="BatteryCriticallyLowThreshold" layoutX="155" layoutY="315" prefWidth="155" promptText="BatteryCriticallyLowThreshold"/>
-    <Label text="BatteryLowThreshold" layoutX="0" layoutY="350" alignment="CENTER_RIGHT" prefWidth="150"/>
-    <TextField fx:id="BatteryLowThreshold" layoutX="155" layoutY="345" prefWidth="155" promptText="BatteryLowThreshold"/>
-    <Label text="EnforcedShutdownDelayTime" layoutX="0" layoutY="380" alignment="CENTER_RIGHT" prefWidth="150"/>
-    <TextField fx:id="EnforcedShutdownDelayTime" layoutX="155" layoutY="375" prefWidth="155" promptText="EnforcedShutdownDelayTime"/>
+    <Label text="BatteryCriticallyLowThreshold" layoutX="0" layoutY="320" alignment="CENTER_RIGHT" prefWidth="195"/>
+    <TextField fx:id="BatteryCriticallyLowThreshold" layoutX="200" layoutY="315" prefWidth="110" promptText="BatteryCriticallyLowThreshold"/>
+    <Label text="BatteryCriticallyLowThresholdInSeconds" layoutX="0" layoutY="350" alignment="CENTER_RIGHT" prefWidth="195"/>
+    <TextField fx:id="BatteryCriticallyLowThresholdInSeconds" layoutX="200" layoutY="345" prefWidth="110" promptText="BatteryCriticallyLowThresholdInSeconds"/>
+    <Label text="BatteryLowThreshold" layoutX="0" layoutY="380" alignment="CENTER_RIGHT" prefWidth="195"/>
+    <TextField fx:id="BatteryLowThreshold" layoutX="200" layoutY="375" prefWidth="110" promptText="BatteryLowThreshold"/>
+    <Label text="BatteryLowThresholdInSeconds" layoutX="0" layoutY="410" alignment="CENTER_RIGHT" prefWidth="195"/>
+    <TextField fx:id="BatteryLowThresholdInSeconds" layoutX="200" layoutY="405" prefWidth="110" promptText="BatteryLowThresholdInSeconds"/>
+    <Label text="EnforcedShutdownDelayTime" layoutX="0" layoutY="440" alignment="CENTER_RIGHT" prefWidth="195"/>
+    <TextField fx:id="EnforcedShutdownDelayTime" layoutX="200" layoutY="435" prefWidth="110" promptText="EnforcedShutdownDelayTime"/>
     <Button onAction="#restartPOS" layoutX="330" layoutY="315" prefWidth="100" text="RestartPOS"/>
     <Button onAction="#shutdownPOS" layoutX="330" layoutY="345" prefWidth="100" text="ShutdownPOS"/>
     <Button onAction="#standbyPOS" layoutX="330" layoutY="375" prefWidth="100" text="StandbyPOS"/>

src/SPF_Test/POSPowerController.java

@@ -32,12 +32,16 @@
  */
 public class POSPowerController extends CommonController {
     public TextField BatteryCriticallyLowThreshold;
+    public TextField BatteryCriticallyLowThresholdInSeconds;
     public TextField BatteryLowThreshold;
+    public TextField BatteryLowThresholdInSeconds;
     public TextField EnforcedShutdownDelayTime;
     public ComboBox<String> SP_reason;
     private POSPower ThePOSPower;
     private PropertyTableRow BatteryCriticallyLowThresholdRow;
+    private PropertyTableRow BatteryCriticallyLowThresholdInSecondsRow;
     private PropertyTableRow BatteryLowThresholdRow;
+    private PropertyTableRow BatteryLowThresholdInSecondsRow;
     private PropertyTableRow EnforcedShutdownDelayTimeRow;
     private PropertyTableRow BatteryCapacityRemainingRow;
     private PropertyTableRow PowerSourceRow;
@@ -75,9 +79,9 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
         Properties.getItems().add(new PropertyTableRow("CapVariableBatteryLowThreshold", ""));
         Properties.getItems().add(new PropertyTableRow("CapVariableBatteryLowThresholdInSeconds", ""));
         Properties.getItems().add(BatteryCriticallyLowThresholdRow = new PropertyTableRow("BatteryCriticallyLowThreshold", ""));
-        Properties.getItems().add(new PropertyTableRow("BatteryCriticallyLowThresholdInSeconds", ""));
+        Properties.getItems().add(BatteryCriticallyLowThresholdInSecondsRow = new PropertyTableRow("BatteryCriticallyLowThresholdInSeconds", ""));
         Properties.getItems().add(BatteryLowThresholdRow = new PropertyTableRow("BatteryLowThreshold", ""));
-        Properties.getItems().add(new PropertyTableRow("BatteryLowThresholdInSeconds", ""));
+        Properties.getItems().add(BatteryLowThresholdInSecondsRow = new PropertyTableRow("BatteryLowThresholdInSeconds", ""));
         Properties.getItems().add(new PropertyTableRow("ChargeTime", ""));
         Properties.getItems().add(EnforcedShutdownDelayTimeRow = new PropertyTableRow("EnforcedShutdownDelayTime", ""));
         Properties.getItems().add(new PropertyTableRow("CheckHealthText", ""));
@@ -92,6 +96,8 @@ public void initialize(URL url, ResourceBundle resourceBundle) {
         Properties.getItems().add(new PropertyTableRow("CapUpdateStatistics", ""));
         setPropertyOnFocusLost(BatteryCriticallyLowThreshold, "BatteryCriticallyLowThreshold");
         setPropertyOnFocusLost(BatteryLowThreshold, "BatteryLowThreshold");
+        setPropertyOnFocusLost(BatteryCriticallyLowThresholdInSeconds, "BatteryCriticallyLowThresholdInSeconds");
+        setPropertyOnFocusLost(BatteryLowThresholdInSeconds, "BatteryLowThresholdInSeconds");
         setPropertyOnFocusLost(EnforcedShutdownDelayTime, "EnforcedShutdownDelayTime");
         Values val = new SP_reasonValues();
         for (int i = 1; i < val.ValueList.length; i += 2)
@@ -106,6 +112,8 @@ void updateGui() {
             InUpdateGui = true;
             BatteryLowThreshold.setText(BatteryLowThresholdRow.getValue());
             BatteryCriticallyLowThreshold.setText(BatteryCriticallyLowThresholdRow.getValue());
+            BatteryLowThresholdInSeconds.setText(BatteryLowThresholdInSecondsRow.getValue());
+            BatteryCriticallyLowThresholdInSeconds.setText(BatteryCriticallyLowThresholdInSecondsRow.getValue());
             EnforcedShutdownDelayTime.setText(EnforcedShutdownDelayTimeRow.getValue());
             InUpdateGui = false;
         }
@@ -147,6 +155,30 @@ public void setBatteryLowThreshold(ActionEvent dummy) {
         }
     }
 
+    public void setBatteryCriticallyLowThresholdInSeconds(ActionEvent dummy) {
+        Integer batteryCriticallyLowThresholdInSeconds = new IntValues().getInteger(BatteryCriticallyLowThresholdInSeconds.getText());
+        if (!invalid(batteryCriticallyLowThresholdInSeconds, "batteryCriticallyLowThresholdInSeconds")) {
+            try {
+                ThePOSPower.setBatteryCriticallyLowThresholdInSeconds(batteryCriticallyLowThresholdInSeconds);
+            } catch (Throwable e) {
+                getFullErrorMessageAndPrintTrace(e);
+            }
+            updateGui();
+        }
+    }
+
+    public void setBatteryLowThresholdInSeconds(ActionEvent dummy) {
+        Integer batteryLowThresholdInSeconds = new IntValues().getInteger(BatteryLowThresholdInSeconds.getText());
+        if (!invalid(batteryLowThresholdInSeconds, "batteryLowThresholdInSeconds")) {
+            try {
+                ThePOSPower.setBatteryLowThresholdInSeconds(batteryLowThresholdInSeconds);
+            } catch (Throwable e) {
+                getFullErrorMessageAndPrintTrace(e);
+            }
+            updateGui();
+        }
+    }
+
 
     public void setEnforcedShutdownDelayTime(ActionEvent dummy) {
         Integer enforcedShutdownDelayTime = new TimeoutValues().getInteger(EnforcedShutdownDelayTime.getText());
@@ -209,6 +241,7 @@ private class POSPStatusUpdateValues extends StatusUpdateValues {
                     POSPowerConst.PWR_SUE_BAT_LOW, "SUE_BAT_LOW",
                     POSPowerConst.PWR_SUE_BAT_CRITICAL, "SUE_BAT_CRITICAL",
                     POSPowerConst.PWR_SUE_BAT_CAPACITY_REMAINING, "SUE_BAT_CAPACITY_REMAINING",
+                    POSPowerConst.PWR_SUE_BAT_CAPACITY_REMAINING_IN_SECONDS, "SUE_BAT_CAPACITY_REMAINING_IN_SECONDS",
                     POSPowerConst.PWR_SUE_FAN_RUNNING, "SUE_FAN_RUNNING",
                     POSPowerConst.PWR_SUE_FAN_STOPPED, "SUE_FAN_STOPPED",
                     POSPowerConst.PWR_SUE_PWR_SOURCE, "SUE_PWR_SOURCE",

src/SPF_Test/SPF-Test.fxml

@@ -43,8 +43,8 @@
         <Label layoutX="20" layoutY="150" wrapText="true" prefWidth="950" text="Belt, BillAcceptor, BillDispenser,
  Biometrics, BumpBar, CashChanger, CashDrawer, CAT, CheckScanner, CoinAcceptor, CoinDispenser, ElectronicJournal,
  ElectronicValueRW, FiscalPrinter, Gate, HardTotals, ImageScanner, ItemDispenser, Keylock, Lights, LineDisplay,
- MICR, MotionSensor, MSR, PINPad, POSKeyboard, POSPower, POSPrinter, RemoteOrderDisplay, RFIDScanner, Scale, Scanner,
- SignatureCapture, SmartCardRW and ToneIndicator."/>
+ MICR, MotionSensor, MSR, PINPad, PointCardRW, POSKeyboard, POSPower, POSPrinter, RemoteOrderDisplay, RFIDScanner,
+ Scale, Scanner, SignatureCapture, SmartCardRW and ToneIndicator."/>
         <Label layoutX="20" layoutY="200" text="To integrate a service into the test program, follow these steps:"/>
         <Label layoutX="40" layoutY="230" text="● Add the necessary entries to jpos.xml, located in the working directory of the test program."/>
         <Label layoutX="40" layoutY="250" text="● Add the necessary jar files to the classpath. You can adjust the startup script to do this."/>