svn commit: r1044917 - in /ofbiz/trunk: applications/order/src/org/ofbiz/order/order/ applications/order/src/org/ofbiz/order/thirdparty/paypal/ applications/party/src/org/ofbiz/party/communication/ applications/product/src/org/ofbiz/shipment/weightPack...

[lektran]

Author: lektran
Date: Sun Dec 12 20:43:03 2010
New Revision: 1044917

URL: http://svn.apache.org/viewvc?rev=1044917&view=rev
Log:
Remove unnecessary semicolons

Modified:
    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java
    ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
    ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java
    ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java
    ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java
    ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalHandlerFactory.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/crypto/HashCrypt.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/json/test/JSONTests.java
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilIO.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/OrderByItem.java
    ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Unioned.java
    ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelFile.java
    ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java
    ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java
    ofbiz/trunk/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilitySession.java
    ofbiz/trunk/specialpurpose/pos/src/org/ofbiz/pos/device/JposDevice.java

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java?rev=1044917&r1=1044916&r2=1044917&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderListState.java Sun Dec 12 20:43:03 2010
@@ -185,7 +185,7 @@ public class OrderListState {
     //==============   Get and Set methods   =================//
 
 
-    public Map getOrderStatusState() { return orderStatusState; };
+    public Map getOrderStatusState() { return orderStatusState; }
     public Map getOrderTypeState() { return orderTypeState; }
     public Map getorderFilterState() { return orderFilterState; }
 

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=1044917&r1=1044916&r2=1044917&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Sun Dec 12 20:43:03 2010
@@ -362,7 +362,7 @@ public class OrderReturnServices {
                             }
                         }
                     } catch (GenericEntityException e) {
-                        Debug.logError(e, module);;
+                        Debug.logError(e, module);
                     }
                 }
             }

Modified: ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java?rev=1044917&r1=1044916&r2=1044917&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java (original)
+++ ofbiz/trunk/applications/order/src/org/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java Sun Dec 12 20:43:03 2010
@@ -47,7 +47,7 @@ public class ExpressCheckoutEvents {
 
     public static final String resourceErr = "AccountingErrorUiLabels";
     public static final String module = ExpressCheckoutEvents.class.getName();
-    public static enum CheckoutType {PAYFLOW, STANDARD, NONE};
+    public static enum CheckoutType {PAYFLOW, STANDARD, NONE}
 
     public static String setExpressCheckout(HttpServletRequest request, HttpServletResponse response) {
         Locale locale = UtilHttp.getLocale(request);

Modified: ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java?rev=1044917&r1=1044916&r2=1044917&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java (original)
+++ ofbiz/trunk/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java Sun Dec 12 20:43:03 2010
@@ -668,7 +668,7 @@ public class CommunicationEventServices
             Address[] addressesTo = wrapper.getTo();
             Address[] addressesCC = wrapper.getCc();
             Address[] addressesBCC = wrapper.getBcc();
-            String messageId = wrapper.getMessageId().replaceAll("[<>]", "");;
+            String messageId = wrapper.getMessageId().replaceAll("[<>]", "");
 
             String aboutThisEmail = "message [" + messageId + "] from [" +
                 (addressesFrom[0] == null? "not found" : addressesFrom[0].toString()) + "] to [" +
@@ -736,9 +736,7 @@ public class CommunicationEventServices
             }
             if (userLogin.get("partyId") == null && partyIdTo != null) {
                 int ch = 0;
-                for (ch=partyIdTo.length(); ch > 0 && Character.isDigit(partyIdTo.charAt(ch-1)); ch--) {
-                    ;
-                }
+                for (ch=partyIdTo.length(); ch > 0 && Character.isDigit(partyIdTo.charAt(ch-1)); ch--) {}
                 userLogin.put("partyId", partyIdTo.substring(0,ch)); //allow services to be called to have prefix
             }
 

Modified: ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java?rev=1044917&r1=1044916&r2=1044917&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java (original)
+++ ofbiz/trunk/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageServices.java Sun Dec 12 20:43:03 2010
@@ -151,7 +151,7 @@ public class WeightPackageServices {
         Map<String, Object> response = FastMap.newInstance();
         try {
             String getActualShippingQuoteFromUps = UtilProperties.getPropertyValue("shipment.properties", "shipment.ups.shipping", "N");
-            String result = weightPackageSession.complete(orderId, locale, getActualShippingQuoteFromUps);;
+            String result = weightPackageSession.complete(orderId, locale, getActualShippingQuoteFromUps);
             if ("showWarningForm".equals(result)) {
                 response.put("showWarningForm", true);
             } else if ("success".equals(result)) {

Modified: ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalHandlerFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalHandlerFactory.java?rev=1044917&r1=1044916&r2=1044917&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalHandlerFactory.java (original)
+++ ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/ICalHandlerFactory.java Sun Dec 12 20:43:03 2010
@@ -106,4 +106,4 @@ public class ICalHandlerFactory implemen
         }
     }
 
-};
+}

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/crypto/HashCrypt.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/crypto/HashCrypt.java?rev=1044917&r1=1044916&r2=1044917&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/crypto/HashCrypt.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/crypto/HashCrypt.java Sun Dec 12 20:43:03 2010
@@ -68,7 +68,7 @@ public class HashCrypt {
 
             messagedigest.update(codeBytes);
             byte digestBytes[] = messagedigest.digest();
-            char[] digestChars = Hex.encodeHex(digestBytes);;
+            char[] digestChars = Hex.encodeHex(digestBytes);
             StringBuilder sb = new StringBuilder();
             sb.append("{").append(hashType).append("}");
             sb.append(digestChars, 0, digestChars.length);

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/json/test/JSONTests.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/json/test/JSONTests.java?rev=1044917&r1=1044916&r2=1044917&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/json/test/JSONTests.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/json/test/JSONTests.java Sun Dec 12 20:43:03 2010
@@ -64,7 +64,7 @@ public class JSONTests extends GenericTe
             jsonWriter = new JSONWriter(writer, JSONWriter.ResolvingFallbackHandler);
         } else {
             jsonWriter = new JSONWriter(writer);
-        };
+        }
         assertTrue("writer is IndentingWriter", jsonWriter.getWriter() instanceof IndentingWriter);
         jsonWriter.write(object);
         return writer.toString();

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilIO.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilIO.java?rev=1044917&r1=1044916&r2=1044917&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilIO.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilIO.java Sun Dec 12 20:43:03 2010
@@ -444,7 +444,7 @@ public final class UtilIO {
                 jsonWriter = new JSONWriter(indenting, JSONWriter.ResolvingFallbackHandler);
             } else {
                 jsonWriter = new JSONWriter(indenting);
-            };
+            }
             jsonWriter.write(value);
             writer.write(sw.toString());
             return true;

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java?rev=1044917&r1=1044916&r2=1044917&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericDelegator.java Sun Dec 12 20:43:03 2010
@@ -118,7 +118,7 @@ public class GenericDelegator implements
     private boolean testRollbackInProgress = false;
     private static final AtomicReferenceFieldUpdater<GenericDelegator, LinkedBlockingDeque> testOperationsUpdater = AtomicReferenceFieldUpdater.newUpdater(GenericDelegator.class, LinkedBlockingDeque.class, "testOperations");
     private volatile LinkedBlockingDeque<TestOperation> testOperations = null;
