Menu
▾
▴
[Redpos-cvs] RedPOS/src/org/redpos/client/payment Pay2Payment.java,1.1,1.2 CreditNotePayment.java,1.1,1.2 PaymentMBean.java,1.1,1.2 BonusCardPayment.java,1.1,1.2 Pay4Payment.java,1.1,1.2 CashPayment.java,1.1,1.2 CardPayment.java,1.1,1.2 PaymentMBeanSupport.java,1.1,1.2 SimpleCurrencyExchangePayment.java,1.1,1.2 PaymentRegistry.java,1.1,1.2 Pay5Payment.java,1.1,1.2 FlowerCardPayment.java,1.1,1.2 Pay3Payment.java,1.1,1.2 Pay1Payment.java,1.1,1.2 GiftVoucherPayment.java,1.1,1.2
Update of /cvsroot/redpos/RedPOS/src/org/redpos/client/payment In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29708/src/org/redpos/client/payment Modified Files: Pay2Payment.java CreditNotePayment.java PaymentMBean.java BonusCardPayment.java Pay4Payment.java CashPayment.java CardPayment.java PaymentMBeanSupport.java SimpleCurrencyExchangePayment.java PaymentRegistry.java Pay5Payment.java FlowerCardPayment.java Pay3Payment.java Pay1Payment.java GiftVoucherPayment.java Log Message: Added functionality for short commands when selecting payment Index: CreditNotePayment.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/payment/CreditNotePayment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CreditNotePayment.java 23 Nov 2004 16:02:25 -0000 1.1 --- CreditNotePayment.java 7 Mar 2005 11:13:45 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- package org.redpos.client.payment; + import org.eclipse.swt.SWT; import org.redpos.amount.Amount; import org.redpos.client.contract.properties.PropertiesUtility; *************** *** 92,95 **** --- 93,108 ---- setLimitRepay(((Double)po.getProperty("payments", "creditnotelimitrepay")).doubleValue()); + + String accelerator = getLanguageString("client.payment.creditnote.name.accelerator", ""); + char acc = accelerator.charAt(0); + setAccelerator(new Integer(acc)); + + String statemask = getLanguageString("client.payment.statemask", ""); + if (statemask.equalsIgnoreCase("CTRL")) + setStatemask(new Integer(SWT.CTRL)); + else if (statemask.equalsIgnoreCase("ALT")) + setStatemask(new Integer(SWT.ALT)); + else if (statemask.equalsIgnoreCase("SHIFT")) + setStatemask(new Integer(SWT.SHIFT)); } } \ No newline at end of file Index: BonusCardPayment.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/payment/BonusCardPayment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BonusCardPayment.java 23 Nov 2004 16:02:25 -0000 1.1 --- BonusCardPayment.java 7 Mar 2005 11:13:45 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- package org.redpos.client.payment; + import org.eclipse.swt.SWT; import org.redpos.amount.Amount; import org.redpos.client.contract.properties.PropertiesUtility; *************** *** 91,94 **** --- 92,107 ---- setLimitRepay(((Double)po.getProperty("payments", "bonuscardlimitrepay")).doubleValue()); + + String accelerator = getLanguageString("client.payment.bonuscard.name.accelerator", ""); + char acc = accelerator.charAt(0); + setAccelerator(new Integer(acc)); + + String statemask = getLanguageString("client.payment.statemask", ""); + if (statemask.equalsIgnoreCase("CTRL")) + setStatemask(new Integer(SWT.CTRL)); + else if (statemask.equalsIgnoreCase("ALT")) + setStatemask(new Integer(SWT.ALT)); + else if (statemask.equalsIgnoreCase("SHIFT")) + setStatemask(new Integer(SWT.SHIFT)); } } \ No newline at end of file Index: CashPayment.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/payment/CashPayment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CashPayment.java 23 Nov 2004 16:02:25 -0000 1.1 --- CashPayment.java 7 Mar 2005 11:13:45 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- package org.redpos.client.payment; + import org.eclipse.swt.SWT; import org.redpos.amount.Amount; import org.redpos.client.contract.properties.PropertiesUtility; *************** *** 86,89 **** --- 87,103 ---- setLimitRepay(((Double)po.getProperty("payments", "cashlimitrepay")).doubleValue()); + + String accelerator = getLanguageString("client.payment.cash.name.accelerator", ""); + char acc = accelerator.charAt(0); + setAccelerator(new Integer(acc)); + + String statemask = getLanguageString("client.payment.statemask", ""); + if (statemask.equalsIgnoreCase("CTRL")) + setStatemask(new Integer(SWT.CTRL)); + else if (statemask.equalsIgnoreCase("ALT")) + setStatemask(new Integer(SWT.ALT)); + else if (statemask.equalsIgnoreCase("SHIFT")) + setStatemask(new Integer(SWT.SHIFT)); } + } \ No newline at end of file Index: CardPayment.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/payment/CardPayment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CardPayment.java 23 Nov 2004 16:02:25 -0000 1.1 --- CardPayment.java 7 Mar 2005 11:13:45 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- package org.redpos.client.payment; + import org.eclipse.swt.SWT; import org.redpos.amount.Amount; import org.redpos.client.contract.properties.PropertiesUtility; *************** *** 83,86 **** --- 84,99 ---- setLimitRepay(((Double)po.getProperty("payments", "cardlimitrepay")).doubleValue()); + + String accelerator = getLanguageString("client.payment.card.name.accelerator", ""); + char acc = accelerator.charAt(0); + setAccelerator(new Integer(acc)); + + String statemask = getLanguageString("client.payment.statemask", ""); + if (statemask.equalsIgnoreCase("CTRL")) + setStatemask(new Integer(SWT.CTRL)); + else if (statemask.equalsIgnoreCase("ALT")) + setStatemask(new Integer(SWT.ALT)); + else if (statemask.equalsIgnoreCase("SHIFT")) + setStatemask(new Integer(SWT.SHIFT)); } } \ No newline at end of file Index: FlowerCardPayment.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/payment/FlowerCardPayment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FlowerCardPayment.java 23 Nov 2004 16:02:25 -0000 1.1 --- FlowerCardPayment.java 7 Mar 2005 11:13:46 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- package org.redpos.client.payment; + import org.eclipse.swt.SWT; import org.redpos.amount.Amount; import org.redpos.client.contract.properties.PropertiesUtility; *************** *** 92,95 **** --- 93,108 ---- setLimitRepay(((Double)po.getProperty("payments", "flowercardlimitrepay")).doubleValue()); + + String accelerator = getLanguageString("client.payment.flowercard.name.accelerator", ""); + char acc = accelerator.charAt(0); + setAccelerator(new Integer(acc)); + + String statemask = getLanguageString("client.payment.statemask", ""); + if (statemask.equalsIgnoreCase("CTRL")) + setStatemask(new Integer(SWT.CTRL)); + else if (statemask.equalsIgnoreCase("ALT")) + setStatemask(new Integer(SWT.ALT)); + else if (statemask.equalsIgnoreCase("SHIFT")) + setStatemask(new Integer(SWT.SHIFT)); } } \ No newline at end of file Index: SimpleCurrencyExchangePayment.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/payment/SimpleCurrencyExchangePayment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SimpleCurrencyExchangePayment.java 17 Jan 2005 10:23:20 -0000 1.1 --- SimpleCurrencyExchangePayment.java 7 Mar 2005 11:13:46 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- package org.redpos.client.payment; + import org.eclipse.swt.SWT; import org.redpos.amount.Amount; import org.redpos.client.contract.properties.PropertiesUtility; *************** *** 86,89 **** --- 87,102 ---- setLimitRepay(((Double)po.getProperty("payments", "simplecurrencyexchangelimitrepay")).doubleValue()); + + String accelerator = getLanguageString("client.payment.simplecurrencyexchange.name.accelerator", ""); + char acc = accelerator.charAt(0); + setAccelerator(new Integer(acc)); + + String statemask = getLanguageString("client.payment.statemask", ""); + if (statemask.equalsIgnoreCase("CTRL")) + setStatemask(new Integer(SWT.CTRL)); + else if (statemask.equalsIgnoreCase("ALT")) + setStatemask(new Integer(SWT.ALT)); + else if (statemask.equalsIgnoreCase("SHIFT")) + setStatemask(new Integer(SWT.SHIFT)); } Index: Pay3Payment.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/payment/Pay3Payment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Pay3Payment.java 23 Dec 2004 10:20:36 -0000 1.1 --- Pay3Payment.java 7 Mar 2005 11:13:46 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- package org.redpos.client.payment; + import org.eclipse.swt.SWT; import org.redpos.amount.Amount; import org.redpos.client.contract.properties.PropertiesUtility; *************** *** 85,88 **** --- 86,101 ---- setLimitRepay(((Double)po.getProperty("payments", "pay3limitrepay")).doubleValue()); + + String accelerator = getLanguageString("client.payment.pay3.name.accelerator", ""); + char acc = accelerator.charAt(0); + setAccelerator(new Integer(acc)); + + String statemask = getLanguageString("client.payment.statemask", ""); + if (statemask.equalsIgnoreCase("CTRL")) + setStatemask(new Integer(SWT.CTRL)); + else if (statemask.equalsIgnoreCase("ALT")) + setStatemask(new Integer(SWT.ALT)); + else if (statemask.equalsIgnoreCase("SHIFT")) + setStatemask(new Integer(SWT.SHIFT)); } Index: PaymentMBeanSupport.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/payment/PaymentMBeanSupport.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PaymentMBeanSupport.java 23 Nov 2004 16:02:25 -0000 1.1 --- PaymentMBeanSupport.java 7 Mar 2005 11:13:46 -0000 1.2 *************** *** 73,76 **** --- 73,82 ---- /** The payment code*/ protected String code; + + /** The service UI accelerator id **/ + protected Integer accelerator; + + /** The service UI statemask id **/ + protected Integer statemask; /** *************** *** 367,369 **** --- 373,414 ---- this.code = code; } + + /** + * Returns accelerator id + * + */ + public Integer getAccelerator() + { + return accelerator; + } + + /** + * Sets accelerator id + * + */ + public void setAccelerator(Integer i) + { + this.accelerator = i; + + } + + /** + * Returns statemask id + * + */ + public Integer getStatemask() + { + return statemask; + } + + /** + * Sets statemask id + * + */ + public void setStatemask(Integer i) + { + this.statemask = i; + + } + } \ No newline at end of file Index: Pay5Payment.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/payment/Pay5Payment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Pay5Payment.java 23 Dec 2004 10:20:36 -0000 1.1 --- Pay5Payment.java 7 Mar 2005 11:13:46 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- package org.redpos.client.payment; + import org.eclipse.swt.SWT; import org.redpos.amount.Amount; import org.redpos.client.contract.properties.PropertiesUtility; *************** *** 85,88 **** --- 86,101 ---- setLimitRepay(((Double)po.getProperty("payments", "pay5limitrepay")).doubleValue()); + + String accelerator = getLanguageString("client.payment.pay5.name.accelerator", ""); + char acc = accelerator.charAt(0); + setAccelerator(new Integer(acc)); + + String statemask = getLanguageString("client.payment.statemask", ""); + if (statemask.equalsIgnoreCase("CTRL")) + setStatemask(new Integer(SWT.CTRL)); + else if (statemask.equalsIgnoreCase("ALT")) + setStatemask(new Integer(SWT.ALT)); + else if (statemask.equalsIgnoreCase("SHIFT")) + setStatemask(new Integer(SWT.SHIFT)); } Index: PaymentMBean.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/payment/PaymentMBean.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PaymentMBean.java 23 Nov 2004 16:02:25 -0000 1.1 --- PaymentMBean.java 7 Mar 2005 11:13:45 -0000 1.2 *************** *** 149,152 **** --- 149,174 ---- */ public String getCode(); + + /** + * Sets the payment accelerator + * @param accelerator + */ + public void setAccelerator(Integer accelerator); + + /** + * @return Returns the payment accelerator + */ + public Integer getAccelerator(); + + /** + * Sets the payment statemask + * @param statemask + */ + public void setStatemask(Integer statemask); + + /** + * @return Returns the payment statemask + */ + public Integer getStatemask(); } \ No newline at end of file Index: Pay1Payment.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/payment/Pay1Payment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Pay1Payment.java 23 Dec 2004 10:20:36 -0000 1.1 --- Pay1Payment.java 7 Mar 2005 11:13:46 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- package org.redpos.client.payment; + import org.eclipse.swt.SWT; import org.redpos.amount.Amount; import org.redpos.client.contract.properties.PropertiesUtility; *************** *** 85,88 **** --- 86,101 ---- setLimitRepay(((Double)po.getProperty("payments", "pay1limitrepay")).doubleValue()); + + String accelerator = getLanguageString("client.payment.pay1.name.accelerator", ""); + char acc = accelerator.charAt(0); + setAccelerator(new Integer(acc)); + + String statemask = getLanguageString("client.payment.statemask", ""); + if (statemask.equalsIgnoreCase("CTRL")) + setStatemask(new Integer(SWT.CTRL)); + else if (statemask.equalsIgnoreCase("ALT")) + setStatemask(new Integer(SWT.ALT)); + else if (statemask.equalsIgnoreCase("SHIFT")) + setStatemask(new Integer(SWT.SHIFT)); } Index: Pay4Payment.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/payment/Pay4Payment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Pay4Payment.java 23 Dec 2004 10:20:36 -0000 1.1 --- Pay4Payment.java 7 Mar 2005 11:13:45 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- package org.redpos.client.payment; + import org.eclipse.swt.SWT; import org.redpos.amount.Amount; import org.redpos.client.contract.properties.PropertiesUtility; *************** *** 85,88 **** --- 86,101 ---- setLimitRepay(((Double)po.getProperty("payments", "pay4limitrepay")).doubleValue()); + + String accelerator = getLanguageString("client.payment.pay4.name.accelerator", ""); + char acc = accelerator.charAt(0); + setAccelerator(new Integer(acc)); + + String statemask = getLanguageString("client.payment.statemask", ""); + if (statemask.equalsIgnoreCase("CTRL")) + setStatemask(new Integer(SWT.CTRL)); + else if (statemask.equalsIgnoreCase("ALT")) + setStatemask(new Integer(SWT.ALT)); + else if (statemask.equalsIgnoreCase("SHIFT")) + setStatemask(new Integer(SWT.SHIFT)); } *************** *** 90,91 **** --- 103,105 ---- } + Index: PaymentRegistry.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/payment/PaymentRegistry.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PaymentRegistry.java 23 Nov 2004 16:02:25 -0000 1.1 --- PaymentRegistry.java 7 Mar 2005 11:13:46 -0000 1.2 *************** *** 96,99 **** --- 96,110 ---- info.updateAllowed = paymentUtility.isUpdateAllowed(); info.cancelAllowed = paymentUtility.isCancelAllowed(); + info.id = element.getCanonicalName(); + + try + { + info.accelerator = paymentUtility.getAccelerator(); + info.statemask = paymentUtility.getStatemask(); + } + catch (Exception e) + { + // no accelarator available + } info.code = paymentUtility.getCode(); Index: Pay2Payment.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/payment/Pay2Payment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Pay2Payment.java 23 Dec 2004 10:20:36 -0000 1.1 --- Pay2Payment.java 7 Mar 2005 11:13:45 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- package org.redpos.client.payment; + import org.eclipse.swt.SWT; import org.redpos.amount.Amount; import org.redpos.client.contract.properties.PropertiesUtility; *************** *** 85,88 **** --- 86,101 ---- setLimitRepay(((Double)po.getProperty("payments", "pay2limitrepay")).doubleValue()); + + String accelerator = getLanguageString("client.payment.pay2.name.accelerator", ""); + char acc = accelerator.charAt(0); + setAccelerator(new Integer(acc)); + + String statemask = getLanguageString("client.payment.statemask", ""); + if (statemask.equalsIgnoreCase("CTRL")) + setStatemask(new Integer(SWT.CTRL)); + else if (statemask.equalsIgnoreCase("ALT")) + setStatemask(new Integer(SWT.ALT)); + else if (statemask.equalsIgnoreCase("SHIFT")) + setStatemask(new Integer(SWT.SHIFT)); } Index: GiftVoucherPayment.java =================================================================== RCS file: /cvsroot/redpos/RedPOS/src/org/redpos/client/payment/GiftVoucherPayment.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GiftVoucherPayment.java 23 Nov 2004 16:02:25 -0000 1.1 --- GiftVoucherPayment.java 7 Mar 2005 11:13:46 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- package org.redpos.client.payment; + import org.eclipse.swt.SWT; import org.redpos.amount.Amount; import org.redpos.client.contract.properties.PropertiesUtility; *************** *** 91,94 **** --- 92,107 ---- setLimitRepay(((Double)po.getProperty("payments", "giftvoucherlimitrepay")).doubleValue()); + + String accelerator = getLanguageString("client.payment.giftvoucher.name.accelerator", ""); + char acc = accelerator.charAt(0); + setAccelerator(new Integer(acc)); + + String statemask = getLanguageString("client.payment.statemask", ""); + if (statemask.equalsIgnoreCase("CTRL")) + setStatemask(new Integer(SWT.CTRL)); + else if (statemask.equalsIgnoreCase("ALT")) + setStatemask(new Integer(SWT.ALT)); + else if (statemask.equalsIgnoreCase("SHIFT")) + setStatemask(new Integer(SWT.SHIFT)); } } \ No newline at end of file |
