Menu
▾
▴
[Redpos-cvs] RedPOS/src/org/redpos/client/ui/plugin/function MakeTallyAndReport.java,1.3,1.4 TotalDiscountAmount.java,1.3,1.4 CancelReceiptRow.java,1.1,1.2 PrintReceiptAgain.java,1.2,1.3 FindSaveReceipt.java,1.2,1.3 Pay.java,1.5,1.6 RowDiscountAmount.java,1.3,1.4 ClosePOS.java,1.1,1.2 RowDiscountPercent.java,1.3,1.4 AddFreetext.java,1.1,1.2 CancelReceipt.java,1.2,1.3 Logoff.java,1.1,1.2 TotalDiscountPercent.java,1.3,1.4 CustomerService.java,1.2,1.3
|
From: Lennart P. <le...@us...> - 2005-02-19 08:37:26
|
Update of /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22296/src/org/redpos/client/ui/plugin/function Modified Files: MakeTallyAndReport.java TotalDiscountAmount.java CancelReceiptRow.java PrintReceiptAgain.java FindSaveReceipt.java Pay.java RowDiscountAmount.java ClosePOS.java RowDiscountPercent.java AddFreetext.java CancelReceipt.java Logoff.java TotalDiscountPercent.java CustomerService.java Log Message: Added dispose of SWT composite. Index: FindSaveReceipt.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/FindSaveReceipt.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FindSaveReceipt.java 17 Jan 2005 10:35:28 -0000 1.2 --- FindSaveReceipt.java 19 Feb 2005 08:37:14 -0000 1.3 *************** *** 70,73 **** --- 70,74 ---- private ReceiptSessionUtility receiptSessionUtility = null; private POSEngineUtility posEngineUtility = null; + private ConfirmActionUI confirm; /** *************** *** 76,80 **** public boolean invokeFunction(Composite parent) { ! ui = null; if(isReceiptStarted()) { --- 77,88 ---- public boolean invokeFunction(Composite parent) { ! try ! { ! ui.dispose(); ! ui = null; ! } ! catch(NullPointerException e) ! {} ! //ui = null; if(isReceiptStarted()) { *************** *** 134,138 **** } break; ! } } --- 142,154 ---- } break; ! } ! try ! { ! confirm.dispose(); ! confirm = null; ! } ! catch(NullPointerException e) ! { ! } } *************** *** 153,157 **** "Do you want to save current receipt?"); ! ConfirmActionUI confirm = new ConfirmActionUI(parent, message, ConfirmActionUI.YES_NO_SELECTION, listener, yesText, noText, okText, cancelText); --- 169,173 ---- "Do you want to save current receipt?"); ! /*ConfirmActionUI*/ confirm = new ConfirmActionUI(parent, message, ConfirmActionUI.YES_NO_SELECTION, listener, yesText, noText, okText, cancelText); Index: CancelReceiptRow.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/CancelReceiptRow.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CancelReceiptRow.java 23 Nov 2004 16:02:27 -0000 1.1 --- CancelReceiptRow.java 19 Feb 2005 08:37:14 -0000 1.2 *************** *** 44,47 **** --- 44,48 ---- { private ReceiptRow receiptRow; + private static ConfirmActionUI confirm; /** *************** *** 101,104 **** --- 102,113 ---- break; } + try + { + confirm.dispose(); + confirm = null; + } + catch(NullPointerException e) + { + } } }; *************** *** 117,121 **** "Do you really want to remove the row?"); ! ConfirmActionUI confirm = new ConfirmActionUI(parent, message, ConfirmActionUI.YES_NO_SELECTION, listener, yesText, noText, okText, cancelText); --- 126,130 ---- "Do you really want to remove the row?"); ! /*ConfirmActionUI*/ confirm = new ConfirmActionUI(parent, message, ConfirmActionUI.YES_NO_SELECTION, listener, yesText, noText, okText, cancelText); Index: TotalDiscountPercent.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/TotalDiscountPercent.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TotalDiscountPercent.java 18 Jan 2005 15:31:57 -0000 1.3 --- TotalDiscountPercent.java 19 Feb 2005 08:37:14 -0000 1.4 *************** *** 86,89 **** --- 86,96 ---- { inputOKSelected(); + try + { + input.dispose(); + input = null; + } + catch(NullPointerException e) + {} } *************** *** 91,94 **** --- 98,108 ---- { inputCancelSelected(); + try + { + input.dispose(); + input = null; + } + catch(NullPointerException e) + {} } }; Index: AddFreetext.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/AddFreetext.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AddFreetext.java 23 Nov 2004 16:02:27 -0000 1.1 --- AddFreetext.java 19 Feb 2005 08:37:14 -0000 1.2 *************** *** 71,74 **** --- 71,82 ---- null); } + try + { + userInput.dispose(); + userInput = null; + } + catch(NullPointerException e) + { + } } *************** *** 78,81 **** --- 86,97 ---- fireNotification( PluginFunctionConstants.NOTIFICATION_FUNCTION_FINISHED, null); + try + { + userInput.dispose(); + userInput = null; + } + catch(NullPointerException e) + { + } } Index: ClosePOS.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/ClosePOS.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ClosePOS.java 23 Nov 2004 16:02:27 -0000 1.1 --- ClosePOS.java 19 Feb 2005 08:37:14 -0000 1.2 *************** *** 46,49 **** --- 46,51 ---- ClosePOSMBean { + + private static ConfirmActionUI confirm; /** *************** *** 69,72 **** --- 71,82 ---- break; } + try + { + confirm.dispose(); + confirm = null; + } + catch(NullPointerException e) + { + } } }; *************** *** 85,89 **** "Do you really want to close the register?"); ! ConfirmActionUI confirm = new ConfirmActionUI(parent, message, ConfirmActionUI.YES_NO_SELECTION, listener, yesText, noText, okText, cancelText); --- 95,99 ---- "Do you really want to close the register?"); ! /*ConfirmActionUI*/ confirm = new ConfirmActionUI(parent, message, ConfirmActionUI.YES_NO_SELECTION, listener, yesText, noText, okText, cancelText); Index: RowDiscountPercent.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/RowDiscountPercent.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RowDiscountPercent.java 18 Jan 2005 15:31:57 -0000 1.3 --- RowDiscountPercent.java 19 Feb 2005 08:37:14 -0000 1.4 *************** *** 89,92 **** --- 89,99 ---- { inputOKSelected(); + try + { + input.dispose(); + input = null; + } + catch(NullPointerException e) + {} } *************** *** 94,97 **** --- 101,111 ---- { inputCancelSelected(); + try + { + input.dispose(); + input = null; + } + catch(NullPointerException e) + {} } }; Index: CustomerService.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/CustomerService.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CustomerService.java 17 Jan 2005 10:25:41 -0000 1.2 --- CustomerService.java 19 Feb 2005 08:37:14 -0000 1.3 *************** *** 52,55 **** --- 52,56 ---- private ReceiptSessionUtility receiptSessionUtility = null; + private static ConfirmActionUI confirm; /** *************** *** 86,89 **** --- 87,98 ---- } } + try + { + confirm.dispose(); + confirm = null; + } + catch(NullPointerException e) + { + } } }; *************** *** 99,103 **** "Customer service su...@re..."); ! ConfirmActionUI confirm = new ConfirmActionUI(parent, message, ConfirmActionUI.OK_SELECTION, listener, yesText, noText, okText, cancelText); --- 108,112 ---- "Customer service su...@re..."); ! /*ConfirmActionUI*/ confirm = new ConfirmActionUI(parent, message, ConfirmActionUI.OK_SELECTION, listener, yesText, noText, okText, cancelText); Index: Logoff.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/Logoff.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Logoff.java 23 Nov 2004 16:02:27 -0000 1.1 --- Logoff.java 19 Feb 2005 08:37:14 -0000 1.2 *************** *** 112,116 **** // kill login UI ! loginUI = null; } } --- 112,122 ---- // kill login UI ! try ! { ! loginUI.dispose(); ! loginUI = null; ! } ! catch(NullPointerException e) ! {} } } *************** *** 332,336 **** private Composite parent; - /** * @param arg0 --- 338,341 ---- Index: PrintReceiptAgain.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/PrintReceiptAgain.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PrintReceiptAgain.java 3 Jan 2005 13:04:54 -0000 1.2 --- PrintReceiptAgain.java 19 Feb 2005 08:37:14 -0000 1.3 *************** *** 49,52 **** --- 49,53 ---- private POSEngineUtility posEngineUtility; + private ConfirmActionUI confirm; *************** *** 89,92 **** --- 90,101 ---- break; } + try + { + confirm.dispose(); + confirm = null; + } + catch(NullPointerException e) + { + } } }; *************** *** 105,109 **** "Do you want to print the previous receipt again?"); ! ConfirmActionUI confirm = new ConfirmActionUI(parent, message, ConfirmActionUI.YES_NO_SELECTION, listener, yesText, noText, okText, cancelText); --- 114,118 ---- "Do you want to print the previous receipt again?"); ! /*ConfirmActionUI*/ confirm = new ConfirmActionUI(parent, message, ConfirmActionUI.YES_NO_SELECTION, listener, yesText, noText, okText, cancelText); Index: CancelReceipt.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/CancelReceipt.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CancelReceipt.java 10 Jan 2005 14:54:05 -0000 1.2 --- CancelReceipt.java 19 Feb 2005 08:37:14 -0000 1.3 *************** *** 48,51 **** --- 48,52 ---- { private POSEngineUtility posEngineUtility = null; + private static ConfirmActionUI confirm; /** *************** *** 103,107 **** break; } ! } }; --- 104,117 ---- break; } ! try ! { ! confirm.dispose(); ! confirm = null; ! } ! catch(NullPointerException e) ! { ! } ! ! } }; *************** *** 119,128 **** "Do you really want to cancel the receipt?"); ! ConfirmActionUI confirm = new ConfirmActionUI(parent, message, ConfirmActionUI.YES_NO_SELECTION, listener, yesText, noText, okText, cancelText); parent.layout(); ! return true; } --- 129,138 ---- "Do you really want to cancel the receipt?"); ! /*ConfirmActionUI*/ confirm = new ConfirmActionUI(parent, message, ConfirmActionUI.YES_NO_SELECTION, listener, yesText, noText, okText, cancelText); parent.layout(); ! return true; } Index: TotalDiscountAmount.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/TotalDiscountAmount.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TotalDiscountAmount.java 18 Jan 2005 15:31:56 -0000 1.3 --- TotalDiscountAmount.java 19 Feb 2005 08:37:14 -0000 1.4 *************** *** 87,90 **** --- 87,97 ---- { inputOKSelected(); + try + { + input.dispose(); + input = null; + } + catch(NullPointerException e) + {} } *************** *** 92,95 **** --- 99,109 ---- { inputCancelSelected(); + try + { + input.dispose(); + input = null; + } + catch(NullPointerException e) + {} } }; Index: Pay.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/Pay.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Pay.java 18 Jan 2005 15:31:57 -0000 1.5 --- Pay.java 19 Feb 2005 08:37:14 -0000 1.6 *************** *** 87,90 **** --- 87,91 ---- private Amount toPayChange; private Amount payChange; + private static ConfirmActionUI confirm; /** *************** *** 191,194 **** --- 192,203 ---- invokeFunction(parent); } + try + { + confirmCancelReceiptAction.dispose(); + confirmCancelReceiptAction = null; + } + catch(NullPointerException e) + { + } } }; *************** *** 410,413 **** --- 419,429 ---- invokeFunction(parent); } + try + { + userInput.dispose(); + userInput = null; + } + catch(NullPointerException e) + {} } *************** *** 426,429 **** --- 442,453 ---- // re-invoke payment selection invokeFunction(parent); + + try + { + userInput.dispose(); + userInput = null; + } + catch(NullPointerException e) + {} } *************** *** 625,632 **** log.error(e.getMessage(), e); } } }; // customer has change due, show message ! ConfirmActionUI message = new ConfirmActionUI(parent, messageString, ConfirmActionUI.OK_SELECTION, listener, yesText, noText, okText, cancelText); --- 649,664 ---- log.error(e.getMessage(), e); } + try + { + confirm.dispose(); + confirm = null; + } + catch(NullPointerException e) + { + } } }; // customer has change due, show message ! /*ConfirmActionUI*/ confirm = new ConfirmActionUI(parent, messageString, ConfirmActionUI.OK_SELECTION, listener, yesText, noText, okText, cancelText); Index: RowDiscountAmount.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/RowDiscountAmount.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RowDiscountAmount.java 18 Jan 2005 15:31:56 -0000 1.3 --- RowDiscountAmount.java 19 Feb 2005 08:37:14 -0000 1.4 *************** *** 90,93 **** --- 90,100 ---- { inputOKSelected(); + try + { + input.dispose(); + input = null; + } + catch(NullPointerException e) + {} } *************** *** 95,98 **** --- 102,112 ---- { inputCancelSelected(); + try + { + input.dispose(); + input = null; + } + catch(NullPointerException e) + {} } }; Index: MakeTallyAndReport.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/ui/plugin/function/MakeTallyAndReport.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MakeTallyAndReport.java 10 Jan 2005 14:54:05 -0000 1.3 --- MakeTallyAndReport.java 19 Feb 2005 08:37:14 -0000 1.4 *************** *** 51,54 **** --- 51,55 ---- private POSEngineUtility posEngineUtility; + private ConfirmActionUI confirm; *************** *** 105,108 **** --- 106,117 ---- break; } + try + { + confirm.dispose(); + confirm = null; + } + catch(NullPointerException e) + { + } } }; *************** *** 121,125 **** "Do you want to create a new cashreport?"); ! ConfirmActionUI confirm = new ConfirmActionUI(parent, message, ConfirmActionUI.YES_NO_SELECTION, listener, yesText, noText, okText, cancelText); --- 130,134 ---- "Do you want to create a new cashreport?"); ! /*ConfirmActionUI*/ confirm = new ConfirmActionUI(parent, message, ConfirmActionUI.YES_NO_SELECTION, listener, yesText, noText, okText, cancelText); |