-    private enum OperationType {INSERT, UPDATE, DELETE};
+    private enum OperationType {INSERT, UPDATE, DELETE}
 
     /** @deprecated Use Delegator delegator = DelegatorFactory.getDelegator(delegatorName);
      * @param delegatorName

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java?rev=1044917&r1=1044916&r2=1044917&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/GenericValue.java Sun Dec 12 20:43:03 2010
@@ -507,5 +507,5 @@ public class GenericValue extends Generi
         public String toString() {
             return "[null-entity-value]";
         }
-    };
+    }
 }

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java?rev=1044917&r1=1044916&r2=1044917&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/condition/EntityConditionFunction.java Sun Dec 12 20:43:03 2010
@@ -50,7 +50,7 @@ public abstract class EntityConditionFun
         public void encryptConditionFields(ModelEntity modelEntity, Delegator delegator) {
             // nothing to do here...
         }
-    };
+    }
 
     protected Integer idInt = null;
     protected String codeString = null;

Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java?rev=1044917&r1=1044916&r2=1044917&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/jdbc/DatabaseUtil.java Sun Dec 12 20:43:03 2010
@@ -1362,7 +1362,7 @@ public class DatabaseUtil {
     }
 
     public Map<String, Map<String, ReferenceCheckInfo>> getReferenceInfo(Set<String> tableNames, Collection<String> messages) {
-        Connection connection = getConnectionLogged(messages);;
+        Connection connection = getConnectionLogged(messages);
         if (connection == null) {
             return null;
         }
@@ -1788,7 +1788,7 @@ public class DatabaseUtil {
             return;
         }
 
-        Connection connection = getConnectionLogged(messages);;
+        Connection connection = getConnectionLogged(messages);
         Statement stmt = null;
         if (connection == null) {
             return;
@@ -2009,7 +2009,7 @@ public class DatabaseUtil {
         }
 
         // need connection
-        Connection connection = getConnectionLogged(messages);;
+        Connection connection = getConnectionLogged(messages);
         Statement stmt = null;
         if (connection == null) {
             return;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/OrderByItem.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/OrderByItem.java?rev=1044917&r1=1044916&r2=1044917&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/OrderByItem.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/OrderByItem.java Sun Dec 12 20:43:03 2010
@@ -22,8 +22,8 @@ import org.ofbiz.base.lang.SourceMonitor
 
 @SourceMonitored
 public final class OrderByItem extends Atom {
-    public enum Order { DEFAULT, ASCENDING, DESCENDING };
-    public enum Nulls { DEFAULT, FIRST, LAST };
+    public enum Order { DEFAULT, ASCENDING, DESCENDING }
+    public enum Nulls { DEFAULT, FIRST, LAST }
 
     private final Order order;
     private final Nulls nulls;

Modified: ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Unioned.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Unioned.java?rev=1044917&r1=1044916&r2=1044917&view=diff
==============================================================================
--- ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Unioned.java (original)
+++ ofbiz/trunk/framework/sql/src/org/ofbiz/sql/Unioned.java Sun Dec 12 20:43:03 2010
@@ -19,7 +19,7 @@
 package org.ofbiz.sql;
 
 public final class Unioned extends Atom {
-    public enum Operator { UNION, UNION_ALL, INTERSECT, INTERSECT_ALL, EXCEPT, EXCEPT_ALL };
+    public enum Operator { UNION, UNION_ALL, INTERSECT, INTERSECT_ALL, EXCEPT, EXCEPT_ALL }
 
     private final Operator operator;
     private final SelectGroup group;

Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelFile.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelFile.java?rev=1044917&r1=1044916&r2=1044917&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelFile.java (original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/LabelFile.java Sun Dec 12 20:43:03 2010
@@ -23,7 +23,7 @@ import java.io.File;
 public class LabelFile {
     public static final String module = LabelFile.class.getName();
 
-    protected final boolean fileLoaded = false;;
+    protected final boolean fileLoaded = false;
     protected final File file;
     protected final String componentName;
 

Modified: ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java?rev=1044917&r1=1044916&r2=1044917&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java (original)
+++ ofbiz/trunk/framework/webtools/src/org/ofbiz/webtools/labelmanager/SaveLabelsToXmlFile.java Sun Dec 12 20:43:03 2010
@@ -134,7 +134,6 @@ public class SaveLabelsToXmlFile {
                         if (UtilValidate.isNotEmpty(valueString)) {
                             valueString = StringEscapeUtils.unescapeHtml(valueString);
                             Element valueElem = UtilXml.addChildElementValue(propertyElem, "value", valueString, resourceDocument);
-                            ;
                             valueElem.setAttribute("xml:lang", localeFound);
                             if (valueString.trim().length() == 0) {
                                 valueElem.setAttribute("xml:space", "preserve");

Modified: ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java?rev=1044917&r1=1044916&r2=1044917&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java (original)
+++ ofbiz/trunk/specialpurpose/ebay/src/org/ofbiz/ebay/ProductsExportToEbay.java Sun Dec 12 20:43:03 2010
@@ -213,7 +213,7 @@ public class ProductsExportToEbay {
                 }
 
                 // Buy it now is the optional value for a product that you send to eBay. Once this value is entered by user - this option allow user to win auction immediately.
-                String buyItNowPrice = (String)context.get("buyItNowPrice");;
+                String buyItNowPrice = (String)context.get("buyItNowPrice");
                 String buyItNowCurrencyUomId = null;
                 if (UtilValidate.isEmpty(buyItNowPrice)) {
                     GenericValue buyItNowPriceValue = EntityUtil.getFirst(EntityUtil.filterByDate(prod.getRelatedByAnd("ProductPrice", UtilMisc.toMap("productPricePurposeId", "EBAY", "productPriceTypeId", "MAXIMUM_PRICE"))));

Modified: ofbiz/trunk/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilitySession.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilitySession.java?rev=1044917&r1=1044916&r2=1044917&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilitySession.java (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/src/org/ofbiz/hhfacility/FacilitySession.java Sun Dec 12 20:43:03 2010
@@ -69,7 +69,7 @@ public class FacilitySession {
             ServletContext ctx = (ServletContext) request.getAttribute("servletContext");
             RequestHandler rh = (RequestHandler) ctx.getAttribute("_REQUEST_HANDLER_");
             GenericValue product = EntityUtil.getFirst(productList);
-            String requestName = "/productstocktake?facilityId=" + facilityIdStr + "&productId=" + product.getString("productId");;
+            String requestName = "/productstocktake?facilityId=" + facilityIdStr + "&productId=" + product.getString("productId");
             String target = rh.makeLink(request, response, requestName, false, false, false);
             try {
                 response.sendRedirect(target);

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=1044917&r1=1044916&r2=1044917&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 Sun Dec 12 20:43:03 2010
@@ -21,5 +21,5 @@ package org.ofbiz.pos.device;
 public interface JposDevice {
 
     public void open() throws jpos.JposException;
-    public void close() throws jpos.JposException;;
+    public void close() throws jpos.JposException;
 }