svn commit: r757096 [1/2] - in /ofbiz/trunk/specialpurpose/po
Locked
 
|
Author: doogie
Date: Sat Mar 21 23:47:33 2009 New Revision: 757096 URL: http://svn.apache.org/viewvc?rev=757096&view=rev Log: Fix purely empty whitespace lines, and remove trailing whitespace. Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/DataEventAdaptor.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/ErrorEventAdaptor.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardReceiver.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/SyncCallbackAdaptor.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Output.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/config/ButtonEventConfig.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/DeviceLoader.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/GenericDevice.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/JposDevice.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CheckScanner.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Journal.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Keyboard.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/LineDisplay.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Msr.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/PinPad.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/SignatureCapture.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/CharacterEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/NavagationEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/NumericEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/factory/OfbizJposServiceFactory.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/BaseService.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/MsrKybService.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/MsrTestService.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullCashDrawer.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/ScannerKybService.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/ConfigureItem.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/DialogCallback.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/Keyboard.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/NumericKeypad.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PaidInOut.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/SelectProduct.java ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/screen/XFocusDialog.java Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -77,7 +77,7 @@ public static final int scale = UtilNumber.getBigDecimalScale("order.decimals"); public static final int rounding = UtilNumber.getBigDecimalRoundingMode("order.rounding"); - public static final BigDecimal ZERO = (BigDecimal.ZERO).setScale(scale, rounding); + public static final BigDecimal ZERO = (BigDecimal.ZERO).setScale(scale, rounding); public static final String resource = "PosUiLabels"; public static final String module = PosTransaction.class.getName(); @@ -242,15 +242,15 @@ itemInfo.put("quantity", UtilFormatOut.formatQuantity(item.getQuantity())); itemInfo.put("subtotal", UtilFormatOut.formatPrice(item.getItemSubTotal())); itemInfo.put("isTaxable", item.taxApplies() ? "T" : " "); - + itemInfo.put("discount", ""); itemInfo.put("adjustments", ""); if (item.getOtherAdjustments().compareTo(BigDecimal.ZERO) != 0) { itemInfo.put("itemDiscount", UtilFormatOut.padString( - UtilProperties.getMessage(PosTransaction.resource,"PosItemDiscount",defaultLocale), Receipt.pridLength[0] + 1, true, ' ')); + UtilProperties.getMessage(PosTransaction.resource,"PosItemDiscount",defaultLocale), Receipt.pridLength[0] + 1, true, ' ')); itemInfo.put("adjustments", UtilFormatOut.formatPrice(item.getOtherAdjustments())); } - + if (isAggregatedItem(item.getProductId())) { ProductConfigWrapper pcw = null; pcw = item.getConfigWrapper(); @@ -375,7 +375,7 @@ payInfo.put("payInfo", infoString); payInfo.putAll(cc); payInfo.put("cardNumber", cardStr); // masked cardNumber - + } else if ("GIFT_CARD".equals(paymentMethodTypeId)) { GenericValue gc = null; try { @@ -415,7 +415,7 @@ } catch (Exception e) { trace("general exception", e); Debug.logError(e, module); - } + } return false; } @@ -425,8 +425,8 @@ ProductConfigWrapper pcw = null; try { GenericDelegator delegator = cart.getDelegator(); - pcw = new ProductConfigWrapper(delegator, session.getDispatcher(), - productId, null, null, null, null, null, null); + pcw = new ProductConfigWrapper(delegator, session.getDispatcher(), + productId, null, null, null, null, null, null); } catch (ItemNotFoundException e) { trace("item not found", e); //throw e; @@ -439,7 +439,7 @@ } catch (Exception e) { trace("general exception", e); Debug.logError(e, module); - } + } return pcw; } @@ -455,10 +455,10 @@ } catch (Exception e) { trace("general exception", e); Debug.logError(e, module); - } + } return pcw; } - + public void addItem(String productId, BigDecimal quantity) throws CartItemModifyException, ItemNotFoundException { trace("add item", productId + "/" + quantity); try { @@ -488,7 +488,7 @@ } } - public void addItem(String productId, ProductConfigWrapper pcw) + public void addItem(String productId, ProductConfigWrapper pcw) throws ItemNotFoundException, CartItemModifyException { trace("add item with ProductConfigWrapper", productId ); try { @@ -505,10 +505,10 @@ } } - public void modifyConfig(String productId, ProductConfigWrapper pcw, String cartIndex) + public void modifyConfig(String productId, ProductConfigWrapper pcw, String cartIndex) throws CartItemModifyException, ItemNotFoundException { trace("modify item config", cartIndex ); - try { + try { int cartIndexInt = Integer.parseInt(cartIndex); ShoppingCartItem cartItem = cart.findCartItem(cartIndexInt); BigDecimal quantity = cartItem.getQuantity(); @@ -527,7 +527,7 @@ } return; } - + public void modifyQty(String productId, BigDecimal quantity) throws CartItemModifyException { trace("modify item quantity", productId + "/" + quantity); ShoppingCartItem item = cart.findCartItem(productId, null, null, null, BigDecimal.ZERO); @@ -602,7 +602,7 @@ public BigDecimal GetTotalDiscount() { return cart.getOrderOtherAdjustmentTotal(); } - + public void voidItem(String productId) throws CartItemModifyException { trace("void item", productId); ShoppingCartItem item = cart.findCartItem(productId, null, null, null, BigDecimal.ZERO); @@ -659,7 +659,7 @@ } currentTx = null; } - + public void calcTax() { try { ch.calcAndAddTax(this.getStoreOrgAddress()); @@ -727,7 +727,7 @@ /* CVV2 code should be entered when a card can't be swiped */ public void setPaymentSecurityCode(String paymentId, String refNum, String securityCode) { trace("setting payment security code", paymentId); - int paymentIndex = cart.getPaymentInfoIndex(paymentId, refNum); + int paymentIndex = cart.getPaymentInfoIndex(paymentId, refNum); ShoppingCart.CartPaymentInfo inf = cart.getPaymentInfo(paymentIndex); inf.securityCode = securityCode; inf.isSwiped = false; @@ -736,7 +736,7 @@ /* Track2 data should be sent to processor when a card is swiped. */ public void setPaymentTrack2(String paymentId, String refNum, String securityCode) { trace("setting payment security code", paymentId); - int paymentIndex = cart.getPaymentInfoIndex(paymentId, refNum); + int paymentIndex = cart.getPaymentInfoIndex(paymentId, refNum); ShoppingCart.CartPaymentInfo inf = cart.getPaymentInfo(paymentIndex); inf.securityCode = securityCode; inf.isSwiped = true; @@ -745,7 +745,7 @@ /* Postal code should be entered when a card can't be swiped */ public void setPaymentPostalCode(String paymentId, String refNum, String postalCode) { trace("setting payment security code", paymentId); - int paymentIndex = cart.getPaymentInfoIndex(paymentId, refNum); + int paymentIndex = cart.getPaymentInfoIndex(paymentId, refNum); ShoppingCart.CartPaymentInfo inf = cart.getPaymentInfo(paymentIndex); inf.postalCode = postalCode; } @@ -809,16 +809,16 @@ output.print(UtilProperties.getMessage(PosTransaction.resource,"PosSaving",defaultLocale)); Map orderRes = ch.createOrder(session.getUserLogin()); //Debug.log("Create Order Resp : " + orderRes, module); - + if (orderRes != null && ServiceUtil.isError(orderRes)) { throw new GeneralException(ServiceUtil.getErrorMessage(orderRes)); } else if (orderRes != null) { this.orderId = (String) orderRes.get("orderId"); } } else { // if the order has already been created - Map changeMap = UtilMisc.toMap("itemReasonMap", - UtilMisc.toMap("reasonEnumId", "EnumIdHere"), // TODO: where does this come from? - "itemCommentMap", + Map changeMap = UtilMisc.toMap("itemReasonMap", + UtilMisc.toMap("reasonEnumId", "EnumIdHere"), // TODO: where does this come from? + "itemCommentMap", UtilMisc.toMap("changeComments", "change Comments here")); //TODO Map svcCtx = FastMap.newInstance(); @@ -827,7 +827,7 @@ svcCtx.put("shoppingCart", cart); svcCtx.put("locale", this.locale); svcCtx.put("changeMap", changeMap); - + Map svcRes = null; try { LocalDispatcher dispatcher = session.getDispatcher(); @@ -836,7 +836,7 @@ Debug.logError(e, module); //pos.showDialog("dialog/error/exception", e.getMessage()); throw new GeneralException(ServiceUtil.getErrorMessage(svcRes)); - } + } } // process the payment(s) @@ -898,7 +898,7 @@ if (facility == null) { return null; } - + GenericDelegator delegator = session.getDelegator(); GenericValue facilityContactMech = ContactMechWorker.getFacilityContactMechByPurpose(delegator, facilityId, UtilMisc.toList("SHIP_ORIG_LOCATION", "PRIMARY_LOCATION")); if (facilityContactMech != null) { @@ -944,7 +944,7 @@ pcw = item.getConfigWrapper(); List selected = pcw.getSelectedOptions(); Iterator iter = selected.iterator(); - while (iter.hasNext()) { + while (iter.hasNext()) { ConfigOption configoption = (ConfigOption)iter.next(); if (configoption.isSelected()) { XModel option = Journal.appendNode(model, "tr", ""+cart.getItemIndex(item), ""); @@ -956,7 +956,7 @@ } } } - + if (adjustment.compareTo(BigDecimal.ZERO) != 0) { // append the promo info XModel promo = Journal.appendNode(model, "tr", "itemadjustment", ""); @@ -973,8 +973,8 @@ if (cart != null) { BigDecimal taxAmount = cart.getTotalSalesTax(); BigDecimal total = cart.getGrandTotal(); - List adjustments = cart.getAdjustments(); - BigDecimal itemsAdjustmentsAmount = BigDecimal.ZERO; + List adjustments = cart.getAdjustments(); + BigDecimal itemsAdjustmentsAmount = BigDecimal.ZERO; Iterator i = cart.iterator(); while (i.hasNext()) { @@ -984,12 +984,12 @@ itemsAdjustmentsAmount = itemsAdjustmentsAmount.add(adjustment); } } - + if (UtilValidate.isNotEmpty(adjustments)) { Iterator iter = adjustments.iterator(); while (iter.hasNext()) { GenericValue orderAdjustment = (GenericValue) iter.next(); - BigDecimal amount = orderAdjustment.getBigDecimal("amount"); + BigDecimal amount = orderAdjustment.getBigDecimal("amount"); } iter = adjustments.iterator(); @@ -999,19 +999,19 @@ BigDecimal sourcePercentage = orderAdjustment.getBigDecimal("sourcePercentage"); XModel adjustmentLine = Journal.appendNode(model, "tr", "adjustment", ""); Journal.appendNode(adjustmentLine, "td", "sku", ""); - Journal.appendNode(adjustmentLine, "td", "desc", + Journal.appendNode(adjustmentLine, "td", "desc", UtilProperties.getMessage(PosTransaction.resource, "PosSalesDiscount",defaultLocale)); if (UtilValidate.isNotEmpty(amount)) { Journal.appendNode(adjustmentLine, "td", "qty", ""); Journal.appendNode(adjustmentLine, "td", "price", UtilFormatOut.formatPrice(amount)); } else if (UtilValidate.isNotEmpty(sourcePercentage)) { BigDecimal percentage = sourcePercentage.movePointLeft(2).negate(); // sourcePercentage is negative and must be show as a positive value (it's a discount not an amount) - Journal.appendNode(adjustmentLine, "td", "qty", UtilFormatOut.formatPercentage(percentage)); + Journal.appendNode(adjustmentLine, "td", "qty", UtilFormatOut.formatPercentage(percentage)); amount = cart.getItemTotal().add(itemsAdjustmentsAmount).multiply(percentage); // itemsAdjustmentsAmount is negative Journal.appendNode(adjustmentLine, "td", "price", UtilFormatOut.formatPrice(amount.negate())); // amount must be shown as a negative value - } + } Journal.appendNode(adjustmentLine, "td", "index", "-1"); - } + } } XModel taxLine = Journal.appendNode(model, "tr", "tax", ""); @@ -1021,7 +1021,7 @@ Journal.appendNode(taxLine, "td", "qty", ""); Journal.appendNode(taxLine, "td", "price", UtilFormatOut.formatPrice(taxAmount)); Journal.appendNode(taxLine, "td", "index", "-1"); - + XModel totalLine = Journal.appendNode(model, "tr", "total", ""); Journal.appendNode(totalLine, "td", "sku", ""); Journal.appendNode(totalLine, "td", "desc", UtilProperties.getMessage(PosTransaction.resource,"PosGrandTotal",defaultLocale)); @@ -1186,7 +1186,7 @@ pos.showDialog("dialog/error/nosales"); } } - + public void loadOrder(PosScreen pos) { List<GenericValue> orders = findOrders(); if (!orders.isEmpty()) { @@ -1196,12 +1196,12 @@ pos.showDialog("dialog/error/nosales"); } } - + private List<GenericValue> findOrders() { LocalDispatcher dispatcher = session.getDispatcher(); Map svcCtx = FastMap.newInstance(); - svcCtx.put("userLogin", session.getUserLogin()); + svcCtx.put("userLogin", session.getUserLogin()); svcCtx.put("partyId", partyId); List orderStatusIds = new ArrayList(); orderStatusIds.add("ORDER_CREATED"); @@ -1212,11 +1212,11 @@ Map svcRes = null; try { - svcRes = dispatcher.runSync("findOrders", svcCtx); + svcRes = dispatcher.runSync("findOrders", svcCtx); } catch (GenericServiceException e) { Debug.logError(e, module); } - + if (svcRes == null) { Debug.log(UtilProperties.getMessage("EcommerceUiLabels","EcommerceNoShoppingListsCreate",locale), module); } else if (ServiceUtil.isError(svcRes)) { @@ -1249,7 +1249,7 @@ } catch (Exception e) { trace("general exception", e); Debug.logError(e, module); - } + } } */ public List createShoppingLists() { @@ -1346,7 +1346,7 @@ this.orderId = orderId; } else { this.cart = restoredCart; - this.orderId = orderId; + this.orderId = orderId; } this.ch = new CheckOutHelper(session.getDispatcher(), session.getDelegator(), cart); if (session.getUserLogin() != null) { @@ -1372,12 +1372,12 @@ return true; } - + public void saveSale(PosScreen pos) { SaveSale SaveSale = new SaveSale(this, pos); SaveSale.openDlg(); } - + public void saveOrder(String shoppingListName, PosScreen pos) { if (cart.size() == 0 ) { pos.showDialog("dialog/error/exception", UtilProperties.getMessage("OrderErrorUiLabels", "OrderUnableToCreateNewShoppingList",locale)); @@ -1397,13 +1397,13 @@ //cart.setInternalCode("Internal Code"); //ch.setCheckOutOptions(null, null, null, null, null, "shipping instructions", null, null, null, "InternalId", null, null, null); Map orderRes = ch.createOrder(session.getUserLogin()); - + if (orderRes != null && ServiceUtil.isError(orderRes)) { Debug.logError(ServiceUtil.getErrorMessage(orderRes), module); //throw new GeneralException(ServiceUtil.getErrorMessage(orderRes)); } else if (orderRes != null) { this.orderId = (String) orderRes.get("orderId"); - } + } } } Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/DataEventAdaptor.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/DataEventAdaptor.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/DataEventAdaptor.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/DataEventAdaptor.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -23,6 +23,6 @@ public class DataEventAdaptor implements jpos.events.DataListener { public void dataOccurred(DataEvent event) { - // does nothing; meant to be overridden + // does nothing; meant to be overridden } } Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/ErrorEventAdaptor.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/ErrorEventAdaptor.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/ErrorEventAdaptor.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/ErrorEventAdaptor.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardAdaptor.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardReceiver.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardReceiver.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardReceiver.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/KeyboardReceiver.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -21,7 +21,7 @@ /** * KeyboardReceiver - Interface for receiving keyboard data - * + * */ public interface KeyboardReceiver { Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/SyncCallbackAdaptor.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/SyncCallbackAdaptor.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/SyncCallbackAdaptor.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/adaptor/SyncCallbackAdaptor.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Input.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -37,9 +37,9 @@ public static final String module = Input.class.getName(); private static final String[] validFunc = { "CHECK", "CHECKINFO", "CLOSE", "CREDIT", "GIFTCARD", "LOGIN", "MGRLOGIN", "MSRINFO", "OPEN", "PAID", "PAID_IN", "PAID_OUT", "PROMOCODE", "QTY", - "REFNUM", "SHIFT", "TOTAL", "UNLOCK", "VOID", "TRACK2", "SECURITYCODE", + "REFNUM", "SHIFT", "TOTAL", "UNLOCK", "VOID", "TRACK2", "SECURITYCODE", "CREDITEXP", "POSTALCODE"}; - + protected Stack functionStack = new Stack(); protected Component[] pageComs = null; Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/InputWithPassword.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -22,10 +22,10 @@ import org.ofbiz.pos.screen.PosScreen; public class InputWithPassword extends Input { - + protected javax.swing.JTextField savedInput; protected XPassword password = null; - + public InputWithPassword( PosScreen page) { super( page); this.savedInput = super.input; Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Journal.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -42,7 +42,7 @@ public static final String module = Journal.class.getName(); protected XProject currentProject = (XProject)XProjectManager.getCurrentProject(); - + private static String[] field = { "sku", "desc", "qty", "price" }; private static String[] name = { "PosSku", "PosItem", "PosQty", "PosAmt" }; private static int[] width = { 100, 170, 50, 90}; @@ -52,33 +52,33 @@ protected XTable jtable = null; protected String style = null; - public Journal(PosScreen page) { + public Journal(PosScreen page) { jpanel = (XScrollPane) page.findComponent("journal_panel"); jpanel.setVisible(false); - + this.jtable = (XTable) page.findComponent("jtable"); - // set the table as selectable + // set the table as selectable jtable.setInteractiveTable(true); jtable.setFocusable(false); - jtable.setDragEnabled(false); - jtable.setColumnSelectionAllowed(false); + jtable.setDragEnabled(false); + jtable.setColumnSelectionAllowed(false); jtable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - + // set the styles - jtable.setBorderStyle("journalBorder"); + jtable.setBorderStyle("journalBorder"); jtable.setHeaderStyle("journalHeader"); jtable.setStyle("journalData"); jtable.setSelectedStyle("journalSelected"); - + // some settings needed for XUI 3.2rc2b update jtable.setRowHeight(30); // Better to catch the line on a touch screen (minimal height I think) XStyle style = currentProject.getStyleManager().getStyle("journalBorder"); - Color borderColor = style.getStyleAsColor(XStyle.COLOR_FORE ); - jtable.setGridColor(borderColor); // jtable.setBorderStyle("journalBorder"); above is not working anymore + Color borderColor = style.getStyleAsColor(XStyle.COLOR_FORE ); + jtable.setGridColor(borderColor); // jtable.setBorderStyle("journalBorder"); above is not working anymore style = currentProject.getStyleManager().getStyle("journalData"); - Color backgoundColor = style.getStyleAsColor(XStyle.COLOR_BACK); + Color backgoundColor = style.getStyleAsColor(XStyle.COLOR_BACK); jtable.setBackground(backgoundColor); // TODO This line is not working jpanel.setBorder(jtable.getBorder()); // TODO there is a small shift between the vertical header grid lines and the other vertical grid lines. This line is not working @@ -155,7 +155,7 @@ // make sure we are at the last item in the journal jtable.setSelectedRow(0); - + try { jtable.update(); } catch (ArrayIndexOutOfBoundsException e) { @@ -168,7 +168,7 @@ XModel jmodel = (XModel)currentProject.getModel().get("table/items"); // clear the list jmodel.clear(); - + if (field.length == 0) { return null; } @@ -194,10 +194,10 @@ newNode.setTagName(tag); if (value != null) { newNode.set(value); - } + } return newNode; } - + private String getModelText(XModel model) { StringWriter sw = new StringWriter(); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Operator.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -47,15 +47,15 @@ public static final String[] OPER_DATE = { "oper_date", "DATE" }; public static final String[] OPER_EMPL = { "oper_empl", "EMPL" }; public static final String[] OPER_TXID = { "oper_txid", "TXID" }; - public static final String[] OPER_DRWR = { "oper_drwr", "DRAWER" }; - + public static final String[] OPER_DRWR = { "oper_drwr", "DRAWER" }; + public static SimpleDateFormat sdf = new SimpleDateFormat(UtilProperties.getMessage(PosTransaction.resource,"PosDateFormat",Locale.getDefault())); protected Component[] operatorField = null; protected XStyle titleStyle = null; protected XPanel operPanel = null; - + private Locale defaultLocale = Locale.getDefault(); - + public Operator(PosScreen page) { this.titleStyle = XProjectManager.getCurrentProject().getStyleManager().getStyle(style); @@ -66,7 +66,7 @@ } public void setLock(boolean lock) { - operPanel.setVisible(!lock); + operPanel.setVisible(!lock); } public void refresh() { Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Output.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Output.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Output.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/Output.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -28,7 +28,7 @@ import net.xoetrope.swing.XButton; import net.xoetrope.xui.helper.SwingWorker; import net.xoetrope.xui.events.XEventHelper; - + import org.ofbiz.base.config.GenericConfigException; import org.ofbiz.base.util.Debug; import org.ofbiz.base.util.UtilValidate; @@ -149,7 +149,7 @@ } } } - + return cl; } } Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -100,7 +100,7 @@ } // get the hex color for the current style - String fcolor = Integer.toHexString(style.getStyleAsColor(XStyle.COLOR_FORE).getRGB() & 0x00ffffff); + String fcolor = Integer.toHexString(style.getStyleAsColor(XStyle.COLOR_FORE).getRGB() & 0x00ffffff); xbutton.setBackground(style.getStyleAsColor(XStyle.COLOR_BACK)); // add the # for the HTML color Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/config/ButtonEventConfig.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/config/ButtonEventConfig.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/config/ButtonEventConfig.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/config/ButtonEventConfig.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -41,7 +41,7 @@ public class ButtonEventConfig implements java.io.Serializable { public static final String module = ButtonEventConfig.class.getName(); - public static final String BUTTON_EVENT_CONFIG = "buttonevents.xml"; + public static final String BUTTON_EVENT_CONFIG = "buttonevents.xml"; private static transient UtilCache buttonConfig = new UtilCache("pos.ButtonEvent", 0, 0, 0, false, true); protected String buttonName = null; Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/JposDeviceContainer.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -54,7 +54,7 @@ Debug.logInfo("******************************************************", module); throw new ContainerException(e); } - + return true; } Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/container/PosContainer.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/DeviceLoader.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/DeviceLoader.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/DeviceLoader.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/DeviceLoader.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -194,7 +194,7 @@ if (receipt != null) { receipt.enable(enable); } - + // cash drawers and journal printer are // never able to be disabled so we can // notify when the drawer is open and Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/GenericDevice.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/GenericDevice.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/GenericDevice.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/GenericDevice.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -79,6 +79,6 @@ MenuEvents.triggerEnter(PosScreen.currentScreen, null); MenuEvents.triggerClear(PosScreen.currentScreen); } - + protected abstract void initialize() throws JposException; } Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/JposDevice.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/JposDevice.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/JposDevice.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/JposDevice.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -54,7 +54,7 @@ public void resetComError() { this.comError = 0; } - + public void openDrawer() { if (this.comError > 2) { // only attempt this 3 times Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CheckScanner.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CheckScanner.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CheckScanner.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CheckScanner.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Journal.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Journal.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Journal.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Journal.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Keyboard.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Keyboard.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Keyboard.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Keyboard.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/LineDisplay.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/LineDisplay.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/LineDisplay.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/LineDisplay.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Msr.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Msr.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Msr.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Msr.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -127,7 +127,7 @@ } else if (UtilValidate.isGiftCard(decodedData[5])) { msrType = MSR_GIFT_CARD; } - } catch (NumberFormatException e) { + } catch (NumberFormatException e) { } // all implemented types Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/PinPad.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/PinPad.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/PinPad.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/PinPad.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -172,7 +172,7 @@ Thread.sleep(3000); } catch (Exception e) { } - } + } } // print the customer receipt @@ -295,7 +295,7 @@ for (int i=0; i < this.configPaddingLength[type]; i+=1) { spaces.append(" "); } - this.configPadding[type] = spaces.toString(); + this.configPadding[type] = spaces.toString(); } catch (NumberFormatException e) { Debug.logWarning(e, module); } @@ -377,7 +377,7 @@ // adjust the padding expandMap.put("description", UtilFormatOut.padString((String) expandMap.get("description"), descLength[type], true, ' ')); expandMap.put("productId", UtilFormatOut.padString((String) expandMap.get("productId"), pridLength[type], true, ' ')); - expandMap.put("basePrice", UtilFormatOut.padString((String) expandMap.get("basePrice"), priceLength[type], false, ' ')); + expandMap.put("basePrice", UtilFormatOut.padString((String) expandMap.get("basePrice"), priceLength[type], false, ' ')); expandMap.put("subtotal", UtilFormatOut.padString((String) expandMap.get("subtotal"), priceLength[type], false, ' ')); expandMap.put("quantity", UtilFormatOut.padString((String) expandMap.get("quantity"), qtyLength[type], false, ' ')); expandMap.put("adjustments", UtilFormatOut.padString((String) expandMap.get("adjustments"), priceLength[type], false, ' ')); @@ -393,7 +393,7 @@ } else { this.println(toPrint); } - + if (trans.isAggregatedItem(((String)expandMap.get("productId")).trim())) { List<Map> maps = trans.getItemConfigInfo(i); for (Map map: maps) { @@ -439,7 +439,7 @@ expandMap.put("nameOnCard", UtilFormatOut.padString((String) expandMap.get("nameOnCard"), infoLength[type], false, ' ')); expandMap.put("payInfo", UtilFormatOut.padString((String) expandMap.get("payInfo"), infoLength[type], false, ' ')); expandMap.put("amount", UtilFormatOut.padString((String) expandMap.get("amount"), priceLength[type], false, ' ')); - + String toPrint = FlexibleStringExpander.expandString(template, expandMap); if (toPrint.indexOf("\n") > -1) { String[] lines = toPrint.split("\\n"); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Scanner.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -62,7 +62,7 @@ Debug.logWarning("Scanner driver does not support decoding data; the raw result is used instead", module); scanData = scanner.getScanData(); } - + scanner.clearInput(); } catch (jpos.JposException e) { Debug.logError(e, module); @@ -79,13 +79,13 @@ if (!"main/pospanel".equals(PosScreen.currentScreen.getName())) { PosScreen.currentScreen.showPage("pospanel"); } - + // we can add some type checking here if needed (i.e. type of barcode; type of SKU, etc) if (dataType == ScannerConst.SCAN_SDT_UNKNOWN) { Debug.logWarning("Scanner type checking problems - check scanner driver", module); } - // This deals with multi Bar Codes in one event alone. + // This deals with multi Bar Codes in one event alone. // For the moment it works only with barcode id of 1 char (see ScannerKybService). // I thought that javapos AutoDisable option should be the way but does not seem to work. // At least with my Zebex handheld and seem also not implemented though present @@ -94,16 +94,16 @@ // Perhaps I'm missing something here, but have no more time to search... // I saw in JavaPOS Doc somehting about supplemental barcode. I think it's ok // because it seems that in this case the scanner is able to deliver only one label. - String toInput = new String(data) + "\n "; + String toInput = new String(data) + "\n "; while (toInput.indexOf("\n") > -1) { - int posCR = toInput.indexOf("\n"); - // stuff the data to the Input component + int posCR = toInput.indexOf("\n"); + // stuff the data to the Input component PosScreen.currentScreen.getInput().clearInput(); PosScreen.currentScreen.getInput().appendString(toInput.substring(0, posCR)); - + // At least one product recognized MenuEvents.addItem(PosScreen.currentScreen, null); - + if (!MULTI_BARCODES_ALLOWED) { break; } Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/SignatureCapture.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/SignatureCapture.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/SignatureCapture.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/impl/SignatureCapture.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/CharacterEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/CharacterEvents.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/CharacterEvents.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/CharacterEvents.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -59,7 +59,7 @@ public class ManagerEvents { - + public static final String module = ManagerEvents.class.getName(); public static boolean mgrLoggedIn = false; static DecimalFormat priceDecimalFormat = new DecimalFormat("#,##0.00"); @@ -67,7 +67,7 @@ // scales and rounding modes for BigDecimal math public static final int scale = UtilNumber.getBigDecimalScale("order.decimals"); public static final int rounding = UtilNumber.getBigDecimalRoundingMode("order.rounding"); - public static final BigDecimal ZERO = (BigDecimal.ZERO).setScale(scale, rounding); + public static final BigDecimal ZERO = (BigDecimal.ZERO).setScale(scale, rounding); public static synchronized void modifyPrice(PosScreen pos) { PosTransaction trans = PosTransaction.getCurrentTx(pos.getSession()); @@ -170,7 +170,7 @@ String[] func = input.getFunction("CLOSE"); String lastValue = input.value(); if (UtilValidate.isNotEmpty(lastValue)) { - + try { BigDecimal amt = new BigDecimal(lastValue); amt = amt.movePointLeft(2); @@ -396,25 +396,25 @@ } public static synchronized void paidOut(PosScreen pos) { - paidOutAndIn(pos, "OUT"); + paidOutAndIn(pos, "OUT"); } public static synchronized void paidIn(PosScreen pos) { - paidOutAndIn(pos, "IN"); + paidOutAndIn(pos, "IN"); } - + public static synchronized void paidOutAndIn(PosScreen pos, String type) { if (!mgrLoggedIn) { pos.showDialog("dialog/error/mgrnotloggedin"); return; } - + PosTransaction trans = PosTransaction.getCurrentTx(pos.getSession()); if (!trans.isOpen()) { pos.showDialog("dialog/error/terminalclosed"); return; } - + PaidInOut PaidInOut = new PaidInOut(trans, pos, type); Map mapInOut = PaidInOut.openDlg(); if (null != mapInOut.get("amount")) { @@ -429,7 +429,7 @@ } GenericValue internTx = pos.getSession().getDelegator().makeValue("PosTerminalInternTx"); - internTx.set("posTerminalLogId", trans.getTerminalLogId()); + internTx.set("posTerminalLogId", trans.getTerminalLogId()); internTx.set("paidAmount", amt); internTx.set("reasonComment", mapInOut.get("reasonComment")); internTx.set("reasonEnumId", mapInOut.get("reason")); @@ -439,13 +439,13 @@ Debug.logError(e, module); pos.showDialog("dialog/error/exception", e.getMessage()); return; - } - //save the TX Log - trans.paidInOut(type); - NavagationEvents.showPosScreen(pos); - } + } + //save the TX Log + trans.paidInOut(type); + NavagationEvents.showPosScreen(pos); + } } - + private static synchronized void printTotals(PosScreen pos, GenericValue state, boolean runBalance) { PosTransaction trans = PosTransaction.getCurrentTx(pos.getSession()); if (!trans.isOpen()) { Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/MenuEvents.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -47,8 +47,8 @@ // scales and rounding modes for BigDecimal math public static final int scale = UtilNumber.getBigDecimalScale("order.decimals"); public static final int rounding = UtilNumber.getBigDecimalRoundingMode("order.rounding"); - public static final BigDecimal ZERO = (BigDecimal.ZERO).setScale(scale, rounding); - + public static final BigDecimal ZERO = (BigDecimal.ZERO).setScale(scale, rounding); + // extended number events public static synchronized void triggerClear(PosScreen pos) { // clear the pieces @@ -207,14 +207,14 @@ } } catch (Exception e) { Debug.logError(e, module); - pos.showDialog("dialog/error/producterror"); + pos.showDialog("dialog/error/producterror"); } - + // add the item to the cart; report any errors to the user if (productId != null) { try { if (!aggregatedItem) { - trans.addItem(productId, quantity); + trans.addItem(productId, quantity); } else { trans.addItem(productId, pcw); } @@ -354,7 +354,7 @@ } catch (NumberFormatException e) { } - amount = amount.movePointLeft(2).negate(); + amount = amount.movePointLeft(2).negate(); trans.addDiscount(sku, amount, percent); trans.calcTax(); } @@ -431,7 +431,7 @@ String index = journal.getSelectedIdx(); String productId = journal.getSelectedSku(); //trans.configureItem(index, pos); - + boolean aggregatedItem = false; ProductConfigWrapper pcw = null; try { @@ -447,14 +447,14 @@ } } catch (Exception e) { Debug.logError(e, module); - pos.showDialog("dialog/error/producterror"); + pos.showDialog("dialog/error/producterror"); } - + trans.calcTax(); pos.refresh(); - + return; } - + } Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/NavagationEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/NavagationEvents.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/NavagationEvents.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/NavagationEvents.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/NumericEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/NumericEvents.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/NumericEvents.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/NumericEvents.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java Sat Mar 21 23:47:33 2009 @@ -32,7 +32,7 @@ public class PaymentEvents { - + public static final String module = PaymentEvents.class.getName(); public static synchronized void payCash(PosScreen pos) { @@ -115,7 +115,7 @@ String[] securityCodeInfo = input.getFunction("SECURITYCODE"); String[] postalCodeInfo = input.getFunction("POSTALCODE"); String[] creditExpirationInfo = input.getFunction("CREDITEXP"); - + // check for no/external payment processing int paymentCheck = trans.checkPaymentMethodType("CREDIT_CARD"); if (paymentCheck == PosTransaction.NO_PAYMENT) { @@ -194,7 +194,7 @@ msrInfoStr = crtInfo[1] + "|" + creditExpirationInfo[1]; } else { msrInfoStr = crtInfo[1]; - } + } } } else { // is swiped // grab total from input, if available @@ -229,7 +229,7 @@ if (pmId != null) { trans.addPayment(pmId, amount); } - if (track2Info != null && UtilValidate.isNotEmpty(track2Info[1])) { + if (track2Info != null && UtilValidate.isNotEmpty(track2Info[1])) { // if swiped trans.setPaymentTrack2(pmId, null, track2Info[1]); } else { //keyed @@ -255,7 +255,7 @@ } } } - + private static synchronized void processNoPayment(PosScreen pos, String paymentMethodTypeId) { PosTransaction trans = PosTransaction.getCurrentTx(pos.getSession()); @@ -416,7 +416,7 @@ // processed or if an error occurred public static synchronized void clearInputPaymentFunctions(PosScreen pos) { String[] paymentFuncs = {"CHECK", "CHECKINFO", "CREDIT", - "GIFTCARD", "MSRINFO", "REFNUM", "CREDITEXP", + "GIFTCARD", "MSRINFO", "REFNUM", "CREDITEXP", "TRACK2", "SECURITYCODE", "POSTALCODE" }; Input input = pos.getInput(); for (int i = 0; i < paymentFuncs.length; i++) { Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/PromoEvents.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,7 +29,7 @@ public class PromoEvents { - + public static final String module = PromoEvents.class.getName(); public static synchronized void addPromoCode(PosScreen pos) { @@ -58,5 +58,5 @@ } } } - } + } } Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -32,7 +32,7 @@ public class SecurityEvents { - + public static final String module = SecurityEvents.class.getName(); public static synchronized void login(PosScreen pos) { @@ -129,7 +129,7 @@ input.clear(); } else { ManagerEvents.mgrLoggedIn = true; - pos.showPage("mgrpanel"); + pos.showPage("mgrpanel"); } } } Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -36,7 +36,7 @@ Journal journal = pos.getJournal(); Debug.log("Selected IDX - " + journal.getSelectedIdx(), module); } - + public static synchronized void testMsr(PosScreen pos) { try { org.ofbiz.pos.jpos.service.MsrTestService.sendTest(); @@ -45,9 +45,9 @@ pos.showDialog("dialog/error/exception", e.getMessage()); } } - + public static synchronized void testNumericKeypad(PosScreen pos) { - + try { NumericKeypad numericKeypad = new NumericKeypad(pos); numericKeypad.setMinus(true); @@ -56,9 +56,9 @@ } catch (Exception e) { Debug.logError(e, module); } - - pos.refresh(); + + pos.refresh(); return; } - + } Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/factory/OfbizJposServiceFactory.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/factory/OfbizJposServiceFactory.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/factory/OfbizJposServiceFactory.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/factory/OfbizJposServiceFactory.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -52,7 +52,7 @@ Object obj = ObjectType.getInstance(className); if (obj == null) { throw new JposException(JposConst.JPOS_E_NOEXIST, "unable to locate serviceClass"); - } + } if (!(obj instanceof JposServiceInstance)) { throw new JposException(JposConst.JPOS_E_NOSERVICE, "serviceClass is not an instance of JposServiceInstance"); Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/BaseService.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/BaseService.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/BaseService.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/BaseService.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -153,7 +153,7 @@ // KeyListener public void keyPressed(KeyEvent event) { this.keyEvent = POSKeyboardConst.KBD_KET_KEYDOWN; - this.lastEvent = event; + this.lastEvent = event; } public void keyTyped(KeyEvent event) { Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/MsrKybService.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/MsrKybService.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/MsrKybService.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/MsrKybService.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -60,7 +60,7 @@ protected int errorType = MSRConst.MSR_ERT_CARD; public MsrKybService() { - KeyboardAdaptor.getInstance(this, KeyboardAdaptor.MSR_DATA); + KeyboardAdaptor.getInstance(this, KeyboardAdaptor.MSR_DATA); } // MSRService12 @@ -320,7 +320,7 @@ ErrorEvent error = new ErrorEvent(this, JposConst.JPOS_E_FAILURE, -1, JposConst.JPOS_EL_INPUT, JposConst.JPOS_ER_CLEAR); this.fireEvent(error); - return; + return; } } } Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/MsrTestService.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/MsrTestService.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/MsrTestService.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/MsrTestService.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullCashDrawer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullCashDrawer.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullCashDrawer.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullCashDrawer.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY Modified: ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java?rev=757096&r1=757095&r2=757096&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java (original) +++ ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java Sat Mar 21 23:47:33 2009 @@ -6,9 +6,9 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -32,7 +32,7 @@ public int getDeviceServiceVersion() throws JposException { return 1002000; } - + public int getCapCharacterSet() throws JposException { return 0; } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |