svn commit: r1804953 [2/3] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
Locked
svn commit: r1804953 [2/3] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/src/ma
 
|
Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/fedex/FedexServices.java Mon Aug 14 08:32:21 2017 @@ -21,6 +21,7 @@ package org.apache.ofbiz.shipment.thirdp import java.io.StringWriter; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.Timestamp; import java.util.HashMap; import java.util.LinkedList; @@ -912,15 +913,15 @@ public class FedexServices { shipRequestContext.put("DropoffType", dropoffType); shipRequestContext.put("Packaging", packaging); if (UtilValidate.isNotEmpty(dimensionsUomId) && - dimensionsLength != null && dimensionsLength.setScale(0, BigDecimal.ROUND_HALF_UP).compareTo(BigDecimal.ZERO) > 0 && - dimensionsWidth != null && dimensionsWidth.setScale(0, BigDecimal.ROUND_HALF_UP).compareTo(BigDecimal.ZERO) > 0 && - dimensionsHeight != null && dimensionsHeight.setScale(0, BigDecimal.ROUND_HALF_UP).compareTo(BigDecimal.ZERO) > 0) { + dimensionsLength != null && dimensionsLength.setScale(0, RoundingMode.HALF_UP).compareTo(BigDecimal.ZERO) > 0 && + dimensionsWidth != null && dimensionsWidth.setScale(0, RoundingMode.HALF_UP).compareTo(BigDecimal.ZERO) > 0 && + dimensionsHeight != null && dimensionsHeight.setScale(0, RoundingMode.HALF_UP).compareTo(BigDecimal.ZERO) > 0) { shipRequestContext.put("DimensionsUnits", dimensionsUomId.equals("LEN_in") ? "IN" : "CM"); - shipRequestContext.put("DimensionsLength", dimensionsLength.setScale(0, BigDecimal.ROUND_HALF_UP).toString()); - shipRequestContext.put("DimensionsWidth", dimensionsWidth.setScale(0, BigDecimal.ROUND_HALF_UP).toString()); - shipRequestContext.put("DimensionsHeight", dimensionsHeight.setScale(0, BigDecimal.ROUND_HALF_UP).toString()); + shipRequestContext.put("DimensionsLength", dimensionsLength.setScale(0, RoundingMode.HALF_UP).toString()); + shipRequestContext.put("DimensionsWidth", dimensionsWidth.setScale(0, RoundingMode.HALF_UP).toString()); + shipRequestContext.put("DimensionsHeight", dimensionsHeight.setScale(0, RoundingMode.HALF_UP).toString()); } - shipRequestContext.put("Weight", weight.setScale(1, BigDecimal.ROUND_UP).toString()); + shipRequestContext.put("Weight", weight.setScale(1, RoundingMode.UP).toString()); } StringWriter outWriter = new StringWriter(); Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/ups/UpsServices.java Mon Aug 14 08:32:21 2017 @@ -23,6 +23,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.math.BigDecimal; import java.math.MathContext; +import java.math.RoundingMode; import java.text.SimpleDateFormat; import java.util.HashMap; import java.util.Iterator; @@ -549,7 +550,7 @@ public class UpsServices { UtilMisc.toMap("shipmentId", shipmentId, "shipmentRouteSegmentId", shipmentRouteSegmentId, "shipmentPackageSeqId", shipmentPackage.getString("shipmentPackageSeqId")), locale)); } BigDecimal boxWeight = shipmentPackage.getBigDecimal("weight"); - UtilXml.addChildElementValue(packageWeightElement, "Weight", UtilValidate.isNotEmpty(boxWeight) ? ""+ boxWeight.setScale(0, BigDecimal.ROUND_CEILING) : "", shipmentConfirmRequestDoc); + UtilXml.addChildElementValue(packageWeightElement, "Weight", UtilValidate.isNotEmpty(boxWeight) ? ""+ boxWeight.setScale(0, RoundingMode.CEILING) : "", shipmentConfirmRequestDoc); // Adding only when order is not an international order if (!internationalServiceCodes.contains(carrierServiceCode)) { Element referenceNumberElement = UtilXml.addChildElement(packageElement, "ReferenceNumber", shipmentConfirmRequestDoc); @@ -567,7 +568,7 @@ public class UpsServices { if (! UtilValidate.isEmpty(insuredValue)) { Element insuredValueElement = UtilXml.addChildElement(packageServiceOptionsElement, "InsuredValue", shipmentConfirmRequestDoc); - UtilXml.addChildElementValue(insuredValueElement, "MonetaryValue", insuredValue.setScale(2, BigDecimal.ROUND_HALF_UP).toString(), shipmentConfirmRequestDoc); + UtilXml.addChildElementValue(insuredValueElement, "MonetaryValue", insuredValue.setScale(2, RoundingMode.HALF_UP).toString(), shipmentConfirmRequestDoc); UtilXml.addChildElementValue(insuredValueElement, "CurrencyCode", currencyCode, shipmentConfirmRequestDoc); } Modified: ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/src/main/java/org/apache/ofbiz/shipment/thirdparty/usps/UspsServices.java Mon Aug 14 08:32:21 2017 @@ -24,6 +24,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; import java.math.BigDecimal; +import java.math.RoundingMode; import java.text.DecimalFormat; import java.util.Collections; import java.util.HashMap; @@ -192,14 +193,14 @@ public class UspsServices { UtilXml.addChildElementValue(packageElement, "ZipOrigination", StringUtils.substring(originationZip, 0, 5), requestDocument); UtilXml.addChildElementValue(packageElement, "ZipDestination", StringUtils.substring(destinationZip, 0, 5), requestDocument); - BigDecimal weightPounds = packageWeight.setScale(0, BigDecimal.ROUND_FLOOR); + BigDecimal weightPounds = packageWeight.setScale(0, RoundingMode.FLOOR); // for Parcel post, the weight must be at least 1 lb if ("PARCEL".equals(serviceCode.toUpperCase()) && (weightPounds.compareTo(BigDecimal.ONE) < 0)) { weightPounds = BigDecimal.ONE; packageWeight = BigDecimal.ZERO; } // (packageWeight % 1) * 16 (Rounded up to 0 dp) - BigDecimal weightOunces = packageWeight.remainder(BigDecimal.ONE).multiply(new BigDecimal("16")).setScale(0, BigDecimal.ROUND_CEILING); + BigDecimal weightOunces = packageWeight.remainder(BigDecimal.ONE).multiply(new BigDecimal("16")).setScale(0, RoundingMode.CEILING); UtilXml.addChildElementValue(packageElement, "Pounds", weightPounds.toPlainString(), requestDocument); UtilXml.addChildElementValue(packageElement, "Ounces", weightOunces.toPlainString(), requestDocument); @@ -1075,8 +1076,8 @@ public class UspsServices { } - BigDecimal weightPounds = weight.setScale(0, BigDecimal.ROUND_FLOOR); - BigDecimal weightOunces = weight.multiply(new BigDecimal("16")).remainder(new BigDecimal("16")).setScale(0, BigDecimal.ROUND_CEILING); + BigDecimal weightPounds = weight.setScale(0, RoundingMode.FLOOR); + BigDecimal weightOunces = weight.multiply(new BigDecimal("16")).remainder(new BigDecimal("16")).setScale(0, RoundingMode.CEILING); DecimalFormat df = new DecimalFormat("#"); UtilXml.addChildElementValue(packageElement, "Pounds", df.format(weightPounds), requestDocument); @@ -1372,7 +1373,7 @@ public class UspsServices { } DecimalFormat df = new DecimalFormat("#"); - UtilXml.addChildElementValue(requestElement, "WeightInOunces", df.format(weight.setScale(0, BigDecimal.ROUND_CEILING)), requestDocument); + UtilXml.addChildElementValue(requestElement, "WeightInOunces", df.format(weight.setScale(0, RoundingMode.CEILING)), requestDocument); UtilXml.addChildElementValue(requestElement, "ServiceType", serviceType, requestDocument); UtilXml.addChildElementValue(requestElement, "ImageType", "TIF", requestDocument); @@ -1613,8 +1614,8 @@ public class UspsServices { } UtilXml.addChildElementValue(itemDetail, "Description", product.getString("productName"), packageDocument); - UtilXml.addChildElementValue(itemDetail, "Quantity", shipmentPackageContent.getBigDecimal("quantity").setScale(0, BigDecimal.ROUND_CEILING).toPlainString(), packageDocument); - String packageContentValue = ShipmentWorker.getShipmentPackageContentValue(shipmentPackageContent).setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString(); + UtilXml.addChildElementValue(itemDetail, "Quantity", shipmentPackageContent.getBigDecimal("quantity").setScale(0, RoundingMode.CEILING).toPlainString(), packageDocument); + String packageContentValue = ShipmentWorker.getShipmentPackageContentValue(shipmentPackageContent).setScale(2, RoundingMode.HALF_UP).toPlainString(); UtilXml.addChildElementValue(itemDetail, "Value", packageContentValue, packageDocument); BigDecimal productWeight = ProductWorker.getProductWeight(product, "WT_lbs", delegator, dispatcher); Integer[] productPoundsOunces = convertPoundsToPoundsOunces(productWeight); @@ -1754,9 +1755,9 @@ public class UspsServices { public static Integer[] convertPoundsToPoundsOunces(BigDecimal decimalPounds) { if (decimalPounds == null) return null; Integer[] poundsOunces = new Integer[2]; - poundsOunces[0] = Integer.valueOf(decimalPounds.setScale(0, BigDecimal.ROUND_FLOOR).toPlainString()); + poundsOunces[0] = Integer.valueOf(decimalPounds.setScale(0, RoundingMode.FLOOR).toPlainString()); // (weight % 1) * 16 rounded up to nearest whole number - poundsOunces[1] = Integer.valueOf(decimalPounds.remainder(BigDecimal.ONE).multiply(new BigDecimal("16")).setScale(0, BigDecimal.ROUND_CEILING).toPlainString()); + poundsOunces[1] = Integer.valueOf(decimalPounds.remainder(BigDecimal.ONE).multiply(new BigDecimal("16")).setScale(0, RoundingMode.CEILING).toPlainString()); return poundsOunces; } Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalConverter.java Mon Aug 14 08:32:21 2017 @@ -34,6 +34,27 @@ import java.util.Locale; import java.util.Map; import java.util.Set; +import org.apache.ofbiz.base.util.DateRange; +import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.base.util.ObjectType; +import org.apache.ofbiz.base.util.TimeDuration; +import org.apache.ofbiz.base.util.UtilGenerics; +import org.apache.ofbiz.base.util.UtilMisc; +import org.apache.ofbiz.base.util.UtilProperties; +import org.apache.ofbiz.base.util.UtilValidate; +import org.apache.ofbiz.entity.Delegator; +import org.apache.ofbiz.entity.GenericEntityException; +import org.apache.ofbiz.entity.GenericValue; +import org.apache.ofbiz.entity.util.EntityQuery; +import org.apache.ofbiz.service.GenericServiceException; +import org.apache.ofbiz.service.LocalDispatcher; +import org.apache.ofbiz.service.ModelParam; +import org.apache.ofbiz.service.ModelService; +import org.apache.ofbiz.service.ServiceUtil; +import org.apache.ofbiz.service.calendar.TemporalExpression; +import org.apache.ofbiz.service.calendar.TemporalExpressionWorker; +import org.apache.ofbiz.workeffort.workeffort.ICalWorker.ResponseProperties; + import net.fortuna.ical4j.data.CalendarBuilder; import net.fortuna.ical4j.data.ParserException; import net.fortuna.ical4j.model.Calendar; @@ -77,27 +98,6 @@ import net.fortuna.ical4j.model.property import net.fortuna.ical4j.model.property.Version; import net.fortuna.ical4j.model.property.XProperty; -import org.apache.ofbiz.base.util.DateRange; -import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.base.util.ObjectType; -import org.apache.ofbiz.base.util.TimeDuration; -import org.apache.ofbiz.base.util.UtilGenerics; -import org.apache.ofbiz.base.util.UtilMisc; -import org.apache.ofbiz.base.util.UtilProperties; -import org.apache.ofbiz.base.util.UtilValidate; -import org.apache.ofbiz.entity.Delegator; -import org.apache.ofbiz.entity.GenericEntityException; -import org.apache.ofbiz.entity.GenericValue; -import org.apache.ofbiz.entity.util.EntityQuery; -import org.apache.ofbiz.service.GenericServiceException; -import org.apache.ofbiz.service.LocalDispatcher; -import org.apache.ofbiz.service.ModelParam; -import org.apache.ofbiz.service.ModelService; -import org.apache.ofbiz.service.ServiceUtil; -import org.apache.ofbiz.service.calendar.TemporalExpression; -import org.apache.ofbiz.service.calendar.TemporalExpressionWorker; -import org.apache.ofbiz.workeffort.workeffort.ICalWorker.ResponseProperties; - /** iCalendar converter class. This class uses the <a href="http://ical4j.sourceforge.net/index.html"> * iCal4J</a> library. */ Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalRecurConverter.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalRecurConverter.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalRecurConverter.java (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/ICalRecurConverter.java Mon Aug 14 08:32:21 2017 @@ -25,16 +25,35 @@ import java.util.List; import java.util.Set; import java.util.Stack; -import net.fortuna.ical4j.model.*; -import net.fortuna.ical4j.model.property.*; - import org.apache.ofbiz.service.calendar.TemporalExpression; import org.apache.ofbiz.service.calendar.TemporalExpressionVisitor; import org.apache.ofbiz.service.calendar.TemporalExpressions; -import org.apache.ofbiz.service.calendar.TemporalExpressions.*; +import org.apache.ofbiz.service.calendar.TemporalExpressions.Difference; +import org.apache.ofbiz.service.calendar.TemporalExpressions.HourRange; +import org.apache.ofbiz.service.calendar.TemporalExpressions.Intersection; +import org.apache.ofbiz.service.calendar.TemporalExpressions.MinuteRange; +import org.apache.ofbiz.service.calendar.TemporalExpressions.Null; +import org.apache.ofbiz.service.calendar.TemporalExpressions.Substitution; +import org.apache.ofbiz.service.calendar.TemporalExpressions.Union; import com.ibm.icu.util.Calendar; +import net.fortuna.ical4j.model.DateTime; +import net.fortuna.ical4j.model.NumberList; +import net.fortuna.ical4j.model.Period; +import net.fortuna.ical4j.model.PeriodList; +import net.fortuna.ical4j.model.Property; +import net.fortuna.ical4j.model.PropertyList; +import net.fortuna.ical4j.model.Recur; +import net.fortuna.ical4j.model.WeekDay; +import net.fortuna.ical4j.model.WeekDayList; +import net.fortuna.ical4j.model.property.DateListProperty; +import net.fortuna.ical4j.model.property.DtStart; +import net.fortuna.ical4j.model.property.ExDate; +import net.fortuna.ical4j.model.property.ExRule; +import net.fortuna.ical4j.model.property.RDate; +import net.fortuna.ical4j.model.property.RRule; + /** Temporal Expression to iCalendar recurrence converter. The conversion results * (or conversion success) are unpredictable since the OFBiz Temporal Expressions * are more sophisticated than iCalendar recurrences. This class attempts to Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/component/ComponentResourceHandler.java Mon Aug 14 08:32:21 2017 @@ -23,9 +23,8 @@ import java.net.URL; import org.apache.ofbiz.base.config.GenericConfigException; import org.apache.ofbiz.base.config.ResourceHandler; -import org.apache.ofbiz.base.util.UtilXml; import org.apache.ofbiz.base.util.Debug; - +import org.apache.ofbiz.base.util.UtilXml; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/FileLoader.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/FileLoader.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/FileLoader.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/FileLoader.java Mon Aug 14 08:32:21 2017 @@ -18,8 +18,9 @@ *******************************************************************************/ package org.apache.ofbiz.base.config; -import java.net.URL; import java.io.InputStream; +import java.net.URL; + import org.apache.ofbiz.base.util.UtilURL; /** Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/MainResourceHandler.java Mon Aug 14 08:32:21 2017 @@ -21,9 +21,8 @@ package org.apache.ofbiz.base.config; import java.io.InputStream; import java.net.URL; -import org.apache.ofbiz.base.util.UtilXml; import org.apache.ofbiz.base.util.Debug; - +import org.apache.ofbiz.base.util.UtilXml; import org.w3c.dom.Document; import org.w3c.dom.Element; Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/UrlLoader.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/UrlLoader.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/UrlLoader.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/config/UrlLoader.java Mon Aug 14 08:32:21 2017 @@ -18,9 +18,9 @@ *******************************************************************************/ package org.apache.ofbiz.base.config; -import java.net.URL; import java.io.InputStream; import java.io.Serializable; +import java.net.URL; /** * Loads resources from a URL Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestBooleanConverters.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestBooleanConverters.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestBooleanConverters.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestBooleanConverters.java Mon Aug 14 08:32:21 2017 @@ -22,13 +22,13 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import junit.framework.TestCase; - import org.apache.ofbiz.base.conversion.BooleanConverters; import org.apache.ofbiz.base.conversion.Converter; import org.apache.ofbiz.base.conversion.ConverterLoader; import org.apache.ofbiz.base.conversion.Converters; +import junit.framework.TestCase; + public class TestBooleanConverters extends TestCase { public TestBooleanConverters(String name) { Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestJSONConverters.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestJSONConverters.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestJSONConverters.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/conversion/test/TestJSONConverters.java Mon Aug 14 08:32:21 2017 @@ -25,8 +25,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import junit.framework.TestCase; - import org.apache.ofbiz.base.conversion.Converter; import org.apache.ofbiz.base.conversion.ConverterLoader; import org.apache.ofbiz.base.conversion.Converters; @@ -34,6 +32,8 @@ import org.apache.ofbiz.base.conversion. import org.apache.ofbiz.base.lang.JSON; import org.apache.ofbiz.base.util.UtilGenerics; +import junit.framework.TestCase; + public class TestJSONConverters extends TestCase { public TestJSONConverters(String name) { super(name); Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/crypto/DesCrypt.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/crypto/DesCrypt.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/crypto/DesCrypt.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/crypto/DesCrypt.java Mon Aug 14 08:32:21 2017 @@ -18,19 +18,20 @@ *******************************************************************************/ package org.apache.ofbiz.base.crypto; -import java.security.NoSuchAlgorithmException; -import java.security.InvalidKeyException; import java.security.InvalidAlgorithmParameterException; +import java.security.InvalidKeyException; import java.security.Key; +import java.security.NoSuchAlgorithmException; import java.security.spec.InvalidKeySpecException; + +import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; -import javax.crypto.BadPaddingException; -import javax.crypto.NoSuchPaddingException; import javax.crypto.KeyGenerator; +import javax.crypto.NoSuchPaddingException; import javax.crypto.SecretKeyFactory; -import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.DESedeKeySpec; +import javax.crypto.spec.IvParameterSpec; import org.apache.ofbiz.base.util.GeneralException; Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/lang/test/ComparableRangeTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/lang/test/ComparableRangeTests.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/lang/test/ComparableRangeTests.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/lang/test/ComparableRangeTests.java Mon Aug 14 08:32:21 2017 @@ -18,14 +18,15 @@ *******************************************************************************/ package org.apache.ofbiz.base.lang.test; -import org.apache.ofbiz.base.test.GenericTestCaseBase; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.lessThan; + import org.apache.ofbiz.base.lang.ComparableRange; import org.apache.ofbiz.base.lang.SourceMonitored; +import org.apache.ofbiz.base.test.GenericTestCaseBase; import org.apache.ofbiz.base.util.UtilGenerics; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; - @SourceMonitored public class ComparableRangeTests extends GenericTestCaseBase { Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/test/BaseUnitTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/test/BaseUnitTests.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/test/BaseUnitTests.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/test/BaseUnitTests.java Mon Aug 14 08:32:21 2017 @@ -18,13 +18,13 @@ *******************************************************************************/ package org.apache.ofbiz.base.test; -import junit.framework.TestCase; - import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.StringUtil; import org.apache.ofbiz.base.util.UtilFormatOut; import org.apache.ofbiz.base.util.UtilValidate; +import junit.framework.TestCase; + public class BaseUnitTests extends TestCase { public BaseUnitTests(String name) { Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/AliasKeyManager.java Mon Aug 14 08:32:21 2017 @@ -18,10 +18,10 @@ *******************************************************************************/ package org.apache.ofbiz.base.util; +import java.net.Socket; import java.security.Principal; import java.security.PrivateKey; import java.security.cert.X509Certificate; -import java.net.Socket; import javax.net.ssl.X509KeyManager; Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/IndentingWriter.java Mon Aug 14 08:32:21 2017 @@ -18,8 +18,8 @@ *******************************************************************************/ package org.apache.ofbiz.base.util; -import java.io.IOException; import java.io.FilterWriter; +import java.io.IOException; import java.io.Writer; import org.apache.ofbiz.base.lang.SourceMonitored; Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectInputStream.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectInputStream.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectInputStream.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/ObjectInputStream.java Mon Aug 14 08:32:21 2017 @@ -18,8 +18,8 @@ *******************************************************************************/ package org.apache.ofbiz.base.util; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.ObjectStreamClass; import java.lang.reflect.Proxy; Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/PatternFactory.java Mon Aug 14 08:32:21 2017 @@ -18,10 +18,10 @@ *******************************************************************************/ package org.apache.ofbiz.base.util; +import org.apache.ofbiz.base.util.cache.UtilCache; import org.apache.oro.text.regex.MalformedPatternException; import org.apache.oro.text.regex.Pattern; import org.apache.oro.text.regex.Perl5Compiler; -import org.apache.ofbiz.base.util.cache.UtilCache; /** * A RegEx compiled pattern factory. Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilMisc.java Mon Aug 14 08:32:21 2017 @@ -39,17 +39,18 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; -import com.google.i18n.phonenumbers.NumberParseException; -import com.google.i18n.phonenumbers.PhoneNumberUtil; -import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; + +import org.apache.ofbiz.base.util.collections.MapComparator; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue; -import org.apache.ofbiz.entity.util.EntityUtilProperties; import org.apache.ofbiz.entity.util.EntityQuery; +import org.apache.ofbiz.entity.util.EntityUtilProperties; import org.apache.ofbiz.service.ModelService; -import org.apache.ofbiz.base.util.collections.MapComparator; +import com.google.i18n.phonenumbers.NumberParseException; +import com.google.i18n.phonenumbers.PhoneNumberUtil; +import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; /** * UtilMisc - Misc Utility Functions Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilObject.java Mon Aug 14 08:32:21 2017 @@ -18,15 +18,14 @@ *******************************************************************************/ package org.apache.ofbiz.base.util; -import java.lang.reflect.Array; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import java.io.ObjectOutputStream; import java.io.InputStream; +import java.io.ObjectOutputStream; +import java.lang.reflect.Array; import java.util.Iterator; import java.util.ServiceLoader; -import java.lang.Class; import org.apache.ofbiz.base.lang.Factory; import org.apache.ofbiz.base.lang.SourceMonitored; Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilValidate.java Mon Aug 14 08:32:21 2017 @@ -24,17 +24,16 @@ import java.util.Map; import org.apache.commons.validator.routines.EmailValidator; import org.apache.ofbiz.base.lang.IsEmpty; - -import com.ibm.icu.util.Calendar; - -import com.google.i18n.phonenumbers.NumberParseException; -import com.google.i18n.phonenumbers.PhoneNumberUtil; -import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue; -import org.apache.ofbiz.entity.util.EntityUtilProperties; import org.apache.ofbiz.entity.util.EntityQuery; +import org.apache.ofbiz.entity.util.EntityUtilProperties; + +import com.google.i18n.phonenumbers.NumberParseException; +import com.google.i18n.phonenumbers.PhoneNumberUtil; +import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; +import com.ibm.icu.util.Calendar; /** * General input/data validation methods Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleMapAccessor.java Mon Aug 14 08:32:21 2017 @@ -21,6 +21,7 @@ package org.apache.ofbiz.base.util.colle import java.io.Serializable; import java.util.Locale; import java.util.Map; + import javax.el.PropertyNotFoundException; import org.apache.ofbiz.base.lang.IsEmpty; Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMap.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMap.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMap.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/GenericMap.java Mon Aug 14 08:32:21 2017 @@ -19,8 +19,8 @@ package org.apache.ofbiz.base.util.collections; import java.io.Serializable; -import java.util.ConcurrentModificationException; import java.util.Collection; +import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.Map; import java.util.Set; Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/LifoSet.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/LifoSet.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/LifoSet.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/LifoSet.java Mon Aug 14 08:32:21 2017 @@ -20,9 +20,9 @@ package org.apache.ofbiz.base.util.colle import java.io.Serializable; import java.util.AbstractSet; +import java.util.EmptyStackException; import java.util.Iterator; import java.util.LinkedList; -import java.util.EmptyStackException; /** * LifoSet - Set interface wrapper around a LinkedList Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java Mon Aug 14 08:32:21 2017 @@ -18,12 +18,12 @@ *******************************************************************************/ package org.apache.ofbiz.base.util.collections.test; +import java.math.BigDecimal; import java.util.HashMap; import java.util.HashSet; import java.util.Locale; import java.util.Map; import java.util.Set; -import java.math.BigDecimal; import org.apache.ofbiz.base.lang.SourceMonitored; import org.apache.ofbiz.base.test.GenericTestCaseBase; Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/JuelConnector.java Mon Aug 14 08:32:21 2017 @@ -28,6 +28,8 @@ import javax.el.ELException; import javax.el.ExpressionFactory; import javax.el.PropertyNotFoundException; +import org.apache.ofbiz.base.util.Debug; + import de.odysseus.el.ExpressionFactoryImpl; import de.odysseus.el.misc.LocalMessages; import de.odysseus.el.tree.Bindings; @@ -45,8 +47,6 @@ import de.odysseus.el.tree.impl.ast.AstE import de.odysseus.el.tree.impl.ast.AstIdentifier; import de.odysseus.el.tree.impl.ast.AstNode; -import org.apache.ofbiz.base.util.Debug; - /** A facade class used to connect the OFBiz framework to the JUEL library. *<p>The Unified Expression Language specification doesn't allow assignment of * values to non-existent variables (auto-vivify) - but the OFBiz scripting Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/NodeELResolver.java Mon Aug 14 08:32:21 2017 @@ -33,9 +33,9 @@ import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import org.apache.xerces.dom.NodeImpl; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.cache.UtilCache; +import org.apache.xerces.dom.NodeImpl; import org.w3c.dom.Node; import org.w3c.dom.NodeList; Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java Mon Aug 14 08:32:21 2017 @@ -37,12 +37,12 @@ import javax.el.FunctionMapper; import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamSource; -import org.cyberneko.html.parsers.DOMParser; import org.apache.ofbiz.base.location.FlexibleLocation; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.FileUtil; import org.apache.ofbiz.base.util.UtilDateTime; import org.apache.ofbiz.base.util.UtilXml; +import org.cyberneko.html.parsers.DOMParser; import org.w3c.dom.Document; import org.w3c.dom.Node; Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java Mon Aug 14 08:32:21 2017 @@ -26,14 +26,14 @@ import java.util.Locale; import java.util.Map; import java.util.TimeZone; -import junit.framework.TestCase; - -import org.apache.ofbiz.base.lang.SourceMonitored; -import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.base.util.string.FlexibleStringExpander; import org.apache.ofbiz.base.conversion.AbstractConverter; import org.apache.ofbiz.base.conversion.ConversionException; import org.apache.ofbiz.base.conversion.Converters; +import org.apache.ofbiz.base.lang.SourceMonitored; +import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.base.util.string.FlexibleStringExpander; + +import junit.framework.TestCase; @SourceMonitored public class FlexibleStringExpanderTests extends TestCase { Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java Mon Aug 14 08:32:21 2017 @@ -36,9 +36,6 @@ import java.util.TimeZone; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; -import freemarker.cache.MultiTemplateLoader; -import freemarker.cache.StringTemplateLoader; -import freemarker.cache.TemplateLoader; import org.apache.ofbiz.base.location.FlexibleLocation; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.StringUtil; @@ -48,6 +45,9 @@ import org.apache.ofbiz.base.util.UtilPr import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.base.util.cache.UtilCache; +import freemarker.cache.MultiTemplateLoader; +import freemarker.cache.StringTemplateLoader; +import freemarker.cache.TemplateLoader; import freemarker.cache.URLTemplateLoader; import freemarker.core.Environment; import freemarker.ext.beans.BeanModel; Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/XslTransform.java Mon Aug 14 08:32:21 2017 @@ -18,40 +18,38 @@ *******************************************************************************/ package org.apache.ofbiz.base.util.template; -import java.util.Map; +import java.io.IOException; +import java.io.InputStream; import java.io.StringReader; +import java.io.StringWriter; import java.net.URL; import java.net.URLConnection; -import java.io.InputStream; -import java.io.IOException; -import java.io.StringWriter; - -import org.xml.sax.InputSource; -import org.xml.sax.XMLReader; -import org.apache.ofbiz.base.util.Debug; -import org.apache.ofbiz.base.util.UtilValidate; -import org.apache.ofbiz.base.util.UtilXml; -import org.apache.ofbiz.base.util.URLConnector; -import org.apache.ofbiz.base.util.cache.UtilCache; -import org.apache.ofbiz.base.location.FlexibleLocation; -import org.apache.ofbiz.base.util.GeneralException; +import java.util.Map; -import javax.xml.transform.Transformer; +import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.Source; +import javax.xml.transform.Templates; +import javax.xml.transform.Transformer; import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; -import javax.xml.parsers.SAXParserFactory; -import javax.xml.transform.sax.SAXSource; -import javax.xml.transform.Templates; -import javax.xml.transform.dom.DOMSource; import javax.xml.transform.dom.DOMResult; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.sax.SAXSource; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; +import org.apache.ofbiz.base.location.FlexibleLocation; +import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.base.util.GeneralException; +import org.apache.ofbiz.base.util.URLConnector; +import org.apache.ofbiz.base.util.UtilValidate; +import org.apache.ofbiz.base.util.UtilXml; +import org.apache.ofbiz.base.util.cache.UtilCache; import org.w3c.dom.Document; import org.w3c.dom.Node; - -import javax.xml.transform.stream.StreamSource; -import javax.xml.transform.stream.StreamResult; +import org.xml.sax.InputSource; +import org.xml.sax.XMLReader; public final class XslTransform { Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/AssertTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/AssertTests.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/AssertTests.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/AssertTests.java Mon Aug 14 08:32:21 2017 @@ -21,10 +21,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.TestCase; - import org.apache.ofbiz.base.util.Assert; +import junit.framework.TestCase; + /** * Assert tests {@link org.apache.ofbiz.base.util.Assert}. * Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/IndentingWriterTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/IndentingWriterTests.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/IndentingWriterTests.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/IndentingWriterTests.java Mon Aug 14 08:32:21 2017 @@ -21,8 +21,8 @@ package org.apache.ofbiz.base.util.test; import java.io.StringWriter; import org.apache.ofbiz.base.lang.SourceMonitored; -import org.apache.ofbiz.base.util.IndentingWriter; import org.apache.ofbiz.base.test.GenericTestCaseBase; +import org.apache.ofbiz.base.util.IndentingWriter; @SourceMonitored public class IndentingWriterTests extends GenericTestCaseBase { Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/StringUtilTests.java Mon Aug 14 08:32:21 2017 @@ -25,10 +25,10 @@ import java.util.Map; import org.apache.ofbiz.base.lang.Appender; import org.apache.ofbiz.base.lang.SourceMonitored; +import org.apache.ofbiz.base.test.GenericTestCaseBase; import org.apache.ofbiz.base.util.GeneralRuntimeException; import org.apache.ofbiz.base.util.StringUtil; import org.apache.ofbiz.base.util.UtilGenerics; -import org.apache.ofbiz.base.test.GenericTestCaseBase; @SourceMonitored public class StringUtilTests extends GenericTestCaseBase { Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/TimeDurationTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/TimeDurationTests.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/TimeDurationTests.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/TimeDurationTests.java Mon Aug 14 08:32:21 2017 @@ -18,15 +18,15 @@ *******************************************************************************/ package org.apache.ofbiz.base.util.test; +import org.apache.ofbiz.base.lang.SourceMonitored; +import org.apache.ofbiz.base.test.GenericTestCaseBase; +import org.apache.ofbiz.base.util.TimeDuration; + //import com.ibm.icu.util.Calendar; //import com.ibm.icu.util.TimeZone; import com.ibm.icu.util.Calendar; import com.ibm.icu.util.TimeZone; -import org.apache.ofbiz.base.lang.SourceMonitored; -import org.apache.ofbiz.base.util.TimeDuration; -import org.apache.ofbiz.base.test.GenericTestCaseBase; - @SourceMonitored public class TimeDurationTests extends GenericTestCaseBase { private static final Calendar zero = Calendar.getInstance(TimeZone.getTimeZone("GMT")); Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilCodecTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilCodecTests.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilCodecTests.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/UtilCodecTests.java Mon Aug 14 08:32:21 2017 @@ -18,11 +18,14 @@ *******************************************************************************/ package org.apache.ofbiz.base.util; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.ArrayList; + import org.junit.Test; -import static org.junit.Assert.*; public class UtilCodecTests { Modified: ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/template/FreeMarkerWorkerTests.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/template/FreeMarkerWorkerTests.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/template/FreeMarkerWorkerTests.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/template/FreeMarkerWorkerTests.java Mon Aug 14 08:32:21 2017 @@ -18,13 +18,14 @@ *******************************************************************************/ package org.apache.ofbiz.base.util.template; +import static org.junit.Assert.assertEquals; + import java.io.StringWriter; import java.util.HashMap; import java.util.Map; import org.junit.Before; import org.junit.Test; -import static org.junit.Assert.*; public class FreeMarkerWorkerTests { @Before Modified: ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CatalinaContainer.java Mon Aug 14 08:32:21 2017 @@ -62,11 +62,6 @@ import org.apache.catalina.tribes.transp import org.apache.catalina.util.ServerInfo; import org.apache.catalina.valves.AccessLogValve; import org.apache.catalina.webresources.StandardRoot; -import org.apache.tomcat.JarScanner; -import org.apache.tomcat.util.IntrospectionUtils; -import org.apache.tomcat.util.descriptor.web.FilterDef; -import org.apache.tomcat.util.descriptor.web.FilterMap; -import org.apache.tomcat.util.scan.StandardJarScanner; import org.apache.ofbiz.base.component.ComponentConfig; import org.apache.ofbiz.base.concurrent.ExecutionPool; import org.apache.ofbiz.base.container.Container; @@ -80,6 +75,11 @@ import org.apache.ofbiz.base.start.Start import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.base.util.UtilXml; +import org.apache.tomcat.JarScanner; +import org.apache.tomcat.util.IntrospectionUtils; +import org.apache.tomcat.util.descriptor.web.FilterDef; +import org.apache.tomcat.util.descriptor.web.FilterMap; +import org.apache.tomcat.util.scan.StandardJarScanner; import org.w3c.dom.Document; import org.xml.sax.SAXException; Modified: ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/catalina/src/main/java/org/apache/ofbiz/catalina/container/CrossSubdomainSessionValve.java Mon Aug 14 08:32:21 2017 @@ -27,12 +27,12 @@ import org.apache.catalina.connector.Req import org.apache.catalina.connector.Response; import org.apache.catalina.util.SessionConfig; import org.apache.catalina.valves.ValveBase; -import org.apache.tomcat.util.buf.MessageBytes; -import org.apache.tomcat.util.http.MimeHeaders; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.util.EntityUtilProperties; +import org.apache.tomcat.util.buf.MessageBytes; +import org.apache.tomcat.util.http.MimeHeaders; public class CrossSubdomainSessionValve extends ValveBase { Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/CommonWorkers.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/CommonWorkers.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/CommonWorkers.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/CommonWorkers.java Mon Aug 14 08:32:21 2017 @@ -20,6 +20,7 @@ package org.apache.ofbiz.common; import java.util.LinkedList; import java.util.List; + import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.StringUtil; import org.apache.ofbiz.base.util.UtilMisc; Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthHelper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthHelper.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthHelper.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthHelper.java Mon Aug 14 08:32:21 2017 @@ -23,8 +23,8 @@ import java.security.AccessController; import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.Collections; -import java.util.List; import java.util.Iterator; +import java.util.List; import java.util.ServiceLoader; import org.apache.ofbiz.base.util.Debug; Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestFailAuthenticator.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestFailAuthenticator.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestFailAuthenticator.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/authentication/example/TestFailAuthenticator.java Mon Aug 14 08:32:21 2017 @@ -19,11 +19,11 @@ package org.apache.ofbiz.common.authentication.example; +import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.common.authentication.api.Authenticator; import org.apache.ofbiz.common.authentication.api.AuthenticatorException; -import org.apache.ofbiz.service.LocalDispatcher; import org.apache.ofbiz.entity.Delegator; -import org.apache.ofbiz.base.util.Debug; +import org.apache.ofbiz.service.LocalDispatcher; /** * LocalAuthenticator Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/email/EmailServices.java Mon Aug 14 08:32:21 2017 @@ -72,9 +72,9 @@ import org.apache.ofbiz.service.LocalDis import org.apache.ofbiz.service.ServiceUtil; import org.apache.ofbiz.service.mail.MimeMessageWrapper; import org.apache.ofbiz.webapp.view.ApacheFopWorker; -import org.apache.ofbiz.widget.renderer.macro.MacroScreenRenderer; import org.apache.ofbiz.widget.renderer.ScreenRenderer; import org.apache.ofbiz.widget.renderer.ScreenStringRenderer; +import org.apache.ofbiz.widget.renderer.macro.MacroScreenRenderer; import org.xml.sax.SAXException; import com.sun.mail.smtp.SMTPAddressFailedException; Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/image/ImageTransform.java Mon Aug 14 08:32:21 2017 @@ -37,9 +37,9 @@ import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilProperties; import org.apache.ofbiz.base.util.UtilXml; import org.apache.ofbiz.service.ModelService; -import org.xml.sax.SAXException; import org.w3c.dom.Document; import org.w3c.dom.Element; +import org.xml.sax.SAXException; Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceServices.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceServices.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/preferences/PreferenceServices.java Mon Aug 14 08:32:21 2017 @@ -18,6 +18,8 @@ *******************************************************************************/ package org.apache.ofbiz.common.preferences; +import static org.apache.ofbiz.base.util.UtilGenerics.checkMap; + import java.util.List; import java.util.Locale; import java.util.Map; @@ -26,7 +28,6 @@ import java.util.Properties; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.ObjectType; -import static org.apache.ofbiz.base.util.UtilGenerics.checkMap; import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.base.util.UtilProperties; import org.apache.ofbiz.base.util.UtilValidate; Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeEvents.java Mon Aug 14 08:32:21 2017 @@ -23,7 +23,6 @@ import java.io.IOException; import java.io.OutputStream; import java.util.Locale; import java.util.Map; -import java.lang.Integer; import javax.imageio.ImageIO; import javax.servlet.http.HttpServletRequest; Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/qrcode/QRCodeServices.java Mon Aug 14 08:32:21 2017 @@ -22,14 +22,13 @@ import java.awt.Graphics2D; import java.awt.geom.AffineTransform; import java.awt.image.AffineTransformOp; import java.awt.image.BufferedImage; +import java.io.IOException; import java.util.Arrays; import java.util.EnumMap; import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import java.io.IOException; -import java.lang.Integer; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.FileUtil; Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/scripting/ContextHelper.java Mon Aug 14 08:32:21 2017 @@ -21,8 +21,8 @@ package org.apache.ofbiz.common.scriptin import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedList; -import java.util.Locale; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.TimeZone; Modified: ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/common/src/main/java/org/apache/ofbiz/common/status/StatusServices.java Mon Aug 14 08:32:21 2017 @@ -18,6 +18,8 @@ *******************************************************************************/ package org.apache.ofbiz.common.status; +import static org.apache.ofbiz.base.util.UtilGenerics.checkList; + import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; @@ -27,9 +29,6 @@ import java.util.Map; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilProperties; import org.apache.ofbiz.base.util.UtilValidate; - -import static org.apache.ofbiz.base.util.UtilGenerics.checkList; - import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericValue; Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorContainer.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorContainer.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorContainer.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorContainer.java Mon Aug 14 08:32:21 2017 @@ -28,8 +28,8 @@ import org.apache.ofbiz.base.container.C import org.apache.ofbiz.base.container.ContainerConfig; import org.apache.ofbiz.base.container.ContainerException; import org.apache.ofbiz.base.start.StartupCommand; -import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.base.util.StringUtil; +import org.apache.ofbiz.base.util.UtilValidate; public class DelegatorContainer implements Container { private String name; Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactory.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactory.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactory.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/DelegatorFactory.java Mon Aug 14 08:32:21 2017 @@ -26,7 +26,6 @@ import java.util.concurrent.FutureTask; import java.util.concurrent.ScheduledExecutorService; import org.apache.ofbiz.base.concurrent.ExecutionPool; - import org.apache.ofbiz.base.lang.Factory; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilObject; Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/Cache.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/Cache.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/Cache.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/cache/Cache.java Mon Aug 14 08:32:21 2017 @@ -23,8 +23,8 @@ import java.util.List; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.UtilGenerics; import org.apache.ofbiz.entity.GenericEntity; -import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.entity.GenericPK; +import org.apache.ofbiz.entity.GenericValue; import org.apache.ofbiz.entity.condition.EntityCondition; public class Cache { Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityComparisonOperator.java Mon Aug 14 08:32:21 2017 @@ -23,11 +23,6 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import org.apache.oro.text.perl.Perl5Util; -import org.apache.oro.text.regex.MalformedPatternException; -import org.apache.oro.text.regex.Pattern; -import org.apache.oro.text.regex.PatternMatcher; -import org.apache.oro.text.regex.Perl5Matcher; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.PatternFactory; import org.apache.ofbiz.base.util.UtilGenerics; @@ -37,6 +32,11 @@ import org.apache.ofbiz.entity.GenericMo import org.apache.ofbiz.entity.config.model.Datasource; import org.apache.ofbiz.entity.model.ModelEntity; import org.apache.ofbiz.entity.model.ModelField; +import org.apache.oro.text.perl.Perl5Util; +import org.apache.oro.text.regex.MalformedPatternException; +import org.apache.oro.text.regex.Pattern; +import org.apache.oro.text.regex.PatternMatcher; +import org.apache.oro.text.regex.Perl5Matcher; /** * Base class for comparisons. Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityConditionBuilder.java Mon Aug 14 08:32:21 2017 @@ -19,8 +19,6 @@ package org.apache.ofbiz.entity.condition; -import groovy.util.BuilderSupport; - import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -33,6 +31,8 @@ import org.apache.ofbiz.entity.GenericMo import org.apache.ofbiz.entity.config.model.Datasource; import org.apache.ofbiz.entity.model.ModelEntity; +import groovy.util.BuilderSupport; + public class EntityConditionBuilder extends BuilderSupport { public static final String module = EntityConditionBuilder.class.getName(); Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DelegatorElement.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DelegatorElement.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DelegatorElement.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/DelegatorElement.java Mon Aug 14 08:32:21 2017 @@ -20,9 +20,9 @@ package org.apache.ofbiz.entity.config.m import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import org.apache.ofbiz.base.lang.ThreadSafe; import org.apache.ofbiz.base.util.UtilXml; Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityConfig.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityConfig.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityConfig.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/config/model/EntityConfig.java Mon Aug 14 08:32:21 2017 @@ -21,9 +21,9 @@ package org.apache.ofbiz.entity.config.m import java.net.URL; import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; import org.apache.ofbiz.base.lang.ThreadSafe; import org.apache.ofbiz.base.util.Debug; Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/connection/DebugManagedDataSource.java Mon Aug 14 08:32:21 2017 @@ -19,18 +19,17 @@ package org.apache.ofbiz.entity.connection; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.HashMap; +import java.util.Map; + import org.apache.commons.dbcp2.managed.ManagedDataSource; import org.apache.commons.dbcp2.managed.TransactionRegistry; import org.apache.commons.pool2.ObjectPool; - import org.apache.commons.pool2.impl.GenericObjectPool; import org.apache.ofbiz.base.util.Debug; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.HashMap; -import java.util.Map; - public class DebugManagedDataSource extends ManagedDataSource { public static final String module = DebugManagedDataSource.class.getName(); Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/datasource/ReadOnlyHelperDAO.java Mon Aug 14 08:32:21 2017 @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.entity.Delegator; import org.apache.ofbiz.entity.GenericEntityException; import org.apache.ofbiz.entity.GenericPK; Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/Finder.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/Finder.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/Finder.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/Finder.java Mon Aug 14 08:32:21 2017 @@ -18,13 +18,13 @@ *******************************************************************************/ package org.apache.ofbiz.entity.finder; -import java.util.Map; import java.io.Serializable; -import org.w3c.dom.Element; +import java.util.Map; import org.apache.ofbiz.base.util.GeneralException; import org.apache.ofbiz.base.util.string.FlexibleStringExpander; import org.apache.ofbiz.entity.Delegator; +import org.w3c.dom.Element; @SuppressWarnings("serial") public abstract class Finder implements Serializable { Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/DynamicViewEntity.java Mon Aug 14 08:32:21 2017 @@ -26,9 +26,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.base.util.UtilXml; import org.apache.ofbiz.entity.Delegator; @@ -37,6 +34,8 @@ import org.apache.ofbiz.entity.model.Mod import org.apache.ofbiz.entity.model.ModelViewEntity.ModelAliasAll; import org.apache.ofbiz.entity.model.ModelViewEntity.ModelMemberEntity; import org.apache.ofbiz.entity.model.ModelViewEntity.ModelViewLink; +import org.w3c.dom.Document; +import org.w3c.dom.Element; /** * This class is used for declaring Dynamic View Entities, to be used and thrown away. * A special method exists on the Delegator to accept a DynamicViewEntity instead Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelUtil.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelUtil.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelUtil.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelUtil.java Mon Aug 14 08:32:21 2017 @@ -21,6 +21,7 @@ package org.apache.ofbiz.entity.model; import java.io.File; import java.util.Iterator; import java.util.List; + import org.apache.ofbiz.base.util.StringUtil; import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.base.util.UtilValidate; Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java Mon Aug 14 08:32:21 2017 @@ -19,16 +19,16 @@ package org.apache.ofbiz.entity.model; import java.io.Serializable; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.HashMap; import java.util.Set; import org.apache.ofbiz.base.util.Debug; Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/serialize/XmlSerializer.java Mon Aug 14 08:32:21 2017 @@ -23,6 +23,7 @@ import java.io.IOException; import java.io.Serializable; import java.lang.ref.WeakReference; import java.math.BigDecimal; +import java.math.RoundingMode; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -149,7 +150,7 @@ public class XmlSerializer { } else if (object instanceof Locale) { return makeElement("std-Locale", object, document); } else if (object instanceof BigDecimal) { - String stringValue = ((BigDecimal) object).setScale(10, BigDecimal.ROUND_HALF_UP).toString(); + String stringValue = ((BigDecimal) object).setScale(10, RoundingMode.HALF_UP).toString(); return makeElement("std-BigDecimal", stringValue, document); // - SQL Objects - } else if (object instanceof java.sql.Timestamp) { Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/test/EntityQueryTestSuite.java Mon Aug 14 08:32:21 2017 @@ -20,8 +20,8 @@ package org.apache.ofbiz.entity.test; import java.util.LinkedList; import java.util.List; - import java.util.Map; + import org.apache.ofbiz.base.util.UtilDateTime; import org.apache.ofbiz.base.util.UtilMisc; import org.apache.ofbiz.entity.GenericEntityException; Modified: ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/testtools/EntityTestCase.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/testtools/EntityTestCase.java?rev=1804953&r1=1804952&r2=1804953&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/testtools/EntityTestCase.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/entity/src/main/java/org/apache/ofbiz/entity/testtools/EntityTestCase.java Mon Aug 14 08:32:21 2017 @@ -19,10 +19,10 @@ package org.apache.ofbiz.entity.testtools; -import junit.framework.TestCase; - import org.apache.ofbiz.entity.Delegator; +import junit.framework.TestCase; + public class EntityTestCase extends TestCase { protected Delegator delegator = null; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |