diff --git a/.hgignore b/.hgignore index 35a5a1c4e0..bce765a476 100644 --- a/.hgignore +++ b/.hgignore @@ -8,6 +8,7 @@ alpn-boot.jar org.adempiere.webstore/bin org.idempiere.hazelcast.service.config/bin */target +runtime-server.product syntax: regexp ^adempiere$ ^org\.adempiere\.install/lib$ diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml index b85223feb3..0ade05e04b 100644 --- a/org.adempiere.base-feature/feature.xml +++ b/org.adempiere.base-feature/feature.xml @@ -2,7 +2,8 @@ + version="5.1.0.qualifier" + provider-name="iDempiere Community"> [Enter Feature Description here.] @@ -99,13 +100,6 @@ version="0.0.0" unpack="false"/> - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.adempiere.base.callout/.classpath b/org.adempiere.base.callout/.classpath index cf36b56119..423c974870 100644 --- a/org.adempiere.base.callout/.classpath +++ b/org.adempiere.base.callout/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.base.callout/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.base.callout/META-INF/MANIFEST.MF b/org.adempiere.base.callout/META-INF/MANIFEST.MF index b58d4c0877..8dd93dde3b 100644 --- a/org.adempiere.base.callout/META-INF/MANIFEST.MF +++ b/org.adempiere.base.callout/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Callout Bundle-SymbolicName: org.adempiere.base.callout Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Eclipse-RegisterBuddy: org.adempiere.base Service-Component: OSGI-INF/costadjustmentcalloutfactory.xml, OSGI-INF/bpartnerquickentrycalloutFactory.xml @@ -11,4 +11,5 @@ Bundle-ActivationPolicy: lazy Export-Package: org.compiere.model Bundle-ClassPath: . Automatic-Module-Name: org.adempiere.base.callout +Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.base.callout/src/org/adempiere/model/CalloutRMA.java b/org.adempiere.base.callout/src/org/adempiere/model/CalloutRMA.java index c14c3bb203..a0816e4e72 100644 --- a/org.adempiere.base.callout/src/org/adempiere/model/CalloutRMA.java +++ b/org.adempiere.base.callout/src/org/adempiere/model/CalloutRMA.java @@ -18,6 +18,7 @@ package org.adempiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.Properties; import org.adempiere.base.Core; @@ -101,7 +102,7 @@ public class CalloutRMA extends CalloutEngine { BigDecimal lineNetAmt = invoiceLine.getQtyEntered().multiply(invoiceLine.getPriceEntered()); int precision = invoiceLine.getPrecision(); if (lineNetAmt.scale() > precision) - lineNetAmt = lineNetAmt.setScale(precision, BigDecimal.ROUND_HALF_UP); + lineNetAmt = lineNetAmt.setScale(precision, RoundingMode.HALF_UP); mTab.setValue(MRMALine.COLUMNNAME_LineNetAmt, lineNetAmt); } else if (iol.getC_OrderLine_ID() != 0) @@ -122,7 +123,7 @@ public class CalloutRMA extends CalloutEngine { BigDecimal lineNetAmt = orderLine.getQtyEntered().multiply(orderLine.getPriceEntered()); int precision = orderLine.getPrecision(); if (lineNetAmt.scale() > precision) - lineNetAmt = lineNetAmt.setScale(precision, BigDecimal.ROUND_HALF_UP); + lineNetAmt = lineNetAmt.setScale(precision, RoundingMode.HALF_UP); mTab.setValue(MRMALine.COLUMNNAME_LineNetAmt, lineNetAmt); } @@ -193,7 +194,7 @@ public class CalloutRMA extends CalloutEngine { BigDecimal lineNetAmt = Env.ONE.multiply(pp.getPriceStd()); if (lineNetAmt.scale() > precision) - lineNetAmt = lineNetAmt.setScale(precision, BigDecimal.ROUND_HALF_UP); + lineNetAmt = lineNetAmt.setScale(precision, RoundingMode.HALF_UP); mTab.setValue(MRMALine.COLUMNNAME_LineNetAmt, lineNetAmt); return ""; @@ -246,7 +247,7 @@ public class CalloutRMA extends CalloutEngine { BigDecimal lineNetAmt = Env.ONE.multiply(charge.getChargeAmt()); if (lineNetAmt.scale() > precision) - lineNetAmt = lineNetAmt.setScale(precision, BigDecimal.ROUND_HALF_UP); + lineNetAmt = lineNetAmt.setScale(precision, RoundingMode.HALF_UP); mTab.setValue(MRMALine.COLUMNNAME_LineNetAmt, lineNetAmt); return ""; diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutAssignment.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutAssignment.java index 261275993e..28dd701ff4 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutAssignment.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutAssignment.java @@ -92,7 +92,7 @@ public class CalloutAssignment extends CalloutEngine if (log.isLoggable(Level.FINE)) log.fine("S_ResourceAssignment_ID=" + S_ResourceAssignment_ID + " - M_Product_ID=" + M_Product_ID); if (M_Product_ID != 0) { - mTab.setValue ("M_Product_ID", new Integer (M_Product_ID)); + mTab.setValue ("M_Product_ID", Integer.valueOf(M_Product_ID)); if (Description != null) Name += " (" + Description + ")"; if (!".".equals(Name)) diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutCashJournal.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutCashJournal.java index e7b9bf305e..81a50121c4 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutCashJournal.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutCashJournal.java @@ -84,7 +84,7 @@ public class CalloutCashJournal extends CalloutEngine rs = pstmt.executeQuery(); if (rs.next()) { - mTab.setValue("C_Currency_ID", new Integer(rs.getInt(2))); + mTab.setValue("C_Currency_ID", Integer.valueOf(rs.getInt(2))); BigDecimal PayAmt = rs.getBigDecimal(3); BigDecimal DiscountAmt = rs.getBigDecimal(5); boolean isSOTrx = "Y".equals(rs.getString(4)); diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutGLJournal.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutGLJournal.java index 048d34e40a..171ba28e47 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutGLJournal.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutGLJournal.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -103,7 +104,7 @@ public class CalloutGLJournal extends CalloutEngine pstmt = null; } if (C_Period_ID != 0) - mTab.setValue("C_Period_ID", new Integer(C_Period_ID)); + mTab.setValue("C_Period_ID", Integer.valueOf(C_Period_ID)); } // When C_Period_ID is changed, check if in DateAcct range and set to end date if not @@ -222,10 +223,10 @@ public class CalloutGLJournal extends CalloutEngine AmtSourceCr = Env.ZERO; BigDecimal AmtAcctDr = AmtSourceDr.multiply(CurrencyRate); - AmtAcctDr = AmtAcctDr.setScale(Precision, BigDecimal.ROUND_HALF_UP); + AmtAcctDr = AmtAcctDr.setScale(Precision, RoundingMode.HALF_UP); mTab.setValue("AmtAcctDr", AmtAcctDr); BigDecimal AmtAcctCr = AmtSourceCr.multiply(CurrencyRate); - AmtAcctCr = AmtAcctCr.setScale(Precision, BigDecimal.ROUND_HALF_UP); + AmtAcctCr = AmtAcctCr.setScale(Precision, RoundingMode.HALF_UP); mTab.setValue("AmtAcctCr", AmtAcctCr); return ""; diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java index e2e847022a..bf9544d7b6 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutInOut.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -61,28 +62,28 @@ public class CalloutInOut extends CalloutEngine { mTab.setValue("DateOrdered", order.getDateOrdered()); mTab.setValue("POReference", order.getPOReference()); - mTab.setValue("AD_Org_ID", new Integer(order.getAD_Org_ID())); - mTab.setValue("AD_OrgTrx_ID", new Integer(order.getAD_OrgTrx_ID())); - mTab.setValue("C_Activity_ID", new Integer(order.getC_Activity_ID())); - mTab.setValue("C_Campaign_ID", new Integer(order.getC_Campaign_ID())); - mTab.setValue("C_Project_ID", new Integer(order.getC_Project_ID())); - mTab.setValue("User1_ID", new Integer(order.getUser1_ID())); - mTab.setValue("User2_ID", new Integer(order.getUser2_ID())); - mTab.setValue("M_Warehouse_ID", new Integer(order.getM_Warehouse_ID())); + mTab.setValue("AD_Org_ID", Integer.valueOf(order.getAD_Org_ID())); + mTab.setValue("AD_OrgTrx_ID", Integer.valueOf(order.getAD_OrgTrx_ID())); + mTab.setValue("C_Activity_ID", Integer.valueOf(order.getC_Activity_ID())); + mTab.setValue("C_Campaign_ID", Integer.valueOf(order.getC_Campaign_ID())); + mTab.setValue("C_Project_ID", Integer.valueOf(order.getC_Project_ID())); + mTab.setValue("User1_ID", Integer.valueOf(order.getUser1_ID())); + mTab.setValue("User2_ID", Integer.valueOf(order.getUser2_ID())); + mTab.setValue("M_Warehouse_ID", Integer.valueOf(order.getM_Warehouse_ID())); // mTab.setValue("DeliveryRule", order.getDeliveryRule()); mTab.setValue("DeliveryViaRule", order.getDeliveryViaRule()); - mTab.setValue("M_Shipper_ID", new Integer(order.getM_Shipper_ID())); + mTab.setValue("M_Shipper_ID", Integer.valueOf(order.getM_Shipper_ID())); mTab.setValue("FreightCostRule", order.getFreightCostRule()); mTab.setValue("FreightAmt", order.getFreightAmt()); - mTab.setValue("C_BPartner_ID", new Integer(order.getC_BPartner_ID())); + mTab.setValue("C_BPartner_ID", Integer.valueOf(order.getC_BPartner_ID())); //[ 1867464 ] - mTab.setValue("C_BPartner_Location_ID", new Integer(order.getC_BPartner_Location_ID())); + mTab.setValue("C_BPartner_Location_ID", Integer.valueOf(order.getC_BPartner_Location_ID())); if (order.getAD_User_ID() > 0) - mTab.setValue("AD_User_ID", new Integer(order.getAD_User_ID())); + mTab.setValue("AD_User_ID", Integer.valueOf(order.getAD_User_ID())); else mTab.setValue("AD_User_ID", null); } @@ -128,28 +129,28 @@ public class CalloutInOut extends CalloutEngine { mTab.setValue("DateOrdered", originalReceipt.getDateOrdered()); mTab.setValue("POReference", originalReceipt.getPOReference()); - mTab.setValue("AD_Org_ID", new Integer(originalReceipt.getAD_Org_ID())); - mTab.setValue("AD_OrgTrx_ID", new Integer(originalReceipt.getAD_OrgTrx_ID())); - mTab.setValue("C_Activity_ID", new Integer(originalReceipt.getC_Activity_ID())); - mTab.setValue("C_Campaign_ID", new Integer(originalReceipt.getC_Campaign_ID())); - mTab.setValue("C_Project_ID", new Integer(originalReceipt.getC_Project_ID())); - mTab.setValue("User1_ID", new Integer(originalReceipt.getUser1_ID())); - mTab.setValue("User2_ID", new Integer(originalReceipt.getUser2_ID())); - mTab.setValue("M_Warehouse_ID", new Integer(originalReceipt.getM_Warehouse_ID())); + mTab.setValue("AD_Org_ID", Integer.valueOf(originalReceipt.getAD_Org_ID())); + mTab.setValue("AD_OrgTrx_ID", Integer.valueOf(originalReceipt.getAD_OrgTrx_ID())); + mTab.setValue("C_Activity_ID", Integer.valueOf(originalReceipt.getC_Activity_ID())); + mTab.setValue("C_Campaign_ID", Integer.valueOf(originalReceipt.getC_Campaign_ID())); + mTab.setValue("C_Project_ID", Integer.valueOf(originalReceipt.getC_Project_ID())); + mTab.setValue("User1_ID", Integer.valueOf(originalReceipt.getUser1_ID())); + mTab.setValue("User2_ID", Integer.valueOf(originalReceipt.getUser2_ID())); + mTab.setValue("M_Warehouse_ID", Integer.valueOf(originalReceipt.getM_Warehouse_ID())); // mTab.setValue("DeliveryRule", originalReceipt.getDeliveryRule()); mTab.setValue("DeliveryViaRule", originalReceipt.getDeliveryViaRule()); - mTab.setValue("M_Shipper_ID", new Integer(originalReceipt.getM_Shipper_ID())); + mTab.setValue("M_Shipper_ID", Integer.valueOf(originalReceipt.getM_Shipper_ID())); mTab.setValue("FreightCostRule", originalReceipt.getFreightCostRule()); mTab.setValue("FreightAmt", originalReceipt.getFreightAmt()); - mTab.setValue("C_BPartner_ID", new Integer(originalReceipt.getC_BPartner_ID())); + mTab.setValue("C_BPartner_ID", Integer.valueOf(originalReceipt.getC_BPartner_ID())); //[ 1867464 ] - mTab.setValue("C_BPartner_Location_ID", new Integer(originalReceipt.getC_BPartner_Location_ID())); + mTab.setValue("C_BPartner_Location_ID", Integer.valueOf(originalReceipt.getC_BPartner_Location_ID())); if (originalReceipt.getAD_User_ID() > 0) - mTab.setValue("AD_User_ID", new Integer(originalReceipt.getAD_User_ID())); + mTab.setValue("AD_User_ID", Integer.valueOf(originalReceipt.getAD_User_ID())); else mTab.setValue("AD_User_ID", null); } @@ -290,13 +291,13 @@ public class CalloutInOut extends CalloutEngine if (!IsSOTrx) { // Location - Integer ii = new Integer(rs.getInt("C_BPartner_Location_ID")); + Integer ii = Integer.valueOf(rs.getInt("C_BPartner_Location_ID")); if (rs.wasNull()) mTab.setValue("C_BPartner_Location_ID", null); else mTab.setValue("C_BPartner_Location_ID", ii); // Contact - ii = new Integer(rs.getInt("AD_User_ID")); + ii = Integer.valueOf(rs.getInt("AD_User_ID")); if (rs.wasNull()) mTab.setValue("AD_User_ID", null); else @@ -361,12 +362,12 @@ public class CalloutInOut extends CalloutEngine if (rs.next()) { // Org - Integer ii = new Integer(rs.getInt(1)); + Integer ii = Integer.valueOf(rs.getInt(1)); int AD_Org_ID = Env.getContextAsInt(ctx, WindowNo, "AD_Org_ID"); if (AD_Org_ID != ii.intValue()) mTab.setValue("AD_Org_ID", ii); // Locator - ii = new Integer(rs.getInt(2)); + ii = Integer.valueOf(rs.getInt(2)); if (rs.wasNull()) Env.setContext(ctx, WindowNo, 0, "M_Locator_ID", null); else @@ -416,17 +417,17 @@ public class CalloutInOut extends CalloutEngine if (ol.get_ID() != 0) { if (ol.getC_Charge_ID() > 0 && ol.getM_Product_ID() <= 0) { - mTab.setValue("C_Charge_ID", new Integer(ol.getC_Charge_ID())); + mTab.setValue("C_Charge_ID", Integer.valueOf(ol.getC_Charge_ID())); mTab.setValue("M_Product_ID", null); mTab.setValue("M_AttributeSetInstance_ID", null); } else { - mTab.setValue("M_Product_ID", new Integer(ol.getM_Product_ID())); - mTab.setValue("M_AttributeSetInstance_ID", new Integer(ol.getM_AttributeSetInstance_ID())); + mTab.setValue("M_Product_ID", Integer.valueOf(ol.getM_Product_ID())); + mTab.setValue("M_AttributeSetInstance_ID", Integer.valueOf(ol.getM_AttributeSetInstance_ID())); mTab.setValue("C_Charge_ID", null); } // - mTab.setValue("C_UOM_ID", new Integer(ol.getC_UOM_ID())); + mTab.setValue("C_UOM_ID", Integer.valueOf(ol.getC_UOM_ID())); BigDecimal MovementQty = ol.getQtyOrdered().subtract(ol.getQtyDelivered()); BigDecimal runningqty = DB.getSQLValueBDEx(null, "SELECT SUM(MovementQty) FROM M_InOutLine WHERE M_InOut_ID=? AND M_InOutLine_ID!=? AND C_OrderLine_ID=?", Env.getContextAsInt(ctx, WindowNo, "M_InOut_ID"), @@ -439,17 +440,17 @@ public class CalloutInOut extends CalloutEngine BigDecimal QtyEntered = MovementQty; if (ol.getQtyEntered().compareTo(ol.getQtyOrdered()) != 0) QtyEntered = QtyEntered.multiply(ol.getQtyEntered()) - .divide(ol.getQtyOrdered(), 12, BigDecimal.ROUND_HALF_UP); + .divide(ol.getQtyOrdered(), 12, RoundingMode.HALF_UP); mTab.setValue("QtyEntered", QtyEntered); // - mTab.setValue("C_Activity_ID", new Integer(ol.getC_Activity_ID())); - mTab.setValue("C_Campaign_ID", new Integer(ol.getC_Campaign_ID())); - mTab.setValue("C_Project_ID", new Integer(ol.getC_Project_ID())); - mTab.setValue("C_ProjectPhase_ID", new Integer(ol.getC_ProjectPhase_ID())); - mTab.setValue("C_ProjectTask_ID", new Integer(ol.getC_ProjectTask_ID())); - mTab.setValue("AD_OrgTrx_ID", new Integer(ol.getAD_OrgTrx_ID())); - mTab.setValue("User1_ID", new Integer(ol.getUser1_ID())); - mTab.setValue("User2_ID", new Integer(ol.getUser2_ID())); + mTab.setValue("C_Activity_ID", Integer.valueOf(ol.getC_Activity_ID())); + mTab.setValue("C_Campaign_ID", Integer.valueOf(ol.getC_Campaign_ID())); + mTab.setValue("C_Project_ID", Integer.valueOf(ol.getC_Project_ID())); + mTab.setValue("C_ProjectPhase_ID", Integer.valueOf(ol.getC_ProjectPhase_ID())); + mTab.setValue("C_ProjectTask_ID", Integer.valueOf(ol.getC_ProjectTask_ID())); + mTab.setValue("AD_OrgTrx_ID", Integer.valueOf(ol.getAD_OrgTrx_ID())); + mTab.setValue("User1_ID", Integer.valueOf(ol.getUser1_ID())); + mTab.setValue("User2_ID", Integer.valueOf(ol.getUser2_ID())); } return ""; } // orderLine @@ -474,30 +475,30 @@ public class CalloutInOut extends CalloutEngine if (rl.get_ID() != 0) { if (rl.getC_Charge_ID() > 0 && rl.getM_Product_ID() <= 0) { - mTab.setValue("C_Charge_ID", new Integer(rl.getC_Charge_ID())); + mTab.setValue("C_Charge_ID", Integer.valueOf(rl.getC_Charge_ID())); mTab.setValue("M_Product_ID", null); mTab.setValue("M_AttributeSetInstance_ID", null); } else { - mTab.setValue("M_Product_ID", new Integer(rl.getM_Product_ID())); - mTab.setValue("M_AttributeSetInstance_ID", new Integer(rl.getM_AttributeSetInstance_ID())); + mTab.setValue("M_Product_ID", Integer.valueOf(rl.getM_Product_ID())); + mTab.setValue("M_AttributeSetInstance_ID", Integer.valueOf(rl.getM_AttributeSetInstance_ID())); mTab.setValue("C_Charge_ID", null); } // - mTab.setValue("C_UOM_ID", new Integer(rl.getC_UOM_ID())); + mTab.setValue("C_UOM_ID", Integer.valueOf(rl.getC_UOM_ID())); BigDecimal MovementQty = rl.getQty().subtract(rl.getQtyDelivered()); mTab.setValue("MovementQty", MovementQty); BigDecimal QtyEntered = MovementQty; mTab.setValue("QtyEntered", QtyEntered); // - mTab.setValue("C_Activity_ID", new Integer(rl.getC_Activity_ID())); - mTab.setValue("C_Campaign_ID", new Integer(rl.getC_Campaign_ID())); - mTab.setValue("C_Project_ID", new Integer(rl.getC_Project_ID())); - mTab.setValue("C_ProjectPhase_ID", new Integer(rl.getC_ProjectPhase_ID())); - mTab.setValue("C_ProjectTask_ID", new Integer(rl.getC_ProjectTask_ID())); - mTab.setValue("AD_OrgTrx_ID", new Integer(rl.getAD_OrgTrx_ID())); - mTab.setValue("User1_ID", new Integer(rl.getUser1_ID())); - mTab.setValue("User2_ID", new Integer(rl.getUser2_ID())); + mTab.setValue("C_Activity_ID", Integer.valueOf(rl.getC_Activity_ID())); + mTab.setValue("C_Campaign_ID", Integer.valueOf(rl.getC_Campaign_ID())); + mTab.setValue("C_Project_ID", Integer.valueOf(rl.getC_Project_ID())); + mTab.setValue("C_ProjectPhase_ID", Integer.valueOf(rl.getC_ProjectPhase_ID())); + mTab.setValue("C_ProjectTask_ID", Integer.valueOf(rl.getC_ProjectTask_ID())); + mTab.setValue("AD_OrgTrx_ID", Integer.valueOf(rl.getAD_OrgTrx_ID())); + mTab.setValue("User1_ID", Integer.valueOf(rl.getUser1_ID())); + mTab.setValue("User2_ID", Integer.valueOf(rl.getUser2_ID())); } return ""; } // rmaLine @@ -525,10 +526,10 @@ public class CalloutInOut extends CalloutEngine && Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_AttributeSetInstance_ID") != 0) { mTab.setValue("M_AttributeSetInstance_ID", - new Integer(Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_AttributeSetInstance_ID"))); + Integer.valueOf(Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_AttributeSetInstance_ID"))); M_Locator_ID = Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_Locator_ID"); if (M_Locator_ID != 0) - mTab.setValue("M_Locator_ID", new Integer(M_Locator_ID)); + mTab.setValue("M_Locator_ID", Integer.valueOf(M_Locator_ID)); } else mTab.setValue("M_AttributeSetInstance_ID", null); @@ -542,7 +543,7 @@ public class CalloutInOut extends CalloutEngine // Set UOM/Locator/Qty MProduct product = MProduct.get(ctx, M_Product_ID.intValue()); - mTab.setValue("C_UOM_ID", new Integer (product.getC_UOM_ID())); + mTab.setValue("C_UOM_ID", Integer.valueOf(product.getC_UOM_ID())); BigDecimal QtyEntered = (BigDecimal)mTab.getValue("QtyEntered"); mTab.setValue("MovementQty", QtyEntered); if (M_Locator_ID != 0) @@ -551,7 +552,7 @@ public class CalloutInOut extends CalloutEngine { MLocator loc = MLocator.get(ctx, product.getM_Locator_ID()); if (M_Warehouse_ID == loc.getM_Warehouse_ID()) - mTab.setValue("M_Locator_ID", new Integer (product.getM_Locator_ID())); + mTab.setValue("M_Locator_ID", Integer.valueOf(product.getM_Locator_ID())); else if (log.isLoggable(Level.FINE)) log.fine("No Locator for M_Product_ID=" + M_Product_ID + " and M_Warehouse_ID=" + M_Warehouse_ID); } @@ -591,7 +592,7 @@ public class CalloutInOut extends CalloutEngine { int C_UOM_To_ID = ((Integer)value).intValue(); QtyEntered = (BigDecimal)mTab.getValue("QtyEntered"); - BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), BigDecimal.ROUND_HALF_UP); + BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), RoundingMode.HALF_UP); if (QtyEntered.compareTo(QtyEntered1) != 0) { if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyEntered Scale UOM=" + C_UOM_To_ID @@ -622,7 +623,7 @@ public class CalloutInOut extends CalloutEngine { int C_UOM_To_ID = Env.getContextAsInt(ctx, WindowNo, mTab.getTabNo(), "C_UOM_ID"); QtyEntered = (BigDecimal)value; - BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), BigDecimal.ROUND_HALF_UP); + BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), RoundingMode.HALF_UP); if (QtyEntered.compareTo(QtyEntered1) != 0) { if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyEntered Scale UOM=" + C_UOM_To_ID @@ -648,7 +649,7 @@ public class CalloutInOut extends CalloutEngine int C_UOM_To_ID = Env.getContextAsInt(ctx, WindowNo, mTab.getTabNo(), "C_UOM_ID"); MovementQty = (BigDecimal)value; int precision = MProduct.get(ctx, M_Product_ID).getUOMPrecision(); - BigDecimal MovementQty1 = MovementQty.setScale(precision, BigDecimal.ROUND_HALF_UP); + BigDecimal MovementQty1 = MovementQty.setScale(precision, RoundingMode.HALF_UP); if (MovementQty.compareTo(MovementQty1) != 0) { if (log.isLoggable(Level.FINE)) log.fine("Corrected MovementQty " @@ -704,7 +705,7 @@ public class CalloutInOut extends CalloutEngine if (selectedM_Locator_ID != 0) { if (log.isLoggable(Level.FINE)) log.fine("Selected M_Locator_ID=" + selectedM_Locator_ID); - mTab.setValue("M_Locator_ID", new Integer (selectedM_Locator_ID)); + mTab.setValue("M_Locator_ID", Integer.valueOf(selectedM_Locator_ID)); } } MAttributeSetInstance asi = MAttributeSetInstance.get(ctx, M_ASI_ID.intValue(), 0); diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java index 28bb0d4b8c..99429d11a7 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoice.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -161,7 +162,7 @@ public class CalloutInvoice extends CalloutEngine } // PriceList & IsTaxIncluded & Currency - Integer ii = new Integer(rs.getInt(IsSOTrx ? "M_PriceList_ID" : "PO_PriceList_ID")); + Integer ii = Integer.valueOf(rs.getInt(IsSOTrx ? "M_PriceList_ID" : "PO_PriceList_ID")); if (!rs.wasNull()) mTab.setValue("M_PriceList_ID", ii); else @@ -171,13 +172,13 @@ public class CalloutInvoice extends CalloutEngine { MPriceList pl = new MPriceList(ctx, i, null); if (IsSOTrx == pl.isSOPriceList()) - mTab.setValue("M_PriceList_ID", new Integer(i)); + mTab.setValue("M_PriceList_ID", Integer.valueOf(i)); else { String sql2 = "SELECT M_PriceList_ID FROM M_PriceList WHERE AD_Client_ID=? AND IsSOPriceList=? AND IsActive='Y' ORDER BY IsDefault DESC"; ii = DB.getSQLValue (null, sql2, Env.getAD_Client_ID(ctx), IsSOTrx); if (ii != 0) - mTab.setValue("M_PriceList_ID", new Integer(ii)); + mTab.setValue("M_PriceList_ID", Integer.valueOf(ii)); } } } @@ -189,7 +190,7 @@ public class CalloutInvoice extends CalloutEngine if (Env.getContext(ctx, WindowNo, "DocBaseType").endsWith("C")) // Credits are Payment Term s = X_C_Invoice.PAYMENTRULE_OnCredit; // Payment Term - ii = new Integer(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID")); + ii = Integer.valueOf(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID")); if (!rs.wasNull()) mTab.setValue("C_PaymentTerm_ID", ii); @@ -206,7 +207,7 @@ public class CalloutInvoice extends CalloutEngine if (locID == 0) mTab.setValue("C_BPartner_Location_ID", null); else - mTab.setValue("C_BPartner_Location_ID", new Integer(locID)); + mTab.setValue("C_BPartner_Location_ID", Integer.valueOf(locID)); // Contact - overwritten by InfoBP selection int contID = rs.getInt("AD_User_ID"); @@ -219,7 +220,7 @@ public class CalloutInvoice extends CalloutEngine if (contID == 0) mTab.setValue("AD_User_ID", null); else - mTab.setValue("AD_User_ID", new Integer(contID)); + mTab.setValue("AD_User_ID", Integer.valueOf(contID)); // CreditAvailable if (IsSOTrx) @@ -358,9 +359,9 @@ public class CalloutInvoice extends CalloutEngine mTab.setValue("PriceLimit", pp.getPriceLimit()); mTab.setValue("PriceActual", pp.getPriceStd()); mTab.setValue("PriceEntered", pp.getPriceStd()); - mTab.setValue("C_Currency_ID", new Integer(pp.getC_Currency_ID())); + mTab.setValue("C_Currency_ID", Integer.valueOf(pp.getC_Currency_ID())); // mTab.setValue("Discount", pp.getDiscount()); - mTab.setValue("C_UOM_ID", new Integer(pp.getC_UOM_ID())); + mTab.setValue("C_UOM_ID", Integer.valueOf(pp.getC_UOM_ID())); Env.setContext(ctx, WindowNo, "EnforcePriceLimit", pp.isEnforcePriceLimit() ? "Y" : "N"); Env.setContext(ctx, WindowNo, "DiscountSchema", pp.isDiscountSchema() ? "Y" : "N"); // @@ -393,7 +394,7 @@ public class CalloutInvoice extends CalloutEngine } mTab.setValue("M_AttributeSetInstance_ID", null); mTab.setValue("S_ResourceAssignment_ID", null); - mTab.setValue("C_UOM_ID", new Integer(100)); // EA + mTab.setValue("C_UOM_ID", Integer.valueOf(100)); // EA Env.setContext(ctx, WindowNo, "DiscountSchema", "N"); String sql = "SELECT ChargeAmt FROM C_Charge WHERE C_Charge_ID=?"; @@ -490,7 +491,7 @@ public class CalloutInvoice extends CalloutEngine if (C_Tax_ID == 0) mTab.fireDataStatusEEvent(CLogger.retrieveError()); else - mTab.setValue("C_Tax_ID", new Integer(C_Tax_ID)); + mTab.setValue("C_Tax_ID", Integer.valueOf(C_Tax_ID)); // return amt (ctx, WindowNo, mTab, mField, value); } // tax @@ -618,7 +619,7 @@ public class CalloutInvoice extends CalloutEngine { PriceActual = new BigDecimal ((100.0 - Discount.doubleValue()) / 100.0 * PriceList.doubleValue()); if (PriceActual.scale() > StdPrecision) - PriceActual = PriceActual.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP); + PriceActual = PriceActual.setScale(StdPrecision, RoundingMode.HALF_UP); PriceEntered = MUOMConversion.convertProductFrom (ctx, M_Product_ID, C_UOM_To_ID, PriceActual); if (PriceEntered == null) @@ -634,7 +635,7 @@ public class CalloutInvoice extends CalloutEngine else Discount = new BigDecimal ((PriceList.doubleValue() - PriceActual.doubleValue()) / PriceList.doubleValue() * 100.0); if (Discount.scale() > 2) - Discount = Discount.setScale(2, BigDecimal.ROUND_HALF_UP); + Discount = Discount.setScale(2, RoundingMode.HALF_UP); mTab.setValue("Discount", Discount); } log.fine("amt = PriceEntered=" + PriceEntered + ", Actual" + PriceActual + ", Discount=" + Discount); @@ -663,7 +664,7 @@ public class CalloutInvoice extends CalloutEngine { Discount = BigDecimal.valueOf((PriceList.doubleValue () - PriceActual.doubleValue ()) / PriceList.doubleValue () * 100.0); if (Discount.scale () > 2) - Discount = Discount.setScale (2, BigDecimal.ROUND_HALF_UP); + Discount = Discount.setScale (2, RoundingMode.HALF_UP); // mTab.setValue ("Discount", Discount); } } @@ -671,7 +672,7 @@ public class CalloutInvoice extends CalloutEngine // Line Net Amt BigDecimal LineNetAmt = QtyInvoiced.multiply(PriceActual); if (LineNetAmt.scale() > StdPrecision) - LineNetAmt = LineNetAmt.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP); + LineNetAmt = LineNetAmt.setScale(StdPrecision, RoundingMode.HALF_UP); if (log.isLoggable(Level.INFO)) log.info("amt = LineNetAmt=" + LineNetAmt); mTab.setValue("LineNetAmt", LineNetAmt); @@ -757,7 +758,7 @@ public class CalloutInvoice extends CalloutEngine { int C_UOM_To_ID = ((Integer)value).intValue(); QtyEntered = (BigDecimal)mTab.getValue("QtyEntered"); - BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), BigDecimal.ROUND_HALF_UP); + BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), RoundingMode.HALF_UP); if (QtyEntered.compareTo(QtyEntered1) != 0) { if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyEntered Scale UOM=" + C_UOM_To_ID @@ -788,7 +789,7 @@ public class CalloutInvoice extends CalloutEngine { int C_UOM_To_ID = Env.getContextAsInt(ctx, WindowNo, mTab.getTabNo(), "C_UOM_ID"); QtyEntered = (BigDecimal)value; - BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), BigDecimal.ROUND_HALF_UP); + BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), RoundingMode.HALF_UP); if (QtyEntered.compareTo(QtyEntered1) != 0) { if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyEntered Scale UOM=" + C_UOM_To_ID @@ -814,7 +815,7 @@ public class CalloutInvoice extends CalloutEngine int C_UOM_To_ID = Env.getContextAsInt(ctx, WindowNo, mTab.getTabNo(), "C_UOM_ID"); QtyInvoiced = (BigDecimal)value; int precision = MProduct.get(ctx, M_Product_ID).getUOMPrecision(); - BigDecimal QtyInvoiced1 = QtyInvoiced.setScale(precision, BigDecimal.ROUND_HALF_UP); + BigDecimal QtyInvoiced1 = QtyInvoiced.setScale(precision, RoundingMode.HALF_UP); if (QtyInvoiced.compareTo(QtyInvoiced1) != 0) { if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyInvoiced Scale " diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoiceBatch.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoiceBatch.java index 8927608662..b346c68442 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoiceBatch.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutInvoiceBatch.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -108,7 +109,7 @@ public class CalloutInvoiceBatch extends CalloutEngine if (Env.getContext(ctx, WindowNo, "DocBaseType").endsWith("C")) // Credits are Payment Term s = X_C_Invoice.PAYMENTRULE_OnCredit; // Payment Term - Integer ii = new Integer(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID")); + Integer ii = Integer.valueOf(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID")); if (!rs.wasNull()) mTab.setValue("C_PaymentTerm_ID", ii); @@ -125,7 +126,7 @@ public class CalloutInvoiceBatch extends CalloutEngine if (locID == 0) mTab.setValue("C_BPartner_Location_ID", null); else - mTab.setValue("C_BPartner_Location_ID", new Integer(locID)); + mTab.setValue("C_BPartner_Location_ID", Integer.valueOf(locID)); // Contact - overwritten by InfoBP selection int contID = rs.getInt("AD_User_ID"); @@ -138,7 +139,7 @@ public class CalloutInvoiceBatch extends CalloutEngine if (contID == 0) mTab.setValue("AD_User_ID", null); else - mTab.setValue("AD_User_ID", new Integer(contID)); + mTab.setValue("AD_User_ID", Integer.valueOf(contID)); // CreditAvailable if (IsSOTrx) @@ -324,7 +325,7 @@ public class CalloutInvoiceBatch extends CalloutEngine if (C_Tax_ID == 0) mTab.fireDataStatusEEvent(CLogger.retrieveError()); else - mTab.setValue("C_Tax_ID", new Integer(C_Tax_ID)); + mTab.setValue("C_Tax_ID", Integer.valueOf(C_Tax_ID)); // return amt (ctx, WindowNo, mTab, mField, value); } // tax @@ -360,7 +361,7 @@ public class CalloutInvoiceBatch extends CalloutEngine // Line Net Amt BigDecimal LineNetAmt = QtyEntered.multiply(PriceEntered); if (LineNetAmt.scale() > StdPrecision) - LineNetAmt = LineNetAmt.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP); + LineNetAmt = LineNetAmt.setScale(StdPrecision, RoundingMode.HALF_UP); // Calculate Tax Amount boolean IsTaxIncluded = "Y".equals(Env.getContext(Env.getCtx(), WindowNo, "IsTaxIncluded")); diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java index 704a2eb6ab..749c83e269 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutOrder.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -186,7 +187,7 @@ public class CalloutOrder extends CalloutEngine if (s != null && s.length() != 0) mTab.setValue("PaymentRule", s); // Payment Term - Integer ii =new Integer(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID")); + Integer ii =Integer.valueOf(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID")); if (!rs.wasNull()) mTab.setValue("C_PaymentTerm_ID", ii); // InvoiceRule @@ -278,7 +279,7 @@ public class CalloutOrder extends CalloutEngine } // PriceList (indirect: IsTaxIncluded & Currency) - Integer ii = new Integer(rs.getInt(IsSOTrx ? "M_PriceList_ID" : "PO_PriceList_ID")); + Integer ii = Integer.valueOf(rs.getInt(IsSOTrx ? "M_PriceList_ID" : "PO_PriceList_ID")); if (!rs.wasNull()) mTab.setValue("M_PriceList_ID", ii); else @@ -288,13 +289,13 @@ public class CalloutOrder extends CalloutEngine { MPriceList pl = new MPriceList(ctx, i, null); if (IsSOTrx == pl.isSOPriceList()) - mTab.setValue("M_PriceList_ID", new Integer(i)); + mTab.setValue("M_PriceList_ID", Integer.valueOf(i)); else { String sql2 = "SELECT M_PriceList_ID FROM M_PriceList WHERE AD_Client_ID=? AND IsSOPriceList=? AND IsActive='Y' ORDER BY IsDefault DESC"; ii = DB.getSQLValue (null, sql2, Env.getAD_Client_ID(ctx), IsSOTrx); if (ii != 0) - mTab.setValue("M_PriceList_ID", new Integer(ii)); + mTab.setValue("M_PriceList_ID", Integer.valueOf(ii)); } } } @@ -325,7 +326,7 @@ public class CalloutOrder extends CalloutEngine if (bill_Location_ID == 0) mTab.setValue("Bill_Location_ID", null); else - mTab.setValue("Bill_Location_ID", new Integer(bill_Location_ID)); + mTab.setValue("Bill_Location_ID", Integer.valueOf(bill_Location_ID)); // Ship-To Location if (shipTo_ID == 0) shipTo_ID = rs.getInt("C_BPartner_Location_ID"); @@ -333,7 +334,7 @@ public class CalloutOrder extends CalloutEngine if (shipTo_ID == 0) mTab.setValue("C_BPartner_Location_ID", null); else - mTab.setValue("C_BPartner_Location_ID", new Integer(shipTo_ID)); + mTab.setValue("C_BPartner_Location_ID", Integer.valueOf(shipTo_ID)); // Contact - overwritten by InfoBP selection int contID = rs.getInt("AD_User_ID"); @@ -347,8 +348,8 @@ public class CalloutOrder extends CalloutEngine mTab.setValue("AD_User_ID", null); else { - mTab.setValue("AD_User_ID", new Integer(contID)); - mTab.setValue("Bill_User_ID", new Integer(contID)); + mTab.setValue("AD_User_ID", Integer.valueOf(contID)); + mTab.setValue("Bill_User_ID", Integer.valueOf(contID)); } // CreditAvailable @@ -399,7 +400,7 @@ public class CalloutOrder extends CalloutEngine if (s != null && s.length() != 0) mTab.setValue("PaymentRule", s); // Payment Term - ii = new Integer(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID")); + ii = Integer.valueOf(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID")); if (!rs.wasNull()) mTab.setValue("C_PaymentTerm_ID", ii); // InvoiceRule @@ -479,7 +480,7 @@ public class CalloutOrder extends CalloutEngine if (rs.next()) { // PriceList (indirect: IsTaxIncluded & Currency) - Integer ii = new Integer(rs.getInt(IsSOTrx ? "M_PriceList_ID" : "PO_PriceList_ID")); + Integer ii = Integer.valueOf(rs.getInt(IsSOTrx ? "M_PriceList_ID" : "PO_PriceList_ID")); if (!rs.wasNull()) mTab.setValue("M_PriceList_ID", ii); else @@ -489,13 +490,13 @@ public class CalloutOrder extends CalloutEngine { MPriceList pl = new MPriceList(ctx, i, null); if (IsSOTrx == pl.isSOPriceList()) - mTab.setValue("M_PriceList_ID", new Integer(i)); + mTab.setValue("M_PriceList_ID", Integer.valueOf(i)); else { String sql2 = "SELECT M_PriceList_ID FROM M_PriceList WHERE AD_Client_ID=? AND IsSOPriceList=? AND IsActive='Y' ORDER BY IsDefault DESC"; ii = DB.getSQLValue (null, sql2, Env.getAD_Client_ID(ctx), IsSOTrx); if (ii != 0) - mTab.setValue("M_PriceList_ID", new Integer(ii)); + mTab.setValue("M_PriceList_ID", Integer.valueOf(ii)); } } } @@ -518,7 +519,7 @@ public class CalloutOrder extends CalloutEngine if (bill_Location_ID == 0) mTab.setValue("Bill_Location_ID", null); else - mTab.setValue("Bill_Location_ID", new Integer(bill_Location_ID)); + mTab.setValue("Bill_Location_ID", Integer.valueOf(bill_Location_ID)); // Contact - overwritten by InfoBP selection int contID = rs.getInt("AD_User_ID"); @@ -531,7 +532,7 @@ public class CalloutOrder extends CalloutEngine if (contID == 0) mTab.setValue("Bill_User_ID", null); else - mTab.setValue("Bill_User_ID", new Integer(contID)); + mTab.setValue("Bill_User_ID", Integer.valueOf(contID)); // CreditAvailable if (IsSOTrx) @@ -577,7 +578,7 @@ public class CalloutOrder extends CalloutEngine if (s != null && s.length() != 0) mTab.setValue("PaymentRule", s); // Payment Term - ii = new Integer(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID")); + ii = Integer.valueOf(rs.getInt(IsSOTrx ? "C_PaymentTerm_ID" : "PO_PaymentTerm_ID")); if (!rs.wasNull()) mTab.setValue("C_PaymentTerm_ID", ii); // InvoiceRule @@ -783,9 +784,9 @@ public class CalloutOrder extends CalloutEngine mTab.setValue("PriceLimit", pp.getPriceLimit()); mTab.setValue("PriceActual", pp.getPriceStd()); mTab.setValue("PriceEntered", pp.getPriceStd()); - mTab.setValue("C_Currency_ID", new Integer(pp.getC_Currency_ID())); + mTab.setValue("C_Currency_ID", Integer.valueOf(pp.getC_Currency_ID())); mTab.setValue("Discount", pp.getDiscount()); - mTab.setValue("C_UOM_ID", new Integer(pp.getC_UOM_ID())); + mTab.setValue("C_UOM_ID", Integer.valueOf(pp.getC_UOM_ID())); mTab.setValue("QtyOrdered", mTab.getValue("QtyEntered")); Env.setContext(ctx, WindowNo, "EnforcePriceLimit", pp.isEnforcePriceLimit() ? "Y" : "N"); Env.setContext(ctx, WindowNo, "DiscountSchema", pp.isDiscountSchema() ? "Y" : "N"); @@ -795,7 +796,7 @@ public class CalloutOrder extends CalloutEngine // Integer wh = (Integer)mTab.getValue("M_Warehouse_ID"); // if (wh.intValue() != M_Warehouse_ID) // { - // mTab.setValue("M_Warehouse_ID", new Integer(M_Warehouse_ID)); + // mTab.setValue("M_Warehouse_ID", Integer.valueOf(M_Warehouse_ID)); // ADialog.warn(,WindowNo, "WarehouseChanged"); // } @@ -822,7 +823,7 @@ public class CalloutOrder extends CalloutEngine { Integer C_OrderLine_ID = (Integer)mTab.getValue("C_OrderLine_ID"); if (C_OrderLine_ID == null) - C_OrderLine_ID = new Integer(0); + C_OrderLine_ID = Integer.valueOf(0); BigDecimal notReserved = MOrderLine.getNotReserved(ctx, M_Warehouse_ID, M_Product_ID, M_AttributeSetInstance_ID, C_OrderLine_ID.intValue()); @@ -869,7 +870,7 @@ public class CalloutOrder extends CalloutEngine } mTab.setValue("M_AttributeSetInstance_ID", null); mTab.setValue("S_ResourceAssignment_ID", null); - mTab.setValue("C_UOM_ID", new Integer(100)); // EA + mTab.setValue("C_UOM_ID", Integer.valueOf(100)); // EA Env.setContext(ctx, WindowNo, "DiscountSchema", "N"); String sql = "SELECT ChargeAmt FROM C_Charge WHERE C_Charge_ID=?"; @@ -976,7 +977,7 @@ public class CalloutOrder extends CalloutEngine if (C_Tax_ID == 0) mTab.fireDataStatusEEvent(CLogger.retrieveError()); else - mTab.setValue("C_Tax_ID", new Integer(C_Tax_ID)); + mTab.setValue("C_Tax_ID", Integer.valueOf(C_Tax_ID)); // if (steps) log.warning("fini"); return amt(ctx, WindowNo, mTab, mField, value); @@ -1119,7 +1120,7 @@ public class CalloutOrder extends CalloutEngine if ( PriceList.doubleValue() != 0 ) PriceActual = BigDecimal.valueOf((100.0 - Discount.doubleValue()) / 100.0 * PriceList.doubleValue()); if (PriceActual.scale() > StdPrecision) - PriceActual = PriceActual.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP); + PriceActual = PriceActual.setScale(StdPrecision, RoundingMode.HALF_UP); PriceEntered = MUOMConversion.convertProductFrom (ctx, M_Product_ID, C_UOM_To_ID, PriceActual); if (PriceEntered == null) @@ -1135,7 +1136,7 @@ public class CalloutOrder extends CalloutEngine else Discount = BigDecimal.valueOf((PriceList.doubleValue() - PriceActual.doubleValue()) / PriceList.doubleValue() * 100.0); if (Discount.scale() > 2) - Discount = Discount.setScale(2, BigDecimal.ROUND_HALF_UP); + Discount = Discount.setScale(2, RoundingMode.HALF_UP); mTab.setValue("Discount", Discount); } if (log.isLoggable(Level.FINE)) log.fine("PriceEntered=" + PriceEntered + ", Actual=" + PriceActual + ", Discount=" + Discount); @@ -1163,7 +1164,7 @@ public class CalloutOrder extends CalloutEngine { Discount = BigDecimal.valueOf((PriceList.doubleValue () - PriceActual.doubleValue ()) / PriceList.doubleValue () * 100.0); if (Discount.scale () > 2) - Discount = Discount.setScale (2, BigDecimal.ROUND_HALF_UP); + Discount = Discount.setScale (2, RoundingMode.HALF_UP); mTab.setValue ("Discount", Discount); } } @@ -1171,7 +1172,7 @@ public class CalloutOrder extends CalloutEngine // Line Net Amt BigDecimal LineNetAmt = QtyOrdered.multiply(PriceActual); if (LineNetAmt.scale() > StdPrecision) - LineNetAmt = LineNetAmt.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP); + LineNetAmt = LineNetAmt.setScale(StdPrecision, RoundingMode.HALF_UP); if (log.isLoggable(Level.INFO)) log.info("LineNetAmt=" + LineNetAmt); mTab.setValue("LineNetAmt", LineNetAmt); // @@ -1210,7 +1211,7 @@ public class CalloutOrder extends CalloutEngine { int C_UOM_To_ID = ((Integer)value).intValue(); QtyEntered = (BigDecimal)mTab.getValue("QtyEntered"); - BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), BigDecimal.ROUND_HALF_UP); + BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), RoundingMode.HALF_UP); if (QtyEntered.compareTo(QtyEntered1) != 0) { if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyEntered Scale UOM=" + C_UOM_To_ID @@ -1241,7 +1242,7 @@ public class CalloutOrder extends CalloutEngine { int C_UOM_To_ID = Env.getContextAsInt(ctx, WindowNo, mTab.getTabNo(), "C_UOM_ID"); QtyEntered = (BigDecimal)value; - BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), BigDecimal.ROUND_HALF_UP); + BigDecimal QtyEntered1 = QtyEntered.setScale(MUOM.getPrecision(ctx, C_UOM_To_ID), RoundingMode.HALF_UP); if (QtyEntered.compareTo(QtyEntered1) != 0) { if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyEntered Scale UOM=" + C_UOM_To_ID @@ -1267,7 +1268,7 @@ public class CalloutOrder extends CalloutEngine int C_UOM_To_ID = Env.getContextAsInt(ctx, WindowNo, mTab.getTabNo(), "C_UOM_ID"); QtyOrdered = (BigDecimal)value; int precision = MProduct.get(ctx, M_Product_ID).getUOMPrecision(); - BigDecimal QtyOrdered1 = QtyOrdered.setScale(precision, BigDecimal.ROUND_HALF_UP); + BigDecimal QtyOrdered1 = QtyOrdered.setScale(precision, RoundingMode.HALF_UP); if (QtyOrdered.compareTo(QtyOrdered1) != 0) { if (log.isLoggable(Level.FINE)) log.fine("Corrected QtyOrdered Scale " @@ -1315,7 +1316,7 @@ public class CalloutOrder extends CalloutEngine { Integer C_OrderLine_ID = (Integer)mTab.getValue("C_OrderLine_ID"); if (C_OrderLine_ID == null) - C_OrderLine_ID = new Integer(0); + C_OrderLine_ID = Integer.valueOf(0); BigDecimal notReserved = MOrderLine.getNotReserved(ctx, M_Warehouse_ID, M_Product_ID, M_AttributeSetInstance_ID, C_OrderLine_ID.intValue()); diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutPaySelection.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutPaySelection.java index ce184c1aaf..c8fc2efef2 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutPaySelection.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutPaySelection.java @@ -127,7 +127,7 @@ public class CalloutPaySelection extends CalloutEngine { OpenAmt = rs.getBigDecimal(1); DiscountAmt = rs.getBigDecimal(2); - IsSOTrx = new Boolean ("Y".equals(rs.getString(3))); + IsSOTrx = Boolean.valueOf ("Y".equals(rs.getString(3))); } } catch (SQLException e) diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutPayment.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutPayment.java index 34a5a9d048..1ca3a98309 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutPayment.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutPayment.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -94,9 +95,9 @@ public class CalloutPayment extends CalloutEngine rs = pstmt.executeQuery (); if (rs.next ()) { - mTab.setValue ("C_BPartner_ID", new Integer (rs.getInt (1))); + mTab.setValue ("C_BPartner_ID", Integer.valueOf(rs.getInt (1))); int C_Currency_ID = rs.getInt (2); // Set Invoice Currency - mTab.setValue ("C_Currency_ID", new Integer (C_Currency_ID)); + mTab.setValue ("C_Currency_ID", Integer.valueOf(C_Currency_ID)); // BigDecimal InvoiceOpen = rs.getBigDecimal (3); // Set Invoice // OPen Amount @@ -170,9 +171,9 @@ public class CalloutPayment extends CalloutEngine rs = pstmt.executeQuery (); if (rs.next ()) { - mTab.setValue ("C_BPartner_ID", new Integer (rs.getInt (1))); + mTab.setValue ("C_BPartner_ID", Integer.valueOf(rs.getInt (1))); int C_Currency_ID = rs.getInt (2); // Set Order Currency - mTab.setValue ("C_Currency_ID", new Integer (C_Currency_ID)); + mTab.setValue ("C_Currency_ID", Integer.valueOf(C_Currency_ID)); // BigDecimal GrandTotal = rs.getBigDecimal (3); // Set Pay // Amount @@ -411,7 +412,7 @@ public class CalloutPayment extends CalloutEngine } // InvoiceOpenAmt = InvoiceOpenAmt.multiply (CurrencyRate).setScale ( - currency.getStdPrecision (), BigDecimal.ROUND_HALF_UP); + currency.getStdPrecision (), RoundingMode.HALF_UP); if (log.isLoggable(Level.FINE)) log.fine ("Rate=" + CurrencyRate + ", InvoiceOpenAmt=" + InvoiceOpenAmt); } @@ -420,16 +421,16 @@ public class CalloutPayment extends CalloutEngine || colName.equals ("C_ConversionType_ID")) { PayAmt = PayAmt.multiply (CurrencyRate).setScale ( - currency.getStdPrecision (), BigDecimal.ROUND_HALF_UP); + currency.getStdPrecision (), RoundingMode.HALF_UP); mTab.setValue ("PayAmt", PayAmt); DiscountAmt = DiscountAmt.multiply (CurrencyRate).setScale ( - currency.getStdPrecision (), BigDecimal.ROUND_HALF_UP); + currency.getStdPrecision (), RoundingMode.HALF_UP); mTab.setValue ("DiscountAmt", DiscountAmt); WriteOffAmt = WriteOffAmt.multiply (CurrencyRate).setScale ( - currency.getStdPrecision (), BigDecimal.ROUND_HALF_UP); + currency.getStdPrecision (), RoundingMode.HALF_UP); mTab.setValue ("WriteOffAmt", WriteOffAmt); OverUnderAmt = OverUnderAmt.multiply (CurrencyRate).setScale ( - currency.getStdPrecision (), BigDecimal.ROUND_HALF_UP); + currency.getStdPrecision (), RoundingMode.HALF_UP); mTab.setValue ("OverUnderAmt", OverUnderAmt); } // No Invoice - Set Discount, Witeoff, Under/Over to 0 diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutPaymentAllocate.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutPaymentAllocate.java index f02ea7bdd1..dd875b23a1 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutPaymentAllocate.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutPaymentAllocate.java @@ -95,9 +95,9 @@ public class CalloutPaymentAllocate extends CalloutEngine rs = pstmt.executeQuery(); if (rs.next()) { - // mTab.setValue("C_BPartner_ID", new Integer(rs.getInt(1))); + // mTab.setValue("C_BPartner_ID", Integer.valueOf(rs.getInt(1))); // int C_Currency_ID = rs.getInt(2); // Set Invoice Currency - // mTab.setValue("C_Currency_ID", new Integer(C_Currency_ID)); + // mTab.setValue("C_Currency_ID", Integer.valueOf(C_Currency_ID)); // BigDecimal InvoiceOpen = rs.getBigDecimal(3); // Set Invoice OPen Amount if (InvoiceOpen == null) diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutProductCategory.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutProductCategory.java index 1a54bbebbd..7a9cbd9f94 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutProductCategory.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutProductCategory.java @@ -43,7 +43,7 @@ public class CalloutProductCategory extends CalloutEngine Integer productCategoryId = (Integer) mTab.getValue(MProductCategory.COLUMNNAME_M_Product_Category_ID); if (productCategoryId == null) - productCategoryId = new Integer(0); + productCategoryId = Integer.valueOf(0); if (productCategoryId.intValue() > 0) { MProductCategory pc = new MProductCategory(ctx, productCategoryId.intValue(), null); diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutProduction.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutProduction.java index e1fef1647a..8d686f27e6 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutProduction.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutProduction.java @@ -51,7 +51,7 @@ public class CalloutProduction extends CalloutEngine if (Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_Product_ID") == M_Product_ID.intValue() && Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_AttributeSetInstance_ID") != 0) { - mTab.setValue("M_AttributeSetInstance_ID", new Integer(Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_AttributeSetInstance_ID"))); + mTab.setValue("M_AttributeSetInstance_ID", Integer.valueOf(Env.getContextAsInt(ctx, WindowNo, Env.TAB_INFO, "M_AttributeSetInstance_ID"))); } else { diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutProject.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutProject.java index 0f23ed39ed..4288e69e80 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutProject.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutProject.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.Properties; import java.util.logging.Level; @@ -61,7 +62,7 @@ public class CalloutProject extends CalloutEngine // BigDecimal PlannedAmt = PlannedQty.multiply(PlannedPrice); if (PlannedAmt.scale() > StdPrecision) - PlannedAmt = PlannedAmt.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP); + PlannedAmt = PlannedAmt.setScale(StdPrecision, RoundingMode.HALF_UP); // if (log.isLoggable(Level.FINE)) log.fine("PlannedQty=" + PlannedQty + " * PlannedPrice=" + PlannedPrice + " -> PlannedAmt=" + PlannedAmt + " (Precision=" + StdPrecision+ ")"); mTab.setValue("PlannedAmt", PlannedAmt); diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutRequest.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutRequest.java index 5ae3fd5c16..af0f100e31 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutRequest.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutRequest.java @@ -138,7 +138,7 @@ public class CalloutRequest extends CalloutEngine MRequestType rt = MRequestType.get(ctx, R_RequestType_ID); int R_Status_ID = rt.getDefaultR_Status_ID(); if (R_Status_ID != 0) - mTab.setValue("R_Status_ID", new Integer(R_Status_ID)); + mTab.setValue("R_Status_ID", Integer.valueOf(R_Status_ID)); return ""; } // type diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutRequisition.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutRequisition.java index c219a54c8d..fbbd264ba6 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutRequisition.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutRequisition.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.Timestamp; import java.util.Properties; import java.util.logging.Level; @@ -89,7 +90,7 @@ public class CalloutRequisition extends CalloutEngine // Multiply BigDecimal LineNetAmt = Qty.multiply(PriceActual); if (LineNetAmt.scale() > StdPrecision) - LineNetAmt = LineNetAmt.setScale(StdPrecision, BigDecimal.ROUND_HALF_UP); + LineNetAmt = LineNetAmt.setScale(StdPrecision, RoundingMode.HALF_UP); line.setLineNetAmt(LineNetAmt); if (log.isLoggable(Level.INFO)) log.info("amt - LineNetAmt=" + LineNetAmt); // diff --git a/org.adempiere.base.callout/src/org/compiere/model/CalloutTimeExpense.java b/org.adempiere.base.callout/src/org/compiere/model/CalloutTimeExpense.java index b26c16a5a1..83f0341425 100644 --- a/org.adempiere.base.callout/src/org/compiere/model/CalloutTimeExpense.java +++ b/org.adempiere.base.callout/src/org/compiere/model/CalloutTimeExpense.java @@ -98,7 +98,7 @@ public class CalloutTimeExpense extends CalloutEngine if (priceActual == null) priceActual = rs.getBigDecimal("PriceLimit"); // Currency - Integer ii = new Integer(rs.getInt("C_Currency_ID")); + Integer ii = Integer.valueOf(rs.getInt("C_Currency_ID")); if (!rs.wasNull()) mTab.setValue("C_Currency_ID", ii); } @@ -143,7 +143,7 @@ public class CalloutTimeExpense extends CalloutEngine if (priceActual == null) priceActual = rs.getBigDecimal("PriceLimit"); // Currency - Integer ii = new Integer(rs.getInt("C_Currency_ID")); + Integer ii = Integer.valueOf(rs.getInt("C_Currency_ID")); if (!rs.wasNull()) mTab.setValue("C_Currency_ID", ii); } diff --git a/org.adempiere.base.process/.classpath b/org.adempiere.base.process/.classpath index cf36b56119..423c974870 100644 --- a/org.adempiere.base.process/.classpath +++ b/org.adempiere.base.process/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.base.process/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.base.process/META-INF/MANIFEST.MF b/org.adempiere.base.process/META-INF/MANIFEST.MF index 963dfb9f28..a876a5f038 100644 --- a/org.adempiere.base.process/META-INF/MANIFEST.MF +++ b/org.adempiere.base.process/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Processes Bundle-SymbolicName: org.adempiere.base.process Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Export-Package: org.adempiere.process, org.compiere.process, @@ -16,3 +16,4 @@ Import-Package: javax.mail;version="1.5", Eclipse-RegisterBuddy: org.adempiere.base Bundle-ClassPath: . Automatic-Module-Name: org.adempiere.base.process +Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.base.process/src/org/adempiere/process/Export.java b/org.adempiere.base.process/src/org/adempiere/process/Export.java index 5f366a04c3..091f33c20c 100644 --- a/org.adempiere.base.process/src/org/adempiere/process/Export.java +++ b/org.adempiere.base.process/src/org/adempiere/process/Export.java @@ -173,7 +173,7 @@ public class Export extends SvrProcess if (rs.next()) { HashMap variableMap = new HashMap(); - variableMap.put(TOTAL_SEGMENTS, new Integer(1)); + variableMap.put(TOTAL_SEGMENTS, Integer.valueOf(1)); Element rootElement = outDocument.createElement(exportFormat.getValue()); rootElement.appendChild(outDocument.createComment(exportFormat.getDescription())); @@ -395,11 +395,11 @@ public class Export extends SvrProcess if (variableName != null && !"".equals(variableName) ) { Integer var = variableMap.get(variableName); if (var == null) { - var = new Integer(0); + var = Integer.valueOf(0); } int intValue = var.intValue(); intValue++; - variableMap.put(variableName, new Integer(intValue)); + variableMap.put(variableName, Integer.valueOf(intValue)); } } diff --git a/org.adempiere.base.process/src/org/compiere/process/AcctSchemaCopyAcct.java b/org.adempiere.base.process/src/org/compiere/process/AcctSchemaCopyAcct.java index 8d32c72762..b21313997a 100644 --- a/org.adempiere.base.process/src/org/compiere/process/AcctSchemaCopyAcct.java +++ b/org.adempiere.base.process/src/org/compiere/process/AcctSchemaCopyAcct.java @@ -122,7 +122,7 @@ public class AcctSchemaCopyAcct extends SvrProcess String columnName = pp.getName(); MAccount sourceAccount = MAccount.get(getCtx(), sourceC_ValidCombination_ID); MAccount targetAccount = createAccount(targetAS, sourceAccount); - target.setValue(columnName, new Integer(targetAccount.getC_ValidCombination_ID())); + target.setValue(columnName, Integer.valueOf(targetAccount.getC_ValidCombination_ID())); } if (!target.save()) throw new AdempiereSystemError("Could not Save GL"); @@ -147,7 +147,7 @@ public class AcctSchemaCopyAcct extends SvrProcess String columnName = pp.getName(); MAccount sourceAccount = MAccount.get(getCtx(), sourceC_ValidCombination_ID); MAccount targetAccount = createAccount(targetAS, sourceAccount); - target.setValue(columnName, new Integer(targetAccount.getC_ValidCombination_ID())); + target.setValue(columnName, Integer.valueOf(targetAccount.getC_ValidCombination_ID())); } if (!target.save()) throw new AdempiereSystemError("Could not Save Default"); diff --git a/org.adempiere.base.process/src/org/compiere/process/ChangeLogProcess.java b/org.adempiere.base.process/src/org/compiere/process/ChangeLogProcess.java index f531ff3417..ed963c59a8 100644 --- a/org.adempiere.base.process/src/org/compiere/process/ChangeLogProcess.java +++ b/org.adempiere.base.process/src/org/compiere/process/ChangeLogProcess.java @@ -91,9 +91,9 @@ public class ChangeLogProcess extends SvrProcess if (para[i].getParameter() == null) ; else if (name.equals("CheckNewValue")) - p_CheckNewValue = new Boolean("Y".equals(para[i].getParameter())); + p_CheckNewValue = Boolean.valueOf("Y".equals(para[i].getParameter())); else if (name.equals("CheckOldValue")) - p_CheckOldValue = new Boolean("Y".equals(para[i].getParameter())); + p_CheckOldValue = Boolean.valueOf("Y".equals(para[i].getParameter())); else if (name.equals("SetCustomization")) p_SetCustomization = "Y".equals(para[i].getParameter()); else diff --git a/org.adempiere.base.process/src/org/compiere/process/DistributionCreate.java b/org.adempiere.base.process/src/org/compiere/process/DistributionCreate.java index dbc8cd4b84..872306c15c 100644 --- a/org.adempiere.base.process/src/org/compiere/process/DistributionCreate.java +++ b/org.adempiere.base.process/src/org/compiere/process/DistributionCreate.java @@ -17,6 +17,7 @@ package org.compiere.process; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.logging.Level; import org.compiere.model.MBPartner; @@ -191,7 +192,7 @@ public class DistributionCreate extends SvrProcess BigDecimal ratio = dll.getRatio(); BigDecimal qty = p_Qty.multiply(ratio); if (qty.compareTo(Env.ZERO) != 0) - qty = qty.divide(m_dl.getRatioTotal(), m_product.getUOMPrecision(), BigDecimal.ROUND_HALF_UP); + qty = qty.divide(m_dl.getRatioTotal(), m_product.getUOMPrecision(), RoundingMode.HALF_UP); BigDecimal minQty = dll.getMinQty(); if (qty.compareTo(minQty) < 0) qty = minQty; diff --git a/org.adempiere.base.process/src/org/compiere/process/DistributionRun.java b/org.adempiere.base.process/src/org/compiere/process/DistributionRun.java index 5a60a72a1e..757863c662 100644 --- a/org.adempiere.base.process/src/org/compiere/process/DistributionRun.java +++ b/org.adempiere.base.process/src/org/compiere/process/DistributionRun.java @@ -17,6 +17,7 @@ package org.compiere.process; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Timestamp; @@ -413,7 +414,7 @@ public class DistributionRun extends SvrProcess if (detail.isCanAdjust()) { BigDecimal diffRatio = detail.getRatio().multiply(difference) - .divide(ratioTotal, BigDecimal.ROUND_HALF_UP); // precision from total + .divide(ratioTotal, RoundingMode.HALF_UP); // precision from total if (log.isLoggable(Level.FINE)) log.fine("Detail=" + detail.toString() + ", Allocation=" + detail.getActualAllocation() + ", DiffRatio=" + diffRatio); @@ -646,7 +647,7 @@ public class DistributionRun extends SvrProcess log.info("Qty Total Available:" + drl.getTotalQty()); log.info("Qty Total Demand:" + totalration); } - BigDecimal factor = ration.divide(totalration, 12 , BigDecimal.ROUND_HALF_UP); + BigDecimal factor = ration.divide(totalration, 12 , RoundingMode.HALF_UP); record.setQty(drl.getTotalQty().multiply(factor)); record.saveEx(); } @@ -750,7 +751,7 @@ public class DistributionRun extends SvrProcess , p_M_DistributionRun_ID, record.getM_Product_ID()); MDistributionRunLine drl = (MDistributionRunLine) MTable.get(getCtx(), MDistributionRunLine.Table_ID).getPO(record.getM_DistributionRunLine_ID(), get_TrxName()); BigDecimal ration = record.getRatio(); - BigDecimal factor = ration.divide(total_ration,BigDecimal.ROUND_HALF_UP); + BigDecimal factor = ration.divide(total_ration,RoundingMode.HALF_UP); record.setQty(factor.multiply(drl.getTotalQty())); record.saveEx(); } diff --git a/org.adempiere.base.process/src/org/compiere/process/DunningPrint.java b/org.adempiere.base.process/src/org/compiere/process/DunningPrint.java index 484a55f868..3ca5c296f2 100644 --- a/org.adempiere.base.process/src/org/compiere/process/DunningPrint.java +++ b/org.adempiere.base.process/src/org/compiere/process/DunningPrint.java @@ -159,7 +159,7 @@ public class DunningPrint extends SvrProcess // query MQuery query = new MQuery("C_Dunning_Header_v"); query.addRestriction("C_DunningRunEntry_ID", MQuery.EQUAL, - new Integer(entry.getC_DunningRunEntry_ID())); + Integer.valueOf(entry.getC_DunningRunEntry_ID())); // Engine PrintInfo info = new PrintInfo( diff --git a/org.adempiere.base.process/src/org/compiere/process/InOutCreateInvoice.java b/org.adempiere.base.process/src/org/compiere/process/InOutCreateInvoice.java index 9076dea73e..a4e371c8d8 100644 --- a/org.adempiere.base.process/src/org/compiere/process/InOutCreateInvoice.java +++ b/org.adempiere.base.process/src/org/compiere/process/InOutCreateInvoice.java @@ -17,6 +17,7 @@ package org.compiere.process; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.logging.Level; import org.compiere.model.MCurrency; @@ -122,7 +123,7 @@ public class InOutCreateInvoice extends SvrProcess BigDecimal igt = invoice.getGrandTotal(); BigDecimal percent = Env.ONE; if (ogt.compareTo(igt) != 0) - percent = igt.divide(ogt, 10, BigDecimal.ROUND_HALF_UP); + percent = igt.divide(ogt, 10, RoundingMode.HALF_UP); MCurrency cur = MCurrency.get(order.getCtx(), order.getC_Currency_ID()); int scale = cur.getStdPrecision(); @@ -132,7 +133,7 @@ public class InOutCreateInvoice extends SvrProcess if (percent != Env.ONE) { BigDecimal propDueAmt = ops.getDueAmt().multiply(percent); if (propDueAmt.scale() > scale) - propDueAmt = propDueAmt.setScale(scale, BigDecimal.ROUND_HALF_UP); + propDueAmt = propDueAmt.setScale(scale, RoundingMode.HALF_UP); ips.setDueAmt(propDueAmt); } ips.setC_Invoice_ID(invoice.getC_Invoice_ID()); diff --git a/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java b/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java index 62576172f1..2026d2bf27 100644 --- a/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java +++ b/org.adempiere.base.process/src/org/compiere/process/InOutGenerate.java @@ -17,6 +17,7 @@ package org.compiere.process; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Timestamp; @@ -448,7 +449,7 @@ public class InOutGenerate extends SvrProcess if (orderLine.getQtyEntered().compareTo(orderLine.getQtyOrdered()) != 0) line.setQtyEntered(qty .multiply(orderLine.getQtyEntered()) - .divide(orderLine.getQtyOrdered(), 12, BigDecimal.ROUND_HALF_UP)); + .divide(orderLine.getQtyOrdered(), 12, RoundingMode.HALF_UP)); line.setLine(m_line + orderLine.getLine()); if (!line.save()) throw new IllegalStateException("Could not create Shipment Line"); @@ -504,7 +505,7 @@ public class InOutGenerate extends SvrProcess line.setQty(line.getMovementQty().add(deliver)); if (orderLine.getQtyEntered().compareTo(orderLine.getQtyOrdered()) != 0) line.setQtyEntered(line.getMovementQty().multiply(orderLine.getQtyEntered()) - .divide(orderLine.getQtyOrdered(), 12, BigDecimal.ROUND_HALF_UP)); + .divide(orderLine.getQtyOrdered(), 12, RoundingMode.HALF_UP)); line.setLine(m_line + orderLine.getLine()); if (!line.save()) throw new IllegalStateException("Could not create Shipment Line"); @@ -530,7 +531,7 @@ public class InOutGenerate extends SvrProcess line.setQty(toDeliver); if (orderLine.getQtyEntered().compareTo(orderLine.getQtyOrdered()) != 0) line.setQtyEntered(line.getMovementQty().multiply(orderLine.getQtyEntered()) - .divide(orderLine.getQtyOrdered(), 12, BigDecimal.ROUND_HALF_UP)); + .divide(orderLine.getQtyOrdered(), 12, RoundingMode.HALF_UP)); line.setLine(m_line + orderLine.getLine()); if (!line.save()) throw new IllegalStateException("Could not create Shipment Line"); diff --git a/org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java b/org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java index 30407ce96b..e0e86158ea 100644 --- a/org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java +++ b/org.adempiere.base.process/src/org/compiere/process/InvoiceGenerate.java @@ -17,6 +17,7 @@ package org.compiere.process; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -300,7 +301,7 @@ public class InvoiceGenerate extends SvrProcess if (oLine.getQtyEntered().compareTo(oLine.getQtyOrdered()) != 0) qtyEntered = toInvoice .multiply(oLine.getQtyEntered()) - .divide(oLine.getQtyOrdered(), 12, BigDecimal.ROUND_HALF_UP); + .divide(oLine.getQtyOrdered(), 12, RoundingMode.HALF_UP); createLine (order, oLine, toInvoice, qtyEntered); } else if (!completeOrder) @@ -492,7 +493,7 @@ public class InvoiceGenerate extends SvrProcess BigDecimal igt = m_invoice.getGrandTotal(); BigDecimal percent = Env.ONE; if (ogt.compareTo(igt) != 0) - percent = igt.divide(ogt, 10, BigDecimal.ROUND_HALF_UP); + percent = igt.divide(ogt, 10, RoundingMode.HALF_UP); MCurrency cur = MCurrency.get(order.getCtx(), order.getC_Currency_ID()); int scale = cur.getStdPrecision(); @@ -502,7 +503,7 @@ public class InvoiceGenerate extends SvrProcess if (percent != Env.ONE) { BigDecimal propDueAmt = ops.getDueAmt().multiply(percent); if (propDueAmt.scale() > scale) - propDueAmt = propDueAmt.setScale(scale, BigDecimal.ROUND_HALF_UP); + propDueAmt = propDueAmt.setScale(scale, RoundingMode.HALF_UP); ips.setDueAmt(propDueAmt); } ips.setC_Invoice_ID(m_invoice.getC_Invoice_ID()); diff --git a/org.adempiere.base.process/src/org/compiere/process/InvoicePrint.java b/org.adempiere.base.process/src/org/compiere/process/InvoicePrint.java index 2d73778a12..b621f48f3c 100644 --- a/org.adempiere.base.process/src/org/compiere/process/InvoicePrint.java +++ b/org.adempiere.base.process/src/org/compiere/process/InvoicePrint.java @@ -275,7 +275,7 @@ public class InvoicePrint extends SvrProcess format.setTranslationLanguage(language); // query MQuery query = new MQuery("C_Invoice_Header_v"); - query.addRestriction("C_Invoice_ID", MQuery.EQUAL, new Integer(C_Invoice_ID)); + query.addRestriction("C_Invoice_ID", MQuery.EQUAL, Integer.valueOf(C_Invoice_ID)); // Engine PrintInfo info = new PrintInfo( diff --git a/org.adempiere.base.process/src/org/compiere/process/M_PriceList_Create.java b/org.adempiere.base.process/src/org/compiere/process/M_PriceList_Create.java index 0365b78175..84bd0d325a 100644 --- a/org.adempiere.base.process/src/org/compiere/process/M_PriceList_Create.java +++ b/org.adempiere.base.process/src/org/compiere/process/M_PriceList_Create.java @@ -20,6 +20,7 @@ package org.compiere.process; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -544,7 +545,7 @@ public class M_PriceList_Create extends SvrProcess { } if (conversion != null) { - price = price.divide(conversion.getDivideRate(), precision, BigDecimal.ROUND_HALF_DOWN); + price = price.divide(conversion.getDivideRate(), precision, RoundingMode.HALF_DOWN); StringBuilder sqlupdate = new StringBuilder(); sqlupdate.append("UPDATE M_ProductPrice SET PriceList=").append(price).append(" WHERE M_PriceList_Version_ID=").append(p_PriceList_Version_ID) .append(" AND M_Product_ID= ").append(product_id); diff --git a/org.adempiere.base.process/src/org/compiere/process/ProductUOMConvert.java b/org.adempiere.base.process/src/org/compiere/process/ProductUOMConvert.java index 014017760c..3a73aaf194 100644 --- a/org.adempiere.base.process/src/org/compiere/process/ProductUOMConvert.java +++ b/org.adempiere.base.process/src/org/compiere/process/ProductUOMConvert.java @@ -17,6 +17,7 @@ package org.compiere.process; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.logging.Level; import org.compiere.model.MProduct; @@ -95,8 +96,8 @@ public class ProductUOMConvert extends SvrProcess throw new AdempiereUserError("@NotFound@: @C_UOM_Conversion_ID@"); MUOM uomTo = MUOM.get(getCtx(), productTo.getC_UOM_ID()); - BigDecimal qtyTo = p_Qty.divide(conversion.getDivideRate(), uomTo.getStdPrecision(), BigDecimal.ROUND_HALF_UP); - BigDecimal qtyTo6 = p_Qty.divide(conversion.getDivideRate(), 6, BigDecimal.ROUND_HALF_UP); + BigDecimal qtyTo = p_Qty.divide(conversion.getDivideRate(), uomTo.getStdPrecision(), RoundingMode.HALF_UP); + BigDecimal qtyTo6 = p_Qty.divide(conversion.getDivideRate(), 6, RoundingMode.HALF_UP); if (qtyTo.compareTo(qtyTo6) != 0) throw new AdempiereUserError("@StdPrecision@: " + qtyTo + " <> " + qtyTo6 + " (" + p_Qty + "/" + conversion.getDivideRate() + ")"); diff --git a/org.adempiere.base.process/src/org/compiere/process/ReplenishReport.java b/org.adempiere.base.process/src/org/compiere/process/ReplenishReport.java index de6fa93c5e..b4ad4950f9 100644 --- a/org.adempiere.base.process/src/org/compiere/process/ReplenishReport.java +++ b/org.adempiere.base.process/src/org/compiere/process/ReplenishReport.java @@ -358,7 +358,7 @@ public class ReplenishReport extends SvrProcess if(custom==null){ // if no OSGi plugin is found try the legacy way (in my own classpath) Class clazz = Class.forName(className); - custom = (ReplenishInterface) clazz.newInstance(); + custom = (ReplenishInterface) clazz.getDeclaredConstructor().newInstance(); } } catch (Exception e) diff --git a/org.adempiere.base.process/src/org/compiere/process/ReplenishReportProduction.java b/org.adempiere.base.process/src/org/compiere/process/ReplenishReportProduction.java index 3f70401567..42a7e92d58 100644 --- a/org.adempiere.base.process/src/org/compiere/process/ReplenishReportProduction.java +++ b/org.adempiere.base.process/src/org/compiere/process/ReplenishReportProduction.java @@ -392,7 +392,7 @@ public class ReplenishReportProduction extends SvrProcess if(custom==null){ // if no OSGi plugin is found try the legacy way (in my own classpath) Class clazz = Class.forName(className); - custom = (ReplenishInterface) clazz.newInstance(); + custom = (ReplenishInterface) clazz.getDeclaredConstructor().newInstance(); } } catch (Exception e) diff --git a/org.adempiere.base.process/src/org/compiere/process/ReplicationLocal.java b/org.adempiere.base.process/src/org/compiere/process/ReplicationLocal.java index 0ae55bbb6b..0afed49056 100644 --- a/org.adempiere.base.process/src/org/compiere/process/ReplicationLocal.java +++ b/org.adempiere.base.process/src/org/compiere/process/ReplicationLocal.java @@ -170,7 +170,7 @@ public class ReplicationLocal extends SvrProcess + "WHERE rt.IsActive='Y' AND t.IsActive='Y'" + " AND AD_ReplicationStrategy_ID=? " // #1 + "ORDER BY t.LoadSeq"; - RowSet rowset = getRowSet(sql, new Object[]{new Integer(m_replication.getAD_ReplicationStrategy_ID())}); + RowSet rowset = getRowSet(sql, new Object[]{Integer.valueOf(m_replication.getAD_ReplicationStrategy_ID())}); if (rowset == null) throw new Exception("setupRemote - No RowSet Data"); @@ -222,7 +222,7 @@ public class ReplicationLocal extends SvrProcess + " AND AD_ReplicationStrategy_ID=?" // #1 + " AND rt.ReplicationType='M' " // Merge + "ORDER BY t.LoadSeq"; - RowSet rowset = getRowSet(sql, new Object[]{new Integer(m_replication.getAD_ReplicationStrategy_ID())}); + RowSet rowset = getRowSet(sql, new Object[]{Integer.valueOf(m_replication.getAD_ReplicationStrategy_ID())}); try { while (rowset.next()) @@ -400,7 +400,7 @@ public class ReplicationLocal extends SvrProcess + " AND AD_ReplicationStrategy_ID=?" // #1 + " AND rt.ReplicationType='R' " // Reference + "ORDER BY t.LoadSeq"; - RowSet rowset = getRowSet(sql, new Object[]{new Integer(m_replication.getAD_ReplicationStrategy_ID())}); + RowSet rowset = getRowSet(sql, new Object[]{Integer.valueOf(m_replication.getAD_ReplicationStrategy_ID())}); try { while (rowset.next()) diff --git a/org.adempiere.base.process/src/org/compiere/process/RfQCreateSO.java b/org.adempiere.base.process/src/org/compiere/process/RfQCreateSO.java index f7c9ff976b..c6942503aa 100644 --- a/org.adempiere.base.process/src/org/compiere/process/RfQCreateSO.java +++ b/org.adempiere.base.process/src/org/compiere/process/RfQCreateSO.java @@ -17,6 +17,7 @@ package org.compiere.process; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.logging.Level; import org.compiere.model.MBPartner; @@ -129,7 +130,7 @@ public class RfQCreateSO extends SvrProcess { margin = margin.add(Env.ONEHUNDRED); price = price.multiply(margin) - .divide(Env.ONEHUNDRED, 2, BigDecimal.ROUND_HALF_UP); + .divide(Env.ONEHUNDRED, 2, RoundingMode.HALF_UP); } } } // price diff --git a/org.adempiere.base.process/src/org/compiere/process/SendMailText.java b/org.adempiere.base.process/src/org/compiere/process/SendMailText.java index babd887342..a5d8688831 100644 --- a/org.adempiere.base.process/src/org/compiere/process/SendMailText.java +++ b/org.adempiere.base.process/src/org/compiere/process/SendMailText.java @@ -252,7 +252,7 @@ public class SendMailText extends SvrProcess private Boolean sendIndividualMail (String Name, int AD_User_ID, StringBuilder unsubscribe) { // Prevent two email - Integer ii = new Integer (AD_User_ID); + Integer ii = Integer.valueOf(AD_User_ID); if (m_list.contains(ii)) return null; m_list.add(ii); @@ -290,7 +290,7 @@ public class SendMailText extends SvrProcess } StringBuilder msglog = new StringBuilder((OK ? "@OK@" : "@ERROR@")).append(" - ").append(to.getEMail()); addLog(0, null, null, msglog.toString()); - return new Boolean(OK); + return Boolean.valueOf(OK); } // sendIndividualMail } // SendMailText diff --git a/org.adempiere.base/.classpath b/org.adempiere.base/.classpath index 17c76976d9..10ed57fe9f 100644 --- a/org.adempiere.base/.classpath +++ b/org.adempiere.base/.classpath @@ -1,6 +1,11 @@ - + + + + + + diff --git a/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs index f6fb89ba37..182138f43f 100644 --- a/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.base/.settings/org.eclipse.jdt.core.prefs @@ -10,15 +10,12 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.APILeak=warning org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning @@ -27,7 +24,6 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled @@ -108,4 +104,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF index c4aee5c15e..8c1ab9f776 100644 --- a/org.adempiere.base/META-INF/MANIFEST.MF +++ b/org.adempiere.base/META-INF/MANIFEST.MF @@ -56,14 +56,14 @@ Export-Package: bsh, org.idempiere.broadcast, org.idempiere.distributed, org.idempiere.model -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Import-Package: com.sun.mail.smtp;version="1.5", - javax.activation, javax.jms;version="1.1.0", javax.mail;version="1.5", javax.mail.internet;version="1.5", javax.servlet;version="3.0.0", javax.servlet.http;version="3.0.0", + javax.xml.bind;version="2.3.0", junit.framework;version="3.8.2";resolution:=optional, junit.textui;version="3.8.2";resolution:=optional, net.sf.cglib.proxy, @@ -77,8 +77,6 @@ Import-Package: com.sun.mail.smtp;version="1.5", org.apache.ecs, org.apache.ecs.xhtml, org.apache.felix.scr;version="1.6.0", - org.apache.poi.hssf.usermodel, - org.apache.poi.ss.usermodel, org.apache.tools.ant, org.apache.tools.ant.taskdefs, org.eclipse.core.runtime;version="3.4.0", @@ -121,6 +119,11 @@ Require-Bundle: org.eclipse.equinox.app;bundle-version="0.0.0", com.itextpdf;bundle-version="0.0.0", net.sf.supercsv.super-csv;bundle-version="0.0.0", bcprov;bundle-version="1.54.0", - groovy-all;bundle-version="0.0.0", - org.krysalis.barcode4j;bundle-version="0.0.0" + org.krysalis.barcode4j;bundle-version="0.0.0", + groovy, + javax.xml;bundle-version="1.3.4", + org.apache.poi.poi;bundle-version="3.15.0", + org.apache.poi.poi-ooxml;bundle-version="3.15.0", + javax.activation;bundle-version="1.1.0" Automatic-Module-Name: org.adempiere.base +Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.base/pom.xml b/org.adempiere.base/pom.xml index f5a42a07cc..310b23576a 100644 --- a/org.adempiere.base/pom.xml +++ b/org.adempiere.base/pom.xml @@ -17,7 +17,11 @@ tycho-compiler-plugin - -warn:+forbidden + + -warn:+forbidden + --add-exports + java.sql.rowset/com.sun.rowset=ALL-UNNAMED + @@ -45,7 +49,7 @@ org.python jython - 2.2.1 + 2.7.0 it.sauronsoftware.cron4j @@ -73,4 +77,4 @@ - \ No newline at end of file + diff --git a/org.adempiere.base/src/com/akunagroup/uk/postcode/AddressLookup.java b/org.adempiere.base/src/com/akunagroup/uk/postcode/AddressLookup.java index 16e9d4f042..39ba901d73 100644 --- a/org.adempiere.base/src/com/akunagroup/uk/postcode/AddressLookup.java +++ b/org.adempiere.base/src/com/akunagroup/uk/postcode/AddressLookup.java @@ -252,7 +252,7 @@ public class AddressLookup implements AddressLookupInterface { NodeList firstValueList = firstElement.getElementsByTagName("Value"); Element ValueElement = (Element) firstValueList.item(0); if (log.isLoggable(Level.FINE)){log.log(Level.FINE, "Value: " + ValueElement.getChildNodes().item(0).getNodeValue().replaceAll("\n","").trim() + " Node: " + i);} - resultCode = (int) new Integer(ValueElement.getChildNodes().item(0).getNodeValue().replaceAll("\n","").trim()); + resultCode = (int) Integer.valueOf(ValueElement.getChildNodes().item(0).getNodeValue().replaceAll("\n","").trim()); } } diff --git a/org.adempiere.base/src/org/adempiere/base/DefaultAddressValidationFactory.java b/org.adempiere.base/src/org/adempiere/base/DefaultAddressValidationFactory.java index 99f1917eb4..5555259e39 100644 --- a/org.adempiere.base/src/org/adempiere/base/DefaultAddressValidationFactory.java +++ b/org.adempiere.base/src/org/adempiere/base/DefaultAddressValidationFactory.java @@ -44,7 +44,7 @@ public class DefaultAddressValidationFactory implements IAddressValidationFactor { Class ppClass = Class.forName(className); if (ppClass != null) - myProcessor = (IAddressValidation) ppClass.newInstance(); + myProcessor = (IAddressValidation) ppClass.getDeclaredConstructor().newInstance(); } catch (Error e1) { // NoClassDefFound diff --git a/org.adempiere.base/src/org/adempiere/base/DefaultCalloutFactory.java b/org.adempiere.base/src/org/adempiere/base/DefaultCalloutFactory.java index 9d74a6249f..e0853b04c0 100644 --- a/org.adempiere.base/src/org/adempiere/base/DefaultCalloutFactory.java +++ b/org.adempiere.base/src/org/adempiere/base/DefaultCalloutFactory.java @@ -80,7 +80,7 @@ public class DefaultCalloutFactory implements ICalloutFactory { //Get callout try { - callout = (Callout)calloutClass.newInstance(); + callout = (Callout)calloutClass.getDeclaredConstructor().newInstance(); } catch (Exception ex) { diff --git a/org.adempiere.base/src/org/adempiere/base/DefaultModelFactory.java b/org.adempiere.base/src/org/adempiere/base/DefaultModelFactory.java index 8a48f6c49e..309f58a47d 100644 --- a/org.adempiere.base/src/org/adempiere/base/DefaultModelFactory.java +++ b/org.adempiere.base/src/org/adempiere/base/DefaultModelFactory.java @@ -269,7 +269,7 @@ public class DefaultModelFactory implements IModelFactory { s_log.warning("No transaction Constructor for " + clazz + " (" + msg + ")"); } - PO po = constructor!=null ? (PO)constructor.newInstance(new Object[] {Env.getCtx(), new Integer(Record_ID), trxName}) : null; + PO po = constructor!=null ? (PO)constructor.newInstance(new Object[] {Env.getCtx(), Integer.valueOf(Record_ID), trxName}) : null; return po; } catch (Exception e) diff --git a/org.adempiere.base/src/org/adempiere/base/DefaultModelValidatorFactory.java b/org.adempiere.base/src/org/adempiere/base/DefaultModelValidatorFactory.java index d8af7d0f93..fe7ecec0aa 100644 --- a/org.adempiere.base/src/org/adempiere/base/DefaultModelValidatorFactory.java +++ b/org.adempiere.base/src/org/adempiere/base/DefaultModelValidatorFactory.java @@ -56,7 +56,7 @@ public class DefaultModelValidatorFactory implements IModelValidatorFactory { } if (clazz != null) { try { - validator = (ModelValidator)clazz.newInstance(); + validator = (ModelValidator)clazz.getDeclaredConstructor().newInstance(); } catch (Exception e) { e.printStackTrace(); } diff --git a/org.adempiere.base/src/org/adempiere/base/DefaultPaymentExporterFactory.java b/org.adempiere.base/src/org/adempiere/base/DefaultPaymentExporterFactory.java index 797a98a602..bdfc978423 100644 --- a/org.adempiere.base/src/org/adempiere/base/DefaultPaymentExporterFactory.java +++ b/org.adempiere.base/src/org/adempiere/base/DefaultPaymentExporterFactory.java @@ -42,7 +42,7 @@ public class DefaultPaymentExporterFactory implements IPaymentExporterFactory { try { Class peClass = Class.forName(className); if (peClass != null) - myExporter = (PaymentExport)peClass.newInstance(); + myExporter = (PaymentExport)peClass.getDeclaredConstructor().newInstance(); } catch (Error e1) { // NoClassDefFound s_log.log(Level.SEVERE, className + " - Error=" + e1.getMessage()); return null; diff --git a/org.adempiere.base/src/org/adempiere/base/DefaultPaymentProcessorFactory.java b/org.adempiere.base/src/org/adempiere/base/DefaultPaymentProcessorFactory.java index 21301c0f70..c948cbfd44 100644 --- a/org.adempiere.base/src/org/adempiere/base/DefaultPaymentProcessorFactory.java +++ b/org.adempiere.base/src/org/adempiere/base/DefaultPaymentProcessorFactory.java @@ -45,7 +45,7 @@ public class DefaultPaymentProcessorFactory implements IPaymentProcessorFactory try { Class ppClass = Class.forName(className); if (ppClass != null) - myProcessor = (PaymentProcessor)ppClass.newInstance(); + myProcessor = (PaymentProcessor)ppClass.getDeclaredConstructor().newInstance(); } catch (Error e1) { // NoClassDefFound s_log.log(Level.SEVERE, className + " - Error=" + e1.getMessage()); return null; diff --git a/org.adempiere.base/src/org/adempiere/base/DefaultProcessFactory.java b/org.adempiere.base/src/org/adempiere/base/DefaultProcessFactory.java index 681f2a1cb7..7d1f7b13a3 100644 --- a/org.adempiere.base/src/org/adempiere/base/DefaultProcessFactory.java +++ b/org.adempiere.base/src/org/adempiere/base/DefaultProcessFactory.java @@ -77,7 +77,7 @@ public class DefaultProcessFactory implements IProcessFactory { //Get Process try { - process = (ProcessCall)processClass.newInstance(); + process = (ProcessCall)processClass.getDeclaredConstructor().newInstance(); } catch (Exception ex) { diff --git a/org.adempiere.base/src/org/adempiere/base/DefaultShipmentProcessorFactory.java b/org.adempiere.base/src/org/adempiere/base/DefaultShipmentProcessorFactory.java index 63e3a13adb..77667ed00b 100644 --- a/org.adempiere.base/src/org/adempiere/base/DefaultShipmentProcessorFactory.java +++ b/org.adempiere.base/src/org/adempiere/base/DefaultShipmentProcessorFactory.java @@ -43,7 +43,7 @@ public class DefaultShipmentProcessorFactory implements IShipmentProcessorFactor { Class ppClass = Class.forName(className); if (ppClass != null) - myProcessor = (IShipmentProcessor) ppClass.newInstance(); + myProcessor = (IShipmentProcessor) ppClass.getDeclaredConstructor().newInstance(); } catch (Error e1) { // NoClassDefFound diff --git a/org.adempiere.base/src/org/adempiere/base/DefaultTaxProviderFactory.java b/org.adempiere.base/src/org/adempiere/base/DefaultTaxProviderFactory.java index 45540988dc..3b5a1d14bf 100644 --- a/org.adempiere.base/src/org/adempiere/base/DefaultTaxProviderFactory.java +++ b/org.adempiere.base/src/org/adempiere/base/DefaultTaxProviderFactory.java @@ -38,7 +38,7 @@ public class DefaultTaxProviderFactory implements ITaxProviderFactory { { Class ppClass = Class.forName(className); if (ppClass != null) - myCalculator = (ITaxProvider) ppClass.newInstance(); + myCalculator = (ITaxProvider) ppClass.getDeclaredConstructor().newInstance(); } catch (Error e1) { // NoClassDefFound diff --git a/org.adempiere.base/src/org/adempiere/base/event/RequestEventHandler.java b/org.adempiere.base/src/org/adempiere/base/event/RequestEventHandler.java index cd96218a8b..420f8857d4 100644 --- a/org.adempiere.base/src/org/adempiere/base/event/RequestEventHandler.java +++ b/org.adempiere.base/src/org/adempiere/base/event/RequestEventHandler.java @@ -368,7 +368,7 @@ public class RequestEventHandler extends AbstractEventHandler implements Managed } // Check duplicate receivers - Integer ii = new Integer (AD_User_ID); + Integer ii = Integer.valueOf(AD_User_ID); if (userList.contains(ii)) continue; userList.add(ii); diff --git a/org.adempiere.base/src/org/adempiere/impexp/AbstractExcelExporter.java b/org.adempiere.base/src/org/adempiere/impexp/AbstractExcelExporter.java index 886ab170e1..02f823d34f 100644 --- a/org.adempiere.base/src/org/adempiere/impexp/AbstractExcelExporter.java +++ b/org.adempiere.base/src/org/adempiere/impexp/AbstractExcelExporter.java @@ -35,6 +35,7 @@ import org.apache.poi.hssf.usermodel.HSSFRichTextString; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.BorderStyle; import org.compiere.model.MSysConfig; import org.compiere.util.CLogger; import org.compiere.util.DisplayType; @@ -166,13 +167,13 @@ public abstract class AbstractExcelExporter if (isHeader) { if (m_fontHeader == null) { m_fontHeader = m_workbook.createFont(); - m_fontHeader.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); + m_fontHeader.setBold(true); } font = m_fontHeader; } else if (isFunctionRow()) { font = m_workbook.createFont(); - font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD); + font.setBold(true); font.setItalic(true); } else { @@ -232,10 +233,10 @@ public abstract class AbstractExcelExporter HSSFFont font = getFont(false); cs.setFont(font); // Border - cs.setBorderLeft((short)1); - cs.setBorderTop((short)1); - cs.setBorderRight((short)1); - cs.setBorderBottom((short)1); + cs.setBorderLeft(BorderStyle.THIN); + cs.setBorderTop(BorderStyle.THIN); + cs.setBorderRight(BorderStyle.THIN); + cs.setBorderBottom(BorderStyle.THIN); // String cellFormat = getCellFormat(row, col); if (cellFormat != null) @@ -268,10 +269,10 @@ public abstract class AbstractExcelExporter HSSFFont font_header = getFont(true); cs_header = m_workbook.createCellStyle(); cs_header.setFont(font_header); - cs_header.setBorderLeft((short)2); - cs_header.setBorderTop((short)2); - cs_header.setBorderRight((short)2); - cs_header.setBorderBottom((short)2); + cs_header.setBorderLeft(BorderStyle.MEDIUM); + cs_header.setBorderTop(BorderStyle.MEDIUM); + cs_header.setBorderRight(BorderStyle.MEDIUM); + cs_header.setBorderBottom(BorderStyle.MEDIUM); cs_header.setDataFormat(HSSFDataFormat.getBuiltinFormat("text")); cs_header.setWrapText(true); m_styles.put(key, cs_header); diff --git a/org.adempiere.base/src/org/adempiere/model/GenericPO.java b/org.adempiere.base/src/org/adempiere/model/GenericPO.java index e65deb5f10..6fd50521e6 100644 --- a/org.adempiere.base/src/org/adempiere/model/GenericPO.java +++ b/org.adempiere.base/src/org/adempiere/model/GenericPO.java @@ -114,7 +114,7 @@ public class GenericPO extends PO { if (AD_OrgTrx_ID == 0) set_Value("AD_OrgTrx_ID", null); else - set_Value("AD_OrgTrx_ID", new Integer(AD_OrgTrx_ID)); + set_Value("AD_OrgTrx_ID", Integer.valueOf(AD_OrgTrx_ID)); } /** diff --git a/org.adempiere.base/src/org/adempiere/model/MBroadcastMessage.java b/org.adempiere.base/src/org/adempiere/model/MBroadcastMessage.java index 240c61e860..7dbe1287ac 100644 --- a/org.adempiere.base/src/org/adempiere/model/MBroadcastMessage.java +++ b/org.adempiere.base/src/org/adempiere/model/MBroadcastMessage.java @@ -50,7 +50,7 @@ public class MBroadcastMessage extends X_AD_BroadcastMessage public static MBroadcastMessage get (Properties ctx, int AD_BroadcastMessage_ID) { - Integer key = new Integer(AD_BroadcastMessage_ID); + Integer key = Integer.valueOf(AD_BroadcastMessage_ID); MBroadcastMessage retValue = (MBroadcastMessage)s_cache.get(key); if (retValue == null) { diff --git a/org.adempiere.base/src/org/adempiere/model/PromotionRule.java b/org.adempiere.base/src/org/adempiere/model/PromotionRule.java index 498f9b8a53..6c059095f7 100644 --- a/org.adempiere.base/src/org/adempiere/model/PromotionRule.java +++ b/org.adempiere.base/src/org/adempiere/model/PromotionRule.java @@ -14,6 +14,7 @@ package org.adempiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -295,7 +296,7 @@ public class PromotionRule { nol.setC_Charge_ID(C_Charge_ID); nol.setQty(qty); if (discount.scale() > 2) - discount = discount.setScale(2, BigDecimal.ROUND_HALF_UP); + discount = discount.setScale(2, RoundingMode.HALF_UP); nol.setPriceEntered(discount.negate()); nol.setPriceActual(discount.negate()); if (ol != null && Integer.toString(ol.getLine()).endsWith("0")) { diff --git a/org.adempiere.base/src/org/adempiere/util/AbstractDocumentSearch.java b/org.adempiere.base/src/org/adempiere/util/AbstractDocumentSearch.java index 126a137bc0..539ffd1418 100644 --- a/org.adempiere.base/src/org/adempiere/util/AbstractDocumentSearch.java +++ b/org.adempiere.base/src/org/adempiere/util/AbstractDocumentSearch.java @@ -216,7 +216,7 @@ public abstract class AbstractDocumentSearch { rsSO = pstmtSO.executeQuery(); Vector idSO = new Vector(); while (rsSO.next()) { - idSO.add(new Integer(rsSO.getInt(1))); + idSO.add(Integer.valueOf(rsSO.getInt(1))); } if (role.getWindowAccess(msd.getAD_Window_ID()) != null) { msglog = new StringBuilder("Open Window: ").append(msd.getAD_Window_ID()).append(" / Table: ") @@ -225,7 +225,7 @@ public abstract class AbstractDocumentSearch { if (idSO.size() == 0 && (searchString == null || searchString.trim().length() == 0)) { // No search string - open the window with new record - idSO.add(new Integer(0)); + idSO.add(Integer.valueOf(0)); } openWindow(idSO, table.getTableName(), msd.getAD_Window_ID()); @@ -239,7 +239,7 @@ public abstract class AbstractDocumentSearch { rsPO = pstmtPO.executeQuery(); Vector idPO = new Vector(); while (rsPO.next()) { - idPO.add(new Integer(rsPO.getInt(1))); + idPO.add(Integer.valueOf(rsPO.getInt(1))); } if (role.getWindowAccess(msd.getPO_Window_ID()) != null) { msglog = new StringBuilder("Open Window: ").append(msd.getPO_Window_ID()).append(" / Table: ") diff --git a/org.adempiere.base/src/org/adempiere/util/GenerateModelJPA.java b/org.adempiere.base/src/org/adempiere/util/GenerateModelJPA.java index 951508ba5c..19b1427911 100755 --- a/org.adempiere.base/src/org/adempiere/util/GenerateModelJPA.java +++ b/org.adempiere.base/src/org/adempiere/util/GenerateModelJPA.java @@ -406,10 +406,10 @@ public class GenerateModelJPA sb.append("if (").append (columnName).append (" <= 0) ") .append(setValue).append(" (\"").append(columnName).append("\", null); else \n"); } - sb.append(setValue).append(" (\"").append(columnName).append("\", new Integer(").append(columnName).append("));"); + sb.append(setValue).append(" (\"").append(columnName).append("\", Integer.valueOf(").append(columnName).append("));"); } else if (clazz.equals(Boolean.class)) - sb.append(setValue).append(" (\"").append(columnName).append("\", new Boolean(").append(columnName).append("));"); + sb.append(setValue).append(" (\"").append(columnName).append("\", Boolean.valueOf(").append(columnName).append("));"); else { if (isMandatory && AD_Reference_ID == 0) // does not apply to int/boolean diff --git a/org.adempiere.base/src/org/compiere/acct/Doc.java b/org.adempiere.base/src/org/compiere/acct/Doc.java index 1bc38d49ce..e4057ae418 100644 --- a/org.adempiere.base/src/org/compiere/acct/Doc.java +++ b/org.adempiere.base/src/org/compiere/acct/Doc.java @@ -1036,12 +1036,12 @@ public abstract class Doc } // Get All Currencies HashSet set = new HashSet(); - set.add(new Integer(getC_Currency_ID())); + set.add(Integer.valueOf(getC_Currency_ID())); for (int i = 0; p_lines != null && i < p_lines.length; i++) { int C_Currency_ID = p_lines[i].getC_Currency_ID(); if (C_Currency_ID != NO_CURRENCY) - set.add(new Integer(C_Currency_ID)); + set.add(Integer.valueOf(C_Currency_ID)); } // just one and the same diff --git a/org.adempiere.base/src/org/compiere/acct/Doc_AllocationHdr.java b/org.adempiere.base/src/org/compiere/acct/Doc_AllocationHdr.java index 6780f17807..8eaad8c421 100644 --- a/org.adempiere.base/src/org/compiere/acct/Doc_AllocationHdr.java +++ b/org.adempiere.base/src/org/compiere/acct/Doc_AllocationHdr.java @@ -17,6 +17,7 @@ package org.compiere.acct; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; @@ -780,7 +781,7 @@ public class Doc_AllocationHdr extends Doc // Round int precision = as.getStdPrecision(); if (invoiceDifference.scale() > precision) - invoiceDifference = invoiceDifference.setScale(precision, BigDecimal.ROUND_HALF_UP); + invoiceDifference = invoiceDifference.setScale(precision, RoundingMode.HALF_UP); StringBuilder d2 = new StringBuilder("(partial) = ").append(invoiceDifference).append(" - Multiplier=").append(multiplier); if (log.isLoggable(Level.FINE)) log.fine(d2.toString()); descriptionInv.append(" - ").append(d2); @@ -847,7 +848,7 @@ public class Doc_AllocationHdr extends Doc // Round int precision = as.getStdPrecision(); if (paymentDifference.scale() > precision) - paymentDifference = paymentDifference.setScale(precision, BigDecimal.ROUND_HALF_UP); + paymentDifference = paymentDifference.setScale(precision, RoundingMode.HALF_UP); StringBuilder d2 = new StringBuilder("(partial) = ").append(paymentDifference).append(" - Multiplier=").append(multiplier); if (log.isLoggable(Level.FINE)) log.fine(d2.toString()); descriptionPay.append(" - ").append(d2); @@ -1193,10 +1194,10 @@ class Doc_AllocationTax || amt.signum() == 0) return Env.ZERO; // - BigDecimal multiplier = tax.divide(total, 10, BigDecimal.ROUND_HALF_UP); + BigDecimal multiplier = tax.divide(total, 10, RoundingMode.HALF_UP); BigDecimal retValue = multiplier.multiply(amt); if (retValue.scale() > precision) - retValue = retValue.setScale(precision, BigDecimal.ROUND_HALF_UP); + retValue = retValue.setScale(precision, RoundingMode.HALF_UP); if (log.isLoggable(Level.FINE)) log.fine(retValue + " (Mult=" + multiplier + "(Prec=" + precision + ")"); return retValue; } // calcAmount diff --git a/org.adempiere.base/src/org/compiere/acct/Doc_Invoice.java b/org.adempiere.base/src/org/compiere/acct/Doc_Invoice.java index d3a6498ba4..3bd709173a 100644 --- a/org.adempiere.base/src/org/compiere/acct/Doc_Invoice.java +++ b/org.adempiere.base/src/org/compiere/acct/Doc_Invoice.java @@ -17,6 +17,7 @@ package org.compiere.acct; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -922,7 +923,7 @@ public class Doc_Invoice extends Doc BigDecimal qty = allocation.getQty(); if (qty.compareTo(iol.getMovementQty()) != 0) { - amt = amt.multiply(iol.getMovementQty()).divide(qty, 12, BigDecimal.ROUND_HALF_UP); + amt = amt.multiply(iol.getMovementQty()).divide(qty, 12, RoundingMode.HALF_UP); } estimatedAmt = estimatedAmt.add(amt); } @@ -931,7 +932,7 @@ public class Doc_Invoice extends Doc if (estimatedAmt.scale() > as.getCostingPrecision()) { - estimatedAmt = estimatedAmt.setScale(as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP); + estimatedAmt = estimatedAmt.setScale(as.getCostingPrecision(), RoundingMode.HALF_UP); } BigDecimal costAdjustmentAmt = allocationAmt; if (estimatedAmt.signum() > 0) @@ -996,7 +997,7 @@ public class Doc_Invoice extends Doc getDateAcct(), getC_ConversionType_ID(), getAD_Client_ID(), getAD_Org_ID()); if (costDetailAmt.scale() > as.getCostingPrecision()) - costDetailAmt = costDetailAmt.setScale(as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP); + costDetailAmt = costDetailAmt.setScale(as.getCostingPrecision(), RoundingMode.HALF_UP); String key = lca.getM_Product_ID()+"_"+lca.getM_AttributeSetInstance_ID(); BigDecimal prevAmt = costDetailAmtMap.remove(key); @@ -1041,11 +1042,11 @@ public class Doc_Invoice extends Doc { if (allocationAmt.scale() > as.getStdPrecision()) { - allocationAmt = allocationAmt.setScale(as.getStdPrecision(), BigDecimal.ROUND_HALF_UP); + allocationAmt = allocationAmt.setScale(as.getStdPrecision(), RoundingMode.HALF_UP); } if (estimatedAmt.scale() > as.getStdPrecision()) { - estimatedAmt = estimatedAmt.setScale(as.getStdPrecision(), BigDecimal.ROUND_HALF_UP); + estimatedAmt = estimatedAmt.setScale(as.getStdPrecision(), RoundingMode.HALF_UP); } int compare = allocationAmt.compareTo(estimatedAmt); if (compare > 0) diff --git a/org.adempiere.base/src/org/compiere/acct/Doc_MatchInv.java b/org.adempiere.base/src/org/compiere/acct/Doc_MatchInv.java index c4545b976f..d65d8ae04f 100644 --- a/org.adempiere.base/src/org/compiere/acct/Doc_MatchInv.java +++ b/org.adempiere.base/src/org/compiere/acct/Doc_MatchInv.java @@ -17,6 +17,7 @@ package org.compiere.acct; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Savepoint; @@ -167,7 +168,7 @@ public class Doc_MatchInv extends Doc // NotInvoicedReceipt DR // From Receipt BigDecimal multiplier = getQty() - .divide(m_receiptLine.getMovementQty(), 12, BigDecimal.ROUND_HALF_UP) + .divide(m_receiptLine.getMovementQty(), 12, RoundingMode.HALF_UP) .abs(); FactLine dr = fact.createLine (null, getAccount(Doc.ACCTTYPE_NotInvoicedReceipts, as), @@ -212,7 +213,7 @@ public class Doc_MatchInv extends Doc expense = m_pc.getAccount(ProductCost.ACCTTYPE_P_Expense, as); BigDecimal LineNetAmt = m_invoiceLine.getLineNetAmt(); multiplier = getQty() - .divide(m_invoiceLine.getQtyInvoiced(), 12, BigDecimal.ROUND_HALF_UP) + .divide(m_invoiceLine.getQtyInvoiced(), 12, RoundingMode.HALF_UP) .abs(); if (multiplier.compareTo(Env.ONE) != 0) LineNetAmt = LineNetAmt.multiply(multiplier); @@ -453,7 +454,7 @@ public class Doc_MatchInv extends Doc BigDecimal LineNetAmt = m_invoiceLine.getLineNetAmt(); BigDecimal multiplier = getQty() - .divide(m_invoiceLine.getQtyInvoiced(), 12, BigDecimal.ROUND_HALF_UP) + .divide(m_invoiceLine.getQtyInvoiced(), 12, RoundingMode.HALF_UP) .abs(); if (multiplier.compareTo(Env.ONE) != 0) LineNetAmt = LineNetAmt.multiply(multiplier); @@ -469,7 +470,7 @@ public class Doc_MatchInv extends Doc { tQty = tQty.add(mInv[i].getQty()); multiplier = mInv[i].getQty() - .divide(m_invoiceLine.getQtyInvoiced(), 12, BigDecimal.ROUND_HALF_UP).abs(); + .divide(m_invoiceLine.getQtyInvoiced(), 12, RoundingMode.HALF_UP).abs(); tAmt = tAmt.add(m_invoiceLine.getLineNetAmt().multiply(multiplier)); } } @@ -516,7 +517,7 @@ public class Doc_MatchInv extends Doc { BigDecimal totalAmt = allocation.getAmt(); BigDecimal totalQty = allocation.getQty(); - BigDecimal amt = totalAmt.multiply(tQty).divide(totalQty, 12, BigDecimal.ROUND_HALF_UP); + BigDecimal amt = totalAmt.multiply(tQty).divide(totalQty, 12, RoundingMode.HALF_UP); if (orderLine.getC_Currency_ID() != as.getC_Currency_ID()) { I_C_Order order = orderLine.getC_Order(); @@ -532,7 +533,7 @@ public class Doc_MatchInv extends Doc } amt = amt.multiply(rate); if (amt.scale() > as.getCostingPrecision()) - amt = amt.setScale(as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP); + amt = amt.setScale(as.getCostingPrecision(), RoundingMode.HALF_UP); } int elementId = allocation.getC_OrderLandedCost().getM_CostElement_ID(); BigDecimal elementAmt = landedCostMap.get(elementId); diff --git a/org.adempiere.base/src/org/compiere/acct/Doc_MatchPO.java b/org.adempiere.base/src/org/compiere/acct/Doc_MatchPO.java index 7580ec3e1c..72758107ca 100644 --- a/org.adempiere.base/src/org/compiere/acct/Doc_MatchPO.java +++ b/org.adempiere.base/src/org/compiere/acct/Doc_MatchPO.java @@ -233,7 +233,7 @@ public class Doc_MatchPO extends Doc amt = amt.divide(getQty(), 12, RoundingMode.HALF_UP); landedCost = landedCost.add(amt); if (landedCost.scale() > as.getCostingPrecision()) - landedCost = landedCost.setScale(as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP); + landedCost = landedCost.setScale(as.getCostingPrecision(), RoundingMode.HALF_UP); int elementId = allocation.getC_OrderLandedCost().getM_CostElement_ID(); BigDecimal elementAmt = landedCostMap.get(elementId); if (elementAmt == null) @@ -263,7 +263,7 @@ public class Doc_MatchPO extends Doc } poCost = poCost.multiply(rate); if (poCost.scale() > as.getCostingPrecision()) - poCost = poCost.setScale(as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP); + poCost = poCost.setScale(as.getCostingPrecision(), RoundingMode.HALF_UP); } String costingError = createMatchPOCostDetail(as, poCost, landedCostMap); @@ -492,7 +492,7 @@ public class Doc_MatchPO extends Doc } if (tAmt.scale() > as.getCostingPrecision()) - tAmt = tAmt.setScale(as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP); + tAmt = tAmt.setScale(as.getCostingPrecision(), RoundingMode.HALF_UP); // Set Total Amount and Total Quantity from Matched PO if (!MCostDetail.createOrder(as, m_oLine.getAD_Org_ID(), getM_Product_ID(), mMatchPO.getM_AttributeSetInstance_ID(), @@ -523,7 +523,7 @@ public class Doc_MatchPO extends Doc BigDecimal amt = landedCostMap.get(elementId); amt = amt.multiply(tQty); if (amt.scale() > as.getCostingPrecision()) - amt = amt.setScale(as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP); + amt = amt.setScale(as.getCostingPrecision(), RoundingMode.HALF_UP); if (!MCostDetail.createOrder(as, m_oLine.getAD_Org_ID(), getM_Product_ID(), mMatchPO.getM_AttributeSetInstance_ID(), m_oLine.getC_OrderLine_ID(), elementId, diff --git a/org.adempiere.base/src/org/compiere/acct/Doc_Order.java b/org.adempiere.base/src/org/compiere/acct/Doc_Order.java index e62ecb3521..451a5fc74e 100644 --- a/org.adempiere.base/src/org/compiere/acct/Doc_Order.java +++ b/org.adempiere.base/src/org/compiere/acct/Doc_Order.java @@ -159,7 +159,7 @@ public class Doc_Order extends Doc for (int i = 0; i < oLines.length; i++) { MOrderLine line = oLines[i]; - qtys.put(new Integer(line.getC_OrderLine_ID()), line.getQtyOrdered()); + qtys.put(Integer.valueOf(line.getC_OrderLine_ID()), line.getQtyOrdered()); } // ArrayList list = new ArrayList(); @@ -182,7 +182,7 @@ public class Doc_Order extends Doc DocLine docLine = new DocLine (line, this); // Quantity - not more then OrderLine // Issue: Split of Requisition to multiple POs & different price - Integer key = new Integer(line.getC_OrderLine_ID()); + Integer key = Integer.valueOf(line.getC_OrderLine_ID()); BigDecimal maxQty = qtys.get(key); BigDecimal Qty = line.getQty().max(maxQty); if (Qty.signum() == 0) diff --git a/org.adempiere.base/src/org/compiere/acct/Doc_Production.java b/org.adempiere.base/src/org/compiere/acct/Doc_Production.java index 23eb0c210a..a5fa72ab84 100644 --- a/org.adempiere.base/src/org/compiere/acct/Doc_Production.java +++ b/org.adempiere.base/src/org/compiere/acct/Doc_Production.java @@ -17,6 +17,7 @@ package org.compiere.acct; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; @@ -318,7 +319,7 @@ public class Doc_Production extends Doc costMap.put(line0.get_ID()+ "_"+ ma.getM_AttributeSetInstance_ID(),maCost); costs0 = costs0.add(maCost); } - bomCost = bomCost.add(costs0.setScale(2,BigDecimal.ROUND_HALF_UP)); + bomCost = bomCost.add(costs0.setScale(2,RoundingMode.HALF_UP)); } else p_Error = "Failed to post - No Attribute Set for line"; @@ -339,7 +340,7 @@ public class Doc_Production extends Doc costs0 = line0.getProductCosts(as, line0.getAD_Org_ID(), false); } costMap.put(line0.get_ID()+ "_"+ line0.getM_AttributeSetInstance_ID(),costs0); - bomCost = bomCost.add(costs0.setScale(2,BigDecimal.ROUND_HALF_UP)); + bomCost = bomCost.add(costs0.setScale(2,RoundingMode.HALF_UP)); } } @@ -358,7 +359,7 @@ public class Doc_Production extends Doc costs0 = line0.getProductCosts(as, line0.getAD_Org_ID(), false); } costMap.put(line0.get_ID()+ "_"+ line0.getM_AttributeSetInstance_ID(),costs0); - bomCost = bomCost.add(costs0.setScale(2,BigDecimal.ROUND_HALF_UP)); + bomCost = bomCost.add(costs0.setScale(2,RoundingMode.HALF_UP)); } } } @@ -366,8 +367,8 @@ public class Doc_Production extends Doc qtyProduced = manipulateQtyProduced (mQtyProduced, endProLine, prod.isUseProductionPlan(), null); if (line.getQty().compareTo(qtyProduced) != 0) { - BigDecimal factor = line.getQty().divide(qtyProduced, 12, BigDecimal.ROUND_HALF_UP); - bomCost = bomCost.multiply(factor).setScale(2,BigDecimal.ROUND_HALF_UP); + BigDecimal factor = line.getQty().divide(qtyProduced, 12, RoundingMode.HALF_UP); + bomCost = bomCost.multiply(factor).setScale(2,RoundingMode.HALF_UP); } if (MAcctSchema.COSTINGLEVEL_BatchLot.equals(CostingLevel)) @@ -386,7 +387,7 @@ public class Doc_Production extends Doc else { int precision = as.getStdPrecision(); - BigDecimal variance = (costs.setScale(precision, BigDecimal.ROUND_HALF_UP)).subtract(bomCost.negate()); + BigDecimal variance = (costs.setScale(precision, RoundingMode.HALF_UP)).subtract(bomCost.negate()); // only post variance if it's not zero if (variance.signum() != 0) { diff --git a/org.adempiere.base/src/org/compiere/acct/Fact.java b/org.adempiere.base/src/org/compiere/acct/Fact.java index ff5803466f..943f9a5abb 100644 --- a/org.adempiere.base/src/org/compiere/acct/Fact.java +++ b/org.adempiere.base/src/org/compiere/acct/Fact.java @@ -378,7 +378,7 @@ public final class Fact for (int i = 0; i < m_lines.size(); i++) { FactLine line = (FactLine)m_lines.get(i); - Integer key = new Integer(line.getAD_Org_ID()); + Integer key = Integer.valueOf(line.getAD_Org_ID()); BigDecimal bal = line.getSourceBalance(); BigDecimal oldBal = (BigDecimal)map.get(key); if (oldBal != null) @@ -445,7 +445,7 @@ public final class Fact for (int i = 0; i < m_lines.size(); i++) { FactLine line = (FactLine)m_lines.get(i); - Integer key = new Integer(line.getAD_Org_ID()); + Integer key = Integer.valueOf(line.getAD_Org_ID()); // BigDecimal balance = line.getSourceBalance(); Balance oldBalance = (Balance)map.get(key); if (oldBalance == null) diff --git a/org.adempiere.base/src/org/compiere/acct/FactLine.java b/org.adempiere.base/src/org/compiere/acct/FactLine.java index 45b92d7a51..bfe93b328c 100644 --- a/org.adempiere.base/src/org/compiere/acct/FactLine.java +++ b/org.adempiere.base/src/org/compiere/acct/FactLine.java @@ -17,6 +17,7 @@ package org.compiere.acct; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -252,14 +253,14 @@ public final class FactLine extends X_Fact_Acct int precision = MCurrency.getStdPrecision(getCtx(), C_Currency_ID); if (AmtSourceDr != null && AmtSourceDr.scale() > precision) { - BigDecimal AmtSourceDr1 = AmtSourceDr.setScale(precision, BigDecimal.ROUND_HALF_UP); + BigDecimal AmtSourceDr1 = AmtSourceDr.setScale(precision, RoundingMode.HALF_UP); if (AmtSourceDr1.compareTo(AmtSourceDr) != 0) log.warning("Source DR Precision " + AmtSourceDr + " -> " + AmtSourceDr1); setAmtSourceDr(AmtSourceDr1); } if (AmtSourceCr != null && AmtSourceCr.scale() > precision) { - BigDecimal AmtSourceCr1 = AmtSourceCr.setScale(precision, BigDecimal.ROUND_HALF_UP); + BigDecimal AmtSourceCr1 = AmtSourceCr.setScale(precision, RoundingMode.HALF_UP); if (AmtSourceCr1.compareTo(AmtSourceCr) != 0) log.warning("Source CR Precision " + AmtSourceCr + " -> " + AmtSourceCr1); setAmtSourceCr(AmtSourceCr1); @@ -326,14 +327,14 @@ public final class FactLine extends X_Fact_Acct int precision = MCurrency.getStdPrecision(getCtx(), C_Currency_ID); if (AmtAcctDr != null && AmtAcctDr.scale() > precision) { - BigDecimal AmtAcctDr1 = AmtAcctDr.setScale(precision, BigDecimal.ROUND_HALF_UP); + BigDecimal AmtAcctDr1 = AmtAcctDr.setScale(precision, RoundingMode.HALF_UP); if (AmtAcctDr1.compareTo(AmtAcctDr) != 0) log.warning("Accounted DR Precision " + AmtAcctDr + " -> " + AmtAcctDr1); setAmtAcctDr(AmtAcctDr1); } if (AmtAcctCr != null && AmtAcctCr.scale() > precision) { - BigDecimal AmtAcctCr1 = AmtAcctCr.setScale(precision, BigDecimal.ROUND_HALF_UP); + BigDecimal AmtAcctCr1 = AmtAcctCr.setScale(precision, RoundingMode.HALF_UP); if (AmtAcctCr1.compareTo(AmtAcctCr) != 0) log.warning("Accounted CR Precision " + AmtAcctCr + " -> " + AmtAcctCr1); setAmtAcctCr(AmtAcctCr1); diff --git a/org.adempiere.base/src/org/compiere/cm/WebProjectDeploy.java b/org.adempiere.base/src/org/compiere/cm/WebProjectDeploy.java index 5ab1d0cba3..4016683e86 100644 --- a/org.adempiere.base/src/org/compiere/cm/WebProjectDeploy.java +++ b/org.adempiere.base/src/org/compiere/cm/WebProjectDeploy.java @@ -94,7 +94,7 @@ public class WebProjectDeploy extends SvrProcess // Stage MCStage[] stages = MCStage.getStages(m_project); for (int i = 0; i < stages.length; i++) - m_map.put(new Integer(stages[i].getCM_CStage_ID()), stages[i]); + m_map.put(Integer.valueOf(stages[i].getCM_CStage_ID()), stages[i]); // Copy Stage Tree MTree treeS = new MTree (getCtx(), m_project.getAD_TreeCMS_ID(), false, false, get_TrxName()); @@ -106,7 +106,7 @@ public class WebProjectDeploy extends SvrProcess for (int i = 0; i < containers.length; i++) { MContainer container = containers[i]; - if (!m_idList.contains(new Integer(container.getCM_Container_ID()))) + if (!m_idList.contains(Integer.valueOf(container.getCM_Container_ID()))) { String name = container.getName(); if (container.delete(true)) { @@ -155,14 +155,14 @@ public class WebProjectDeploy extends SvrProcess private void copyStage (MTreeNode node, String path) { org.compiere.cm.CacheHandler thisHandler = new org.compiere.cm.CacheHandler(org.compiere.cm.CacheHandler.convertJNPURLToCacheURL(getCtx().getProperty("java.naming.provider.url")), log, getCtx(), get_TrxName()); - Integer ID = new Integer(node.getNode_ID()); + Integer ID = Integer.valueOf(node.getNode_ID()); MCStage stage = m_map.get(ID); // int size = node.getChildCount(); for (int i = 0; i < size; i++) { MTreeNode child = (MTreeNode)node.getChildAt(i); - ID = new Integer(child.getNode_ID()); + ID = Integer.valueOf(child.getNode_ID()); stage = m_map.get(ID); if (stage == null) { diff --git a/org.adempiere.base/src/org/compiere/impexp/ImpFormatRow.java b/org.adempiere.base/src/org/compiere/impexp/ImpFormatRow.java index 4c007df795..9ee90cd1f4 100644 --- a/org.adempiere.base/src/org/compiere/impexp/ImpFormatRow.java +++ b/org.adempiere.base/src/org/compiere/impexp/ImpFormatRow.java @@ -18,6 +18,7 @@ package org.compiere.impexp; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.Timestamp; import java.text.DateFormat; import java.text.ParseException; @@ -309,7 +310,7 @@ public final class ImpFormatRow if (methodStart != -1) // no class { Class cClass = Class.forName(callout.substring(0,methodStart)); - m_callout = (Callout)cClass.newInstance(); + m_callout = (Callout)cClass.getDeclaredConstructor().newInstance(); m_method = callout.substring(methodStart+1); } } @@ -525,7 +526,7 @@ public final class ImpFormatRow bd = BigDecimal.ZERO; if (m_divideBy100) // assumed two decimal scale - bd = bd.divide(Env.ONEHUNDRED, 2, BigDecimal.ROUND_HALF_UP); + bd = bd.divide(Env.ONEHUNDRED, 2, RoundingMode.HALF_UP); return bd.toString(); } // parseNumber diff --git a/org.adempiere.base/src/org/compiere/model/CalloutEngine.java b/org.adempiere.base/src/org/compiere/model/CalloutEngine.java index c734b8e437..d0eaecce99 100644 --- a/org.adempiere.base/src/org/compiere/model/CalloutEngine.java +++ b/org.adempiere.base/src/org/compiere/model/CalloutEngine.java @@ -18,6 +18,7 @@ package org.compiere.model; import java.lang.reflect.Method; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.Timestamp; import java.util.Properties; import java.util.logging.Level; @@ -103,9 +104,9 @@ public class CalloutEngine implements Callout { Object[] args = null; if (argLength == 6) - args = new Object[] {ctx, new Integer(WindowNo), mTab, mField, value, oldValue}; + args = new Object[] {ctx, Integer.valueOf(WindowNo), mTab, mField, value, oldValue}; else - args = new Object[] {ctx, new Integer(WindowNo), mTab, mField, value}; + args = new Object[] {ctx, Integer.valueOf(WindowNo), mTab, mField, value}; retValue = (String)method.invoke(this, args); } catch (Exception e) @@ -303,7 +304,7 @@ public class CalloutEngine implements Callout BigDecimal rate2 = Env.ZERO; if (rate1.signum() != 0.0) // no divide by zero - rate2 = Env.ONE.divide(rate1, 12, BigDecimal.ROUND_HALF_UP); + rate2 = Env.ONE.divide(rate1, 12, RoundingMode.HALF_UP); // if (mField.getColumnName().equals("MultiplyRate")) mTab.setValue("DivideRate", rate2); diff --git a/org.adempiere.base/src/org/compiere/model/GridField.java b/org.adempiere.base/src/org/compiere/model/GridField.java index 12618898a2..1f26b575df 100644 --- a/org.adempiere.base/src/org/compiere/model/GridField.java +++ b/org.adempiere.base/src/org/compiere/model/GridField.java @@ -791,14 +791,14 @@ public class GridField && (m_vo.ColumnName.equals("AD_Client_ID") || m_vo.ColumnName.equals("AD_Org_ID"))) { if (log.isLoggable(Level.FINE)) log.fine("[SystemAccess] " + m_vo.ColumnName + "=0"); - return new Integer(0); + return Integer.valueOf(0); } // Set Org to System, if Client access else if (X_AD_Table.ACCESSLEVEL_SystemPlusClient.equals(Env.getContext(m_vo.ctx, m_vo.WindowNo, m_vo.TabNo, GridTab.CTX_AccessLevel)) && m_vo.ColumnName.equals("AD_Org_ID")) { if (log.isLoggable(Level.FINE)) log.fine("[ClientAccess] " + m_vo.ColumnName + "=0"); - return new Integer(0); + return Integer.valueOf(0); } return null; @@ -1057,17 +1057,17 @@ public class GridField int ii = Integer.parseInt(value); if (ii < 0) return null; - return new Integer(ii); + return Integer.valueOf(ii); } catch (Exception e) { log.warning("Cannot parse: " + value + " - " + e.getMessage()); } - return new Integer(0); + return Integer.valueOf(0); } // Integer if (m_vo.displayType == DisplayType.Integer) - return new Integer(value); + return Integer.valueOf(value); // Number if (DisplayType.isNumeric(m_vo.displayType)) @@ -2057,7 +2057,7 @@ public class GridField || (DisplayType.isID(dt) && getColumnName().endsWith("_ID"))) { int i = Integer.parseInt(newValue); - setValue (new Integer(i), inserting); + setValue (Integer.valueOf(i), inserting); } // Return BigDecimal else if (DisplayType.isNumeric(dt)) diff --git a/org.adempiere.base/src/org/compiere/model/GridFieldVO.java b/org.adempiere.base/src/org/compiere/model/GridFieldVO.java index f2c08f4e79..479b719e52 100644 --- a/org.adempiere.base/src/org/compiere/model/GridFieldVO.java +++ b/org.adempiere.base/src/org/compiere/model/GridFieldVO.java @@ -870,7 +870,7 @@ public class GridFieldVO implements Serializable public static class SeqNoComparator implements Comparator { @Override public int compare(GridFieldVO gf1, GridFieldVO gf2) { - return (new Integer(gf1.SeqNo)).compareTo(new Integer(gf2.SeqNo)); + return (Integer.valueOf(gf1.SeqNo)).compareTo(Integer.valueOf(gf2.SeqNo)); } } diff --git a/org.adempiere.base/src/org/compiere/model/GridTab.java b/org.adempiere.base/src/org/compiere/model/GridTab.java index 86891042f4..af44023cb2 100644 --- a/org.adempiere.base/src/org/compiere/model/GridTab.java +++ b/org.adempiere.base/src/org/compiere/model/GridTab.java @@ -1818,13 +1818,13 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable if (rs.next()) { // {0} - Number of lines - Integer lines = new Integer(rs.getInt(1)); + Integer lines = Integer.valueOf(rs.getInt(1)); arguments[0] = lines; // {1} - Line net - Double net = new Double(rs.getDouble(2)); + Double net = Double.valueOf(rs.getDouble(2)); arguments[1] = net; // {2} - Line net - Double total = new Double(rs.getDouble(3)); + Double total = Double.valueOf(rs.getDouble(3)); arguments[2] = total; filled = true; } @@ -1905,19 +1905,19 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable if (rs.next()) { // {0} - Number of lines - Integer lines = new Integer(rs.getInt(1)); + Integer lines = Integer.valueOf(rs.getInt(1)); arguments[0] = lines; // {1} - Line toral - Double lineTotal = new Double(rs.getDouble(3)); + Double lineTotal = Double.valueOf(rs.getDouble(3)); arguments[1] = lineTotal; // {2} - Grand total (including tax, etc.) - Double grandTotal = new Double(rs.getDouble(4)); + Double grandTotal = Double.valueOf(rs.getDouble(4)); arguments[2] = grandTotal; // {3} - Currency String currency = rs.getString(2); arguments[3] = currency; // (4) - Grand total converted to Euro - Double grandEuro = new Double(rs.getDouble(5)); + Double grandEuro = Double.valueOf(rs.getDouble(5)); arguments[4] = grandEuro; filled = true; } @@ -1979,10 +1979,10 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable if (rs.next()) { // {0} - Number of lines - Integer lines = new Integer(rs.getInt(1)); + Integer lines = Integer.valueOf(rs.getInt(1)); arguments[0] = lines; // {1} - Line total - Double total = new Double(rs.getDouble(2)); + Double total = Double.valueOf(rs.getDouble(2)); arguments[1] = total; // {3} - Currency arguments[2] = " "; @@ -2234,7 +2234,7 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable rs = pstmt.executeQuery(); while (rs.next()) { - Integer key = new Integer(rs.getInt(1)); + Integer key = Integer.valueOf(rs.getInt(1)); m_Lock.add(key); } } @@ -2264,7 +2264,7 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable if (m_Lock == null || m_Lock.isEmpty()) return false; // - Integer key = new Integer(m_mTable.getKeyID (m_currentRow)); + Integer key = Integer.valueOf(m_mTable.getKeyID (m_currentRow)); return m_Lock.contains(key); } // isLocked @@ -2927,7 +2927,7 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable if (call == null) { //no match from factory, check java classpath Class cClass = Class.forName(className); - call = (Callout)cClass.newInstance(); + call = (Callout)cClass.getDeclaredConstructor().newInstance(); } } } @@ -3190,9 +3190,9 @@ public class GridTab implements DataStatusListener, Evaluatee, Serializable lineNoCurrentRow = (Integer) m_mTable.getValueAt(from, lineCol); lineNoNextRow = (Integer) m_mTable.getValueAt(to, lineCol); } else if (m_mTable.getValueAt(from, lineCol) instanceof BigDecimal) { - lineNoCurrentRow = new Integer(((BigDecimal) m_mTable.getValueAt(from, lineCol)) + lineNoCurrentRow = Integer.valueOf(((BigDecimal) m_mTable.getValueAt(from, lineCol)) .intValue()); - lineNoNextRow = new Integer(((BigDecimal) m_mTable.getValueAt(to, lineCol)) + lineNoNextRow = Integer.valueOf(((BigDecimal) m_mTable.getValueAt(to, lineCol)) .intValue()); } else { log.fine("unknown value format - return"); diff --git a/org.adempiere.base/src/org/compiere/model/GridTable.java b/org.adempiere.base/src/org/compiere/model/GridTable.java index 144304b5ac..cc11e1a1e8 100644 --- a/org.adempiere.base/src/org/compiere/model/GridTable.java +++ b/org.adempiere.base/src/org/compiere/model/GridTable.java @@ -1303,8 +1303,8 @@ public class GridTable extends AbstractTableModel // Save old value m_oldValue = new Object[3]; - m_oldValue[0] = new Integer(row); - m_oldValue[1] = new Integer(col); + m_oldValue[0] = Integer.valueOf(row); + m_oldValue[1] = Integer.valueOf(col); m_oldValue[2] = oldValue; // Set Data item @@ -1894,7 +1894,7 @@ public class GridTable extends AbstractTableModel if (dd instanceof Integer) iii = (Integer)dd; else - iii = new Integer(dd.toString()); + iii = Integer.valueOf(dd.toString()); if (encrypted) iii = (Integer)encrypt(iii, getAD_Client_ID()); if (manualUpdate) @@ -3242,7 +3242,7 @@ public class GridTable extends AbstractTableModel // Integer, ID, Lookup if (displayType == DisplayType.Integer || (DisplayType.isID(displayType) && !(columnName.equals("EntityType") || columnName.equals("AD_Language")))) { - rowData[j] = new Integer(rs.getInt(j+1)); // Integer + rowData[j] = Integer.valueOf(rs.getInt(j+1)); // Integer if (rs.wasNull()) rowData[j] = null; } @@ -3261,7 +3261,7 @@ public class GridTable extends AbstractTableModel String str = rs.getString(j+1); if (field.isEncryptedColumn()) str = (String)decrypt(str, getAD_Client_ID(rs)); - rowData[j] = new Boolean ("Y".equals(str)); // Boolean + rowData[j] = Boolean.valueOf("Y".equals(str)); // Boolean } // LOB else if (DisplayType.isLOB(displayType)) diff --git a/org.adempiere.base/src/org/compiere/model/MAcctSchema.java b/org.adempiere.base/src/org/compiere/model/MAcctSchema.java index 495bf66133..58bd6f7dde 100644 --- a/org.adempiere.base/src/org/compiere/model/MAcctSchema.java +++ b/org.adempiere.base/src/org/compiere/model/MAcctSchema.java @@ -62,7 +62,7 @@ public class MAcctSchema extends X_C_AcctSchema public static MAcctSchema get (Properties ctx, int C_AcctSchema_ID, String trxName) { // Check Cache - Integer key = new Integer(C_AcctSchema_ID); + Integer key = Integer.valueOf(C_AcctSchema_ID); MAcctSchema retValue = (MAcctSchema)s_cache.get(key); if (retValue != null) return retValue; @@ -93,7 +93,7 @@ public class MAcctSchema extends X_C_AcctSchema public static synchronized MAcctSchema[] getClientAcctSchema (Properties ctx, int AD_Client_ID, String trxName) { // Check Cache - Integer key = new Integer(AD_Client_ID); + Integer key = Integer.valueOf(AD_Client_ID); if (s_schema.containsKey(key)) return (MAcctSchema[])s_schema.get(key); diff --git a/org.adempiere.base/src/org/compiere/model/MAcctSchemaElement.java b/org.adempiere.base/src/org/compiere/model/MAcctSchemaElement.java index 47c7bde908..7e48939ad3 100644 --- a/org.adempiere.base/src/org/compiere/model/MAcctSchemaElement.java +++ b/org.adempiere.base/src/org/compiere/model/MAcctSchemaElement.java @@ -57,7 +57,7 @@ public class MAcctSchemaElement extends X_C_AcctSchema_Element */ public static MAcctSchemaElement[] getAcctSchemaElements (MAcctSchema as) { - Integer key = new Integer (as.getC_AcctSchema_ID()); + Integer key = Integer.valueOf(as.getC_AcctSchema_ID()); MAcctSchemaElement[] retValue = (MAcctSchemaElement[]) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MAging.java b/org.adempiere.base/src/org/compiere/model/MAging.java index 9396a52e91..05d5332fd0 100644 --- a/org.adempiere.base/src/org/compiere/model/MAging.java +++ b/org.adempiere.base/src/org/compiere/model/MAging.java @@ -116,9 +116,9 @@ public class MAging extends X_T_Aging // Optional // setC_Invoice_ID (C_Invoice_ID); // may be zero - set_ValueNoCheck ("C_Invoice_ID", new Integer(C_Invoice_ID)); + set_ValueNoCheck ("C_Invoice_ID", Integer.valueOf(C_Invoice_ID)); // setC_InvoicePaySchedule_ID(C_InvoicePaySchedule_ID); // may be zero - set_Value ("C_InvoicePaySchedule_ID", new Integer(C_InvoicePaySchedule_ID)); + set_Value ("C_InvoicePaySchedule_ID", Integer.valueOf(C_InvoicePaySchedule_ID)); setIsListInvoices(C_Invoice_ID != 0); // setDueDate(DueDate); // only sensible if List invoices @@ -156,9 +156,9 @@ public class MAging extends X_T_Aging // Optional // setC_Invoice_ID (C_Invoice_ID); // may be zero - set_ValueNoCheck ("C_Invoice_ID", new Integer(C_Invoice_ID)); + set_ValueNoCheck ("C_Invoice_ID", Integer.valueOf(C_Invoice_ID)); // setC_InvoicePaySchedule_ID(C_InvoicePaySchedule_ID); // may be zero - set_Value ("C_InvoicePaySchedule_ID", new Integer(C_InvoicePaySchedule_ID)); + set_Value ("C_InvoicePaySchedule_ID", Integer.valueOf(C_InvoicePaySchedule_ID)); setIsListInvoices(C_Invoice_ID != 0); // setDueDate(DueDate); // only sensible if List invoices diff --git a/org.adempiere.base/src/org/compiere/model/MAllocationHdr.java b/org.adempiere.base/src/org/compiere/model/MAllocationHdr.java index 6041a67c53..e6146929e8 100644 --- a/org.adempiere.base/src/org/compiere/model/MAllocationHdr.java +++ b/org.adempiere.base/src/org/compiere/model/MAllocationHdr.java @@ -18,6 +18,7 @@ package org.compiere.model; import java.io.File; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Timestamp; @@ -1066,7 +1067,7 @@ public class MAllocationHdr extends X_C_AllocationHdr implements DocAction // Round int precision = MCurrency.getStdPrecision(getCtx(), client.getC_Currency_ID()); if (openBalanceDiff.scale() > precision) - openBalanceDiff = openBalanceDiff.setScale(precision, BigDecimal.ROUND_HALF_UP); + openBalanceDiff = openBalanceDiff.setScale(precision, RoundingMode.HALF_UP); } } diff --git a/org.adempiere.base/src/org/compiere/model/MAttributeSet.java b/org.adempiere.base/src/org/compiere/model/MAttributeSet.java index 292a0071b8..a03dd23c34 100644 --- a/org.adempiere.base/src/org/compiere/model/MAttributeSet.java +++ b/org.adempiere.base/src/org/compiere/model/MAttributeSet.java @@ -51,7 +51,7 @@ public class MAttributeSet extends X_M_AttributeSet */ public static MAttributeSet get (Properties ctx, int M_AttributeSet_ID) { - Integer key = new Integer (M_AttributeSet_ID); + Integer key = Integer.valueOf(M_AttributeSet_ID); MAttributeSet retValue = (MAttributeSet) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MBOM.java b/org.adempiere.base/src/org/compiere/model/MBOM.java index a011ddc982..e2ccd91c9e 100644 --- a/org.adempiere.base/src/org/compiere/model/MBOM.java +++ b/org.adempiere.base/src/org/compiere/model/MBOM.java @@ -45,7 +45,7 @@ public class MBOM extends X_M_BOM */ public static MBOM get (Properties ctx, int M_BOM_ID) { - Integer key = new Integer (M_BOM_ID); + Integer key = Integer.valueOf(M_BOM_ID); MBOM retValue = (MBOM) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MBPGroup.java b/org.adempiere.base/src/org/compiere/model/MBPGroup.java index 9d8ae48efc..74581087eb 100644 --- a/org.adempiere.base/src/org/compiere/model/MBPGroup.java +++ b/org.adempiere.base/src/org/compiere/model/MBPGroup.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.Properties; @@ -49,7 +50,7 @@ public class MBPGroup extends X_C_BP_Group */ public static MBPGroup get (Properties ctx, int C_BP_Group_ID) { - Integer key = new Integer (C_BP_Group_ID); + Integer key = Integer.valueOf(C_BP_Group_ID); MBPGroup retValue = (MBPGroup) s_cache.get (key); if (retValue != null) return retValue; @@ -82,7 +83,7 @@ public class MBPGroup extends X_C_BP_Group public static MBPGroup getDefault (Properties ctx) { int AD_Client_ID = Env.getAD_Client_ID(ctx); - Integer key = new Integer (AD_Client_ID); + Integer key = Integer.valueOf(AD_Client_ID); MBPGroup retValue = (MBPGroup) s_cacheDefault.get (key); if (retValue != null) return retValue; @@ -141,7 +142,7 @@ public class MBPGroup extends X_C_BP_Group if (rs.next ()) { retValue = new MBPGroup (ctx, rs, null); - Integer key = new Integer (retValue.getC_BP_Group_ID()); + Integer key = Integer.valueOf(retValue.getC_BP_Group_ID()); if (retValue.get_ID () != 0) s_cache.put (key, retValue); } @@ -220,7 +221,7 @@ public class MBPGroup extends X_C_BP_Group { BigDecimal bd = super.getCreditWatchPercent(); if (bd.compareTo(Env.ZERO) != 0) - return bd.divide(Env.ONEHUNDRED, 2, BigDecimal.ROUND_HALF_UP); + return bd.divide(Env.ONEHUNDRED, 2, RoundingMode.HALF_UP); return BigDecimal.valueOf(0.90); } // getCreditWatchRatio diff --git a/org.adempiere.base/src/org/compiere/model/MBPartner.java b/org.adempiere.base/src/org/compiere/model/MBPartner.java index d704367e27..d0df6787b8 100644 --- a/org.adempiere.base/src/org/compiere/model/MBPartner.java +++ b/org.adempiere.base/src/org/compiere/model/MBPartner.java @@ -63,7 +63,7 @@ public class MBPartner extends X_C_BPartner // Reset if (template != null) { - template.set_ValueNoCheck ("C_BPartner_ID", new Integer(0)); + template.set_ValueNoCheck ("C_BPartner_ID", Integer.valueOf(0)); template.set_ValueNoCheck ("C_BPartner_UU", (String)null); template.setAD_OrgBP_ID(0); template.setLogo_ID(0); @@ -660,7 +660,7 @@ public class MBPartner extends X_C_BPartner */ public void setPrimaryC_BPartner_Location_ID(int C_BPartner_Location_ID) { - m_primaryC_BPartner_Location_ID = new Integer (C_BPartner_Location_ID); + m_primaryC_BPartner_Location_ID = Integer.valueOf(C_BPartner_Location_ID); } // setPrimaryC_BPartner_Location_ID /** @@ -669,7 +669,7 @@ public class MBPartner extends X_C_BPartner */ public void setPrimaryAD_User_ID(int AD_User_ID) { - m_primaryAD_User_ID = new Integer (AD_User_ID); + m_primaryAD_User_ID = Integer.valueOf(AD_User_ID); } // setPrimaryAD_User_ID diff --git a/org.adempiere.base/src/org/compiere/model/MBPartnerLocation.java b/org.adempiere.base/src/org/compiere/model/MBPartnerLocation.java index 11b5aa17b1..dc3866976c 100644 --- a/org.adempiere.base/src/org/compiere/model/MBPartnerLocation.java +++ b/org.adempiere.base/src/org/compiere/model/MBPartnerLocation.java @@ -105,7 +105,7 @@ public class MBPartnerLocation extends X_C_BPartner_Location { this(bp.getCtx(), 0, bp.get_TrxName()); setClientOrg(bp); // may (still) be 0 - set_ValueNoCheck("C_BPartner_ID", new Integer(bp.getC_BPartner_ID())); + set_ValueNoCheck("C_BPartner_ID", Integer.valueOf(bp.getC_BPartner_ID())); } // MBPartner_Location /** diff --git a/org.adempiere.base/src/org/compiere/model/MBank.java b/org.adempiere.base/src/org/compiere/model/MBank.java index e3b8c9afc7..93e3c4ec04 100644 --- a/org.adempiere.base/src/org/compiere/model/MBank.java +++ b/org.adempiere.base/src/org/compiere/model/MBank.java @@ -43,7 +43,7 @@ public class MBank extends X_C_Bank */ public static MBank get (Properties ctx, int C_Bank_ID) { - Integer key = new Integer (C_Bank_ID); + Integer key = Integer.valueOf(C_Bank_ID); MBank retValue = (MBank)s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MBankAccount.java b/org.adempiere.base/src/org/compiere/model/MBankAccount.java index 9bb98fca78..086ef6f5b6 100644 --- a/org.adempiere.base/src/org/compiere/model/MBankAccount.java +++ b/org.adempiere.base/src/org/compiere/model/MBankAccount.java @@ -47,7 +47,7 @@ public class MBankAccount extends X_C_BankAccount */ public static MBankAccount get (Properties ctx, int C_BankAccount_ID) { - Integer key = new Integer (C_BankAccount_ID); + Integer key = Integer.valueOf(C_BankAccount_ID); MBankAccount retValue = (MBankAccount) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MBankStatementLoader.java b/org.adempiere.base/src/org/compiere/model/MBankStatementLoader.java index aa790d9f2f..7a61593ae0 100644 --- a/org.adempiere.base/src/org/compiere/model/MBankStatementLoader.java +++ b/org.adempiere.base/src/org/compiere/model/MBankStatementLoader.java @@ -132,7 +132,7 @@ import org.compiere.util.Util; if(m_loader==null){ // if no OSGi plugin is found try the legacy way (in my own classpath) Class bsrClass = Class.forName(getStmtLoaderClass()); - m_loader = (BankStatementLoaderInterface) bsrClass.newInstance(); + m_loader = (BankStatementLoaderInterface) bsrClass.getDeclaredConstructor().newInstance(); } } catch(Exception e) diff --git a/org.adempiere.base/src/org/compiere/model/MBankStatementMatcher.java b/org.adempiere.base/src/org/compiere/model/MBankStatementMatcher.java index c255442ab8..9137ec4e6c 100644 --- a/org.adempiere.base/src/org/compiere/model/MBankStatementMatcher.java +++ b/org.adempiere.base/src/org/compiere/model/MBankStatementMatcher.java @@ -141,7 +141,7 @@ public class MBankStatementMatcher extends X_C_BankStatementMatcher if(m_matcher==null){ // if no OSGi plugin is found try the legacy way (in my own classpath) Class bsrClass = Class.forName(className); - m_matcher = (BankStatementMatcherInterface) bsrClass.newInstance(); + m_matcher = (BankStatementMatcherInterface) bsrClass.getDeclaredConstructor().newInstance(); } m_matcherValid = Boolean.TRUE; } diff --git a/org.adempiere.base/src/org/compiere/model/MCalendar.java b/org.adempiere.base/src/org/compiere/model/MCalendar.java index 2f20ef7649..34f149e340 100644 --- a/org.adempiere.base/src/org/compiere/model/MCalendar.java +++ b/org.adempiere.base/src/org/compiere/model/MCalendar.java @@ -46,7 +46,7 @@ public class MCalendar extends X_C_Calendar */ public static MCalendar get (Properties ctx, int C_Calendar_ID) { - Integer key = new Integer (C_Calendar_ID); + Integer key = Integer.valueOf(C_Calendar_ID); MCalendar retValue = (MCalendar) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MCashBook.java b/org.adempiere.base/src/org/compiere/model/MCashBook.java index d486d503e2..1a02dece78 100644 --- a/org.adempiere.base/src/org/compiere/model/MCashBook.java +++ b/org.adempiere.base/src/org/compiere/model/MCashBook.java @@ -57,7 +57,7 @@ public class MCashBook extends X_C_CashBook */ public static MCashBook get(Properties ctx, int C_CashBook_ID, String trxName) { - Integer key = new Integer (C_CashBook_ID); + Integer key = Integer.valueOf(C_CashBook_ID); MCashBook retValue = (MCashBook) s_cache.get (key); if (retValue != null) return retValue; @@ -93,7 +93,7 @@ public class MCashBook extends X_C_CashBook .first(); if (retValue!=null) { - Integer key = new Integer (retValue.getC_CashBook_ID()); + Integer key = Integer.valueOf(retValue.getC_CashBook_ID()); s_cache.put (key, retValue); } return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MChangeLog.java b/org.adempiere.base/src/org/compiere/model/MChangeLog.java index a282041244..8ed28049c6 100644 --- a/org.adempiere.base/src/org/compiere/model/MChangeLog.java +++ b/org.adempiere.base/src/org/compiere/model/MChangeLog.java @@ -72,7 +72,7 @@ public class MChangeLog extends X_AD_ChangeLog pstmt = DB.prepareStatement(sql, null); rs = pstmt.executeQuery(); while (rs.next()) - list.add(new Integer(rs.getInt(1))); + list.add(Integer.valueOf(rs.getInt(1))); } catch (Exception e) { diff --git a/org.adempiere.base/src/org/compiere/model/MCharge.java b/org.adempiere.base/src/org/compiere/model/MCharge.java index 2432e6a13e..9b3133053e 100644 --- a/org.adempiere.base/src/org/compiere/model/MCharge.java +++ b/org.adempiere.base/src/org/compiere/model/MCharge.java @@ -87,7 +87,7 @@ public class MCharge extends X_C_Charge */ public static MCharge get (Properties ctx, int C_Charge_ID) { - Integer key = new Integer (C_Charge_ID); + Integer key = Integer.valueOf(C_Charge_ID); MCharge retValue = (MCharge)s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MChatType.java b/org.adempiere.base/src/org/compiere/model/MChatType.java index 1dac912ea0..71a2daa810 100644 --- a/org.adempiere.base/src/org/compiere/model/MChatType.java +++ b/org.adempiere.base/src/org/compiere/model/MChatType.java @@ -42,7 +42,7 @@ public class MChatType extends X_CM_ChatType */ public static MChatType get (Properties ctx, int CM_ChatType_ID) { - Integer key = new Integer (CM_ChatType_ID); + Integer key = Integer.valueOf(CM_ChatType_ID); MChatType retValue = (MChatType)s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MCity.java b/org.adempiere.base/src/org/compiere/model/MCity.java index ada89eebbc..0cb3c8701c 100644 --- a/org.adempiere.base/src/org/compiere/model/MCity.java +++ b/org.adempiere.base/src/org/compiere/model/MCity.java @@ -46,7 +46,7 @@ public class MCity extends X_C_City */ public static MCity get (Properties ctx, int C_City_ID) { - Integer key = new Integer (C_City_ID); + Integer key = Integer.valueOf(C_City_ID); MCity r = s_Cities.get(key); if (r != null) return r; diff --git a/org.adempiere.base/src/org/compiere/model/MClient.java b/org.adempiere.base/src/org/compiere/model/MClient.java index 21589b1d96..569744b792 100644 --- a/org.adempiere.base/src/org/compiere/model/MClient.java +++ b/org.adempiere.base/src/org/compiere/model/MClient.java @@ -66,7 +66,7 @@ public class MClient extends X_AD_Client */ public static MClient get (Properties ctx, int AD_Client_ID) { - Integer key = new Integer (AD_Client_ID); + Integer key = Integer.valueOf(AD_Client_ID); MClient client = (MClient)s_cache.get(key); if (client != null) return client; @@ -97,7 +97,7 @@ public class MClient extends X_AD_Client .setOrderBy(orderBy) .list(); for(MClient client:list ){ - s_cache.put (new Integer (client.getAD_Client_ID()), client); + s_cache.put (Integer.valueOf(client.getAD_Client_ID()), client); } MClient[] retValue = new MClient[list.size ()]; list.toArray (retValue); diff --git a/org.adempiere.base/src/org/compiere/model/MClientInfo.java b/org.adempiere.base/src/org/compiere/model/MClientInfo.java index 49e44cd991..9e1fe9f94b 100644 --- a/org.adempiere.base/src/org/compiere/model/MClientInfo.java +++ b/org.adempiere.base/src/org/compiere/model/MClientInfo.java @@ -61,7 +61,7 @@ public class MClientInfo extends X_AD_ClientInfo */ public static MClientInfo get (Properties ctx, int AD_Client_ID, String trxName) { - Integer key = new Integer (AD_Client_ID); + Integer key = Integer.valueOf(AD_Client_ID); MClientInfo info = (MClientInfo)s_cache.get(key); if (info != null) return info; diff --git a/org.adempiere.base/src/org/compiere/model/MColorSchema.java b/org.adempiere.base/src/org/compiere/model/MColorSchema.java index e69810a679..79521528a1 100644 --- a/org.adempiere.base/src/org/compiere/model/MColorSchema.java +++ b/org.adempiere.base/src/org/compiere/model/MColorSchema.java @@ -18,6 +18,7 @@ package org.compiere.model; import java.awt.Color; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.ResultSet; import java.util.Properties; @@ -54,7 +55,7 @@ public class MColorSchema extends X_PA_ColorSchema && target != null && target.signum() != 0) { BigDecimal pp = actual.multiply(Env.ONEHUNDRED) - .divide(target, 0, BigDecimal.ROUND_HALF_UP); + .divide(target, 0, RoundingMode.HALF_UP); percent = pp.intValue(); } return getColor(ctx, PA_ColorSchema_ID, percent); @@ -88,7 +89,7 @@ public class MColorSchema extends X_PA_ColorSchema retValue.setDefault(); return retValue; } - Integer key = new Integer (PA_ColorSchema_ID); + Integer key = Integer.valueOf(PA_ColorSchema_ID); MColorSchema retValue = (MColorSchema)s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MColumn.java b/org.adempiere.base/src/org/compiere/model/MColumn.java index 54b99947d4..93dd0e0a67 100644 --- a/org.adempiere.base/src/org/compiere/model/MColumn.java +++ b/org.adempiere.base/src/org/compiere/model/MColumn.java @@ -66,7 +66,7 @@ public class MColumn extends X_AD_Column */ public static MColumn get(Properties ctx, int AD_Column_ID, String trxName) { - Integer key = new Integer (AD_Column_ID); + Integer key = Integer.valueOf(AD_Column_ID); MColumn retValue = (MColumn) s_cache.get (key); if (retValue != null) { retValue.set_TrxName(trxName); diff --git a/org.adempiere.base/src/org/compiere/model/MConversionRate.java b/org.adempiere.base/src/org/compiere/model/MConversionRate.java index 009cd24b82..74c8de8287 100644 --- a/org.adempiere.base/src/org/compiere/model/MConversionRate.java +++ b/org.adempiere.base/src/org/compiere/model/MConversionRate.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Timestamp; @@ -142,7 +143,7 @@ public class MConversionRate extends X_C_Conversion_Rate int stdPrecision = isCosting ? MCurrency.getCostingPrecision(ctx, CurTo_ID): MCurrency.getStdPrecision(ctx, CurTo_ID); if (retValue.scale() > stdPrecision) - retValue = retValue.setScale(stdPrecision, BigDecimal.ROUND_HALF_UP); + retValue = retValue.setScale(stdPrecision, RoundingMode.HALF_UP); return retValue; } // convert diff --git a/org.adempiere.base/src/org/compiere/model/MConversionType.java b/org.adempiere.base/src/org/compiere/model/MConversionType.java index 93b9bc42f2..1fc540b595 100644 --- a/org.adempiere.base/src/org/compiere/model/MConversionType.java +++ b/org.adempiere.base/src/org/compiere/model/MConversionType.java @@ -52,7 +52,7 @@ public class MConversionType extends X_C_ConversionType public static int getDefault (int AD_Client_ID) { // Try Cache - Integer key = new Integer (AD_Client_ID); + Integer key = Integer.valueOf(AD_Client_ID); Integer ii = (Integer)s_cache.get(key); if (ii != null) return ii.intValue(); @@ -66,7 +66,7 @@ public class MConversionType extends X_C_ConversionType + "ORDER BY IsDefault DESC, AD_Client_ID DESC"; C_ConversionType_ID = DB.getSQLValue(null, sql, AD_Client_ID); // Return - s_cache.put(key, new Integer(C_ConversionType_ID)); + s_cache.put(key, Integer.valueOf(C_ConversionType_ID)); return C_ConversionType_ID; } // getDefault diff --git a/org.adempiere.base/src/org/compiere/model/MCost.java b/org.adempiere.base/src/org/compiere/model/MCost.java index 934e0900c9..f30b3845be 100644 --- a/org.adempiere.base/src/org/compiere/model/MCost.java +++ b/org.adempiere.base/src/org/compiere/model/MCost.java @@ -18,6 +18,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -243,15 +244,15 @@ public class MCost extends X_M_Cost if (percentage.signum() == 0) // no percentages { if (costs.scale() > precision) - costs = costs.setScale(precision, BigDecimal.ROUND_HALF_UP); + costs = costs.setScale(precision, RoundingMode.HALF_UP); return costs; } // BigDecimal percentCost = costs.multiply(percentage); - percentCost = percentCost.divide(Env.ONEHUNDRED, precision, BigDecimal.ROUND_HALF_UP); + percentCost = percentCost.divide(Env.ONEHUNDRED, precision, RoundingMode.HALF_UP); costs = costs.add(percentCost); if (costs.scale() > precision) - costs = costs.setScale(precision, BigDecimal.ROUND_HALF_UP); + costs = costs.setScale(precision, RoundingMode.HALF_UP); if (s_log.isLoggable(Level.FINER)) s_log.finer("Sum Costs = " + costs + " (Add=" + percentCost + ")"); return costs; } // getCurrentCost @@ -921,8 +922,8 @@ public class MCost extends X_M_Cost BigDecimal averageCurrent = oldStockQty.multiply(oldAverageAmt); BigDecimal averageIncrease = matchQty.multiply(cost); BigDecimal newAmt = averageCurrent.add(averageIncrease); - newAmt = newAmt.setScale(as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP); - newAverageAmt = newAmt.divide(newStockQty, as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP); + newAmt = newAmt.setScale(as.getCostingPrecision(), RoundingMode.HALF_UP); + newAverageAmt = newAmt.divide(newStockQty, as.getCostingPrecision(), RoundingMode.HALF_UP); if (s_log.isLoggable(Level.FINER)) s_log.finer("Movement=" + movementQty + ", StockQty=" + newStockQty + ", Match=" + matchQty + ", Cost=" + cost + ", NewAvg=" + newAverageAmt); } @@ -1017,8 +1018,8 @@ public class MCost extends X_M_Cost BigDecimal averageCurrent = oldStockQty.multiply(oldAverageAmt); BigDecimal averageIncrease = matchQty.multiply(cost); BigDecimal newAmt = averageCurrent.add(averageIncrease); - newAmt = newAmt.setScale(as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP); - newAverageAmt = newAmt.divide(newStockQty, as.getCostingPrecision(), BigDecimal.ROUND_HALF_UP); + newAmt = newAmt.setScale(as.getCostingPrecision(), RoundingMode.HALF_UP); + newAverageAmt = newAmt.divide(newStockQty, as.getCostingPrecision(), RoundingMode.HALF_UP); if (s_log.isLoggable(Level.FINER)) s_log.finer("Movement=" + movementQty + ", StockQty=" + newStockQty + ", Match=" + matchQty + ", Cost=" + cost + ", NewAvg=" + newAverageAmt); } @@ -1539,12 +1540,12 @@ public class MCost extends X_M_Cost if (sumQty.signum() != 0) { BigDecimal oldSum = getCurrentCostPrice().multiply(getCurrentQty()); - BigDecimal oldCost = oldSum.divide(sumQty, 12, BigDecimal.ROUND_HALF_UP); - BigDecimal newCost = amt.divide(sumQty, 12, BigDecimal.ROUND_HALF_UP); //amt is total already + BigDecimal oldCost = oldSum.divide(sumQty, 12, RoundingMode.HALF_UP); + BigDecimal newCost = amt.divide(sumQty, 12, RoundingMode.HALF_UP); //amt is total already BigDecimal cost = oldCost.add(newCost); if (cost.scale() > (getPrecision()*2)) { - cost = cost.setScale((getPrecision()*2), BigDecimal.ROUND_HALF_UP); + cost = cost.setScale((getPrecision()*2), RoundingMode.HALF_UP); } setCurrentCostPrice(cost); } @@ -1562,7 +1563,7 @@ public class MCost extends X_M_Cost BigDecimal cost = amtUnit; if (cost.scale() > (getPrecision()*2)) { - cost = cost.setScale((getPrecision()*2), BigDecimal.ROUND_HALF_UP); + cost = cost.setScale((getPrecision()*2), RoundingMode.HALF_UP); } setCurrentCostPrice(cost); } // setWeightedAverageInitial @@ -1601,7 +1602,7 @@ public class MCost extends X_M_Cost if (getCumulatedQty().signum() != 0 && getCumulatedAmt().signum() != 0) retValue = getCumulatedAmt() - .divide(getCumulatedQty(), getPrecision(), BigDecimal.ROUND_HALF_UP); + .divide(getCumulatedQty(), getPrecision(), RoundingMode.HALF_UP); return retValue; } // getHistoryAverage diff --git a/org.adempiere.base/src/org/compiere/model/MCostDetail.java b/org.adempiere.base/src/org/compiere/model/MCostDetail.java index c110089c44..14ac88cf36 100644 --- a/org.adempiere.base/src/org/compiere/model/MCostDetail.java +++ b/org.adempiere.base/src/org/compiere/model/MCostDetail.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.List; @@ -1047,7 +1048,7 @@ public class MCostDetail extends X_M_CostDetail int precision = as.getCostingPrecision(); BigDecimal price = amt; if (qty.signum() != 0) - price = amt.divide(qty, precision, BigDecimal.ROUND_HALF_UP); + price = amt.divide(qty, precision, RoundingMode.HALF_UP); /** All Costing Methods if (ce.isAverageInvoice()) diff --git a/org.adempiere.base/src/org/compiere/model/MCostElement.java b/org.adempiere.base/src/org/compiere/model/MCostElement.java index a6b840a5cd..f5ee4f7620 100644 --- a/org.adempiere.base/src/org/compiere/model/MCostElement.java +++ b/org.adempiere.base/src/org/compiere/model/MCostElement.java @@ -186,7 +186,7 @@ public class MCostElement extends X_M_CostElement */ public static MCostElement get (Properties ctx, int M_CostElement_ID) { - Integer key = new Integer (M_CostElement_ID); + Integer key = Integer.valueOf(M_CostElement_ID); MCostElement retValue = (MCostElement) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MCostQueue.java b/org.adempiere.base/src/org/compiere/model/MCostQueue.java index 6f2aaa21aa..93972b1c01 100644 --- a/org.adempiere.base/src/org/compiere/model/MCostQueue.java +++ b/org.adempiere.base/src/org/compiere/model/MCostQueue.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; @@ -381,7 +382,7 @@ public class MCostQueue extends X_M_CostQueue BigDecimal sumQty = getCurrentQty().add(qty); if (sumQty.signum() != 0) { - BigDecimal cost = sumAmt.divide(sumQty, precision, BigDecimal.ROUND_HALF_UP); + BigDecimal cost = sumAmt.divide(sumQty, precision, RoundingMode.HALF_UP); setCurrentCostPrice(cost); } // diff --git a/org.adempiere.base/src/org/compiere/model/MCurrency.java b/org.adempiere.base/src/org/compiere/model/MCurrency.java index daf865d361..efae23d85f 100644 --- a/org.adempiere.base/src/org/compiere/model/MCurrency.java +++ b/org.adempiere.base/src/org/compiere/model/MCurrency.java @@ -125,7 +125,7 @@ public class MCurrency extends X_C_Currency public static MCurrency get (Properties ctx, int C_Currency_ID) { // Try Cache - Integer key = new Integer(C_Currency_ID); + Integer key = Integer.valueOf(C_Currency_ID); MCurrency retValue = (MCurrency)s_currencies.get(key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MDesktop.java b/org.adempiere.base/src/org/compiere/model/MDesktop.java index 98f0eb066e..88ab8c587c 100644 --- a/org.adempiere.base/src/org/compiere/model/MDesktop.java +++ b/org.adempiere.base/src/org/compiere/model/MDesktop.java @@ -223,7 +223,7 @@ public class MDesktop while (rs.next()) { int AD_Workbench_ID = rs.getInt(1); - m_workbenches.add (new Integer(AD_Workbench_ID)); + m_workbenches.add (Integer.valueOf(AD_Workbench_ID)); } } catch (SQLException e) diff --git a/org.adempiere.base/src/org/compiere/model/MDiscountSchema.java b/org.adempiere.base/src/org/compiere/model/MDiscountSchema.java index 292baccabf..4342710982 100644 --- a/org.adempiere.base/src/org/compiere/model/MDiscountSchema.java +++ b/org.adempiere.base/src/org/compiere/model/MDiscountSchema.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; @@ -50,7 +51,7 @@ public class MDiscountSchema extends X_M_DiscountSchema */ public static MDiscountSchema get (Properties ctx, int M_DiscountSchema_ID) { - Integer key = new Integer (M_DiscountSchema_ID); + Integer key = Integer.valueOf(M_DiscountSchema_ID); MDiscountSchema retValue = (MDiscountSchema) s_cache.get (key); if (retValue != null) return retValue; @@ -203,7 +204,7 @@ public class MDiscountSchema extends X_M_DiscountSchema // BigDecimal onehundred = Env.ONEHUNDRED; BigDecimal multiplier = (onehundred).subtract(discount); - multiplier = multiplier.divide(onehundred, 6, BigDecimal.ROUND_HALF_UP); + multiplier = multiplier.divide(onehundred, 6, RoundingMode.HALF_UP); BigDecimal newPrice = Price.multiply(multiplier); if (log.isLoggable(Level.FINE)) log.fine("=>" + newPrice); return newPrice; diff --git a/org.adempiere.base/src/org/compiere/model/MDistribution.java b/org.adempiere.base/src/org/compiere/model/MDistribution.java index 963dc65f67..d3cb7d288e 100644 --- a/org.adempiere.base/src/org/compiere/model/MDistribution.java +++ b/org.adempiere.base/src/org/compiere/model/MDistribution.java @@ -153,7 +153,7 @@ public class MDistribution extends X_GL_Distribution */ public static MDistribution[] get (Properties ctx, int Account_ID) { - Integer key = new Integer (Account_ID); + Integer key = Integer.valueOf(Account_ID); MDistribution[] retValue = (MDistribution[])s_accounts.get(key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MDistributionLine.java b/org.adempiere.base/src/org/compiere/model/MDistributionLine.java index 637fe98f16..643ca8c73b 100644 --- a/org.adempiere.base/src/org/compiere/model/MDistributionLine.java +++ b/org.adempiere.base/src/org/compiere/model/MDistributionLine.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.ResultSet; import java.util.Properties; @@ -193,7 +194,7 @@ public class MDistributionLine extends X_GL_DistributionLine public void calculateAmt (BigDecimal amt, int precision) { m_amt = amt.multiply(getPercent()); - m_amt = m_amt.divide(Env.ONEHUNDRED, precision, BigDecimal.ROUND_HALF_UP); + m_amt = m_amt.divide(Env.ONEHUNDRED, precision, RoundingMode.HALF_UP); } // setAmt /** @@ -203,7 +204,7 @@ public class MDistributionLine extends X_GL_DistributionLine public void calculateQty (BigDecimal qty) { m_qty = qty.multiply(getPercent()); - m_qty = m_qty.divide(Env.ONEHUNDRED, BigDecimal.ROUND_HALF_UP); + m_qty = m_qty.divide(Env.ONEHUNDRED, RoundingMode.HALF_UP); } // setAmt diff --git a/org.adempiere.base/src/org/compiere/model/MDistributionRunDetail.java b/org.adempiere.base/src/org/compiere/model/MDistributionRunDetail.java index c4c54a2292..9652fb934e 100644 --- a/org.adempiere.base/src/org/compiere/model/MDistributionRunDetail.java +++ b/org.adempiere.base/src/org/compiere/model/MDistributionRunDetail.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; @@ -121,13 +122,13 @@ public class MDistributionRunDetail extends X_T_DistributionRunDetail BigDecimal min = getMinQty(); if (min.scale() > m_precision) { - setMinQty(min.setScale(m_precision, BigDecimal.ROUND_HALF_UP)); + setMinQty(min.setScale(m_precision, RoundingMode.HALF_UP)); dirty = true; } BigDecimal qty = getQty(); if (qty.scale() > m_precision) { - setQty(qty.setScale(m_precision, BigDecimal.ROUND_HALF_UP)); + setQty(qty.setScale(m_precision, RoundingMode.HALF_UP)); dirty = true; } if (dirty) @@ -162,7 +163,7 @@ public class MDistributionRunDetail extends X_T_DistributionRunDetail */ public BigDecimal adjustQty (BigDecimal difference) { - BigDecimal diff = difference.setScale(m_precision, BigDecimal.ROUND_HALF_UP); + BigDecimal diff = difference.setScale(m_precision, RoundingMode.HALF_UP); BigDecimal qty = getQty(); BigDecimal max = getMinQty().subtract(qty); BigDecimal remaining = Env.ZERO; diff --git a/org.adempiere.base/src/org/compiere/model/MDocTypeCounter.java b/org.adempiere.base/src/org/compiere/model/MDocTypeCounter.java index 07e560db8c..c1514643d7 100644 --- a/org.adempiere.base/src/org/compiere/model/MDocTypeCounter.java +++ b/org.adempiere.base/src/org/compiere/model/MDocTypeCounter.java @@ -90,7 +90,7 @@ public class MDocTypeCounter extends X_C_DocTypeCounter */ public static MDocTypeCounter getCounterDocType (Properties ctx, int C_DocType_ID) { - Integer key = new Integer (C_DocType_ID); + Integer key = Integer.valueOf(C_DocType_ID); MDocTypeCounter retValue = (MDocTypeCounter)s_counter.get(key); if (retValue != null) return retValue; @@ -141,7 +141,7 @@ public class MDocTypeCounter extends X_C_DocTypeCounter */ public static MDocTypeCounter get (Properties ctx, int C_DocTypeCounter_ID, String trxName) { - Integer key = new Integer (C_DocTypeCounter_ID); + Integer key = Integer.valueOf(C_DocTypeCounter_ID); MDocTypeCounter retValue = (MDocTypeCounter) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MGLCategory.java b/org.adempiere.base/src/org/compiere/model/MGLCategory.java index af392f5d7e..cab8f91794 100644 --- a/org.adempiere.base/src/org/compiere/model/MGLCategory.java +++ b/org.adempiere.base/src/org/compiere/model/MGLCategory.java @@ -48,7 +48,7 @@ public class MGLCategory extends X_GL_Category */ public static MGLCategory get (Properties ctx, int GL_Category_ID) { - Integer key = new Integer (GL_Category_ID); + Integer key = Integer.valueOf(GL_Category_ID); MGLCategory retValue = (MGLCategory)s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MGoal.java b/org.adempiere.base/src/org/compiere/model/MGoal.java index fbafd6b4b4..aa07f18e4c 100644 --- a/org.adempiere.base/src/org/compiere/model/MGoal.java +++ b/org.adempiere.base/src/org/compiere/model/MGoal.java @@ -18,6 +18,7 @@ package org.compiere.model; import java.awt.Color; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Timestamp; @@ -416,7 +417,7 @@ public class MGoal extends X_PA_Goal BigDecimal MeasureActual = getMeasureActual(); BigDecimal GoalPerformance = Env.ZERO; if (MeasureTarget.signum() != 0) - GoalPerformance = MeasureActual.divide(MeasureTarget, 6, BigDecimal.ROUND_HALF_UP); + GoalPerformance = MeasureActual.divide(MeasureTarget, 6, RoundingMode.HALF_UP); super.setGoalPerformance (GoalPerformance); m_color = null; } // setGoalPerformance diff --git a/org.adempiere.base/src/org/compiere/model/MGroup.java b/org.adempiere.base/src/org/compiere/model/MGroup.java index c2f602a7b1..1425a9c8e7 100644 --- a/org.adempiere.base/src/org/compiere/model/MGroup.java +++ b/org.adempiere.base/src/org/compiere/model/MGroup.java @@ -42,7 +42,7 @@ public class MGroup extends X_R_Group */ public static MGroup get (Properties ctx, int R_Group_ID) { - Integer key = new Integer (R_Group_ID); + Integer key = Integer.valueOf(R_Group_ID); MGroup retValue = (MGroup) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MHierarchy.java b/org.adempiere.base/src/org/compiere/model/MHierarchy.java index dd1120eb6f..9200d66ada 100644 --- a/org.adempiere.base/src/org/compiere/model/MHierarchy.java +++ b/org.adempiere.base/src/org/compiere/model/MHierarchy.java @@ -42,7 +42,7 @@ public class MHierarchy extends X_PA_Hierarchy */ public static MHierarchy get (Properties ctx, int PA_Hierarchy_ID) { - Integer key = new Integer (PA_Hierarchy_ID); + Integer key = Integer.valueOf(PA_Hierarchy_ID); MHierarchy retValue = (MHierarchy)s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MImage.java b/org.adempiere.base/src/org/compiere/model/MImage.java index 2f52c87d36..b0f965684a 100644 --- a/org.adempiere.base/src/org/compiere/model/MImage.java +++ b/org.adempiere.base/src/org/compiere/model/MImage.java @@ -60,7 +60,7 @@ public class MImage extends X_AD_Image if (AD_Image_ID == 0) return new MImage (ctx, AD_Image_ID, null); // - Integer key = new Integer (AD_Image_ID); + Integer key = Integer.valueOf(AD_Image_ID); MImage retValue = (MImage) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MInOut.java b/org.adempiere.base/src/org/compiere/model/MInOut.java index 3b6d4460f6..7691b08732 100644 --- a/org.adempiere.base/src/org/compiere/model/MInOut.java +++ b/org.adempiere.base/src/org/compiere/model/MInOut.java @@ -18,6 +18,7 @@ package org.compiere.model; import java.io.File; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -151,7 +152,7 @@ public class MInOut extends X_M_InOut implements DocAction if (oLines[i].getQtyEntered().compareTo(oLines[i].getQtyOrdered()) != 0) line.setQtyEntered(lineQty .multiply(oLines[i].getQtyEntered()) - .divide(oLines[i].getQtyOrdered(), 12, BigDecimal.ROUND_HALF_UP)); + .divide(oLines[i].getQtyOrdered(), 12, RoundingMode.HALF_UP)); line.setC_Project_ID(oLines[i].getC_Project_ID()); line.saveEx(trxName); // Delivered everything ? diff --git a/org.adempiere.base/src/org/compiere/model/MInOutLine.java b/org.adempiere.base/src/org/compiere/model/MInOutLine.java index b79c2a8d5b..e4dc303c82 100644 --- a/org.adempiere.base/src/org/compiere/model/MInOutLine.java +++ b/org.adempiere.base/src/org/compiere/model/MInOutLine.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.ResultSet; import java.util.List; import java.util.Properties; @@ -283,7 +284,7 @@ public class MInOutLine extends X_M_InOutLine if (M_Locator_ID < 0) throw new IllegalArgumentException ("M_Locator_ID is mandatory."); // set to 0 explicitly to reset - set_Value (COLUMNNAME_M_Locator_ID, new Integer(M_Locator_ID)); + set_Value (COLUMNNAME_M_Locator_ID, Integer.valueOf(M_Locator_ID)); } // setM_Locator_ID /** @@ -335,7 +336,7 @@ public class MInOutLine extends X_M_InOutLine if (QtyEntered != null && getC_UOM_ID() != 0) { int precision = MUOM.getPrecision(getCtx(), getC_UOM_ID()); - QtyEntered = QtyEntered.setScale(precision, BigDecimal.ROUND_HALF_UP); + QtyEntered = QtyEntered.setScale(precision, RoundingMode.HALF_UP); } super.setQtyEntered (QtyEntered); } // setQtyEntered @@ -350,7 +351,7 @@ public class MInOutLine extends X_M_InOutLine if (MovementQty != null && product != null) { int precision = product.getUOMPrecision(); - MovementQty = MovementQty.setScale(precision, BigDecimal.ROUND_HALF_UP); + MovementQty = MovementQty.setScale(precision, RoundingMode.HALF_UP); } super.setMovementQty(MovementQty); } // setMovementQty diff --git a/org.adempiere.base/src/org/compiere/model/MInterestArea.java b/org.adempiere.base/src/org/compiere/model/MInterestArea.java index d6eb1ff970..07f5019948 100644 --- a/org.adempiere.base/src/org/compiere/model/MInterestArea.java +++ b/org.adempiere.base/src/org/compiere/model/MInterestArea.java @@ -89,7 +89,7 @@ public class MInterestArea extends X_R_InterestArea */ public static MInterestArea get (Properties ctx, int R_InterestArea_ID) { - Integer key = new Integer (R_InterestArea_ID); + Integer key = Integer.valueOf(R_InterestArea_ID); MInterestArea retValue = (MInterestArea) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MInventory.java b/org.adempiere.base/src/org/compiere/model/MInventory.java index 741788d345..586f8661ce 100644 --- a/org.adempiere.base/src/org/compiere/model/MInventory.java +++ b/org.adempiere.base/src/org/compiere/model/MInventory.java @@ -66,7 +66,7 @@ public class MInventory extends X_M_Inventory implements DocAction */ public static MInventory get (Properties ctx, int M_Inventory_ID) { - Integer key = new Integer (M_Inventory_ID); + Integer key = Integer.valueOf(M_Inventory_ID); MInventory retValue = (MInventory) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MInventoryLine.java b/org.adempiere.base/src/org/compiere/model/MInventoryLine.java index bb7f4b60d3..c6ae8f53c8 100644 --- a/org.adempiere.base/src/org/compiere/model/MInventoryLine.java +++ b/org.adempiere.base/src/org/compiere/model/MInventoryLine.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.ResultSet; import java.util.Properties; @@ -172,7 +173,7 @@ public class MInventoryLine extends X_M_InventoryLine if (product != null) { int precision = product.getUOMPrecision(); - QtyCount = QtyCount.setScale(precision, BigDecimal.ROUND_HALF_UP); + QtyCount = QtyCount.setScale(precision, RoundingMode.HALF_UP); } } super.setQtyCount(QtyCount); @@ -191,7 +192,7 @@ public class MInventoryLine extends X_M_InventoryLine if (product != null) { int precision = product.getUOMPrecision(); - QtyInternalUse = QtyInternalUse.setScale(precision, BigDecimal.ROUND_HALF_UP); + QtyInternalUse = QtyInternalUse.setScale(precision, RoundingMode.HALF_UP); } } super.setQtyInternalUse(QtyInternalUse); diff --git a/org.adempiere.base/src/org/compiere/model/MInvoice.java b/org.adempiere.base/src/org/compiere/model/MInvoice.java index 65aab2a5cb..242b4e1305 100644 --- a/org.adempiere.base/src/org/compiere/model/MInvoice.java +++ b/org.adempiere.base/src/org/compiere/model/MInvoice.java @@ -247,7 +247,7 @@ public class MInvoice extends X_C_Invoice implements DocAction */ public static MInvoice get (Properties ctx, int C_Invoice_ID) { - Integer key = new Integer (C_Invoice_ID); + Integer key = Integer.valueOf(C_Invoice_ID); MInvoice retValue = (MInvoice) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MInvoiceLine.java b/org.adempiere.base/src/org/compiere/model/MInvoiceLine.java index 586eb649a1..140b9a4a81 100644 --- a/org.adempiere.base/src/org/compiere/model/MInvoiceLine.java +++ b/org.adempiere.base/src/org/compiere/model/MInvoiceLine.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Timestamp; @@ -192,7 +193,7 @@ public class MInvoiceLine extends X_C_InvoiceLine m_C_BPartner_ID = invoice.getC_BPartner_ID(); m_C_BPartner_Location_ID = invoice.getC_BPartner_Location_ID(); m_IsSOTrx = invoice.isSOTrx(); - m_precision = new Integer(invoice.getPrecision()); + m_precision = Integer.valueOf(invoice.getPrecision()); } // setOrder /** @@ -343,7 +344,7 @@ public class MInvoiceLine extends X_C_InvoiceLine public void setM_AttributeSetInstance_ID (int M_AttributeSetInstance_ID) { if (M_AttributeSetInstance_ID == 0) // 0 is valid ID - set_Value("M_AttributeSetInstance_ID", new Integer(0)); + set_Value("M_AttributeSetInstance_ID", Integer.valueOf(0)); else super.setM_AttributeSetInstance_ID (M_AttributeSetInstance_ID); } // setM_AttributeSetInstance_ID @@ -387,7 +388,7 @@ public class MInvoiceLine extends X_C_InvoiceLine setPriceEntered(getPriceActual()); else setPriceEntered(getPriceActual().multiply(getQtyInvoiced() - .divide(getQtyEntered(), 6, BigDecimal.ROUND_HALF_UP))); // precision + .divide(getQtyEntered(), 6, RoundingMode.HALF_UP))); // precision // if (getC_UOM_ID() == 0) setC_UOM_ID(m_productPricing.getC_UOM_ID()); @@ -476,7 +477,7 @@ public class MInvoiceLine extends X_C_InvoiceLine BigDecimal bd = getPriceActual().multiply(getQtyInvoiced()); int precision = getPrecision(); if (bd.scale() > precision) - bd = bd.setScale(precision, BigDecimal.ROUND_HALF_UP); + bd = bd.setScale(precision, RoundingMode.HALF_UP); super.setLineNetAmt (bd); } // setLineNetAmt /** @@ -528,7 +529,7 @@ public class MInvoiceLine extends X_C_InvoiceLine if (QtyEntered != null && getC_UOM_ID() != 0) { int precision = MUOM.getPrecision(getCtx(), getC_UOM_ID()); - QtyEntered = QtyEntered.setScale(precision, BigDecimal.ROUND_HALF_UP); + QtyEntered = QtyEntered.setScale(precision, RoundingMode.HALF_UP); } super.setQtyEntered (QtyEntered); } // setQtyEntered @@ -543,7 +544,7 @@ public class MInvoiceLine extends X_C_InvoiceLine if (QtyInvoiced != null && product != null) { int precision = product.getUOMPrecision(); - QtyInvoiced = QtyInvoiced.setScale(precision, BigDecimal.ROUND_HALF_UP); + QtyInvoiced = QtyInvoiced.setScale(precision, RoundingMode.HALF_UP); } super.setQtyInvoiced(QtyInvoiced); } // setQtyInvoiced @@ -768,7 +769,7 @@ public class MInvoiceLine extends X_C_InvoiceLine log.warning("getPrecision = " + i + " - set to 2"); i = 2; } - m_precision = new Integer(i); + m_precision = Integer.valueOf(i); return m_precision.intValue(); } // getPrecision diff --git a/org.adempiere.base/src/org/compiere/model/MInvoicePaySchedule.java b/org.adempiere.base/src/org/compiere/model/MInvoicePaySchedule.java index 72d58110d5..988a668f63 100644 --- a/org.adempiere.base/src/org/compiere/model/MInvoicePaySchedule.java +++ b/org.adempiere.base/src/org/compiere/model/MInvoicePaySchedule.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Timestamp; @@ -152,10 +153,10 @@ public class MInvoicePaySchedule extends X_C_InvoicePaySchedule else { due = due.multiply(paySchedule.getPercentage()) - .divide(Env.ONEHUNDRED, scale, BigDecimal.ROUND_HALF_UP); + .divide(Env.ONEHUNDRED, scale, RoundingMode.HALF_UP); setDueAmt (due); BigDecimal discount = due.multiply(paySchedule.getDiscount()) - .divide(Env.ONEHUNDRED, scale, BigDecimal.ROUND_HALF_UP); + .divide(Env.ONEHUNDRED, scale, RoundingMode.HALF_UP); setDiscountAmt (discount); setIsValid(true); } diff --git a/org.adempiere.base/src/org/compiere/model/MInvoiceSchedule.java b/org.adempiere.base/src/org/compiere/model/MInvoiceSchedule.java index ef18cc02c1..383b1fef46 100644 --- a/org.adempiere.base/src/org/compiere/model/MInvoiceSchedule.java +++ b/org.adempiere.base/src/org/compiere/model/MInvoiceSchedule.java @@ -49,7 +49,7 @@ public class MInvoiceSchedule extends X_C_InvoiceSchedule */ public static MInvoiceSchedule get (Properties ctx, int C_InvoiceSchedule_ID, String trxName) { - Integer key = new Integer (C_InvoiceSchedule_ID); + Integer key = Integer.valueOf(C_InvoiceSchedule_ID); MInvoiceSchedule retValue = (MInvoiceSchedule) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java b/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java index e888b88f45..8256ba56ca 100644 --- a/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java +++ b/org.adempiere.base/src/org/compiere/model/MInvoiceTax.java @@ -159,7 +159,7 @@ public class MInvoiceTax extends X_C_InvoiceTax */ protected void setPrecision (int precision) { - m_precision = new Integer(precision); + m_precision = Integer.valueOf(precision); } // setPrecision /** diff --git a/org.adempiere.base/src/org/compiere/model/MJournalLine.java b/org.adempiere.base/src/org/compiere/model/MJournalLine.java index 8778b1e2a3..08dd1190de 100644 --- a/org.adempiere.base/src/org/compiere/model/MJournalLine.java +++ b/org.adempiere.base/src/org/compiere/model/MJournalLine.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.ResultSet; import java.sql.Timestamp; import java.util.Properties; @@ -308,11 +309,11 @@ public class MJournalLine extends X_GL_JournalLine BigDecimal rate = getCurrencyRate(); BigDecimal amt = rate.multiply(getAmtSourceDr()); if (amt.scale() > getPrecision()) - amt = amt.setScale(getPrecision(), BigDecimal.ROUND_HALF_UP); + amt = amt.setScale(getPrecision(), RoundingMode.HALF_UP); setAmtAcctDr(amt); amt = rate.multiply(getAmtSourceCr()); if (amt.scale() > getPrecision()) - amt = amt.setScale(getPrecision(), BigDecimal.ROUND_HALF_UP); + amt = amt.setScale(getPrecision(), RoundingMode.HALF_UP); setAmtAcctCr(amt); // Set Line Org to Doc Org if still not set if(getAD_Org_ID() <= 0) diff --git a/org.adempiere.base/src/org/compiere/model/MLandedCostAllocation.java b/org.adempiere.base/src/org/compiere/model/MLandedCostAllocation.java index c882bc9f0e..4982a3b03e 100644 --- a/org.adempiere.base/src/org/compiere/model/MLandedCostAllocation.java +++ b/org.adempiere.base/src/org/compiere/model/MLandedCostAllocation.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.ArrayList; @@ -133,7 +134,7 @@ public class MLandedCostAllocation extends X_C_LandedCostAllocation { BigDecimal bd = BigDecimal.valueOf(Amt); if (bd.scale() > precision) - bd = bd.setScale(precision, BigDecimal.ROUND_HALF_UP); + bd = bd.setScale(precision, RoundingMode.HALF_UP); super.setAmt(bd); } // setAmt diff --git a/org.adempiere.base/src/org/compiere/model/MLocation.java b/org.adempiere.base/src/org/compiere/model/MLocation.java index b29ad68f6f..e840425bb1 100644 --- a/org.adempiere.base/src/org/compiere/model/MLocation.java +++ b/org.adempiere.base/src/org/compiere/model/MLocation.java @@ -70,7 +70,7 @@ public class MLocation extends X_C_Location implements Comparator if (C_Location_ID == 0) return new MLocation(ctx, C_Location_ID, trxName); // - Integer key = new Integer (C_Location_ID); + Integer key = Integer.valueOf(C_Location_ID); MLocation retValue = null; if (trxName == null) retValue = (MLocation) s_cache.get (key); diff --git a/org.adempiere.base/src/org/compiere/model/MLocator.java b/org.adempiere.base/src/org/compiere/model/MLocator.java index 1fd76d5dc6..4f5b8f50c5 100644 --- a/org.adempiere.base/src/org/compiere/model/MLocator.java +++ b/org.adempiere.base/src/org/compiere/model/MLocator.java @@ -180,7 +180,7 @@ public class MLocator extends X_M_Locator { if (s_cache == null) s_cache = new CCache(Table_Name, 20); - Integer key = new Integer (M_Locator_ID); + Integer key = Integer.valueOf(M_Locator_ID); MLocator retValue = (MLocator) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MLocatorLookup.java b/org.adempiere.base/src/org/compiere/model/MLocatorLookup.java index 65d041dd29..5ea53dbd65 100644 --- a/org.adempiere.base/src/org/compiere/model/MLocatorLookup.java +++ b/org.adempiere.base/src/org/compiere/model/MLocatorLookup.java @@ -229,7 +229,7 @@ public final class MLocatorLookup extends Lookup implements Serializable // int key = loc.getM_Locator_ID(); if (saveInCache) - m_lookup.put(new Integer(key), loc); + m_lookup.put(Integer.valueOf(key), loc); NamePair retValue = new KeyNamePair(key, loc.toString()); return retValue; } // getDirect @@ -375,7 +375,7 @@ public final class MLocatorLookup extends Lookup implements Serializable { int M_Locator_ID = rs.getInt(1); MLocator loc = MLocator.get(m_ctx, M_Locator_ID); - m_lookup.put(new Integer(M_Locator_ID), loc); + m_lookup.put(Integer.valueOf(M_Locator_ID), loc); } } catch (SQLException e) diff --git a/org.adempiere.base/src/org/compiere/model/MLocatorType.java b/org.adempiere.base/src/org/compiere/model/MLocatorType.java index a1d70ddfe5..3ec2e27e84 100644 --- a/org.adempiere.base/src/org/compiere/model/MLocatorType.java +++ b/org.adempiere.base/src/org/compiere/model/MLocatorType.java @@ -50,7 +50,7 @@ public class MLocatorType extends X_M_LocatorType { public static MLocatorType get (Properties ctx, int M_LocatorType_ID) { if (s_cache == null) s_cache = new CCache(Table_Name, 20); - Integer key = new Integer (M_LocatorType_ID); + Integer key = Integer.valueOf(M_LocatorType_ID); MLocatorType retValue = (MLocatorType) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MLookup.java b/org.adempiere.base/src/org/compiere/model/MLookup.java index 7f44ec8928..fbf48b26cc 100644 --- a/org.adempiere.base/src/org/compiere/model/MLookup.java +++ b/org.adempiere.base/src/org/compiere/model/MLookup.java @@ -101,7 +101,7 @@ public final class MLookup extends Lookup implements Serializable /** Number of max rows to load */ private static final int MAX_ROWS = 5000; /** Indicator for Null */ - private static Integer MINUS_ONE = new Integer(-1); + private static Integer MINUS_ONE = Integer.valueOf(-1); /** The Lookup Info Value Object */ private MLookupInfo m_info = null; @@ -539,7 +539,7 @@ public final class MLookup extends Lookup implements Serializable int keyValue = rs.getInt(1); KeyNamePair p = new KeyNamePair(keyValue, name.toString()); if (saveInCache) // save if - m_lookup.put(new Integer(keyValue), p); + m_lookup.put(Integer.valueOf(keyValue), p); directValue = p; } else @@ -878,7 +878,7 @@ public final class MLookup extends Lookup implements Serializable { int key = rs.getInt(1); KeyNamePair p = new KeyNamePair(key, name.toString()); - m_lookup.put(new Integer(key), p); + m_lookup.put(Integer.valueOf(key), p); } else { diff --git a/org.adempiere.base/src/org/compiere/model/MMatchPO.java b/org.adempiere.base/src/org/compiere/model/MMatchPO.java index 81ca8b82b1..e6b2c17b8b 100644 --- a/org.adempiere.base/src/org/compiere/model/MMatchPO.java +++ b/org.adempiere.base/src/org/compiere/model/MMatchPO.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Savepoint; @@ -948,7 +949,7 @@ public class MMatchPO extends X_M_MatchPO BigDecimal poAmt = poPrice.multiply(getQty()); BigDecimal maxTolerance = poAmt.multiply(mt); maxTolerance = maxTolerance.abs() - .divide(Env.ONEHUNDRED, 2, BigDecimal.ROUND_HALF_UP); + .divide(Env.ONEHUNDRED, 2, RoundingMode.HALF_UP); difference = difference.abs(); boolean ok = difference.compareTo(maxTolerance) <= 0; if (log.isLoggable(Level.CONFIG)) log.config("Difference=" + getPriceMatchDifference() diff --git a/org.adempiere.base/src/org/compiere/model/MMeasure.java b/org.adempiere.base/src/org/compiere/model/MMeasure.java index aac86ad6d4..238bc1a72b 100644 --- a/org.adempiere.base/src/org/compiere/model/MMeasure.java +++ b/org.adempiere.base/src/org/compiere/model/MMeasure.java @@ -64,7 +64,7 @@ public class MMeasure extends X_PA_Measure */ public static MMeasure get (Properties ctx, int PA_Measure_ID) { - Integer key = new Integer (PA_Measure_ID); + Integer key = Integer.valueOf(PA_Measure_ID); MMeasure retValue = (MMeasure)s_cache.get (key); if (retValue != null) return retValue; @@ -634,7 +634,7 @@ public class MMeasure extends X_PA_Measure try { Class clazz = Class.forName(cmd); - custom = (MeasureInterface)clazz.newInstance(); + custom = (MeasureInterface)clazz.getDeclaredConstructor().newInstance(); } catch (Exception e) { diff --git a/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java b/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java index ccc13d6096..f61ca9bf9d 100644 --- a/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java +++ b/org.adempiere.base/src/org/compiere/model/MMeasureCalc.java @@ -48,7 +48,7 @@ public class MMeasureCalc extends X_PA_MeasureCalc */ public static MMeasureCalc get (Properties ctx, int PA_MeasureCalc_ID) { - Integer key = new Integer (PA_MeasureCalc_ID); + Integer key = Integer.valueOf(PA_MeasureCalc_ID); MMeasureCalc retValue = (MMeasureCalc)s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MMovementLine.java b/org.adempiere.base/src/org/compiere/model/MMovementLine.java index b2eaad6e88..299ad40ff6 100644 --- a/org.adempiere.base/src/org/compiere/model/MMovementLine.java +++ b/org.adempiere.base/src/org/compiere/model/MMovementLine.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.ResultSet; import java.util.List; import java.util.Properties; @@ -137,7 +138,7 @@ public class MMovementLine extends X_M_MovementLine if (product != null) { int precision = product.getUOMPrecision(); - MovementQty = MovementQty.setScale(precision, BigDecimal.ROUND_HALF_UP); + MovementQty = MovementQty.setScale(precision, RoundingMode.HALF_UP); } } super.setMovementQty(MovementQty); diff --git a/org.adempiere.base/src/org/compiere/model/MOrder.java b/org.adempiere.base/src/org/compiere/model/MOrder.java index cfa0507cae..2174f90b0a 100644 --- a/org.adempiere.base/src/org/compiere/model/MOrder.java +++ b/org.adempiere.base/src/org/compiere/model/MOrder.java @@ -18,6 +18,7 @@ package org.compiere.model; import java.io.File; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.ResultSet; import java.sql.Timestamp; import java.util.Hashtable; @@ -2183,7 +2184,7 @@ public class MOrder extends X_C_Order implements DocAction if (oLine.getQtyEntered().compareTo(oLine.getQtyOrdered()) != 0) ioLine.setQtyEntered(MovementQty .multiply(oLine.getQtyEntered()) - .divide(oLine.getQtyOrdered(), 6, BigDecimal.ROUND_HALF_UP)); + .divide(oLine.getQtyOrdered(), 6, RoundingMode.HALF_UP)); if (!ioLine.save(get_TrxName())) { m_processMsg = "Could not create Shipment Line"; @@ -2270,7 +2271,7 @@ public class MOrder extends X_C_Order implements DocAction iLine.setQtyEntered(iLine.getQtyInvoiced()); else iLine.setQtyEntered(iLine.getQtyInvoiced().multiply(oLine.getQtyEntered()) - .divide(oLine.getQtyOrdered(), 12, BigDecimal.ROUND_HALF_UP)); + .divide(oLine.getQtyOrdered(), 12, RoundingMode.HALF_UP)); if (!iLine.save(get_TrxName())) { m_processMsg = "Could not create Invoice Line from Order Line"; diff --git a/org.adempiere.base/src/org/compiere/model/MOrderLandedCost.java b/org.adempiere.base/src/org/compiere/model/MOrderLandedCost.java index adb1b17bdd..2ce645be9c 100644 --- a/org.adempiere.base/src/org/compiere/model/MOrderLandedCost.java +++ b/org.adempiere.base/src/org/compiere/model/MOrderLandedCost.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.ResultSet; import java.util.ArrayList; import java.util.List; @@ -146,7 +147,7 @@ public class MOrderLandedCost extends X_C_OrderLandedCost { if (base.signum() != 0) { BigDecimal result = getAmt().multiply(base); - result = result.divide(total, orderLine.getParent().getC_Currency().getCostingPrecision(), BigDecimal.ROUND_HALF_UP); + result = result.divide(total, orderLine.getParent().getC_Currency().getCostingPrecision(), RoundingMode.HALF_UP); allocation.setAmt(result.doubleValue(), orderLine.getParent().getC_Currency().getCostingPrecision()); } allocation.saveEx(); diff --git a/org.adempiere.base/src/org/compiere/model/MOrderLandedCostAllocation.java b/org.adempiere.base/src/org/compiere/model/MOrderLandedCostAllocation.java index b9b9ac0774..e7d1de00e6 100644 --- a/org.adempiere.base/src/org/compiere/model/MOrderLandedCostAllocation.java +++ b/org.adempiere.base/src/org/compiere/model/MOrderLandedCostAllocation.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.ResultSet; import java.util.List; import java.util.Properties; @@ -63,7 +64,7 @@ public class MOrderLandedCostAllocation extends X_C_OrderLandedCostAllocation { { BigDecimal bd = BigDecimal.valueOf(Amt); if (bd.scale() > precision) - bd = bd.setScale(precision, BigDecimal.ROUND_HALF_UP); + bd = bd.setScale(precision, RoundingMode.HALF_UP); super.setAmt(bd); } // setAmt diff --git a/org.adempiere.base/src/org/compiere/model/MOrderLine.java b/org.adempiere.base/src/org/compiere/model/MOrderLine.java index f92d1deb5c..04841e5506 100644 --- a/org.adempiere.base/src/org/compiere/model/MOrderLine.java +++ b/org.adempiere.base/src/org/compiere/model/MOrderLine.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.util.Properties; @@ -233,7 +234,7 @@ public class MOrderLine extends X_C_OrderLine public void setHeaderInfo (MOrder order) { m_parent = order; - m_precision = new Integer(order.getPrecision()); + m_precision = Integer.valueOf(order.getPrecision()); m_M_PriceList_ID = order.getM_PriceList_ID(); m_IsSOTrx = order.isSOTrx(); } // setHeaderInfo @@ -305,7 +306,7 @@ public class MOrderLine extends X_C_OrderLine setPriceEntered(getPriceActual()); else setPriceEntered(getPriceActual().multiply(getQtyOrdered() - .divide(getQtyEntered(), 12, BigDecimal.ROUND_HALF_UP))); // recision + .divide(getQtyEntered(), 12, RoundingMode.HALF_UP))); // recision // Calculate Discount setDiscount(m_productPrice.getDiscount()); @@ -356,7 +357,7 @@ public class MOrderLine extends X_C_OrderLine BigDecimal bd = getPriceActual().multiply(getQtyOrdered()); int precision = getPrecision(); if (bd.scale() > precision) - bd = bd.setScale(precision, BigDecimal.ROUND_HALF_UP); + bd = bd.setScale(precision, RoundingMode.HALF_UP); super.setLineNetAmt (bd); } // setLineNetAmt @@ -401,7 +402,7 @@ public class MOrderLine extends X_C_OrderLine MCurrency cur = MCurrency.get(getCtx(), getC_Currency_ID()); if (cur.get_ID() != 0) { - m_precision = new Integer (cur.getStdPrecision()); + m_precision = Integer.valueOf(cur.getStdPrecision()); return m_precision.intValue(); } } @@ -410,7 +411,7 @@ public class MOrderLine extends X_C_OrderLine + "FROM C_Currency c INNER JOIN C_Order x ON (x.C_Currency_ID=c.C_Currency_ID) " + "WHERE x.C_Order_ID=?"; int i = DB.getSQLValue(get_TrxName(), sql, getC_Order_ID()); - m_precision = new Integer(i); + m_precision = Integer.valueOf(i); return m_precision.intValue(); } // getPrecision @@ -481,7 +482,7 @@ public class MOrderLine extends X_C_OrderLine public void setM_AttributeSetInstance_ID (int M_AttributeSetInstance_ID) { if (M_AttributeSetInstance_ID == 0) // 0 is valid ID - set_Value("M_AttributeSetInstance_ID", new Integer(0)); + set_Value("M_AttributeSetInstance_ID", Integer.valueOf(0)); else super.setM_AttributeSetInstance_ID (M_AttributeSetInstance_ID); } // setM_AttributeSetInstance_ID @@ -676,7 +677,7 @@ public class MOrderLine extends X_C_OrderLine return; BigDecimal discount = list.subtract(getPriceActual()) .multiply(Env.ONEHUNDRED) - .divide(list, getPrecision(), BigDecimal.ROUND_HALF_UP); + .divide(list, getPrecision(), RoundingMode.HALF_UP); setDiscount(discount); } // setDiscount @@ -717,7 +718,7 @@ public class MOrderLine extends X_C_OrderLine if (QtyEntered != null && getC_UOM_ID() != 0) { int precision = MUOM.getPrecision(getCtx(), getC_UOM_ID()); - QtyEntered = QtyEntered.setScale(precision, BigDecimal.ROUND_HALF_UP); + QtyEntered = QtyEntered.setScale(precision, RoundingMode.HALF_UP); } super.setQtyEntered (QtyEntered); } // setQtyEntered @@ -732,7 +733,7 @@ public class MOrderLine extends X_C_OrderLine if (QtyOrdered != null && product != null) { int precision = product.getUOMPrecision(); - QtyOrdered = QtyOrdered.setScale(precision, BigDecimal.ROUND_HALF_UP); + QtyOrdered = QtyOrdered.setScale(precision, RoundingMode.HALF_UP); } super.setQtyOrdered(QtyOrdered); } // setQtyOrdered diff --git a/org.adempiere.base/src/org/compiere/model/MOrderPaySchedule.java b/org.adempiere.base/src/org/compiere/model/MOrderPaySchedule.java index ad9d8c3bec..7f722ed9c3 100644 --- a/org.adempiere.base/src/org/compiere/model/MOrderPaySchedule.java +++ b/org.adempiere.base/src/org/compiere/model/MOrderPaySchedule.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Timestamp; @@ -152,10 +153,10 @@ public class MOrderPaySchedule extends X_C_OrderPaySchedule else { due = due.multiply(paySchedule.getPercentage()) - .divide(Env.ONEHUNDRED, scale, BigDecimal.ROUND_HALF_UP); + .divide(Env.ONEHUNDRED, scale, RoundingMode.HALF_UP); setDueAmt (due); BigDecimal discount = due.multiply(paySchedule.getDiscount()) - .divide(Env.ONEHUNDRED, scale, BigDecimal.ROUND_HALF_UP); + .divide(Env.ONEHUNDRED, scale, RoundingMode.HALF_UP); setDiscountAmt (discount); setIsValid(true); } diff --git a/org.adempiere.base/src/org/compiere/model/MOrderTax.java b/org.adempiere.base/src/org/compiere/model/MOrderTax.java index 917a9c4120..0a9d37b55f 100644 --- a/org.adempiere.base/src/org/compiere/model/MOrderTax.java +++ b/org.adempiere.base/src/org/compiere/model/MOrderTax.java @@ -178,7 +178,7 @@ public class MOrderTax extends X_C_OrderTax */ protected void setPrecision (int precision) { - m_precision = new Integer(precision); + m_precision = Integer.valueOf(precision); } // setPrecision /** diff --git a/org.adempiere.base/src/org/compiere/model/MOrg.java b/org.adempiere.base/src/org/compiere/model/MOrg.java index f0ed6d80a2..3847ddd09a 100644 --- a/org.adempiere.base/src/org/compiere/model/MOrg.java +++ b/org.adempiere.base/src/org/compiere/model/MOrg.java @@ -195,7 +195,7 @@ public class MOrg extends X_AD_Org getAD_Org_ID()); if (C_BPartner_ID < 0) // not found = -1 C_BPartner_ID = 0; - m_linkedBPartner = new Integer (C_BPartner_ID); + m_linkedBPartner = Integer.valueOf(C_BPartner_ID); } return m_linkedBPartner.intValue(); } // getLinkedC_BPartner_ID diff --git a/org.adempiere.base/src/org/compiere/model/MPInstance.java b/org.adempiere.base/src/org/compiere/model/MPInstance.java index 5edcdd135c..f1df9917df 100644 --- a/org.adempiere.base/src/org/compiere/model/MPInstance.java +++ b/org.adempiere.base/src/org/compiere/model/MPInstance.java @@ -276,7 +276,7 @@ public class MPInstance extends X_AD_PInstance if (log.isLoggable(Level.INFO)) log.info("Set to 0 from " + Record_ID); Record_ID = 0; } - set_ValueNoCheck ("Record_ID", new Integer(Record_ID)); + set_ValueNoCheck ("Record_ID", Integer.valueOf(Record_ID)); } // setRecord_ID /** diff --git a/org.adempiere.base/src/org/compiere/model/MPOS.java b/org.adempiere.base/src/org/compiere/model/MPOS.java index cd8bb144c3..f63c154ac1 100644 --- a/org.adempiere.base/src/org/compiere/model/MPOS.java +++ b/org.adempiere.base/src/org/compiere/model/MPOS.java @@ -46,7 +46,7 @@ public class MPOS extends X_C_POS */ public static MPOS get (Properties ctx, int C_POS_ID) { - Integer key = new Integer (C_POS_ID); + Integer key = Integer.valueOf(C_POS_ID); MPOS retValue = (MPOS) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MPOSKeyLayout.java b/org.adempiere.base/src/org/compiere/model/MPOSKeyLayout.java index 7e39faa9fd..0b52b5e166 100644 --- a/org.adempiere.base/src/org/compiere/model/MPOSKeyLayout.java +++ b/org.adempiere.base/src/org/compiere/model/MPOSKeyLayout.java @@ -46,7 +46,7 @@ public class MPOSKeyLayout extends X_C_POSKeyLayout */ public static MPOSKeyLayout get (Properties ctx, int C_POSKeyLayout_ID) { - Integer key = new Integer (C_POSKeyLayout_ID); + Integer key = Integer.valueOf(C_POSKeyLayout_ID); MPOSKeyLayout retValue = (MPOSKeyLayout) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MPOSTerminal.java b/org.adempiere.base/src/org/compiere/model/MPOSTerminal.java index cee86a4956..e1be689b2b 100644 --- a/org.adempiere.base/src/org/compiere/model/MPOSTerminal.java +++ b/org.adempiere.base/src/org/compiere/model/MPOSTerminal.java @@ -65,7 +65,7 @@ public class MPOSTerminal extends X_U_POSTerminal */ public static MPOSTerminal get(Properties ctx, int U_POSTerminal_ID) { - Integer key = new Integer(U_POSTerminal_ID); + Integer key = Integer.valueOf(U_POSTerminal_ID); MPOSTerminal retValue = (MPOSTerminal)s_cache.get(key); if (retValue == null) { @@ -133,7 +133,7 @@ public class MPOSTerminal extends X_U_POSTerminal if (success) { - s_cache.remove(new Integer(get_ID())); + s_cache.remove(Integer.valueOf(get_ID())); } return success; diff --git a/org.adempiere.base/src/org/compiere/model/MPayment.java b/org.adempiere.base/src/org/compiere/model/MPayment.java index 33f16025b5..f09d39b812 100644 --- a/org.adempiere.base/src/org/compiere/model/MPayment.java +++ b/org.adempiere.base/src/org/compiere/model/MPayment.java @@ -1526,7 +1526,7 @@ public class MPayment extends X_C_Payment pstmt.setInt(1, getC_Invoice_ID()); rs = pstmt.executeQuery(); if (rs.next()) - documentSO = new Boolean ("Y".equals(rs.getString(1))); + documentSO = Boolean.valueOf("Y".equals(rs.getString(1))); } catch (Exception e) { @@ -1553,7 +1553,7 @@ public class MPayment extends X_C_Payment pstmt.setInt(1, getC_Order_ID()); rs = pstmt.executeQuery(); if (rs.next()) - documentSO = new Boolean ("Y".equals(rs.getString(1))); + documentSO = Boolean.valueOf("Y".equals(rs.getString(1))); } catch (Exception e) { @@ -1591,7 +1591,7 @@ public class MPayment extends X_C_Payment return false; } } else { - documentSO = new Boolean ("Y".equals(rs.getString(1))); + documentSO = Boolean.valueOf("Y".equals(rs.getString(1))); } } } @@ -1622,7 +1622,7 @@ public class MPayment extends X_C_Payment pstmt.setInt(1, getC_DocType_ID()); rs = pstmt.executeQuery(); if (rs.next()) - paymentSO = new Boolean ("Y".equals(rs.getString(1))); + paymentSO = Boolean.valueOf("Y".equals(rs.getString(1))); } catch (Exception e) { diff --git a/org.adempiere.base/src/org/compiere/model/MPeriod.java b/org.adempiere.base/src/org/compiere/model/MPeriod.java index 943ed0135c..7f9e351c37 100644 --- a/org.adempiere.base/src/org/compiere/model/MPeriod.java +++ b/org.adempiere.base/src/org/compiere/model/MPeriod.java @@ -68,7 +68,7 @@ public class MPeriod extends X_C_Period if (C_Period_ID <= 0) return null; // - Integer key = new Integer(C_Period_ID); + Integer key = Integer.valueOf(C_Period_ID); MPeriod retValue = (MPeriod) s_cache.get (key); if (retValue != null) return retValue; @@ -170,7 +170,7 @@ public class MPeriod extends X_C_Period while (rs.next()) { MPeriod period = new MPeriod(ctx, rs, trxName); - Integer key = new Integer(period.getC_Period_ID()); + Integer key = Integer.valueOf(period.getC_Period_ID()); s_cache.put (key, period); if (period.isStandardPeriod()) retValue = period; diff --git a/org.adempiere.base/src/org/compiere/model/MPriceList.java b/org.adempiere.base/src/org/compiere/model/MPriceList.java index b06188c463..4ff33827ef 100644 --- a/org.adempiere.base/src/org/compiere/model/MPriceList.java +++ b/org.adempiere.base/src/org/compiere/model/MPriceList.java @@ -50,7 +50,7 @@ public class MPriceList extends X_M_PriceList */ public static MPriceList get (Properties ctx, int M_PriceList_ID, String trxName) { - Integer key = new Integer (M_PriceList_ID); + Integer key = Integer.valueOf(M_PriceList_ID); MPriceList retValue = (MPriceList)s_cache.get(key); if (retValue == null) { @@ -263,7 +263,7 @@ public class MPriceList extends X_M_PriceList if (m_precision == null) { MCurrency c = MCurrency.get(getCtx(), getC_Currency_ID()); - m_precision = new Integer (c.getStdPrecision()); + m_precision = Integer.valueOf(c.getStdPrecision()); } return m_precision.intValue(); } // getStandardPrecision diff --git a/org.adempiere.base/src/org/compiere/model/MPrivateAccess.java b/org.adempiere.base/src/org/compiere/model/MPrivateAccess.java index cc75c46764..15e42d7a53 100644 --- a/org.adempiere.base/src/org/compiere/model/MPrivateAccess.java +++ b/org.adempiere.base/src/org/compiere/model/MPrivateAccess.java @@ -94,7 +94,7 @@ public class MPrivateAccess extends X_AD_Private_Access pstmt.setInt(2, AD_User_ID); ResultSet rs = pstmt.executeQuery(); while (rs.next()) - list.add(new Integer(rs.getInt(1))); + list.add(Integer.valueOf(rs.getInt(1))); rs.close(); pstmt.close(); pstmt = null; diff --git a/org.adempiere.base/src/org/compiere/model/MProcess.java b/org.adempiere.base/src/org/compiere/model/MProcess.java index b4eda61350..8e07379176 100644 --- a/org.adempiere.base/src/org/compiere/model/MProcess.java +++ b/org.adempiere.base/src/org/compiere/model/MProcess.java @@ -54,7 +54,7 @@ public class MProcess extends X_AD_Process */ public static MProcess get (Properties ctx, int AD_Process_ID) { - Integer key = new Integer (AD_Process_ID); + Integer key = Integer.valueOf(AD_Process_ID); MProcess retValue = (MProcess) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MProcessPara.java b/org.adempiere.base/src/org/compiere/model/MProcessPara.java index 2de67394bb..0451b51724 100644 --- a/org.adempiere.base/src/org/compiere/model/MProcessPara.java +++ b/org.adempiere.base/src/org/compiere/model/MProcessPara.java @@ -47,7 +47,7 @@ public class MProcessPara extends X_AD_Process_Para */ public static MProcessPara get (Properties ctx, int AD_Process_Para_ID) { - Integer key = new Integer (AD_Process_Para_ID); + Integer key = Integer.valueOf(AD_Process_Para_ID); MProcessPara retValue = (MProcessPara)s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MProduct.java b/org.adempiere.base/src/org/compiere/model/MProduct.java index fcd11091af..1e044332f4 100644 --- a/org.adempiere.base/src/org/compiere/model/MProduct.java +++ b/org.adempiere.base/src/org/compiere/model/MProduct.java @@ -65,7 +65,7 @@ public class MProduct extends X_M_Product { return null; } - Integer key = new Integer (M_Product_ID); + Integer key = Integer.valueOf(M_Product_ID); MProduct retValue = (MProduct) s_cache.get (key); if (retValue != null) { @@ -423,7 +423,7 @@ public class MProduct extends X_M_Product int C_UOM_ID = getC_UOM_ID(); if (C_UOM_ID == 0) return 0; // EA - m_precision = new Integer (MUOM.getPrecision(getCtx(), C_UOM_ID)); + m_precision = Integer.valueOf(MUOM.getPrecision(getCtx(), C_UOM_ID)); } return m_precision.intValue(); } // getUOMPrecision diff --git a/org.adempiere.base/src/org/compiere/model/MProductCategory.java b/org.adempiere.base/src/org/compiere/model/MProductCategory.java index 4c1603765e..505012bac0 100644 --- a/org.adempiere.base/src/org/compiere/model/MProductCategory.java +++ b/org.adempiere.base/src/org/compiere/model/MProductCategory.java @@ -51,7 +51,7 @@ public class MProductCategory extends X_M_Product_Category */ public static MProductCategory get (Properties ctx, int M_Product_Category_ID) { - Integer ii = new Integer (M_Product_Category_ID); + Integer ii = Integer.valueOf(M_Product_Category_ID); MProductCategory retValue = (MProductCategory)s_cache.get(ii); if (retValue != null) return retValue; @@ -72,7 +72,7 @@ public class MProductCategory extends X_M_Product_Category if (M_Product_ID == 0 || M_Product_Category_ID == 0) return false; // Look up - Integer product = new Integer (M_Product_ID); + Integer product = Integer.valueOf(M_Product_ID); Integer category = (Integer)s_products.get(product); if (category != null) return category.intValue() == M_Product_Category_ID; @@ -86,7 +86,7 @@ public class MProductCategory extends X_M_Product_Category pstmt.setInt (1, M_Product_ID); rs = pstmt.executeQuery (); if (rs.next ()) - category = new Integer(rs.getInt(1)); + category = Integer.valueOf(rs.getInt(1)); } catch (Exception e) { diff --git a/org.adempiere.base/src/org/compiere/model/MProductPrice.java b/org.adempiere.base/src/org/compiere/model/MProductPrice.java index 510a975d8a..1c2d9f610c 100644 --- a/org.adempiere.base/src/org/compiere/model/MProductPrice.java +++ b/org.adempiere.base/src/org/compiere/model/MProductPrice.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.ResultSet; import java.util.Properties; @@ -136,9 +137,9 @@ public class MProductPrice extends X_M_ProductPrice */ public void setPrices (BigDecimal PriceList, BigDecimal PriceStd, BigDecimal PriceLimit) { - setPriceLimit (PriceLimit.setScale(this.getM_PriceList_Version().getM_PriceList().getPricePrecision(), BigDecimal.ROUND_HALF_UP)); - setPriceList (PriceList.setScale(this.getM_PriceList_Version().getM_PriceList().getPricePrecision(), BigDecimal.ROUND_HALF_UP)); - setPriceStd (PriceStd.setScale(this.getM_PriceList_Version().getM_PriceList().getPricePrecision(), BigDecimal.ROUND_HALF_UP)); + setPriceLimit (PriceLimit.setScale(this.getM_PriceList_Version().getM_PriceList().getPricePrecision(), RoundingMode.HALF_UP)); + setPriceList (PriceList.setScale(this.getM_PriceList_Version().getM_PriceList().getPricePrecision(), RoundingMode.HALF_UP)); + setPriceStd (PriceStd.setScale(this.getM_PriceList_Version().getM_PriceList().getPricePrecision(), RoundingMode.HALF_UP)); } // setPrice /** diff --git a/org.adempiere.base/src/org/compiere/model/MProductPricing.java b/org.adempiere.base/src/org/compiere/model/MProductPricing.java index c2a06912fa..c658cc21ad 100644 --- a/org.adempiere.base/src/org/compiere/model/MProductPricing.java +++ b/org.adempiere.base/src/org/compiere/model/MProductPricing.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Timestamp; @@ -160,7 +161,7 @@ public class MProductPricing extends AbstractProductPricing calculateDiscount(); setPrecision(); // from Price List // - m_found = new Boolean (m_calculated); + m_found = Boolean.valueOf(m_calculated); return m_calculated; } // calculatePrice @@ -826,7 +827,7 @@ public class MProductPricing extends AbstractProductPricing Discount = BigDecimal.valueOf((m_PriceList.doubleValue() - m_PriceStd.doubleValue()) / m_PriceList.doubleValue() * 100.0); if (Discount.scale() > 2) - Discount = Discount.setScale(2, BigDecimal.ROUND_HALF_UP); + Discount = Discount.setScale(2, RoundingMode.HALF_UP); return Discount; } // getDiscount @@ -898,7 +899,7 @@ public class MProductPricing extends AbstractProductPricing { if (m_precision >= 0 // -1 = no rounding && bd.scale() > m_precision) - return bd.setScale(m_precision, BigDecimal.ROUND_HALF_UP); + return bd.setScale(m_precision, RoundingMode.HALF_UP); return bd; } // round diff --git a/org.adempiere.base/src/org/compiere/model/MProjectType.java b/org.adempiere.base/src/org/compiere/model/MProjectType.java index e86701589d..3b1edc7242 100644 --- a/org.adempiere.base/src/org/compiere/model/MProjectType.java +++ b/org.adempiere.base/src/org/compiere/model/MProjectType.java @@ -49,7 +49,7 @@ public class MProjectType extends X_C_ProjectType */ public static MProjectType get (Properties ctx, int C_ProjectType_ID) { - Integer key = new Integer (C_ProjectType_ID); + Integer key = Integer.valueOf(C_ProjectType_ID); MProjectType retValue = (MProjectType)s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MQuery.java b/org.adempiere.base/src/org/compiere/model/MQuery.java index 9b27c76616..f04c37fe4a 100644 --- a/org.adempiere.base/src/org/compiere/model/MQuery.java +++ b/org.adempiere.base/src/org/compiere/model/MQuery.java @@ -131,11 +131,11 @@ public class MQuery implements Serializable Double P_Number = null; double d = rs.getDouble(4); if (!rs.wasNull()) - P_Number = new Double(d); + P_Number = Double.valueOf(d); Double P_Number_To = null; d = rs.getDouble(5); if (!rs.wasNull()) - P_Number_To = new Double(d); + P_Number_To = Double.valueOf(d); // Timestamp P_Date = rs.getTimestamp(6); Timestamp P_Date_To = rs.getTimestamp(7); @@ -311,7 +311,7 @@ public class MQuery implements Serializable MQuery query = new MQuery(); if (columnName.endsWith("_ID")) query.setTableName(columnName.substring(0, columnName.length()-3)); - query.addRestriction(columnName, EQUAL, new Integer(value)); + query.addRestriction(columnName, EQUAL, Integer.valueOf(value)); query.setRecordCount(1); // guess return query; } // getEqualQuery @@ -527,7 +527,7 @@ public class MQuery implements Serializable int Code) { Restriction r = new Restriction (ColumnName, Operator, - new Integer(Code), null, null, true, 0); + Integer.valueOf(Code), null, null, true, 0); m_list.add(r); } // addRestriction @@ -1024,7 +1024,7 @@ class Restriction implements Serializable if (code instanceof Boolean) Code = ((Boolean)code).booleanValue() ? "Y" : "N"; else if (code instanceof KeyNamePair) - Code = new Integer(((KeyNamePair)code).getKey()); + Code = Integer.valueOf(((KeyNamePair)code).getKey()); else if (code instanceof ValueNamePair) Code = ((ValueNamePair)code).getValue(); else diff --git a/org.adempiere.base/src/org/compiere/model/MRMALine.java b/org.adempiere.base/src/org/compiere/model/MRMALine.java index 58c5ebf791..d9ff2f2dd9 100644 --- a/org.adempiere.base/src/org/compiere/model/MRMALine.java +++ b/org.adempiere.base/src/org/compiere/model/MRMALine.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.ResultSet; import java.util.Properties; @@ -249,7 +250,7 @@ public class MRMALine extends X_M_RMALine BigDecimal bd = getAmt().multiply(getQty()); int precision = getPrecision(); if (bd.scale() > precision) - bd = bd.setScale(precision, BigDecimal.ROUND_HALF_UP); + bd = bd.setScale(precision, RoundingMode.HALF_UP); return bd; } // getAmt diff --git a/org.adempiere.base/src/org/compiere/model/MRMATax.java b/org.adempiere.base/src/org/compiere/model/MRMATax.java index bd80356233..c5d312af37 100644 --- a/org.adempiere.base/src/org/compiere/model/MRMATax.java +++ b/org.adempiere.base/src/org/compiere/model/MRMATax.java @@ -171,7 +171,7 @@ public class MRMATax extends X_M_RMATax */ protected void setPrecision (int precision) { - m_precision = new Integer(precision); + m_precision = Integer.valueOf(precision); } // setPrecision /** diff --git a/org.adempiere.base/src/org/compiere/model/MRegistrationAttribute.java b/org.adempiere.base/src/org/compiere/model/MRegistrationAttribute.java index eb90a0d5b6..1e17010d66 100644 --- a/org.adempiere.base/src/org/compiere/model/MRegistrationAttribute.java +++ b/org.adempiere.base/src/org/compiere/model/MRegistrationAttribute.java @@ -64,7 +64,7 @@ public class MRegistrationAttribute extends X_A_RegistrationAttribute while (rs.next()) { MRegistrationAttribute value = new MRegistrationAttribute(ctx, rs, null); - Integer key = new Integer(value.getA_RegistrationAttribute_ID()); + Integer key = Integer.valueOf(value.getA_RegistrationAttribute_ID()); s_cache.put(key, value); list.add(value); } @@ -93,7 +93,7 @@ public class MRegistrationAttribute extends X_A_RegistrationAttribute */ public static MRegistrationAttribute get (Properties ctx, int A_RegistrationAttribute_ID, String trxName) { - Integer key = new Integer(A_RegistrationAttribute_ID); + Integer key = Integer.valueOf(A_RegistrationAttribute_ID); MRegistrationAttribute retValue = (MRegistrationAttribute)s_cache.get(key); if (retValue == null) { diff --git a/org.adempiere.base/src/org/compiere/model/MRequest.java b/org.adempiere.base/src/org/compiere/model/MRequest.java index 1f39b11155..5dcfc70c7c 100644 --- a/org.adempiere.base/src/org/compiere/model/MRequest.java +++ b/org.adempiere.base/src/org/compiere/model/MRequest.java @@ -119,8 +119,8 @@ public class MRequest extends X_R_Request int R_RequestType_ID, String Summary, boolean isSelfService, String trxName) { this(ctx, 0, trxName); - set_Value ("SalesRep_ID", new Integer(SalesRep_ID)); // could be 0 - set_Value ("R_RequestType_ID", new Integer(R_RequestType_ID)); + set_Value ("SalesRep_ID", Integer.valueOf(SalesRep_ID)); // could be 0 + set_Value ("R_RequestType_ID", Integer.valueOf(R_RequestType_ID)); setSummary (Summary); setIsSelfService(isSelfService); getRequestType(); diff --git a/org.adempiere.base/src/org/compiere/model/MRequestCategory.java b/org.adempiere.base/src/org/compiere/model/MRequestCategory.java index d398642d6e..0674802345 100644 --- a/org.adempiere.base/src/org/compiere/model/MRequestCategory.java +++ b/org.adempiere.base/src/org/compiere/model/MRequestCategory.java @@ -42,7 +42,7 @@ public class MRequestCategory extends X_R_Category */ public static MRequestCategory get (Properties ctx, int R_Category_ID) { - Integer key = new Integer (R_Category_ID); + Integer key = Integer.valueOf(R_Category_ID); MRequestCategory retValue = (MRequestCategory) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MRequestType.java b/org.adempiere.base/src/org/compiere/model/MRequestType.java index fcabf19f4a..10c7bcc7cc 100644 --- a/org.adempiere.base/src/org/compiere/model/MRequestType.java +++ b/org.adempiere.base/src/org/compiere/model/MRequestType.java @@ -52,7 +52,7 @@ public class MRequestType extends X_R_RequestType */ public static MRequestType get (Properties ctx, int R_RequestType_ID) { - Integer key = new Integer (R_RequestType_ID); + Integer key = Integer.valueOf(R_RequestType_ID); MRequestType retValue = (MRequestType)s_cache.get(key); if (retValue == null) { diff --git a/org.adempiere.base/src/org/compiere/model/MRequisition.java b/org.adempiere.base/src/org/compiere/model/MRequisition.java index ee15a69020..c41cee9ca3 100644 --- a/org.adempiere.base/src/org/compiere/model/MRequisition.java +++ b/org.adempiere.base/src/org/compiere/model/MRequisition.java @@ -18,6 +18,7 @@ package org.compiere.model; import java.io.File; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.ResultSet; import java.sql.Timestamp; import java.util.List; @@ -274,7 +275,7 @@ public class MRequisition extends X_M_Requisition implements DocAction { MRequisitionLine line = lines[i]; BigDecimal lineNet = line.getQty().multiply(line.getPriceActual()); - lineNet = lineNet.setScale(precision, BigDecimal.ROUND_HALF_UP); + lineNet = lineNet.setScale(precision, RoundingMode.HALF_UP); if (lineNet.compareTo(line.getLineNetAmt()) != 0) { line.setLineNetAmt(lineNet); diff --git a/org.adempiere.base/src/org/compiere/model/MResolution.java b/org.adempiere.base/src/org/compiere/model/MResolution.java index 7aee211616..ec8ec38a8a 100644 --- a/org.adempiere.base/src/org/compiere/model/MResolution.java +++ b/org.adempiere.base/src/org/compiere/model/MResolution.java @@ -43,7 +43,7 @@ public class MResolution extends X_R_Resolution */ public static MResolution get (Properties ctx, int R_Resolution_ID) { - Integer key = new Integer (R_Resolution_ID); + Integer key = Integer.valueOf(R_Resolution_ID); MResolution retValue = (MResolution) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MRfQ.java b/org.adempiere.base/src/org/compiere/model/MRfQ.java index d5a5b5814b..1a6385c80a 100644 --- a/org.adempiere.base/src/org/compiere/model/MRfQ.java +++ b/org.adempiere.base/src/org/compiere/model/MRfQ.java @@ -50,7 +50,7 @@ public class MRfQ extends X_C_RfQ */ public static MRfQ get (Properties ctx, int C_RfQ_ID, String trxName) { - Integer key = new Integer (C_RfQ_ID); + Integer key = Integer.valueOf(C_RfQ_ID); MRfQ retValue = (MRfQ) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MRfQLine.java b/org.adempiere.base/src/org/compiere/model/MRfQLine.java index ab39cf0438..6508d90540 100644 --- a/org.adempiere.base/src/org/compiere/model/MRfQLine.java +++ b/org.adempiere.base/src/org/compiere/model/MRfQLine.java @@ -48,7 +48,7 @@ public class MRfQLine extends X_C_RfQLine */ public static MRfQLine get (Properties ctx, int C_RfQLine_ID, String trxName) { - Integer key = new Integer (C_RfQLine_ID); + Integer key = Integer.valueOf(C_RfQLine_ID); MRfQLine retValue = (MRfQLine) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MRfQLineQty.java b/org.adempiere.base/src/org/compiere/model/MRfQLineQty.java index 212c536174..3269807b41 100644 --- a/org.adempiere.base/src/org/compiere/model/MRfQLineQty.java +++ b/org.adempiere.base/src/org/compiere/model/MRfQLineQty.java @@ -48,7 +48,7 @@ public class MRfQLineQty extends X_C_RfQLineQty */ public static MRfQLineQty get (Properties ctx, int C_RfQLineQty_ID, String trxName) { - Integer key = new Integer (C_RfQLineQty_ID); + Integer key = Integer.valueOf(C_RfQLineQty_ID); MRfQLineQty retValue = (MRfQLineQty) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MRfQResponseLineQty.java b/org.adempiere.base/src/org/compiere/model/MRfQResponseLineQty.java index 57e1560c00..bc5b1638e3 100644 --- a/org.adempiere.base/src/org/compiere/model/MRfQResponseLineQty.java +++ b/org.adempiere.base/src/org/compiere/model/MRfQResponseLineQty.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.ResultSet; import java.util.Comparator; import java.util.Properties; @@ -148,7 +149,7 @@ public class MRfQResponseLineQty extends X_C_RfQResponseLineQty implements Compa // Calculate // double result = price.doubleValue() * (100.0 - discount.doubleValue()) / 100.0; BigDecimal factor = Env.ONEHUNDRED.subtract(discount); - return price.multiply(factor).divide(Env.ONEHUNDRED, 2, BigDecimal.ROUND_HALF_UP); + return price.multiply(factor).divide(Env.ONEHUNDRED, 2, RoundingMode.HALF_UP); } // getNetAmt diff --git a/org.adempiere.base/src/org/compiere/model/MRole.java b/org.adempiere.base/src/org/compiere/model/MRole.java index 7b07d0ba6b..8238abc2d8 100644 --- a/org.adempiere.base/src/org/compiere/model/MRole.java +++ b/org.adempiere.base/src/org/compiere/model/MRole.java @@ -902,7 +902,7 @@ public final class MRole extends X_AD_Role rs = pstmt.executeQuery(); while (rs.next()) { - Integer ii = new Integer(rs.getInt(1)); + Integer ii = Integer.valueOf(rs.getInt(1)); m_tableAccessLevel.put(ii, rs.getString(2)); String tableName = rs.getString(3); m_tableName.put(tableName, ii); @@ -1345,7 +1345,7 @@ public final class MRole extends X_AD_Role // AccessLevel // 1 = Org - 2 = Client - 4 = System // 3 = Org+Client - 6 = Client+System - 7 = All - String roleAccessLevel = (String)m_tableAccessLevel.get(new Integer(AD_Table_ID)); + String roleAccessLevel = (String)m_tableAccessLevel.get(Integer.valueOf(AD_Table_ID)); if (roleAccessLevel == null) { if (log.isLoggable(Level.FINE)) log.fine("NO - No AccessLevel - AD_Table_ID=" + AD_Table_ID); @@ -1542,14 +1542,14 @@ public final class MRole extends X_AD_Role pstmt.setInt(1, getAD_Role_ID()); rs = pstmt.executeQuery(); while (rs.next()) { - Integer winId = new Integer(rs.getInt(1)); + Integer winId = Integer.valueOf(rs.getInt(1)); if ("N".equals(rs.getString(3))) { // inactive window on direct access if (m_windowAccess.containsKey(winId)) { m_windowAccess.remove(winId); } } else { - directAccess.put(winId, new Boolean("Y".equals(rs.getString(2)))); + directAccess.put(winId, Boolean.valueOf("Y".equals(rs.getString(2)))); } } } @@ -1627,14 +1627,14 @@ public final class MRole extends X_AD_Role pstmt.setInt(1, getAD_Role_ID()); rs = pstmt.executeQuery(); while (rs.next()) { - Integer procId = new Integer(rs.getInt(1)); + Integer procId = Integer.valueOf(rs.getInt(1)); if ("N".equals(rs.getString(3))) { // inactive process on direct access if (m_processAccess.containsKey(procId)) { m_processAccess.remove(procId); } } else { - directAccess.put(procId, new Boolean("Y".equals(rs.getString(2)))); + directAccess.put(procId, Boolean.valueOf("Y".equals(rs.getString(2)))); } } } @@ -1707,14 +1707,14 @@ public final class MRole extends X_AD_Role pstmt.setInt(1, getAD_Role_ID()); rs = pstmt.executeQuery(); while (rs.next()) { - Integer taskId = new Integer(rs.getInt(1)); + Integer taskId = Integer.valueOf(rs.getInt(1)); if ("N".equals(rs.getString(3))) { // inactive task on direct access if (m_taskAccess.containsKey(taskId)) { m_taskAccess.remove(taskId); } } else { - directAccess.put(taskId, new Boolean("Y".equals(rs.getString(2)))); + directAccess.put(taskId, Boolean.valueOf("Y".equals(rs.getString(2)))); } } } @@ -1787,14 +1787,14 @@ public final class MRole extends X_AD_Role pstmt.setInt(1, getAD_Role_ID()); rs = pstmt.executeQuery(); while (rs.next()) { - Integer formId = new Integer(rs.getInt(1)); + Integer formId = Integer.valueOf(rs.getInt(1)); if ("N".equals(rs.getString(3))) { // inactive form on direct access if (m_formAccess.containsKey(formId)) { m_formAccess.remove(formId); } } else { - directAccess.put(formId, new Boolean("Y".equals(rs.getString(2)))); + directAccess.put(formId, Boolean.valueOf("Y".equals(rs.getString(2)))); } } } @@ -1867,14 +1867,14 @@ public final class MRole extends X_AD_Role pstmt.setInt(1, getAD_Role_ID()); rs = pstmt.executeQuery(); while (rs.next()) { - Integer formId = new Integer(rs.getInt(1)); + Integer formId = Integer.valueOf(rs.getInt(1)); if ("N".equals(rs.getString(3))) { // inactive workflow on direct access if (m_workflowAccess.containsKey(formId)) { m_workflowAccess.remove(formId); } } else { - directAccess.put(formId, new Boolean("Y".equals(rs.getString(2)))); + directAccess.put(formId, Boolean.valueOf("Y".equals(rs.getString(2)))); } } } @@ -3137,7 +3137,7 @@ public final class MRole extends X_AD_Role pstmt.setInt(1, getAD_Role_ID()); rs = pstmt.executeQuery(); while (rs.next()) { - Integer infoId = new Integer(rs.getInt(1)); + Integer infoId = Integer.valueOf(rs.getInt(1)); if ("N".equals(rs.getString(2))) { // inactive info on direct access if (m_infoAccess.containsKey(infoId)) { @@ -3177,7 +3177,7 @@ public final class MRole extends X_AD_Role + " AND (iwa.AD_Role_ID = ? OR iwa.AD_Role_ID IN" + " (SELECT ri.Included_Role_ID FROM AD_Role_Included ri WHERE ri.IsActive='Y' AND ri.AD_Role_ID=?))"; int cnt = DB.getSQLValueEx(get_TrxName(), sql, I_M_Product.Table_ID, getAD_Role_ID(), getAD_Role_ID()); - m_canAccess_Info_Product = new Boolean(cnt > 0); + m_canAccess_Info_Product = Boolean.valueOf(cnt > 0); // Verify if is excluded in the specific role (it can be allowed in included role and inactive in specific role) if (m_canAccess_Info_Product) { @@ -3192,7 +3192,7 @@ public final class MRole extends X_AD_Role + " AND iwa.AD_Role_ID = ?"; int cntInactive = DB.getSQLValueEx(get_TrxName(), sqlInactive, I_M_Product.Table_ID, getAD_Role_ID()); if (cntInactive > 0) - m_canAccess_Info_Product = new Boolean(false); + m_canAccess_Info_Product = Boolean.FALSE; } } return m_canAccess_Info_Product.booleanValue(); diff --git a/org.adempiere.base/src/org/compiere/model/MRule.java b/org.adempiere.base/src/org/compiere/model/MRule.java index bb87a37f07..a2489408dc 100644 --- a/org.adempiere.base/src/org/compiere/model/MRule.java +++ b/org.adempiere.base/src/org/compiere/model/MRule.java @@ -65,7 +65,7 @@ public class MRule extends X_AD_Rule */ public static MRule get (Properties ctx, int AD_Rule_ID) { - Integer key = new Integer (AD_Rule_ID); + Integer key = Integer.valueOf(AD_Rule_ID); MRule retValue = (MRule) s_cache.get (key); if (retValue != null) return retValue; @@ -101,7 +101,7 @@ public class MRule extends X_AD_Rule if (retValue != null) { - Integer key = new Integer (retValue.getAD_Rule_ID()); + Integer key = Integer.valueOf(retValue.getAD_Rule_ID()); s_cache.put (key, retValue); } return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MSLACriteria.java b/org.adempiere.base/src/org/compiere/model/MSLACriteria.java index 00f858f0b8..5f66ad22d5 100644 --- a/org.adempiere.base/src/org/compiere/model/MSLACriteria.java +++ b/org.adempiere.base/src/org/compiere/model/MSLACriteria.java @@ -50,7 +50,7 @@ public class MSLACriteria extends X_PA_SLA_Criteria */ public static MSLACriteria get (Properties ctx, int PA_SLA_Criteria_ID, String trxName) { - Integer key = new Integer (PA_SLA_Criteria_ID); + Integer key = Integer.valueOf(PA_SLA_Criteria_ID); MSLACriteria retValue = (MSLACriteria) s_cache.get (key); if (retValue != null) return retValue; @@ -134,7 +134,7 @@ public class MSLACriteria extends X_PA_SLA_Criteria try { Class clazz = Class.forName(getClassname()); - SLACriteria retValue = (SLACriteria)clazz.newInstance(); + SLACriteria retValue = (SLACriteria)clazz.getDeclaredConstructor().newInstance(); return retValue; } catch (Exception e) diff --git a/org.adempiere.base/src/org/compiere/model/MSalesRegion.java b/org.adempiere.base/src/org/compiere/model/MSalesRegion.java index d7e79c60db..7c3b408b32 100644 --- a/org.adempiere.base/src/org/compiere/model/MSalesRegion.java +++ b/org.adempiere.base/src/org/compiere/model/MSalesRegion.java @@ -43,7 +43,7 @@ public class MSalesRegion extends X_C_SalesRegion */ public static MSalesRegion get (Properties ctx, int C_SalesRegion_ID) { - Integer key = new Integer (C_SalesRegion_ID); + Integer key = Integer.valueOf(C_SalesRegion_ID); MSalesRegion retValue = (MSalesRegion) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MSchedule.java b/org.adempiere.base/src/org/compiere/model/MSchedule.java index 7562ff3ec3..b2a7a9fe9f 100644 --- a/org.adempiere.base/src/org/compiere/model/MSchedule.java +++ b/org.adempiere.base/src/org/compiere/model/MSchedule.java @@ -145,7 +145,7 @@ public class MSchedule extends X_AD_Schedule public static MSchedule get(Properties ctx, int AD_Schedule_ID) { - Integer key = new Integer (AD_Schedule_ID); + Integer key = Integer.valueOf(AD_Schedule_ID); MSchedule retValue = (MSchedule)s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MSequence.java b/org.adempiere.base/src/org/compiere/model/MSequence.java index ef52c5dcad..446fde29d3 100644 --- a/org.adempiere.base/src/org/compiere/model/MSequence.java +++ b/org.adempiere.base/src/org/compiere/model/MSequence.java @@ -1229,7 +1229,7 @@ public class MSequence extends X_AD_Sequence try { int no = DB.getNextID(0, "Test", null); - s_list.add(new Integer(no)); + s_list.add(Integer.valueOf(no)); // System.out.println("#" + m_i + ": " + no); } catch (Exception e) diff --git a/org.adempiere.base/src/org/compiere/model/MSession.java b/org.adempiere.base/src/org/compiere/model/MSession.java index 6800c1f5f3..e77d6c9826 100644 --- a/org.adempiere.base/src/org/compiere/model/MSession.java +++ b/org.adempiere.base/src/org/compiere/model/MSession.java @@ -59,7 +59,7 @@ public class MSession extends X_AD_Session int AD_Session_ID = Env.getContextAsInt(ctx, "#AD_Session_ID"); MSession session = null; if (AD_Session_ID > 0) - session = (MSession)s_sessions.get(new Integer(AD_Session_ID)); + session = (MSession)s_sessions.get(Integer.valueOf(AD_Session_ID)); // Try to load if (session == null && AD_Session_ID > 0) { @@ -76,7 +76,7 @@ public class MSession extends X_AD_Session session.saveEx(); AD_Session_ID = session.getAD_Session_ID(); Env.setContext (ctx, "#AD_Session_ID", AD_Session_ID); - s_sessions.put (new Integer(AD_Session_ID), session); + s_sessions.put (Integer.valueOf(AD_Session_ID), session); } return session; } // get @@ -94,14 +94,14 @@ public class MSession extends X_AD_Session int AD_Session_ID = Env.getContextAsInt(ctx, "#AD_Session_ID"); MSession session = null; if (AD_Session_ID > 0) - session = (MSession)s_sessions.get(new Integer(AD_Session_ID)); + session = (MSession)s_sessions.get(Integer.valueOf(AD_Session_ID)); if (session == null) { session = new MSession (ctx, Remote_Addr, Remote_Host, WebSession, null); // remote session session.saveEx(); AD_Session_ID = session.getAD_Session_ID(); Env.setContext(ctx, "#AD_Session_ID", AD_Session_ID); - s_sessions.put(new Integer(AD_Session_ID), session); + s_sessions.put(Integer.valueOf(AD_Session_ID), session); } return session; } // get @@ -238,7 +238,7 @@ public class MSession extends X_AD_Session { setProcessed(true); saveEx(); - s_sessions.remove(new Integer(getAD_Session_ID())); + s_sessions.remove(Integer.valueOf(getAD_Session_ID())); if (log.isLoggable(Level.INFO)) log.info(TimeUtil.formatElapsed(getCreated(), getUpdated())); } // logout diff --git a/org.adempiere.base/src/org/compiere/model/MStatus.java b/org.adempiere.base/src/org/compiere/model/MStatus.java index 968c5a984c..164ce26f8a 100644 --- a/org.adempiere.base/src/org/compiere/model/MStatus.java +++ b/org.adempiere.base/src/org/compiere/model/MStatus.java @@ -51,7 +51,7 @@ public class MStatus extends X_R_Status { if (R_Status_ID == 0) return null; - Integer key = new Integer (R_Status_ID); + Integer key = Integer.valueOf(R_Status_ID); MStatus retValue = (MStatus)s_cache.get(key); if (retValue == null) { @@ -69,7 +69,7 @@ public class MStatus extends X_R_Status */ public static MStatus getDefault (Properties ctx, int R_RequestType_ID) { - Integer key = new Integer(R_RequestType_ID); + Integer key = Integer.valueOf(R_RequestType_ID); MStatus retValue = (MStatus)s_cacheDefault.get(key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MStatusCategory.java b/org.adempiere.base/src/org/compiere/model/MStatusCategory.java index 3ec805e663..644c025c2d 100644 --- a/org.adempiere.base/src/org/compiere/model/MStatusCategory.java +++ b/org.adempiere.base/src/org/compiere/model/MStatusCategory.java @@ -106,7 +106,7 @@ public class MStatusCategory extends X_R_StatusCategory */ public static MStatusCategory get (Properties ctx, int R_StatusCategory_ID) { - Integer key = new Integer (R_StatusCategory_ID); + Integer key = Integer.valueOf(R_StatusCategory_ID); MStatusCategory retValue = (MStatusCategory)s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MStore.java b/org.adempiere.base/src/org/compiere/model/MStore.java index 0b01c99b69..ec845d2583 100644 --- a/org.adempiere.base/src/org/compiere/model/MStore.java +++ b/org.adempiere.base/src/org/compiere/model/MStore.java @@ -52,7 +52,7 @@ public class MStore extends X_W_Store */ public static MStore get (Properties ctx, int W_Store_ID) { - Integer key = new Integer (W_Store_ID); + Integer key = Integer.valueOf(W_Store_ID); MStore retValue = (MStore) s_cache.get (key); if (retValue != null) return retValue; @@ -133,7 +133,7 @@ public class MStore extends X_W_Store return null; // Save - Integer key = new Integer (wstore.getW_Store_ID()); + Integer key = Integer.valueOf(wstore.getW_Store_ID()); s_cache.put (key, wstore); return wstore; } // get diff --git a/org.adempiere.base/src/org/compiere/model/MStyle.java b/org.adempiere.base/src/org/compiere/model/MStyle.java index 762269ba8b..b2b6e2aeb3 100644 --- a/org.adempiere.base/src/org/compiere/model/MStyle.java +++ b/org.adempiere.base/src/org/compiere/model/MStyle.java @@ -37,7 +37,7 @@ public class MStyle extends X_AD_Style { public static MStyle get (Properties ctx, int AD_Style_ID) { - Integer key = new Integer(AD_Style_ID); + Integer key = Integer.valueOf(AD_Style_ID); MStyle retValue = (MStyle)s_cache.get(key); if (retValue == null) { diff --git a/org.adempiere.base/src/org/compiere/model/MTax.java b/org.adempiere.base/src/org/compiere/model/MTax.java index 04336ada00..5292933801 100644 --- a/org.adempiere.base/src/org/compiere/model/MTax.java +++ b/org.adempiere.base/src/org/compiere/model/MTax.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.ResultSet; import java.util.List; import java.util.Properties; @@ -91,7 +92,7 @@ public class MTax extends X_C_Tax */ public static MTax get (Properties ctx, int C_Tax_ID) { - Integer key = new Integer (C_Tax_ID); + Integer key = Integer.valueOf(C_Tax_ID); MTax retValue = (MTax) s_cache.get (key); if (retValue != null) return retValue; @@ -264,17 +265,17 @@ public class MTax extends X_C_Tax BigDecimal tax = Env.ZERO; for (MTax taxc : taxarray) { - BigDecimal multiplier = taxc.getRate().divide(Env.ONEHUNDRED, 12, BigDecimal.ROUND_HALF_UP); + BigDecimal multiplier = taxc.getRate().divide(Env.ONEHUNDRED, 12, RoundingMode.HALF_UP); if (!taxIncluded) // $100 * 6 / 100 == $6 == $100 * 0.06 { - BigDecimal itax = amount.multiply(multiplier).setScale(scale, BigDecimal.ROUND_HALF_UP); + BigDecimal itax = amount.multiply(multiplier).setScale(scale, RoundingMode.HALF_UP); tax = tax.add(itax); } else // $106 - ($106 / (100+6)/100) == $6 == $106 - ($106/1.06) { multiplier = multiplier.add(Env.ONE); - BigDecimal base = amount.divide(multiplier, 12, BigDecimal.ROUND_HALF_UP); - BigDecimal itax = amount.subtract(base).setScale(scale, BigDecimal.ROUND_HALF_UP); + BigDecimal base = amount.divide(multiplier, 12, RoundingMode.HALF_UP); + BigDecimal itax = amount.subtract(base).setScale(scale, RoundingMode.HALF_UP); tax = tax.add(itax); } } diff --git a/org.adempiere.base/src/org/compiere/model/MTest.java b/org.adempiere.base/src/org/compiere/model/MTest.java index c57b0f3cf8..ec6aa1296f 100644 --- a/org.adempiere.base/src/org/compiere/model/MTest.java +++ b/org.adempiere.base/src/org/compiere/model/MTest.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.ResultSet; import java.sql.Timestamp; import java.util.Properties; @@ -78,7 +79,7 @@ public class MTest extends X_Test setT_DateTime(new Timestamp (System.currentTimeMillis())); setT_Integer(testNo); setT_Amount(new BigDecimal(testNo)); - setT_Number(Env.ONE.divide(new BigDecimal(testNo), BigDecimal.ROUND_HALF_UP)); + setT_Number(Env.ONE.divide(new BigDecimal(testNo), RoundingMode.HALF_UP)); // setC_Currency_ID(100); // USD setC_Location_ID(109); // Monroe diff --git a/org.adempiere.base/src/org/compiere/model/MTree_Base.java b/org.adempiere.base/src/org/compiere/model/MTree_Base.java index c70411cae8..d6160b0ddc 100644 --- a/org.adempiere.base/src/org/compiere/model/MTree_Base.java +++ b/org.adempiere.base/src/org/compiere/model/MTree_Base.java @@ -204,7 +204,7 @@ public class MTree_Base extends X_AD_Tree */ public static MTree_Base get (Properties ctx, int AD_Tree_ID, String trxName) { - Integer key = new Integer (AD_Tree_ID); + Integer key = Integer.valueOf(AD_Tree_ID); MTree_Base retValue = (MTree_Base) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MTree_NodeCMC.java b/org.adempiere.base/src/org/compiere/model/MTree_NodeCMC.java index cb564c71cf..25b17f5316 100644 --- a/org.adempiere.base/src/org/compiere/model/MTree_NodeCMC.java +++ b/org.adempiere.base/src/org/compiere/model/MTree_NodeCMC.java @@ -149,6 +149,6 @@ public class MTree_NodeCMC extends X_AD_TreeNodeCMC */ public void setParent_ID (int Parent_ID) { - set_Value ("Parent_ID", new Integer(Parent_ID)); + set_Value ("Parent_ID", Integer.valueOf(Parent_ID)); } } // MTree_NodeCMC diff --git a/org.adempiere.base/src/org/compiere/model/MUOM.java b/org.adempiere.base/src/org/compiere/model/MUOM.java index 7b321ec903..d9b4034b7e 100644 --- a/org.adempiere.base/src/org/compiere/model/MUOM.java +++ b/org.adempiere.base/src/org/compiere/model/MUOM.java @@ -17,6 +17,7 @@ package org.compiere.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.ResultSet; import java.util.Iterator; import java.util.List; @@ -216,7 +217,7 @@ public class MUOM extends X_C_UOM if (!stdPrecision) precision = getCostingPrecision(); if (qty.scale() > precision) - return qty.setScale(getStdPrecision(), BigDecimal.ROUND_HALF_UP); + return qty.setScale(getStdPrecision(), RoundingMode.HALF_UP); return qty; } // round diff --git a/org.adempiere.base/src/org/compiere/model/MUOMConversion.java b/org.adempiere.base/src/org/compiere/model/MUOMConversion.java index d31902694a..58eaf42263 100644 --- a/org.adempiere.base/src/org/compiere/model/MUOMConversion.java +++ b/org.adempiere.base/src/org/compiere/model/MUOMConversion.java @@ -18,6 +18,7 @@ package org.compiere.model; import java.awt.Point; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -191,7 +192,7 @@ public class MUOMConversion extends X_C_UOM_Conversion s_conversions.put(p, mr); // reverse if (dr == null && mr != null) - dr = Env.ONE.divide(mr, BigDecimal.ROUND_HALF_UP); + dr = Env.ONE.divide(mr, RoundingMode.HALF_UP); if (dr != null) s_conversions.put(new Point(p.y,p.x), dr); } @@ -445,7 +446,7 @@ public class MUOMConversion extends X_C_UOM_Conversion // Calculate & Scale retValue = retValue.multiply(qty); if (retValue.scale() > precision) - retValue = retValue.setScale(precision, BigDecimal.ROUND_HALF_UP); + retValue = retValue.setScale(precision, RoundingMode.HALF_UP); return retValue; } // convert @@ -601,7 +602,7 @@ public class MUOMConversion extends X_C_UOM_Conversion { if (M_Product_ID == 0) return new MUOMConversion[0]; - Integer key = new Integer (M_Product_ID); + Integer key = Integer.valueOf(M_Product_ID); MUOMConversion[] result = (MUOMConversion[])s_conversionProduct.get(key); if (result != null) return result; diff --git a/org.adempiere.base/src/org/compiere/model/MUser.java b/org.adempiere.base/src/org/compiere/model/MUser.java index 956457c375..05ce2ac997 100644 --- a/org.adempiere.base/src/org/compiere/model/MUser.java +++ b/org.adempiere.base/src/org/compiere/model/MUser.java @@ -136,7 +136,7 @@ public class MUser extends X_AD_User */ public static MUser get (Properties ctx, int AD_User_ID) { - Integer key = new Integer(AD_User_ID); + Integer key = Integer.valueOf(AD_User_ID); MUser retValue = (MUser)s_cache.get(key); if (retValue == null) { diff --git a/org.adempiere.base/src/org/compiere/model/MUserRoles.java b/org.adempiere.base/src/org/compiere/model/MUserRoles.java index be673ee89e..9521ecef3c 100644 --- a/org.adempiere.base/src/org/compiere/model/MUserRoles.java +++ b/org.adempiere.base/src/org/compiere/model/MUserRoles.java @@ -120,7 +120,7 @@ public class MUserRoles extends X_AD_User_Roles */ public void setAD_User_ID (int AD_User_ID) { - set_ValueNoCheck ("AD_User_ID", new Integer(AD_User_ID)); + set_ValueNoCheck ("AD_User_ID", Integer.valueOf(AD_User_ID)); } // setAD_User_ID /** @@ -130,7 +130,7 @@ public class MUserRoles extends X_AD_User_Roles **/ public void setAD_Role_ID (int AD_Role_ID) { - set_ValueNoCheck ("AD_Role_ID", new Integer(AD_Role_ID)); + set_ValueNoCheck ("AD_Role_ID", Integer.valueOf(AD_Role_ID)); } // setAD_Role_ID @Override diff --git a/org.adempiere.base/src/org/compiere/model/MValRule.java b/org.adempiere.base/src/org/compiere/model/MValRule.java index ef38c0bc07..672f79a37f 100644 --- a/org.adempiere.base/src/org/compiere/model/MValRule.java +++ b/org.adempiere.base/src/org/compiere/model/MValRule.java @@ -50,7 +50,7 @@ public class MValRule extends X_AD_Val_Rule */ public static MValRule get (Properties ctx, int AD_Val_Rule_ID) { - Integer key = new Integer (AD_Val_Rule_ID); + Integer key = Integer.valueOf(AD_Val_Rule_ID); MValRule retValue = (MValRule) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MWarehouse.java b/org.adempiere.base/src/org/compiere/model/MWarehouse.java index 7943bc89e7..71382d3d0c 100644 --- a/org.adempiere.base/src/org/compiere/model/MWarehouse.java +++ b/org.adempiere.base/src/org/compiere/model/MWarehouse.java @@ -63,7 +63,7 @@ public class MWarehouse extends X_M_Warehouse */ public static MWarehouse get (Properties ctx, int M_Warehouse_ID, String trxName) { - Integer key = new Integer(M_Warehouse_ID); + Integer key = Integer.valueOf(M_Warehouse_ID); MWarehouse retValue = (MWarehouse)s_cache.get(key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/MWebProject.java b/org.adempiere.base/src/org/compiere/model/MWebProject.java index 8f8ada66c4..1925fe3c47 100644 --- a/org.adempiere.base/src/org/compiere/model/MWebProject.java +++ b/org.adempiere.base/src/org/compiere/model/MWebProject.java @@ -43,7 +43,7 @@ public class MWebProject extends X_CM_WebProject */ public static MWebProject get (Properties ctx, int CM_WebProject_ID) { - Integer key = new Integer (CM_WebProject_ID); + Integer key = Integer.valueOf(CM_WebProject_ID); MWebProject retValue = (MWebProject)s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/model/PO.java b/org.adempiere.base/src/org/compiere/model/PO.java index f1de8670b8..737c496505 100644 --- a/org.adempiere.base/src/org/compiere/model/PO.java +++ b/org.adempiere.base/src/org/compiere/model/PO.java @@ -256,7 +256,7 @@ public abstract class PO private HashMap m_attributes = null; /** Zero Integer */ - protected static final Integer I_ZERO = new Integer(0); + protected static final Integer I_ZERO = Integer.valueOf(0); /** Accounting Columns */ private ArrayList s_acctColumns = null; @@ -657,7 +657,7 @@ public abstract class PO { int result = ((Integer)nValue).intValue(); result -= ((Integer)oValue).intValue(); - return new Integer(result); + return Integer.valueOf(result); } // log.warning("Invalid type - New=" + nValue); @@ -814,11 +814,11 @@ public abstract class PO // Integer can be set as BigDecimal else if (value.getClass() == BigDecimal.class && p_info.getColumnClass(index) == Integer.class) - m_newValues[index] = new Integer (((BigDecimal)value).intValue()); + m_newValues[index] = Integer.valueOf(((BigDecimal)value).intValue()); // Set Boolean else if (p_info.getColumnClass(index) == Boolean.class && ("Y".equals(value) || "N".equals(value)) ) - m_newValues[index] = new Boolean("Y".equals(value)); + m_newValues[index] = Boolean.valueOf("Y".equals(value)); // added by vpj-cd // To solve BUG [ 1618423 ] Set Project Type button in Project window throws warning // generated because C_Project.C_Project_Type_ID is defined as button in dictionary @@ -830,7 +830,7 @@ public abstract class PO && p_info.getColumnClass(index) == Integer.class) try { - m_newValues[index] = new Integer((String)value); + m_newValues[index] = Integer.valueOf((String)value); } catch (NumberFormatException e) { @@ -1283,7 +1283,7 @@ public abstract class PO if (ID > 0) { setKeyInfo(); - m_IDs = new Object[] {new Integer(ID)}; + m_IDs = new Object[] {Integer.valueOf(ID)}; //m_KeyColumns = new String[] {p_info.getTableName() + "_ID"}; load(trxName); } @@ -1399,11 +1399,11 @@ public abstract class PO try { if (clazz == Integer.class) - m_oldValues[index] = decrypt(index, new Integer(rs.getInt(columnName))); + m_oldValues[index] = decrypt(index, Integer.valueOf(rs.getInt(columnName))); else if (clazz == BigDecimal.class) m_oldValues[index] = decrypt(index, rs.getBigDecimal(columnName)); else if (clazz == Boolean.class) - m_oldValues[index] = new Boolean ("Y".equals(decrypt(index, rs.getString(columnName)))); + m_oldValues[index] = Boolean.valueOf("Y".equals(decrypt(index, rs.getString(columnName)))); else if (clazz == Timestamp.class) m_oldValues[index] = decrypt(index, rs.getTimestamp(columnName)); else if (DisplayType.isLOB(dt)) @@ -1475,11 +1475,11 @@ public abstract class PO try { if (clazz == Integer.class) - m_oldValues[index] = new Integer(value); + m_oldValues[index] = Integer.valueOf(value); else if (clazz == BigDecimal.class) m_oldValues[index] = new BigDecimal(value); else if (clazz == Boolean.class) - m_oldValues[index] = new Boolean ("Y".equals(value)); + m_oldValues[index] = Boolean.valueOf("Y".equals(value)); else if (clazz == Timestamp.class) m_oldValues[index] = Timestamp.valueOf(value); else if (DisplayType.isLOB(dt)) @@ -1626,23 +1626,23 @@ public abstract class PO String colName = p_info.getColumnName(i); // Set Standard Values if (colName.endsWith("tedBy")) - m_newValues[i] = new Integer (Env.getContextAsInt(p_ctx, "#AD_User_ID")); + m_newValues[i] = Integer.valueOf(Env.getContextAsInt(p_ctx, "#AD_User_ID")); else if (colName.equals("Created") || colName.equals("Updated")) m_newValues[i] = new Timestamp (System.currentTimeMillis()); else if (colName.equals(p_info.getTableName() + "_ID")) // KeyColumn m_newValues[i] = I_ZERO; else if (colName.equals("IsActive")) - m_newValues[i] = new Boolean(true); + m_newValues[i] = Boolean.TRUE; else if (colName.equals("AD_Client_ID")) - m_newValues[i] = new Integer(Env.getAD_Client_ID(p_ctx)); + m_newValues[i] = Integer.valueOf(Env.getAD_Client_ID(p_ctx)); else if (colName.equals("AD_Org_ID")) - m_newValues[i] = new Integer(Env.getAD_Org_ID(p_ctx)); + m_newValues[i] = Integer.valueOf(Env.getAD_Org_ID(p_ctx)); else if (colName.equals("Processed")) - m_newValues[i] = new Boolean(false); + m_newValues[i] = Boolean.FALSE; else if (colName.equals("Processing")) - m_newValues[i] = new Boolean(false); + m_newValues[i] = Boolean.FALSE; else if (colName.equals("Posted")) - m_newValues[i] = new Boolean(false); + m_newValues[i] = Boolean.FALSE; } } // setDefaults @@ -1748,7 +1748,7 @@ public abstract class PO */ final protected void setAD_Client_ID (int AD_Client_ID) { - set_ValueNoCheck ("AD_Client_ID", new Integer(AD_Client_ID)); + set_ValueNoCheck ("AD_Client_ID", Integer.valueOf(AD_Client_ID)); } // setAD_Client_ID /** @@ -1769,7 +1769,7 @@ public abstract class PO */ final public void setAD_Org_ID (int AD_Org_ID) { - set_ValueNoCheck ("AD_Org_ID", new Integer(AD_Org_ID)); + set_ValueNoCheck ("AD_Org_ID", Integer.valueOf(AD_Org_ID)); } // setAD_Org_ID /** @@ -1812,7 +1812,7 @@ public abstract class PO */ public final void setIsActive (boolean active) { - set_Value("IsActive", new Boolean(active)); + set_Value("IsActive", Boolean.valueOf(active)); } // setActive /** @@ -1875,7 +1875,7 @@ public abstract class PO */ final protected void setUpdatedBy (int AD_User_ID) { - set_ValueNoCheck ("UpdatedBy", new Integer(AD_User_ID)); + set_ValueNoCheck ("UpdatedBy", Integer.valueOf(AD_User_ID)); } // setAD_User_ID /** Cache */ @@ -2502,7 +2502,7 @@ public abstract class PO if (!changes && !updatedBy) { int AD_User_ID = Env.getContextAsInt(p_ctx, "#AD_User_ID"); - set_ValueNoCheck("UpdatedBy", new Integer(AD_User_ID)); + set_ValueNoCheck("UpdatedBy", Integer.valueOf(AD_User_ID)); sql.append("UpdatedBy=").append(AD_User_ID); changes = true; updatedBy = true; @@ -2681,7 +2681,7 @@ public abstract class PO if (!updatedBy) // UpdatedBy not explicitly set { int AD_User_ID = Env.getContextAsInt(p_ctx, "#AD_User_ID"); - set_ValueNoCheck("UpdatedBy", new Integer(AD_User_ID)); + set_ValueNoCheck("UpdatedBy", Integer.valueOf(AD_User_ID)); if (withValues) { sql.append(",UpdatedBy=").append(AD_User_ID); @@ -2755,7 +2755,7 @@ public abstract class PO log.severe("No NextID (" + no + ")"); return saveFinish (true, false); } - m_IDs[0] = new Integer(no); + m_IDs[0] = Integer.valueOf(no); set_ValueNoCheck(m_KeyColumns[0], m_IDs[0]); } //uuid secondary key @@ -4341,7 +4341,7 @@ public abstract class PO pstmt = DB.prepareStatement(sql.toString(), trxName); rs = pstmt.executeQuery(); while (rs.next()) - list.add(new Integer(rs.getInt(1))); + list.add(Integer.valueOf(rs.getInt(1))); } catch (SQLException e) { diff --git a/org.adempiere.base/src/org/compiere/model/PO_Record.java b/org.adempiere.base/src/org/compiere/model/PO_Record.java index 8eee24c98d..c1e58926f9 100644 --- a/org.adempiere.base/src/org/compiere/model/PO_Record.java +++ b/org.adempiere.base/src/org/compiere/model/PO_Record.java @@ -108,7 +108,7 @@ public class PO_Record // DELETE FROM table WHERE AD_Table_ID=#1 AND Record_ID=#2 if (s_cascades[i] != AD_Table_ID) { - Object[] params = new Object[]{new Integer(AD_Table_ID), new Integer(Record_ID)}; + Object[] params = new Object[]{Integer.valueOf(AD_Table_ID), Integer.valueOf(Record_ID)}; StringBuffer sql = new StringBuffer ("DELETE FROM ") .append(s_cascadeNames[i]) .append(" WHERE AD_Table_ID=? AND Record_ID=?"); @@ -129,7 +129,7 @@ public class PO_Record if (s_parents[j] == AD_Table_ID) { int AD_Table_IDchild = s_parentChilds[j]; - Object[] params = new Object[]{new Integer(AD_Table_IDchild), new Integer(Record_ID)}; + Object[] params = new Object[]{Integer.valueOf(AD_Table_IDchild), Integer.valueOf(Record_ID)}; for (int i = 0; i < s_cascades.length; i++) { StringBuffer sql = new StringBuffer ("DELETE FROM ") diff --git a/org.adempiere.base/src/org/compiere/model/PaymentProcessor.java b/org.adempiere.base/src/org/compiere/model/PaymentProcessor.java index 7ffdaae862..fd57f8e6e2 100644 --- a/org.adempiere.base/src/org/compiere/model/PaymentProcessor.java +++ b/org.adempiere.base/src/org/compiere/model/PaymentProcessor.java @@ -21,6 +21,7 @@ import java.io.DataOutputStream; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; import java.math.BigDecimal; +import java.math.RoundingMode; import java.net.URL; import java.net.URLDecoder; import java.net.URLEncoder; @@ -191,7 +192,7 @@ public abstract class PaymentProcessor else { if (value.scale() < 2) - value = value.setScale(2, BigDecimal.ROUND_HALF_UP); + value = value.setScale(2, RoundingMode.HALF_UP); return createPair (name, String.valueOf(value), maxLength); } } // createPair diff --git a/org.adempiere.base/src/org/compiere/model/Scriptlet.java b/org.adempiere.base/src/org/compiere/model/Scriptlet.java index 9b93eafa29..f502f2da3f 100644 --- a/org.adempiere.base/src/org/compiere/model/Scriptlet.java +++ b/org.adempiere.base/src/org/compiere/model/Scriptlet.java @@ -305,12 +305,12 @@ public class Scriptlet // Boolean if (stringValue.equals("Y")) { - m_ctx.put(convertKey(key), new Boolean(true)); + m_ctx.put(convertKey(key), Boolean.TRUE); return; } if (stringValue.equals("N")) { - m_ctx.put(convertKey(key), new Boolean(false)); + m_ctx.put(convertKey(key), Boolean.FALSE); return; } diff --git a/org.adempiere.base/src/org/compiere/model/StandardTaxProvider.java b/org.adempiere.base/src/org/compiere/model/StandardTaxProvider.java index a508cc3250..31aed1bd80 100644 --- a/org.adempiere.base/src/org/compiere/model/StandardTaxProvider.java +++ b/org.adempiere.base/src/org/compiere/model/StandardTaxProvider.java @@ -45,7 +45,7 @@ public class StandardTaxProvider implements ITaxProvider { { MOrderLine line = lines[i]; totalLines = totalLines.add(line.getLineNetAmt()); - Integer taxID = new Integer(line.getC_Tax_ID()); + Integer taxID = Integer.valueOf(line.getC_Tax_ID()); if (!taxList.contains(taxID)) { MTax tax = new MTax(order.getCtx(), taxID, order.get_TrxName()); @@ -302,7 +302,7 @@ public class StandardTaxProvider implements ITaxProvider { { MRMALine line = lines[i]; totalLines = totalLines.add(line.getLineNetAmt()); - Integer taxID = new Integer(line.getC_Tax_ID()); + Integer taxID = Integer.valueOf(line.getC_Tax_ID()); if (!taxList.contains(taxID)) { MTax tax = new MTax(rma.getCtx(), taxID, rma.get_TrxName()); diff --git a/org.adempiere.base/src/org/compiere/model/TranslationTable.java b/org.adempiere.base/src/org/compiere/model/TranslationTable.java index 0336644ca6..dc8611cbbc 100644 --- a/org.adempiere.base/src/org/compiere/model/TranslationTable.java +++ b/org.adempiere.base/src/org/compiere/model/TranslationTable.java @@ -72,7 +72,7 @@ public class TranslationTable return s_activeLanguages.intValue(); int no = DB.getSQLValue(null, "SELECT COUNT(*) FROM AD_Language WHERE IsActive='Y' AND IsSystemLanguage='Y'"); - s_activeLanguages = new Integer(no); + s_activeLanguages = Integer.valueOf(no); return s_activeLanguages.intValue(); } // getActiveLanguages diff --git a/org.adempiere.base/src/org/compiere/print/DataEngine.java b/org.adempiere.base/src/org/compiere/print/DataEngine.java index a7d80cc06c..e65a67f1a6 100644 --- a/org.adempiere.base/src/org/compiere/print/DataEngine.java +++ b/org.adempiere.base/src/org/compiere/print/DataEngine.java @@ -984,7 +984,7 @@ public class DataEngine if (!rs.wasNull()) { boolean b = s.equals("Y"); - pde = new PrintDataElement(pdc.getColumnName(), new Boolean(b), pdc.getDisplayType(), pdc.getFormatPattern()); + pde = new PrintDataElement(pdc.getColumnName(), Boolean.valueOf(b), pdc.getDisplayType(), pdc.getFormatPattern()); } } else if (pdc.getDisplayType() == DisplayType.TextLong) diff --git a/org.adempiere.base/src/org/compiere/print/MPrintColor.java b/org.adempiere.base/src/org/compiere/print/MPrintColor.java index 9d69c80124..489f3b8f08 100644 --- a/org.adempiere.base/src/org/compiere/print/MPrintColor.java +++ b/org.adempiere.base/src/org/compiere/print/MPrintColor.java @@ -92,7 +92,7 @@ public class MPrintColor extends X_AD_PrintColor { // if (AD_PrintColor_ID == 0) // return new MPrintColor (ctx, 0); - Integer key = new Integer(AD_PrintColor_ID); + Integer key = Integer.valueOf(AD_PrintColor_ID); MPrintColor pc = (MPrintColor)s_colors.get(key); if (pc == null) { diff --git a/org.adempiere.base/src/org/compiere/print/MPrintFont.java b/org.adempiere.base/src/org/compiere/print/MPrintFont.java index 5b0d28dd54..ea70daabc4 100644 --- a/org.adempiere.base/src/org/compiere/print/MPrintFont.java +++ b/org.adempiere.base/src/org/compiere/print/MPrintFont.java @@ -205,7 +205,7 @@ public class MPrintFont extends X_AD_PrintFont */ static public MPrintFont get (int AD_PrintFont_ID) { - Integer key = new Integer(AD_PrintFont_ID); + Integer key = Integer.valueOf(AD_PrintFont_ID); MPrintFont pf = (MPrintFont)s_fonts.get(key); if (pf == null) { diff --git a/org.adempiere.base/src/org/compiere/print/MPrintFormat.java b/org.adempiere.base/src/org/compiere/print/MPrintFormat.java index 90381f9579..a69b64d256 100644 --- a/org.adempiere.base/src/org/compiere/print/MPrintFormat.java +++ b/org.adempiere.base/src/org/compiere/print/MPrintFormat.java @@ -147,7 +147,7 @@ public class MPrintFormat extends X_AD_PrintFormat { // Sort Order and Column must be > 0 if (m_items[i].getSortNo() != 0 && m_items[i].getAD_Column_ID() != 0) - map.put(new Integer(m_items[i].getSortNo()), new Integer(m_items[i].getAD_Column_ID())); + map.put(Integer.valueOf(m_items[i].getSortNo()), Integer.valueOf(m_items[i].getAD_Column_ID())); } // Get SortNo and Sort them Integer[] keys = new Integer[map.keySet().size()]; @@ -174,7 +174,7 @@ public class MPrintFormat extends X_AD_PrintFormat for (int i = 0; i < m_items.length; i++) { if (m_items[i].getAD_Column_ID() != 0 && m_items[i].isPrinted()) - list.add(new Integer(m_items[i].getAD_Column_ID())); + list.add(Integer.valueOf(m_items[i].getAD_Column_ID())); } // Convert int[] retValue = new int[list.size()]; @@ -1087,7 +1087,7 @@ public class MPrintFormat extends X_AD_PrintFormat */ static public MPrintFormat get (Properties ctx, int AD_PrintFormat_ID, boolean readFromDisk) { - Integer key = new Integer(AD_PrintFormat_ID); + Integer key = Integer.valueOf(AD_PrintFormat_ID); MPrintFormat pf = null; if (!readFromDisk) pf = (MPrintFormat)s_formats.get(key); @@ -1154,7 +1154,7 @@ public class MPrintFormat extends X_AD_PrintFormat */ static public void deleteFromCache (int AD_PrintFormat_ID) { - Integer key = new Integer(AD_PrintFormat_ID); + Integer key = Integer.valueOf(AD_PrintFormat_ID); s_formats.put(key, null); } // deleteFromCache @@ -1197,9 +1197,9 @@ public class MPrintFormat extends X_AD_PrintFormat // add sql parameter List lsParameter = new ArrayList(); - lsParameter.add(new Integer(AD_Table_ID)); + lsParameter.add(Integer.valueOf(AD_Table_ID)); if (AD_Window_ID > 0) - lsParameter.add(new Integer(AD_Window_ID)); + lsParameter.add(Integer.valueOf(AD_Window_ID)); // init query Query query = new Query(Env.getCtx(), MPrintFormat.Table_Name, sqlWhere, trxName); diff --git a/org.adempiere.base/src/org/compiere/print/MPrintFormatItem.java b/org.adempiere.base/src/org/compiere/print/MPrintFormatItem.java index 8035008339..96c2bf1145 100644 --- a/org.adempiere.base/src/org/compiere/print/MPrintFormatItem.java +++ b/org.adempiere.base/src/org/compiere/print/MPrintFormatItem.java @@ -392,7 +392,7 @@ public class MPrintFormatItem extends X_AD_PrintFormatItem public String getColumnName() { if (m_columnName == null) // Get Column Name from AD_Column not index - m_columnName = getColumnName (new Integer(getAD_Column_ID())); + m_columnName = getColumnName (Integer.valueOf(getAD_Column_ID())); return m_columnName; } // getColumnName diff --git a/org.adempiere.base/src/org/compiere/print/MPrintPaper.java b/org.adempiere.base/src/org/compiere/print/MPrintPaper.java index ed153ab6e0..d6bb08dc5a 100644 --- a/org.adempiere.base/src/org/compiere/print/MPrintPaper.java +++ b/org.adempiere.base/src/org/compiere/print/MPrintPaper.java @@ -62,7 +62,7 @@ public class MPrintPaper extends X_AD_PrintPaper */ static public MPrintPaper get (int AD_PrintPaper_ID) { - Integer key = new Integer(AD_PrintPaper_ID); + Integer key = Integer.valueOf(AD_PrintPaper_ID); MPrintPaper pp = (MPrintPaper)s_papers.get(key); if (pp == null) { diff --git a/org.adempiere.base/src/org/compiere/print/MPrintTableFormat.java b/org.adempiere.base/src/org/compiere/print/MPrintTableFormat.java index 558ba699c8..50afc0c615 100644 --- a/org.adempiere.base/src/org/compiere/print/MPrintTableFormat.java +++ b/org.adempiere.base/src/org/compiere/print/MPrintTableFormat.java @@ -549,7 +549,7 @@ public class MPrintTableFormat extends X_AD_PrintTableFormat */ static public MPrintTableFormat get (Properties ctx, int AD_PrintTableFormat_ID, Font standard_font) { - Integer ii = new Integer (AD_PrintTableFormat_ID); + Integer ii = Integer.valueOf(AD_PrintTableFormat_ID); MPrintTableFormat tf = (MPrintTableFormat)s_cache.get(ii); if (tf == null) { diff --git a/org.adempiere.base/src/org/compiere/print/PrintData.java b/org.adempiere.base/src/org/compiere/print/PrintData.java index 9af356724d..723760c46f 100644 --- a/org.adempiere.base/src/org/compiere/print/PrintData.java +++ b/org.adempiere.base/src/org/compiere/print/PrintData.java @@ -252,9 +252,9 @@ public class PrintData implements Serializable { m_matrix.addRow(nodes); if (functionRow) - m_functionRows.add(new Integer(m_matrix.getRowIndex())); + m_functionRows.add(Integer.valueOf(m_matrix.getRowIndex())); if (m_hasLevelNo && levelNo != 0) - addNode(new PrintDataElement(LEVEL_NO, new Integer(levelNo), DisplayType.Integer, null)); + addNode(new PrintDataElement(LEVEL_NO, Integer.valueOf(levelNo), DisplayType.Integer, null)); } // addRow /** @@ -301,7 +301,7 @@ public class PrintData implements Serializable */ public boolean isFunctionRow (int row) { - return m_functionRows.contains(new Integer(row)); + return m_functionRows.contains(Integer.valueOf(row)); } // isFunctionRow /** @@ -310,7 +310,7 @@ public class PrintData implements Serializable */ public boolean isFunctionRow () { - return m_functionRows.contains(new Integer(m_matrix.getRowIndex())); + return m_functionRows.contains(Integer.valueOf(m_matrix.getRowIndex())); } // isFunctionRow /** diff --git a/org.adempiere.base/src/org/compiere/print/PrintDataFunction.java b/org.adempiere.base/src/org/compiere/print/PrintDataFunction.java index ddba97f545..86d2444c20 100644 --- a/org.adempiere.base/src/org/compiere/print/PrintDataFunction.java +++ b/org.adempiere.base/src/org/compiere/print/PrintDataFunction.java @@ -17,6 +17,7 @@ package org.compiere.print; import java.math.BigDecimal; +import java.math.RoundingMode; import org.compiere.util.DisplayType; import org.compiere.util.Env; @@ -132,25 +133,25 @@ public class PrintDataFunction // Mean = sum/count - round to 4 digits if (function == F_MEAN) { - BigDecimal mean = m_sum.divide(count, 4, BigDecimal.ROUND_HALF_UP); + BigDecimal mean = m_sum.divide(count, 4, RoundingMode.HALF_UP); if (mean.scale() > 4) - mean = mean.setScale(4, BigDecimal.ROUND_HALF_UP); + mean = mean.setScale(4, RoundingMode.HALF_UP); return mean; } // Variance = ( sum of squares - (square of sum / count) ) / count BigDecimal ss = m_sum.multiply(m_sum); - ss = ss.divide(count, 10, BigDecimal.ROUND_HALF_UP); - BigDecimal variance = m_sumSquare.subtract(ss).divide(count, 10, BigDecimal.ROUND_HALF_UP); + ss = ss.divide(count, 10, RoundingMode.HALF_UP); + BigDecimal variance = m_sumSquare.subtract(ss).divide(count, 10, RoundingMode.HALF_UP); if (function == F_VARIANCE) { if (variance.scale() > 4) - variance = variance.setScale(4, BigDecimal.ROUND_HALF_UP); + variance = variance.setScale(4, RoundingMode.HALF_UP); return variance; } // Standard Deviation BigDecimal deviation = BigDecimal.valueOf(Math.sqrt(variance.doubleValue())); if (deviation.scale() > 4) - deviation = deviation.setScale(4, BigDecimal.ROUND_HALF_UP); + deviation = deviation.setScale(4, RoundingMode.HALF_UP); return deviation; } // getValue diff --git a/org.adempiere.base/src/org/compiere/print/ReportEngine.java b/org.adempiere.base/src/org/compiere/print/ReportEngine.java index 0de7d5fcbc..f8577f1ee5 100644 --- a/org.adempiere.base/src/org/compiere/print/ReportEngine.java +++ b/org.adempiere.base/src/org/compiere/print/ReportEngine.java @@ -729,7 +729,7 @@ queued-job-count = 0 (class javax.print.attribute.standard.QueuedJobCount) { td td = new td(); tr.addElement(td); - Object obj = m_printData.getNode(new Integer(item.getAD_Column_ID())); + Object obj = m_printData.getNode(Integer.valueOf(item.getAD_Column_ID())); if (obj == null){ td.addElement(" "); if (colSuppressRepeats[printColIndex]){ @@ -945,7 +945,7 @@ queued-job-count = 0 (class javax.print.attribute.standard.QueuedJobCount) else { printColIndex++; - Object obj = m_printData.getNode(new Integer(item.getAD_Column_ID())); + Object obj = m_printData.getNode(Integer.valueOf(item.getAD_Column_ID())); String data = ""; if (obj == null){ if (colSuppressRepeats[printColIndex]){ diff --git a/org.adempiere.base/src/org/compiere/print/layout/ImageElement.java b/org.adempiere.base/src/org/compiere/print/layout/ImageElement.java index 170b01cb0c..1aa56b9982 100644 --- a/org.adempiere.base/src/org/compiere/print/layout/ImageElement.java +++ b/org.adempiere.base/src/org/compiere/print/layout/ImageElement.java @@ -89,7 +89,7 @@ public class ImageElement extends PrintElement */ public static ImageElement get (int AD_PrintFormatItem_ID) { - Object key = new Integer(AD_PrintFormatItem_ID); + Object key = Integer.valueOf(AD_PrintFormatItem_ID); ImageElement image = (ImageElement)s_cache.get(key); if (image == null) { diff --git a/org.adempiere.base/src/org/compiere/print/layout/LayoutEngine.java b/org.adempiere.base/src/org/compiere/print/layout/LayoutEngine.java index e2abc30d48..4e551fb4c8 100644 --- a/org.adempiere.base/src/org/compiere/print/layout/LayoutEngine.java +++ b/org.adempiere.base/src/org/compiere/print/layout/LayoutEngine.java @@ -1233,7 +1233,7 @@ public class LayoutEngine implements Pageable, Printable, Doc int AD_Column_ID = item.getAD_Column_ID(); if (log.isLoggable(Level.INFO)) log.info(format + " - Item=" + item.getName() + " (" + AD_Column_ID + ")"); // - Object obj = data.getNode(new Integer(AD_Column_ID)); + Object obj = data.getNode(Integer.valueOf(AD_Column_ID)); // Object obj = data.getNode(item.getColumnName()); // slower if (obj == null) { @@ -1267,7 +1267,7 @@ public class LayoutEngine implements Pageable, Printable, Doc return null; } MQuery query = new MQuery (format.getAD_Table_ID()); - query.addRestriction(item.getColumnName(), MQuery.EQUAL, new Integer(Record_ID)); + query.addRestriction(item.getColumnName(), MQuery.EQUAL, Integer.valueOf(Record_ID)); format.setTranslationViewQuery(query); if (log.isLoggable(Level.FINE)) log.fine(query.toString()); @@ -1363,7 +1363,7 @@ public class LayoutEngine implements Pageable, Printable, Doc String FieldAlignmentType, boolean isForm) { // Get Data - Object obj = m_data.getNode(new Integer(item.getAD_Column_ID())); + Object obj = m_data.getNode(Integer.valueOf(item.getAD_Column_ID())); if (obj == null) return null; else if (obj instanceof PrintDataElement) @@ -1479,7 +1479,7 @@ public class LayoutEngine implements Pageable, Printable, Doc */ private PrintElement createImageElement (MPrintFormatItem item, PrintData printData) { - Object obj = printData.getNode(new Integer(item.getAD_Column_ID())); + Object obj = printData.getNode(Integer.valueOf(item.getAD_Column_ID())); if (obj == null) return null; else if (obj instanceof PrintDataElement) @@ -1518,7 +1518,7 @@ public class LayoutEngine implements Pageable, Printable, Doc private PrintElement createBarcodeElement (MPrintFormatItem item, PrintData printData) { // Get Data - Object obj = printData.getNode(new Integer(item.getAD_Column_ID())); + Object obj = printData.getNode(Integer.valueOf(item.getAD_Column_ID())); if (obj == null) return null; else if (obj instanceof PrintDataElement) @@ -1620,7 +1620,7 @@ public class LayoutEngine implements Pageable, Printable, Doc { if (item.isNextLine() && item.getBelowColumn() != 0) { - additionalLines.put(new Integer(col), new Integer(item.getBelowColumn()-1)); + additionalLines.put(Integer.valueOf(col), Integer.valueOf(item.getBelowColumn()-1)); if (!item.isSuppressNull()) { item.setIsSuppressNull(true); // display size will be set to 0 in TableElement @@ -1676,13 +1676,13 @@ public class LayoutEngine implements Pageable, Printable, Doc printData.setRowIndex(row); if (printData.isFunctionRow()) { - functionRows.add(new Integer(row)); + functionRows.add(Integer.valueOf(row)); rowColFont.put(new Point(row, TableElement.ALL), tf.getFunct_Font()); rowColColor.put(new Point(row, TableElement.ALL), tf.getFunctFG_Color()); rowColBackground.put(new Point(row, TableElement.ALL), tf.getFunctBG_Color()); if (printData.isPageBreak()) { - pageBreak.add(new Integer(row)); + pageBreak.add(Integer.valueOf(row)); if (log.isLoggable(Level.FINER)) log.finer("PageBreak row=" + row); } @@ -1737,7 +1737,7 @@ public class LayoutEngine implements Pageable, Printable, Doc { Object obj = null; if (item.getAD_Column_ID() > 0) // teo_sarca, [ 1673542 ] - obj = printData.getNode(new Integer(item.getAD_Column_ID())); + obj = printData.getNode(Integer.valueOf(item.getAD_Column_ID())); if (obj == null) ; else if (obj instanceof PrintDataElement) diff --git a/org.adempiere.base/src/org/compiere/print/layout/StringElement.java b/org.adempiere.base/src/org/compiere/print/layout/StringElement.java index 445d6a5f88..c892872ed2 100644 --- a/org.adempiere.base/src/org/compiere/print/layout/StringElement.java +++ b/org.adempiere.base/src/org/compiere/print/layout/StringElement.java @@ -380,7 +380,7 @@ public class StringElement extends PrintElement String tableName = MQuery.getZoomTableName(columnName); Object code = m_ID.getID(); if (m_ID instanceof KeyNamePair) - code = new Integer(((KeyNamePair)m_ID).getKey()); + code = Integer.valueOf(((KeyNamePair)m_ID).getKey()); // MQuery query = new MQuery(tableName); query.addRestriction(columnName, MQuery.EQUAL, code); diff --git a/org.adempiere.base/src/org/compiere/print/layout/TableElement.java b/org.adempiere.base/src/org/compiere/print/layout/TableElement.java index d49fd59123..f77a8ed583 100644 --- a/org.adempiere.base/src/org/compiere/print/layout/TableElement.java +++ b/org.adempiere.base/src/org/compiere/print/layout/TableElement.java @@ -301,9 +301,9 @@ public class TableElement extends PrintElement { int col = dataCol; // Print below existing column - if (m_additionalLines.containsKey(new Integer(dataCol))) + if (m_additionalLines.containsKey(Integer.valueOf(dataCol))) { - col = ((Integer)m_additionalLines.get(new Integer(dataCol))).intValue(); + col = ((Integer)m_additionalLines.get(Integer.valueOf(dataCol))).intValue(); if (log.isLoggable(Level.FINEST)) log.finest("DataColumn=" + dataCol + ", BelowColumn=" + col); } float colWidth = 0; @@ -545,7 +545,7 @@ public class TableElement extends PrintElement // Print below existing column if (col != dataCol) { - m_columnWidths.add(new Float(0.0)); // for the data column + m_columnWidths.add(Float.valueOf((float)0.0)); // for the data column Float origWidth=null; try{ origWidth = (Float)m_columnWidths.get(col); @@ -554,14 +554,14 @@ public class TableElement extends PrintElement log.log(Level.SEVERE, "Column " + dataCol + " below " + col + " - no value for orig width"); else { - if (origWidth.compareTo(new Float(colWidth)) >= 0) + if (origWidth.compareTo(Float.valueOf(colWidth)) >= 0) { if (log.isLoggable(Level.FINEST)) log.finest("Same Width - Col=" + col + " - OrigWidth=" + origWidth + " - Width=" + colWidth + " - Total=" + p_width); } else { - m_columnWidths.set(col, new Float(colWidth)); + m_columnWidths.set(col, Float.valueOf(colWidth)); p_width += (colWidth - origWidth.floatValue()); if (log.isLoggable(Level.FINEST)) log.finest("New Width - Col=" + col + " - OrigWidth=" + origWidth + " - Width=" + colWidth + " - Total=" + p_width); @@ -571,7 +571,7 @@ public class TableElement extends PrintElement // Add new Column else { - m_columnWidths.add(new Float(colWidth)); + m_columnWidths.add(Float.valueOf(colWidth)); p_width += colWidth; if (log.isLoggable(Level.FINEST)) log.finest("Width - Col=" + dataCol + " - Width=" + colWidth + " - Total=" + p_width); @@ -591,7 +591,7 @@ public class TableElement extends PrintElement rowHeight = (float)dimensions.get(col).height; } // for all columns rowHeight += m_tFormat.getLineStroke().floatValue() + (2*V_GAP); - m_rowHeights.add(new Float(rowHeight)); + m_rowHeights.add(Float.valueOf(rowHeight)); p_height += rowHeight; } // for all rows // HeaderRow @@ -614,8 +614,8 @@ public class TableElement extends PrintElement if (m_firstPage.height >= p_height && m_pageBreak.size() == 0) { if (log.isLoggable(Level.FINEST)) log.finest("Page Y=1 - PageHeight=" + m_firstPage.height + " - TableHeight=" + p_height); - m_firstRowOnPage.add(new Integer(0)); // Y - m_pageHeight.add(new Float(p_height)); // Y index only + m_firstRowOnPage.add(Integer.valueOf(0)); // Y + m_pageHeight.add(Float.valueOf(p_height)); // Y index only } // multiple pages on Y | Axis else @@ -652,10 +652,10 @@ public class TableElement extends PrintElement if (pageBreak) { availableHeight = firstPage ? m_firstPage.height : m_nextPages.height; - m_firstRowOnPage.add(new Integer(dataRow+addlRows)); // Y + m_firstRowOnPage.add(Integer.valueOf(dataRow+addlRows)); // Y if (!firstPage) { - m_pageHeight.add(new Float(usedHeight)); // Y index only + m_pageHeight.add(Float.valueOf(usedHeight)); // Y index only if (log.isLoggable(Level.FINEST)) log.finest("Page Y=" + m_pageHeight.size() + " - PageHeight=" + usedHeight); } @@ -678,7 +678,7 @@ public class TableElement extends PrintElement + ", Row=" + dataRow + ",AddlRows=" + addlRows + ", Height=" + rowHeight + " - Available=" + availableHeight + ", Used=" + usedHeight); } // for all rows - m_pageHeight.add(new Float(usedHeight)); // Y index only + m_pageHeight.add(Float.valueOf(usedHeight)); // Y index only if (log.isLoggable(Level.FINEST)) log.finest("Page Y=" + m_pageHeight.size() + " - PageHeight=" + usedHeight); } // multiple Y | pages @@ -688,7 +688,7 @@ public class TableElement extends PrintElement { if (log.isLoggable(Level.FINEST)) log.finest("Page X=1 - PageWidth=" + m_firstPage.width + " - TableWidth=" + p_width); - m_firstColumnOnPage.add(new Integer(0)); // X + m_firstColumnOnPage.add(Integer.valueOf(0)); // X // distributeColumns (m_firstPage.width-(int)p_width, 0, m_columnWidths.size()); } @@ -706,7 +706,7 @@ public class TableElement extends PrintElement if (col != 0) distributeColumns (availableWidth, lastStart, col); // - m_firstColumnOnPage.add(new Integer(col)); // X + m_firstColumnOnPage.add(Integer.valueOf(col)); // X if (log.isLoggable(Level.FINEST)) log.finest("Page X=" + m_firstColumnOnPage.size() + " - Col=" + col); lastStart = col; @@ -761,12 +761,12 @@ public class TableElement extends PrintElement int additionalPart = columnWidth * availableWidth / totalWidth; if (remainingWidth < additionalPart) { - m_columnWidths.set(col, new Float(columnWidth+remainingWidth)); + m_columnWidths.set(col, Float.valueOf(columnWidth+remainingWidth)); remainingWidth = 0; } else { - m_columnWidths.set(col, new Float(columnWidth+additionalPart)); + m_columnWidths.set(col, Float.valueOf(columnWidth+additionalPart)); remainingWidth -= additionalPart; } if (log.isLoggable(Level.FINEST)) log.finest(" col=" + col + " - From " + columnWidth + " to " + m_columnWidths.get(col)); @@ -779,7 +779,7 @@ public class TableElement extends PrintElement int columnWidth = ((Float)m_columnWidths.get(c)).intValue(); if (columnWidth > 0) { - m_columnWidths.set(c, new Float(columnWidth+remainingWidth)); + m_columnWidths.set(c, Float.valueOf(columnWidth+remainingWidth)); if (log.isLoggable(Level.FINEST)) log.finest("Final col=" + c + " - From " + columnWidth + " to " + m_columnWidths.get(c)); remainingWidth = 0; } @@ -1073,7 +1073,7 @@ public class TableElement extends PrintElement String tableName = MQuery.getZoomTableName(columnName); Object code = pp.getID(); if (pp instanceof KeyNamePair) - code = new Integer(((KeyNamePair)pp).getKey()); + code = Integer.valueOf(((KeyNamePair)pp).getKey()); // MQuery query = new MQuery(tableName); query.addRestriction(columnName, MQuery.EQUAL, code, null, pp.toString()); @@ -1612,8 +1612,8 @@ public class TableElement extends PrintElement else { // next line is a funcion column -> underline this - boolean nextIsFunction = m_functionRows.contains(new Integer(row+1)); - if (nextIsFunction && m_functionRows.contains(new Integer(row))) + boolean nextIsFunction = m_functionRows.contains(Integer.valueOf(row+1)); + if (nextIsFunction && m_functionRows.contains(Integer.valueOf(row))) nextIsFunction = false; // this is a function line too if (nextIsFunction) { diff --git a/org.adempiere.base/src/org/compiere/print/util/SwapFile.java b/org.adempiere.base/src/org/compiere/print/util/SwapFile.java index 89f8f8438b..89b8db5e38 100644 --- a/org.adempiere.base/src/org/compiere/print/util/SwapFile.java +++ b/org.adempiere.base/src/org/compiere/print/util/SwapFile.java @@ -213,7 +213,6 @@ public class SwapFile protected void finalize() throws Throwable //NOSONAR { dispose(); - super.finalize(); } diff --git a/org.adempiere.base/src/org/compiere/process/DocActionTemplate.java b/org.adempiere.base/src/org/compiere/process/DocActionTemplate.java index 1e775a36f8..d5053e8ace 100644 --- a/org.adempiere.base/src/org/compiere/process/DocActionTemplate.java +++ b/org.adempiere.base/src/org/compiere/process/DocActionTemplate.java @@ -26,7 +26,6 @@ import org.compiere.model.ModelValidationEngine; import org.compiere.model.ModelValidator; import org.compiere.model.PO; import org.compiere.model.POInfo; -import org.compiere.util.TimeUtil; /** * Template for DocAction diff --git a/org.adempiere.base/src/org/compiere/process/ProcessInfo.java b/org.adempiere.base/src/org/compiere/process/ProcessInfo.java index d8a52a03f9..a6566a4c32 100644 --- a/org.adempiere.base/src/org/compiere/process/ProcessInfo.java +++ b/org.adempiere.base/src/org/compiere/process/ProcessInfo.java @@ -547,7 +547,7 @@ public class ProcessInfo implements Serializable */ public void setAD_Client_ID (int AD_Client_ID) { - m_AD_Client_ID = new Integer (AD_Client_ID); + m_AD_Client_ID = Integer.valueOf(AD_Client_ID); } /** * Method getAD_Client_ID @@ -564,7 +564,7 @@ public class ProcessInfo implements Serializable */ public void setAD_User_ID (int AD_User_ID) { - m_AD_User_ID = new Integer (AD_User_ID); + m_AD_User_ID = Integer.valueOf(AD_User_ID); } /** * Method getAD_User_ID diff --git a/org.adempiere.base/src/org/compiere/process/SvrProcess.java b/org.adempiere.base/src/org/compiere/process/SvrProcess.java index 4c71c3aa86..e4cb3092c8 100644 --- a/org.adempiere.base/src/org/compiere/process/SvrProcess.java +++ b/org.adempiere.base/src/org/compiere/process/SvrProcess.java @@ -527,7 +527,7 @@ public abstract class SvrProcess implements ProcessCall try { Class clazz = Class.forName(className); - Object object = clazz.newInstance(); + Object object = clazz.getDeclaredConstructor().newInstance(); Method[] methods = clazz.getMethods(); for (int i = 0; i < methods.length; i++) { diff --git a/org.adempiere.base/src/org/compiere/report/FinReportJasper.java b/org.adempiere.base/src/org/compiere/report/FinReportJasper.java index b60797e30b..129b5c2869 100644 --- a/org.adempiere.base/src/org/compiere/report/FinReportJasper.java +++ b/org.adempiere.base/src/org/compiere/report/FinReportJasper.java @@ -61,7 +61,7 @@ public class FinReportJasper extends FinReport for (int i = 0; i < oldpara.length; i++) list.add (oldpara[i]); // and add the T_Report_AD_PInstance_ID parameter - list.add (new ProcessInfoParameter("T_Report_AD_PInstance_ID", new Integer(getAD_PInstance_ID()), null, null, null)); + list.add (new ProcessInfoParameter("T_Report_AD_PInstance_ID", Integer.valueOf(getAD_PInstance_ID()), null, null, null)); ProcessInfoParameter[] pars = new ProcessInfoParameter[list.size()]; list.toArray(pars); diff --git a/org.adempiere.base/src/org/compiere/report/MReportTree.java b/org.adempiere.base/src/org/compiere/report/MReportTree.java index 307891c84b..8d16fab310 100644 --- a/org.adempiere.base/src/org/compiere/report/MReportTree.java +++ b/org.adempiere.base/src/org/compiere/report/MReportTree.java @@ -24,6 +24,8 @@ import java.util.Enumeration; import java.util.Properties; import java.util.logging.Level; +import javax.swing.tree.TreeNode; + import org.compiere.model.MAcctSchemaElement; import org.compiere.model.MHierarchy; import org.compiere.model.MRole; @@ -250,13 +252,11 @@ public class MReportTree StringBuffer result = null; if (node != null && node.isSummary ()) { - - @SuppressWarnings("unchecked") - Enumeration en = (Enumeration)node.preorderEnumeration (); + Enumeration en = node.preorderEnumeration (); StringBuffer sb = new StringBuffer (); while (en.hasMoreElements ()) { - MTreeNode nn = en.nextElement (); + MTreeNode nn = (MTreeNode)en.nextElement (); if (!nn.isSummary ()) { if (sb.length () > 0) @@ -303,7 +303,7 @@ public class MReportTree MTreeNode nn = (MTreeNode)en.nextElement(); if (!nn.isSummary()) { - list.add(new Integer(nn.getNode_ID())); + list.add(Integer.valueOf(nn.getNode_ID())); if (log.isLoggable(Level.FINEST)) log.finest("- " + nn); } else @@ -311,7 +311,7 @@ public class MReportTree } } else // not found or not summary - list.add(new Integer(ID)); + list.add(Integer.valueOf(ID)); // Integer[] retValue = new Integer[list.size()]; list.toArray(retValue); diff --git a/org.adempiere.base/src/org/compiere/report/core/RModel.java b/org.adempiere.base/src/org/compiere/report/core/RModel.java index dd1ada7c34..713bf10706 100644 --- a/org.adempiere.base/src/org/compiere/report/core/RModel.java +++ b/org.adempiere.base/src/org/compiere/report/core/RModel.java @@ -226,7 +226,7 @@ public class RModel implements Serializable if (log.isLoggable(Level.CONFIG)) log.config( "RModel.setGroup col=" + col); if (col < 0 || col >= m_data.cols.size()) return; - Integer ii = new Integer(col); + Integer ii = Integer.valueOf(col); if (!m_data.groups.contains(ii)) m_data.groups.add(ii); } // setGroup @@ -262,7 +262,7 @@ public class RModel implements Serializable if (log.isLoggable(Level.CONFIG)) log.config( "RModel.setFunction col=" + col + " - " + function); if (col < 0 || col >= m_data.cols.size()) return; - m_data.functions.put(new Integer(col), function); + m_data.functions.put(Integer.valueOf(col), function); } // setFunction /*************************************************************************/ diff --git a/org.adempiere.base/src/org/compiere/report/core/RModelData.java b/org.adempiere.base/src/org/compiere/report/core/RModelData.java index 0d65821ca8..1adbb75652 100644 --- a/org.adempiere.base/src/org/compiere/report/core/RModelData.java +++ b/org.adempiere.base/src/org/compiere/report/core/RModelData.java @@ -148,13 +148,13 @@ public class RModelData else if (rc.getColClass() == BigDecimal.class) row.add(rs.getBigDecimal(index++)); else if (rc.getColClass() == Double.class) - row.add(new Double(rs.getDouble(index++))); + row.add(Double.valueOf(rs.getDouble(index++))); else if (rc.getColClass() == Integer.class) - row.add(new Integer(rs.getInt(index++))); + row.add(Integer.valueOf(rs.getInt(index++))); else if (rc.getColClass() == Timestamp.class) row.add(rs.getTimestamp(index++)); else if (rc.getColClass() == Boolean.class) - row.add(new Boolean("Y".equals(rs.getString(index++)))); + row.add(Boolean.valueOf("Y".equals(rs.getString(index++)))); else // should not happen { row.add(rs.getString(index++)); @@ -290,7 +290,7 @@ public class RModelData } } // for all columns // - m_groupRows.add(new Integer(rows.size())); // group row indicator + m_groupRows.add(Integer.valueOf(rows.size())); // group row indicator rows.add(newRow); groupBysValue[level] = row.get(idx); } @@ -347,7 +347,7 @@ public class RModelData // remove empty row added earlier to force group change if (gSize > 0) rows.remove(rows.size()-1); - m_groupRows.add(new Integer(rows.size())); // group row indicator + m_groupRows.add(Integer.valueOf(rows.size())); // group row indicator rows.add(newRow); } if (log.isLoggable(Level.FINE)) log.fine("End Rows=" + rows.size()); @@ -367,7 +367,7 @@ public class RModelData { m_groupRowsIndicator = new ArrayList(rows.size()); for (int r = 0; r < rows.size(); r++) - m_groupRowsIndicator.add(new Boolean(m_groupRows.contains(new Integer(r)))); + m_groupRowsIndicator.add(Boolean.valueOf(m_groupRows.contains(Integer.valueOf(r)))); } if (row < 0 || row >= m_groupRowsIndicator.size()) return false; diff --git a/org.adempiere.base/src/org/compiere/sla/DeliveryAccuracy.java b/org.adempiere.base/src/org/compiere/sla/DeliveryAccuracy.java index c4bbfee1f8..18b95b2114 100644 --- a/org.adempiere.base/src/org/compiere/sla/DeliveryAccuracy.java +++ b/org.adempiere.base/src/org/compiere/sla/DeliveryAccuracy.java @@ -17,6 +17,7 @@ package org.compiere.sla; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Timestamp; @@ -146,7 +147,7 @@ public class DeliveryAccuracy extends SLACriteria // Calculate with 2 digits precision if (count != 0) - retValue = total.divide(new BigDecimal(count), 2, BigDecimal.ROUND_HALF_UP); + retValue = total.divide(new BigDecimal(count), 2, RoundingMode.HALF_UP); return retValue; } // calculateMeasure diff --git a/org.adempiere.base/src/org/compiere/util/AmtInWords_HR.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_HR.java index 76b5513bf9..11eee07493 100644 --- a/org.adempiere.base/src/org/compiere/util/AmtInWords_HR.java +++ b/org.adempiere.base/src/org/compiere/util/AmtInWords_HR.java @@ -2,6 +2,8 @@ package org.compiere.util; import java.math.BigDecimal; +import java.math.RoundingMode; + import static java.math.BigDecimal.valueOf; import java.util.HashMap; import java.util.Map; @@ -74,10 +76,10 @@ izmeÄ‘u StringBuilder rezultat = new StringBuilder(); // zaokruži na dvije decimale - broj = broj.setScale(2, BigDecimal.ROUND_HALF_EVEN); + broj = broj.setScale(2, RoundingMode.HALF_EVEN); // kune (dio bez decimala) - BigDecimal kune = broj.setScale(0, BigDecimal.ROUND_DOWN); + BigDecimal kune = broj.setScale(0, RoundingMode.DOWN); rezultat.append(slovima(kune, "kuna", false, false)); rezultat.append(RAZMAK + "i" + RAZMAK); diff --git a/org.adempiere.base/src/org/compiere/util/AmtInWords_PT.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_PT.java index 46f8379ef2..9511337e6a 100644 --- a/org.adempiere.base/src/org/compiere/util/AmtInWords_PT.java +++ b/org.adempiere.base/src/org/compiere/util/AmtInWords_PT.java @@ -13,6 +13,7 @@ package org.compiere.util; import java.math.BigDecimal; +import java.math.RoundingMode; /** * Portuguese Amount in Words @@ -248,7 +249,7 @@ public class AmtInWords_PT implements AmtInWords public String getAmtInWords (BigDecimal amount) throws Exception { - amount = amount.setScale(2, BigDecimal.ROUND_HALF_UP); + amount = amount.setScale(2, RoundingMode.HALF_UP); String samount = amount.toString(); samount = samount.replaceAll("\\.", ","); diff --git a/org.adempiere.base/src/org/compiere/util/AmtInWords_ZH.java b/org.adempiere.base/src/org/compiere/util/AmtInWords_ZH.java index d273dd977a..a07f1c2bf6 100644 --- a/org.adempiere.base/src/org/compiere/util/AmtInWords_ZH.java +++ b/org.adempiere.base/src/org/compiere/util/AmtInWords_ZH.java @@ -16,6 +16,7 @@ *****************************************************************************/ package org.compiere.util; import java.math.BigDecimal; +import java.math.RoundingMode; /** * Amount in Words for Zh_CN (CNY in Simplified Chinese) @@ -139,7 +140,7 @@ public class AmtInWords_ZH implements AmtInWords } // round to 1/100, get long number ,eg -5432.135 = 543214 - long lnumber = number.movePointRight(2).setScale(0, BigDecimal.ROUND_HALF_UP).abs().longValue(); + long lnumber = number.movePointRight(2).setScale(0, RoundingMode.HALF_UP).abs().longValue(); // number must less 10000000000000 (10^13) if (lnumber >= 1000000000000000L) { diff --git a/org.adempiere.base/src/org/compiere/util/CCachedRowSet.java b/org.adempiere.base/src/org/compiere/util/CCachedRowSet.java index 7291952c30..bb1f225a2b 100644 --- a/org.adempiere.base/src/org/compiere/util/CCachedRowSet.java +++ b/org.adempiere.base/src/org/compiere/util/CCachedRowSet.java @@ -188,6 +188,7 @@ public class CCachedRowSet extends CachedRowSetImpl implements CachedRowSet */ public static void main (String[] args) { + CachedRowSetImpl rs = null; try { Locale.setDefault(Locale.CANADA); @@ -195,12 +196,18 @@ public class CCachedRowSet extends CachedRowSetImpl implements CachedRowSet System.out.println("OK 1"); get(); System.out.println("OK 1a"); - new CachedRowSetImpl(); + rs = new CachedRowSetImpl(); System.out.println("OK 2"); } catch (Exception e) { e.printStackTrace(); + if (rs != null) + try { + rs.close(); + } catch (SQLException e1) { + e1.printStackTrace(); + } } } // main diff --git a/org.adempiere.base/src/org/compiere/util/CLogMgt.java b/org.adempiere.base/src/org/compiere/util/CLogMgt.java index 3123fcd2e9..069e750005 100644 --- a/org.adempiere.base/src/org/compiere/util/CLogMgt.java +++ b/org.adempiere.base/src/org/compiere/util/CLogMgt.java @@ -16,8 +16,6 @@ *****************************************************************************/ package org.compiere.util; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.io.BufferedInputStream; import java.io.InputStream; import java.io.PrintWriter; @@ -62,15 +60,12 @@ public class CLogMgt private static final Map levelMap = new HashMap(); - private final static PropertyChangeListener listener = new PropertyChangeListener() { + private final static Runnable configurationListener = new Runnable() { @Override - public void propertyChange(PropertyChangeEvent evt) { - if (evt.getPropertyName() == null) { - reInit(); - } + public void run() { + reInit(); } - }; - + }; private static synchronized void reInit() { CLogMgt.initialize(Ini.isClient()); @@ -193,8 +188,8 @@ public class CLogMgt setFormatter(CLogFormatter.get()); setFilter(CLogFilter.get()); - mgr.removePropertyChangeListener(listener); - mgr.addPropertyChangeListener(listener); + mgr.removeConfigurationListener(configurationListener); + mgr.addConfigurationListener(configurationListener); } // initialize diff --git a/org.adempiere.base/src/org/compiere/util/DB.java b/org.adempiere.base/src/org/compiere/util/DB.java index 189c020788..41065426a4 100644 --- a/org.adempiere.base/src/org/compiere/util/DB.java +++ b/org.adempiere.base/src/org/compiere/util/DB.java @@ -147,7 +147,7 @@ public final class DB try { Class clazz = Class.forName("org.compiere.MigrateData"); - clazz.newInstance(); + clazz.getDeclaredConstructor().newInstance(); } catch (Exception e) { @@ -961,7 +961,7 @@ public final class DB */ public static int executeUpdate (String sql, int param, String trxName, int timeOut) { - return executeUpdate (sql, new Object[]{new Integer(param)}, false, trxName, timeOut); + return executeUpdate (sql, new Object[]{Integer.valueOf(param)}, false, trxName, timeOut); } // executeUpdate /** @@ -990,7 +990,7 @@ public final class DB */ public static int executeUpdate (String sql, int param, boolean ignoreError, String trxName, int timeOut) { - return executeUpdate (sql, new Object[]{new Integer(param)}, ignoreError, trxName, timeOut); + return executeUpdate (sql, new Object[]{Integer.valueOf(param)}, ignoreError, trxName, timeOut); } // executeUpdate /** diff --git a/org.adempiere.base/src/org/compiere/util/Language.java b/org.adempiere.base/src/org/compiere/util/Language.java index 366ac3f435..980fb7134e 100644 --- a/org.adempiere.base/src/org/compiere/util/Language.java +++ b/org.adempiere.base/src/org/compiere/util/Language.java @@ -443,7 +443,7 @@ public class Language implements Serializable { if (m_leftToRight == null) // returns true if language not iw, ar, fa, ur - m_leftToRight = new Boolean(ComponentOrientation.getOrientation(m_locale).isLeftToRight()); + m_leftToRight = Boolean.valueOf(ComponentOrientation.getOrientation(m_locale).isLeftToRight()); return m_leftToRight.booleanValue(); } // isLeftToRight @@ -456,7 +456,7 @@ public class Language implements Serializable if (m_decimalPoint == null) { DecimalFormatSymbols dfs = new DecimalFormatSymbols(m_locale); - m_decimalPoint = new Boolean(dfs.getDecimalSeparator() == '.'); + m_decimalPoint = Boolean.valueOf(dfs.getDecimalSeparator() == '.'); } return m_decimalPoint.booleanValue(); } // isDecimalPoint diff --git a/org.adempiere.base/src/org/compiere/util/Msg.java b/org.adempiere.base/src/org/compiere/util/Msg.java index 41f5e198a9..06458a4b28 100644 --- a/org.adempiere.base/src/org/compiere/util/Msg.java +++ b/org.adempiere.base/src/org/compiere/util/Msg.java @@ -429,7 +429,7 @@ public final class Msg { className += language.getLanguageCode().toUpperCase(); Class clazz = Class.forName(className); - AmtInWords aiw = (AmtInWords)clazz.newInstance(); + AmtInWords aiw = (AmtInWords)clazz.getDeclaredConstructor().newInstance(); return aiw.getAmtInWords(amount); } catch (ClassNotFoundException e) diff --git a/org.adempiere.base/src/org/compiere/util/SecureEngine.java b/org.adempiere.base/src/org/compiere/util/SecureEngine.java index 23e51937df..3be126c074 100644 --- a/org.adempiere.base/src/org/compiere/util/SecureEngine.java +++ b/org.adempiere.base/src/org/compiere/util/SecureEngine.java @@ -193,7 +193,7 @@ public class SecureEngine try { Class clazz = Class.forName(realClass); - implementation = (SecureInterface)clazz.newInstance(); + implementation = (SecureInterface)clazz.getDeclaredConstructor().newInstance(); } catch (Exception e) { diff --git a/org.adempiere.base/src/org/compiere/util/Trx.java b/org.adempiere.base/src/org/compiere/util/Trx.java index 9dbfd1cf5c..ab2f85d437 100644 --- a/org.adempiere.base/src/org/compiere/util/Trx.java +++ b/org.adempiere.base/src/org/compiere/util/Trx.java @@ -749,6 +749,5 @@ public class Trx } }, 2, TimeUnit.SECONDS); } - super.finalize(); } } // Trx diff --git a/org.adempiere.base/src/org/compiere/util/WebSessionCtx.java b/org.adempiere.base/src/org/compiere/util/WebSessionCtx.java index 83e7734d36..7176d5400a 100644 --- a/org.adempiere.base/src/org/compiere/util/WebSessionCtx.java +++ b/org.adempiere.base/src/org/compiere/util/WebSessionCtx.java @@ -267,7 +267,7 @@ public class WebSessionCtx implements Serializable if (wstore == null) return new Properties(); // - Integer key = new Integer (wstore.getW_Store_ID()); + Integer key = Integer.valueOf(wstore.getW_Store_ID()); Properties newCtx = (Properties)s_cacheCtx.get(key); /** Create New Context */ diff --git a/org.adempiere.base/src/org/compiere/util/ZipUtil.java b/org.adempiere.base/src/org/compiere/util/ZipUtil.java index 292240de04..34b03e074f 100644 --- a/org.adempiere.base/src/org/compiere/util/ZipUtil.java +++ b/org.adempiere.base/src/org/compiere/util/ZipUtil.java @@ -401,6 +401,8 @@ public class ZipUtil return pathEntries[i]; } path = System.getProperty("sun.boot.class.path"); + if (path == null) + return null; pathEntries = path.split(System.getProperty("path.separator")); for (int i = 0; i < pathEntries.length; i++) { diff --git a/org.adempiere.base/src/org/compiere/wf/MWFActivity.java b/org.adempiere.base/src/org/compiere/wf/MWFActivity.java index 954bd49eed..53c007b0b7 100644 --- a/org.adempiere.base/src/org/compiere/wf/MWFActivity.java +++ b/org.adempiere.base/src/org/compiere/wf/MWFActivity.java @@ -1291,7 +1291,7 @@ public class MWFActivity extends X_AD_WF_Activity implements Runnable if (value == null) ; else if (displayType == DisplayType.YesNo) - dbValue = new Boolean("Y".equals(value)); + dbValue = Boolean.valueOf("Y".equals(value)); else if (DisplayType.isNumeric(displayType)) dbValue = new BigDecimal (value); else if (DisplayType.isID(displayType)) { diff --git a/org.adempiere.base/src/org/compiere/wf/MWFBlock.java b/org.adempiere.base/src/org/compiere/wf/MWFBlock.java index aad279f718..6b69e444e9 100644 --- a/org.adempiere.base/src/org/compiere/wf/MWFBlock.java +++ b/org.adempiere.base/src/org/compiere/wf/MWFBlock.java @@ -45,7 +45,7 @@ public class MWFBlock extends X_AD_WF_Block */ public static MWFBlock get (Properties ctx, int AD_WF_Block_ID) { - Integer key = new Integer (AD_WF_Block_ID); + Integer key = Integer.valueOf(AD_WF_Block_ID); MWFBlock retValue = (MWFBlock) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/compiere/wf/MWFNode.java b/org.adempiere.base/src/org/compiere/wf/MWFNode.java index 042b441174..69994490a7 100644 --- a/org.adempiere.base/src/org/compiere/wf/MWFNode.java +++ b/org.adempiere.base/src/org/compiere/wf/MWFNode.java @@ -18,6 +18,7 @@ package org.compiere.wf; import java.awt.Point; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -142,7 +143,7 @@ public class MWFNode extends X_AD_WF_Node // Save to Cache String key = null; try { - Integer wfnodeid = new Integer (rs.getInt("AD_WF_Node_ID")); + Integer wfnodeid = Integer.valueOf(rs.getInt("AD_WF_Node_ID")); if (wfnodeid != null && wfnodeid.intValue() > 0) key = Env.getAD_Language(ctx) + "_" + wfnodeid; } catch (SQLException e) { @@ -496,7 +497,7 @@ public class MWFNode extends X_AD_WF_Node return 0; // BigDecimal change = new BigDecimal (seconds) - .divide(divide, BigDecimal.ROUND_DOWN) + .divide(divide, RoundingMode.DOWN) .multiply(getDynPriorityChange()); return change.intValue(); } // calculateDynamicPriority diff --git a/org.adempiere.base/src/org/compiere/wf/MWFNodeNext.java b/org.adempiere.base/src/org/compiere/wf/MWFNodeNext.java index 83426263be..10e4d87b57 100644 --- a/org.adempiere.base/src/org/compiere/wf/MWFNodeNext.java +++ b/org.adempiere.base/src/org/compiere/wf/MWFNodeNext.java @@ -221,7 +221,7 @@ public class MWFNodeNext extends X_AD_WF_NodeNext */ public void setFromSplitAnd (boolean fromSplitAnd) { - m_fromSplitAnd = new Boolean(fromSplitAnd); + m_fromSplitAnd = Boolean.valueOf(fromSplitAnd); } // setFromSplitAnd /** @@ -246,7 +246,7 @@ public class MWFNodeNext extends X_AD_WF_NodeNext */ private void setToJoinAnd (boolean toJoinAnd) { - m_toJoinAnd = new Boolean(toJoinAnd); + m_toJoinAnd = Boolean.valueOf(toJoinAnd); } // setToJoinAnd } // MWFNodeNext diff --git a/org.adempiere.base/src/org/compiere/wf/MWFResponsible.java b/org.adempiere.base/src/org/compiere/wf/MWFResponsible.java index aeae1dccd2..9108911e02 100644 --- a/org.adempiere.base/src/org/compiere/wf/MWFResponsible.java +++ b/org.adempiere.base/src/org/compiere/wf/MWFResponsible.java @@ -46,7 +46,7 @@ public class MWFResponsible extends X_AD_WF_Responsible */ public static MWFResponsible get (Properties ctx, int AD_WF_Responsible_ID) { - Integer key = new Integer (AD_WF_Responsible_ID); + Integer key = Integer.valueOf(AD_WF_Responsible_ID); MWFResponsible retValue = (MWFResponsible) s_cache.get (key); if (retValue != null) return retValue; diff --git a/org.adempiere.base/src/org/eevolution/model/MDDOrderLine.java b/org.adempiere.base/src/org/eevolution/model/MDDOrderLine.java index b6ea792e48..e6a6b91d66 100644 --- a/org.adempiere.base/src/org/eevolution/model/MDDOrderLine.java +++ b/org.adempiere.base/src/org/eevolution/model/MDDOrderLine.java @@ -17,6 +17,7 @@ package org.eevolution.model; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.ResultSet; import java.util.ArrayList; import java.util.Properties; @@ -285,7 +286,7 @@ public class MDDOrderLine extends X_DD_OrderLine public void setM_AttributeSetInstance_ID (int M_AttributeSetInstance_ID) { if (M_AttributeSetInstance_ID == 0) // 0 is valid ID - set_Value("M_AttributeSetInstance_ID", new Integer(0)); + set_Value("M_AttributeSetInstance_ID", Integer.valueOf(0)); else super.setM_AttributeSetInstance_ID (M_AttributeSetInstance_ID); } // setM_AttributeSetInstance_ID @@ -485,7 +486,7 @@ public class MDDOrderLine extends X_DD_OrderLine if (QtyEntered != null && getC_UOM_ID() != 0) { int precision = MUOM.getPrecision(getCtx(), getC_UOM_ID()); - QtyEntered = QtyEntered.setScale(precision, BigDecimal.ROUND_HALF_UP); + QtyEntered = QtyEntered.setScale(precision, RoundingMode.HALF_UP); } super.setQtyEntered (QtyEntered); } // setQtyEntered @@ -500,7 +501,7 @@ public class MDDOrderLine extends X_DD_OrderLine if (QtyOrdered != null && product != null) { int precision = product.getUOMPrecision(); - QtyOrdered = QtyOrdered.setScale(precision, BigDecimal.ROUND_HALF_UP); + QtyOrdered = QtyOrdered.setScale(precision, RoundingMode.HALF_UP); } super.setQtyOrdered(QtyOrdered); } // setQtyOrdered diff --git a/org.adempiere.base/src/org/eevolution/model/MPPProductBOMLine.java b/org.adempiere.base/src/org/eevolution/model/MPPProductBOMLine.java index 96df7ec20e..6750910dae 100644 --- a/org.adempiere.base/src/org/eevolution/model/MPPProductBOMLine.java +++ b/org.adempiere.base/src/org/eevolution/model/MPPProductBOMLine.java @@ -226,8 +226,8 @@ public class MPPProductBOMLine extends X_PP_Product_BOMLine // if (includeScrapQty) { - BigDecimal scrapDec = getScrap().divide(Env.ONEHUNDRED, 12, BigDecimal.ROUND_UP); - qty = qty.divide(Env.ONE.subtract(scrapDec), precision, BigDecimal.ROUND_HALF_UP); + BigDecimal scrapDec = getScrap().divide(Env.ONEHUNDRED, 12, RoundingMode.UP); + qty = qty.divide(Env.ONE.subtract(scrapDec), precision, RoundingMode.HALF_UP); } // if (qty.scale() > precision) diff --git a/org.adempiere.base/src/org/globalqss/process/CashFlow.java b/org.adempiere.base/src/org/globalqss/process/CashFlow.java index 3ff691291e..3fc4e72490 100644 --- a/org.adempiere.base/src/org/globalqss/process/CashFlow.java +++ b/org.adempiere.base/src/org/globalqss/process/CashFlow.java @@ -17,6 +17,7 @@ package org.globalqss.process; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Timestamp; @@ -229,7 +230,7 @@ public class CashFlow extends SvrProcess { open = open.subtract(paid); } if (open.scale() > curr.getStdPrecision()) - open = open.setScale(curr.getStdPrecision(), BigDecimal.ROUND_HALF_UP); + open = open.setScale(curr.getStdPrecision(), RoundingMode.HALF_UP); BigDecimal invoiced = order.getGrandTotal().subtract(open); if (isPaySchedule) { MOrderPaySchedule[] schedule = MOrderPaySchedule.getOrderPaySchedule(getCtx(), order_id, 0, get_TrxName()); diff --git a/org.adempiere.base/src/org/globalqss/process/GLJournalGenerate.java b/org.adempiere.base/src/org/globalqss/process/GLJournalGenerate.java index 62b08b662f..9d9487e753 100644 --- a/org.adempiere.base/src/org/globalqss/process/GLJournalGenerate.java +++ b/org.adempiere.base/src/org/globalqss/process/GLJournalGenerate.java @@ -26,6 +26,7 @@ package org.globalqss.process; import java.math.BigDecimal; import java.math.MathContext; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -543,11 +544,11 @@ public class GLJournalGenerate extends SvrProcess if (roundFactor < 0) { BigDecimal divisor = BigDecimal.valueOf(Math.pow(10, -roundFactor)); sourceAmt = sourceAmt.divide(divisor, MathContext.UNLIMITED); - sourceAmt = sourceAmt.setScale(0, BigDecimal.ROUND_HALF_UP); + sourceAmt = sourceAmt.setScale(0, RoundingMode.HALF_UP); sourceAmt = sourceAmt.multiply(divisor, MathContext.UNLIMITED); - sourceAmt = sourceAmt.setScale(0, BigDecimal.ROUND_HALF_UP); + sourceAmt = sourceAmt.setScale(0, RoundingMode.HALF_UP); } else { - sourceAmt = sourceAmt.setScale(roundFactor, BigDecimal.ROUND_HALF_UP); + sourceAmt = sourceAmt.setScale(roundFactor, RoundingMode.HALF_UP); } return sourceAmt; } diff --git a/org.adempiere.bundles.external-feature/feature.xml b/org.adempiere.bundles.external-feature/feature.xml index 3cfe1a7c2e..4b259284cb 100644 --- a/org.adempiere.bundles.external-feature/feature.xml +++ b/org.adempiere.bundles.external-feature/feature.xml @@ -31,13 +31,6 @@ version="0.0.0" unpack="false"/> - - - + + + + + diff --git a/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.eclipse.equinox.http.servlet/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF index c58c7561b8..9b661ecd27 100644 --- a/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF +++ b/org.adempiere.eclipse.equinox.http.servlet/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Bundle-SymbolicName: org.adempiere.eclipse.equinox.http.servlet Eclipse-LazyStart: true Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt: diff --git a/org.adempiere.eclipse.equinox.http.servletbridge/.classpath b/org.adempiere.eclipse.equinox.http.servletbridge/.classpath index cf36b56119..423c974870 100644 --- a/org.adempiere.eclipse.equinox.http.servletbridge/.classpath +++ b/org.adempiere.eclipse.equinox.http.servletbridge/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.eclipse.equinox.http.servletbridge/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF index fd8b5fcad9..6d031b6968 100644 --- a/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF +++ b/org.adempiere.eclipse.equinox.http.servletbridge/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Bundle-Name: %bundleName Bundle-SymbolicName: org.adempiere.eclipse.equinox.http.servletbridge;singleton:=true Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt: diff --git a/org.adempiere.eclipse.equinox.servletbridge/.classpath b/org.adempiere.eclipse.equinox.servletbridge/.classpath index cf36b56119..423c974870 100644 --- a/org.adempiere.eclipse.equinox.servletbridge/.classpath +++ b/org.adempiere.eclipse.equinox.servletbridge/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.eclipse.equinox.servletbridge/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF b/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF index 070c38ed5e..6668a3fe90 100644 --- a/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF +++ b/org.adempiere.eclipse.equinox.servletbridge/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Bundle-Name: %bundleName Bundle-SymbolicName: org.adempiere.eclipse.equinox.servletbridge;singleton:=true Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt: diff --git a/org.adempiere.extend/.classpath b/org.adempiere.extend/.classpath index cf36b56119..423c974870 100644 --- a/org.adempiere.extend/.classpath +++ b/org.adempiere.extend/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.adempiere.extend/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.extend/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.extend/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.extend/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.extend/META-INF/MANIFEST.MF b/org.adempiere.extend/META-INF/MANIFEST.MF index 36dc00e646..dd705c8b4c 100644 --- a/org.adempiere.extend/META-INF/MANIFEST.MF +++ b/org.adempiere.extend/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: iDempiere extend Bundle-SymbolicName: org.adempiere.extend;singleton:=true Bundle-Version: 5.1.0.qualifier Eclipse-RegisterBuddy: org.adempiere.tools -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Export-Package: compiere.model, test Fragment-Host: org.adempiere.base;bundle-version="0.0.0" @@ -17,3 +17,4 @@ Import-Package: junit.framework;version="3.8.2", org.supercsv.prefs Bundle-ClassPath: . Automatic-Module-Name: org.adempiere.extend +Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.extend/src/compiere/model/CalloutUser.java b/org.adempiere.extend/src/compiere/model/CalloutUser.java index 1469b04c7f..f29ceb060d 100644 --- a/org.adempiere.extend/src/compiere/model/CalloutUser.java +++ b/org.adempiere.extend/src/compiere/model/CalloutUser.java @@ -112,7 +112,7 @@ public class CalloutUser extends CalloutEngine if (locID == 0) mTab.setValue("C_BPartner_Location_ID", null); else - mTab.setValue("C_BPartner_Location_ID", new Integer(locID)); + mTab.setValue("C_BPartner_Location_ID", Integer.valueOf(locID)); // Contact - overwritten by InfoBP selection int contID = rs.getInt("AD_User_ID"); @@ -125,7 +125,7 @@ public class CalloutUser extends CalloutEngine if (contID == 0) mTab.setValue("AD_User_ID", null); else - mTab.setValue("AD_User_ID", new Integer(contID)); + mTab.setValue("AD_User_ID", Integer.valueOf(contID)); } } catch (SQLException e) diff --git a/org.adempiere.extend/src/compiere/model/MyValidator.java b/org.adempiere.extend/src/compiere/model/MyValidator.java index bb4b768ffd..f81fb746a0 100644 --- a/org.adempiere.extend/src/compiere/model/MyValidator.java +++ b/org.adempiere.extend/src/compiere/model/MyValidator.java @@ -168,7 +168,7 @@ public class MyValidator implements ModelValidator // Calculate Discount BigDecimal discountPercent = new BigDecimal(3); // 3% example BigDecimal discountAmt = totalLines.multiply(discountPercent); - discountAmt = discountAmt.divide(Env.ONEHUNDRED, order.getPrecision(), BigDecimal.ROUND_HALF_UP); + discountAmt = discountAmt.divide(Env.ONEHUNDRED, order.getPrecision(), RoundingMode.HALF_UP); discountLine.setPrice(discountAmt.negate()); if (!discountLine.save()) return "Could not save discount line"; diff --git a/org.adempiere.extend/src/test/AdempiereTestCase.java b/org.adempiere.extend/src/test/AdempiereTestCase.java index 1260481f08..b53f677ba8 100644 --- a/org.adempiere.extend/src/test/AdempiereTestCase.java +++ b/org.adempiere.extend/src/test/AdempiereTestCase.java @@ -148,8 +148,8 @@ public class AdempiereTestCase extends TestCase //m_Ctx = new Properties(); m_Ctx = Env.getCtx(); - m_Ctx.setProperty("#AD_User_ID", new Integer(AD_User_ID_Value).toString()); - m_Ctx.setProperty("#AD_Client_ID", new Integer(AD_Client_ID_Value).toString()); + m_Ctx.setProperty("#AD_User_ID", Integer.valueOf(AD_User_ID_Value).toString()); + m_Ctx.setProperty("#AD_Client_ID", Integer.valueOf(AD_Client_ID_Value).toString()); if (fileName_Value.length() < 1) { assertEquals("Please specify path to idempiere.properties file!", true, false); diff --git a/org.adempiere.extend/src/test/functional/MStorageTest.java b/org.adempiere.extend/src/test/functional/MStorageTest.java index 1fafe26782..9e80c2817b 100644 --- a/org.adempiere.extend/src/test/functional/MStorageTest.java +++ b/org.adempiere.extend/src/test/functional/MStorageTest.java @@ -14,6 +14,7 @@ package test.functional; import java.math.BigDecimal; +import java.math.RoundingMode; import org.compiere.model.MLocator; import org.compiere.model.MStorageOnHand; @@ -44,12 +45,12 @@ public class MStorageTest extends AdempiereTestCase loc.setXYZ("X"+locatorValue, "Y"+locatorValue, "Z"+locatorValue); loc.saveEx(); // - BigDecimal targetQty = BigDecimal.valueOf(qtyOnHand).setScale(12, BigDecimal.ROUND_HALF_UP); + BigDecimal targetQty = BigDecimal.valueOf(qtyOnHand).setScale(12, RoundingMode.HALF_UP); MStorageOnHand s1 = MStorageOnHand.getCreate(getCtx(), loc.get_ID(), product_id, 0,null, getTrxName()); s1.setQtyOnHand(targetQty); s1.saveEx(); // - BigDecimal qty = MStorageReservation.getQtyAvailable(wh.get_ID(), product_id, 0, getTrxName()).setScale(12, BigDecimal.ROUND_HALF_UP); + BigDecimal qty = MStorageReservation.getQtyAvailable(wh.get_ID(), product_id, 0, getTrxName()).setScale(12, RoundingMode.HALF_UP); assertEquals("Error on locator "+locatorValue, targetQty, qty); // return loc; @@ -57,8 +58,8 @@ public class MStorageTest extends AdempiereTestCase private void assertWarehouseQty(MWarehouse wh, BigDecimal targetQty) { BigDecimal qty = MStorageReservation.getQtyAvailable(wh.get_ID(), product_id, 0, getTrxName()); - qty = qty.setScale(12, BigDecimal.ROUND_HALF_UP); - targetQty = targetQty.setScale(12, BigDecimal.ROUND_HALF_UP); + qty = qty.setScale(12, RoundingMode.HALF_UP); + targetQty = targetQty.setScale(12, RoundingMode.HALF_UP); assertEquals(targetQty, qty); } diff --git a/org.adempiere.extend/src/test/performance/SingleMProductTest.java b/org.adempiere.extend/src/test/performance/SingleMProductTest.java index b6183034f3..42ec6e259f 100644 --- a/org.adempiere.extend/src/test/performance/SingleMProductTest.java +++ b/org.adempiere.extend/src/test/performance/SingleMProductTest.java @@ -45,7 +45,7 @@ public class SingleMProductTest extends TestCase { AD_User_ID_Value = Integer.parseInt(testProperties.getProperty(AD_User_ID_Key, AD_User_ID_DefaultValue) ); m_Ctx = new Properties(); - m_Ctx.setProperty("#AD_User_ID", new Integer(AD_User_ID_Value).toString()); + m_Ctx.setProperty("#AD_User_ID", Integer.valueOf(AD_User_ID_Value).toString()); System.out.println("m_Ctx: " + m_Ctx); if (fileName_Value.length() < 1) { diff --git a/org.adempiere.install/.classpath b/org.adempiere.install/.classpath index 1917c2a589..b89f6895b7 100644 --- a/org.adempiere.install/.classpath +++ b/org.adempiere.install/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.install/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.install/META-INF/MANIFEST.MF b/org.adempiere.install/META-INF/MANIFEST.MF index 7f0b1fb4c1..5efbd47741 100644 --- a/org.adempiere.install/META-INF/MANIFEST.MF +++ b/org.adempiere.install/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 5.1.0.qualifier Export-Package: org.adempiere.install, org.compiere.install Require-Bundle: org.adempiere.base;bundle-version="0.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Import-Package: javax.mail;version="1.5", javax.mail.internet;version="1.5", org.apache.tools.ant, @@ -18,3 +18,4 @@ Bundle-ActivationPolicy: lazy Bundle-Activator: org.adempiere.install.InstallBundleActivator Bundle-ClassPath: . Automatic-Module-Name: org.adempiere.install +Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch index a50af90157..9f5c0cf049 100644 --- a/org.adempiere.install/install.app.launch +++ b/org.adempiere.install/install.app.launch @@ -1,36 +1,36 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.adempiere.install/pom.xml b/org.adempiere.install/pom.xml index 078bc2bbf9..3ade39391d 100644 --- a/org.adempiere.install/pom.xml +++ b/org.adempiere.install/pom.xml @@ -9,4 +9,19 @@ org.adempiere.install eclipse-plugin + + + + + org.eclipse.tycho + tycho-compiler-plugin + + + --add-exports + java.base/sun.security.tools.keytool=ALL-UNNAMED + + + + + \ No newline at end of file diff --git a/org.adempiere.install/src/org/compiere/install/ConfigVM.java b/org.adempiere.install/src/org/compiere/install/ConfigVM.java index c503a2b079..4c2764b0fd 100644 --- a/org.adempiere.install/src/org/compiere/install/ConfigVM.java +++ b/org.adempiere.install/src/org/compiere/install/ConfigVM.java @@ -75,7 +75,7 @@ public class ConfigVM extends Config System.setProperty(ConfigurationData.JAVA_HOME, javaHome.getAbsolutePath()); // Java Version - final String[] versions = new String[]{"1.7.0", "1.8.0"}; + final String[] versions = new String[]{"1.7.0", "1.8.0", "9", "9.", "10", "10.", "11", "11.", "12", "12."}; pass = false; String thisJV = System.getProperty("java.version"); for(String version : versions) diff --git a/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java b/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java index bd99e78aa8..41bb66d8bc 100644 --- a/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java +++ b/org.adempiere.install/src/org/compiere/install/ConfigurationPanel.java @@ -538,7 +538,7 @@ public class ConfigurationPanel extends JPanel implements ActionListener, IDBCon m_success = true; bTest.setEnabled(true); m_testing = false; - return new Boolean(m_success); + return Boolean.valueOf(m_success); } // Finish it public void finished() diff --git a/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java b/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java index 29b3be5a52..024bc3da14 100644 --- a/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java +++ b/org.adempiere.install/src/org/compiere/install/KeyStoreMgt.java @@ -19,7 +19,6 @@ package org.compiere.install; import java.io.File; import java.io.FileInputStream; import java.io.InputStream; -import java.lang.reflect.Method; import java.net.InetAddress; import java.security.Key; import java.security.KeyStore; @@ -35,6 +34,8 @@ import org.compiere.Adempiere; import org.compiere.util.CLogMgt; import org.compiere.util.CLogger; +import sun.security.tools.keytool.Main; + /** * Class to manage SSL KeyStore * @@ -459,16 +460,7 @@ public class KeyStoreMgt //vpj-cd add support java 6 try { - Class keyTool = null; - try{ - // java 7 - keyTool = Class.forName("sun.security.tools.KeyTool"); - }catch (ClassNotFoundException ex){ - // java 8 - keyTool = Class.forName("sun.security.tools.keytool.Main"); - } - Method mainMethod = keyTool.getDeclaredMethod("main", String[].class); - mainMethod.invoke(null, new Object[]{args}); + Main.main(args);; } catch (Exception e) { diff --git a/org.adempiere.install/src/org/compiere/install/util/AppsAction.java b/org.adempiere.install/src/org/compiere/install/util/AppsAction.java index c74d8d6870..de5a507b5e 100644 --- a/org.adempiere.install/src/org/compiere/install/util/AppsAction.java +++ b/org.adempiere.install/src/org/compiere/install/util/AppsAction.java @@ -96,11 +96,11 @@ public final class AppsAction extends AbstractAction int pos = toolTipText.indexOf('&'); if (pos != -1 && toolTipText.length() > pos) // We have a nemonic - creates ALT-_ { - Character ch = new Character(toolTipText.toUpperCase().charAt(pos+1)); + Character ch = Character.valueOf(toolTipText.toUpperCase().charAt(pos+1)); if (ch != ' ') { toolTipText = toolTipText.substring(0, pos) + toolTipText.substring(pos+1); - putValue(Action.MNEMONIC_KEY, new Integer(ch.hashCode())); + putValue(Action.MNEMONIC_KEY, Integer.valueOf(ch.hashCode())); } } // @@ -125,7 +125,7 @@ public final class AppsAction extends AbstractAction putValue(Action.SHORT_DESCRIPTION, toolTipText); // Tooltip putValue(Action.ACTION_COMMAND_KEY, m_action); // ActionCammand putValue(Action.ACCELERATOR_KEY, accelerator); // KeyStroke - // putValue(Action.MNEMONIC_KEY, new Integer(0)); // Mnemonic + // putValue(Action.MNEMONIC_KEY, Integer.valueOf(0)); // Mnemonic // putValue(Action.DEFAULT, text); // Not Used // Create Button diff --git a/org.adempiere.install/src/org/compiere/install/util/ConfirmPanel.java b/org.adempiere.install/src/org/compiere/install/util/ConfirmPanel.java index 30cc4f97e1..c313a0b2db 100644 --- a/org.adempiere.install/src/org/compiere/install/util/ConfirmPanel.java +++ b/org.adempiere.install/src/org/compiere/install/util/ConfirmPanel.java @@ -20,6 +20,7 @@ import java.awt.BorderLayout; import java.awt.Component; import java.awt.FlowLayout; import java.awt.Insets; +import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyEvent; @@ -241,7 +242,7 @@ public final class ConfirmPanel extends JPanel public static final JButton createProcessButton (String text) { AppsAction aa = new AppsAction (A_PROCESS, - KeyStroke.getKeyStroke(KeyEvent.VK_F4, KeyEvent.SHIFT_MASK), text); + KeyStroke.getKeyStroke(KeyEvent.VK_F4, ActionEvent.SHIFT_MASK), text); JButton button = (JButton)aa.getButton(); button.setMargin(s_insets); return button; diff --git a/org.adempiere.install/src/org/compiere/install/util/OnlineHelp.java b/org.adempiere.install/src/org/compiere/install/util/OnlineHelp.java index a31db24494..5761627216 100644 --- a/org.adempiere.install/src/org/compiere/install/util/OnlineHelp.java +++ b/org.adempiere.install/src/org/compiere/install/util/OnlineHelp.java @@ -266,7 +266,7 @@ class Worker extends Thread InputStream is = conn.getInputStream(); HTMLEditorKit kit = new HTMLEditorKit(); HTMLDocument doc = (HTMLDocument)kit.createDefaultDocument(); - doc.putProperty("IgnoreCharsetDirective", new Boolean(true)); + doc.putProperty("IgnoreCharsetDirective", Boolean.TRUE); kit.read (new InputStreamReader(is), doc, 0); // Get The Links to the Help Pages diff --git a/org.adempiere.payment.processor-feature/feature.xml b/org.adempiere.payment.processor-feature/feature.xml index 30ea714266..75f4a6dae8 100644 --- a/org.adempiere.payment.processor-feature/feature.xml +++ b/org.adempiere.payment.processor-feature/feature.xml @@ -2,7 +2,8 @@ + version="5.1.0.qualifier" + provider-name="iDempiere Community"> [Enter Feature Description here.] diff --git a/org.adempiere.payment.processor/.classpath b/org.adempiere.payment.processor/.classpath index 7cbaeca459..16d91fc017 100644 --- a/org.adempiere.payment.processor/.classpath +++ b/org.adempiere.payment.processor/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.payment.processor/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.payment.processor/META-INF/MANIFEST.MF b/org.adempiere.payment.processor/META-INF/MANIFEST.MF index 7da604b92f..187d03732e 100644 --- a/org.adempiere.payment.processor/META-INF/MANIFEST.MF +++ b/org.adempiere.payment.processor/META-INF/MANIFEST.MF @@ -3,11 +3,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Payment Processor Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Bundle-ClassPath: ., lib/jpayment.jar, lib/payflow.jar, lib/Verisign.jar Automatic-Module-Name: org.adempiere.payment.processor +Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.pipo-feature/feature.xml b/org.adempiere.pipo-feature/feature.xml index 3ab39bbf12..b152d75314 100644 --- a/org.adempiere.pipo-feature/feature.xml +++ b/org.adempiere.pipo-feature/feature.xml @@ -2,7 +2,8 @@ + version="5.1.0.qualifier" + provider-name="iDempiere Community"> [Enter Feature Description here.] diff --git a/org.adempiere.pipo.handlers/.classpath b/org.adempiere.pipo.handlers/.classpath index cf36b56119..423c974870 100644 --- a/org.adempiere.pipo.handlers/.classpath +++ b/org.adempiere.pipo.handlers/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.pipo.handlers/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF index aaaf7e804a..e7751ae3d5 100644 --- a/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF +++ b/org.adempiere.pipo.handlers/META-INF/MANIFEST.MF @@ -3,8 +3,9 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere 2Pack Handlers Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Require-Bundle: org.adempiere.pipo;bundle-version="0.0.0", org.adempiere.base;bundle-version="0.0.0" Bundle-ClassPath: . Automatic-Module-Name: org.adempiere.pipo.handlers +Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.pipo/.classpath b/org.adempiere.pipo/.classpath index cf36b56119..423c974870 100644 --- a/org.adempiere.pipo/.classpath +++ b/org.adempiere.pipo/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.pipo/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.pipo/META-INF/MANIFEST.MF b/org.adempiere.pipo/META-INF/MANIFEST.MF index 1761107a4d..e37fab0ba2 100644 --- a/org.adempiere.pipo/META-INF/MANIFEST.MF +++ b/org.adempiere.pipo/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere 2Pack Core Bundle-SymbolicName: org.adempiere.pipo;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Import-Package: org.apache.commons.codec, org.apache.commons.codec.binary, org.apache.tools.ant, @@ -19,3 +19,4 @@ Service-Component: OSGI-INF/dictionaryservice.xml Bundle-Activator: org.adempiere.plugin.utils.PackInApplicationActivator Bundle-ClassPath: . Automatic-Module-Name: org.adempiere.pipo +Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/PackOut.java b/org.adempiere.pipo/src/org/adempiere/pipo2/PackOut.java index 1eaf2ee448..c6d3a59ca6 100644 --- a/org.adempiere.pipo/src/org/adempiere/pipo2/PackOut.java +++ b/org.adempiere.pipo/src/org/adempiere/pipo2/PackOut.java @@ -197,7 +197,7 @@ public class PackOut SAXTransformerFactory packoutFactory = (SAXTransformerFactory) SAXTransformerFactory.newInstance(); //indent-number attribute support is not guarantee try { - packoutFactory.setAttribute("indent-number", new Integer(4)); + packoutFactory.setAttribute("indent-number", Integer.valueOf(4)); } catch (Exception e) {} TransformerHandler packoutHandler = packoutFactory.newTransformerHandler(); Transformer packoutTransformer = packoutHandler.getTransformer(); @@ -247,7 +247,7 @@ public class PackOut SAXTransformerFactory transformerFactory = (SAXTransformerFactory) SAXTransformerFactory.newInstance(); //indent-number attribute support is not guarantee try { - transformerFactory.setAttribute("indent-number", new Integer(4)); + transformerFactory.setAttribute("indent-number", Integer.valueOf(4)); } catch (Exception e) {} TransformerHandler docHandler = transformerFactory.newTransformerHandler(); Transformer transformer = docHandler.getTransformer(); diff --git a/org.adempiere.pipo/src/org/adempiere/pipo2/PoFiller.java b/org.adempiere.pipo/src/org/adempiere/pipo2/PoFiller.java index 25a1a6334c..8414308d7f 100644 --- a/org.adempiere.pipo/src/org/adempiere/pipo2/PoFiller.java +++ b/org.adempiere.pipo/src/org/adempiere/pipo2/PoFiller.java @@ -131,7 +131,7 @@ public class PoFiller{ if (value!=null && value.trim().length() == 0) value = null; - Integer i = value != null ? new Integer(value) : null; + Integer i = value != null ? Integer.valueOf(value) : null; Object oldValue = po.get_Value(qName); if (oldValue == null && i == null) @@ -267,7 +267,7 @@ public class PoFiller{ //only import official id if (qName.equalsIgnoreCase(po.get_TableName()+"_ID")) { String value = e != null ? e.contents.toString() : null; - Integer i = !Util.isEmpty(value) ? new Integer(value) : null; + Integer i = !Util.isEmpty(value) ? Integer.valueOf(value) : null; if (i != null && i.intValue() > 0 && i.intValue() <= MTable.MAX_OFFICIAL_ID) { if (po.get_ID() != i.intValue()) { //make sure id have not been used by other client diff --git a/org.adempiere.plugin.utils/.classpath b/org.adempiere.plugin.utils/.classpath index cf36b56119..423c974870 100644 --- a/org.adempiere.plugin.utils/.classpath +++ b/org.adempiere.plugin.utils/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.plugin.utils/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF index d9f5971be5..bdb7f9b3ed 100644 --- a/org.adempiere.plugin.utils/META-INF/MANIFEST.MF +++ b/org.adempiere.plugin.utils/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Plugin Utils Bundle-SymbolicName: org.adempiere.plugin.utils Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Import-Package: org.adempiere.base, org.adempiere.util, org.apache.xerces.dom;version="2.9.0", @@ -50,3 +50,4 @@ Import-Package: org.adempiere.base, Export-Package: org.adempiere.plugin.utils Bundle-ClassPath: . Automatic-Module-Name: org.adempiere.plugin.utils +Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.replication-feature/feature.xml b/org.adempiere.replication-feature/feature.xml index 0a69014d61..9f7d539654 100644 --- a/org.adempiere.replication-feature/feature.xml +++ b/org.adempiere.replication-feature/feature.xml @@ -2,7 +2,8 @@ + version="5.1.0.qualifier" + provider-name="iDempiere Community"> [Enter Feature Description here.] diff --git a/org.adempiere.replication.server-feature/feature.xml b/org.adempiere.replication.server-feature/feature.xml index 9a7390e9f9..268eba2169 100644 --- a/org.adempiere.replication.server-feature/feature.xml +++ b/org.adempiere.replication.server-feature/feature.xml @@ -2,7 +2,8 @@ + version="5.1.0.qualifier" + provider-name="iDempiere Community"> [Enter Feature Description here.] diff --git a/org.adempiere.replication.server/.classpath b/org.adempiere.replication.server/.classpath index cf36b56119..423c974870 100644 --- a/org.adempiere.replication.server/.classpath +++ b/org.adempiere.replication.server/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.replication.server/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.replication.server/META-INF/MANIFEST.MF b/org.adempiere.replication.server/META-INF/MANIFEST.MF index eb482f2009..896c667040 100644 --- a/org.adempiere.replication.server/META-INF/MANIFEST.MF +++ b/org.adempiere.replication.server/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Replication Server Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Require-Bundle: org.adempiere.server;bundle-version="0.0.0", org.adempiere.replication;bundle-version="0.0.0", org.adempiere.base;bundle-version="0.0.0" @@ -13,3 +13,4 @@ Service-Component: OSGI-INF/serverfactory.xml Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Automatic-Module-Name: org.adempiere.replication.server +Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.replication.server/src/org/compiere/server/ReplicationProcessor.java b/org.adempiere.replication.server/src/org/compiere/server/ReplicationProcessor.java index 542d25058c..650bbee04b 100644 --- a/org.adempiere.replication.server/src/org/compiere/server/ReplicationProcessor.java +++ b/org.adempiere.replication.server/src/org/compiere/server/ReplicationProcessor.java @@ -127,7 +127,7 @@ public class ReplicationProcessor extends AdempiereServer { try { Class clazz = Class.forName(javaClass); - importProcessor = (IImportProcessor)clazz.newInstance(); + importProcessor = (IImportProcessor)clazz.getDeclaredConstructor().newInstance(); importProcessor.process(mImportProcessor.getCtx(), this, trxName ); } catch (Exception e) diff --git a/org.adempiere.replication/.classpath b/org.adempiere.replication/.classpath index cf36b56119..423c974870 100644 --- a/org.adempiere.replication/.classpath +++ b/org.adempiere.replication/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.replication/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.replication/META-INF/MANIFEST.MF b/org.adempiere.replication/META-INF/MANIFEST.MF index 7e96e4a07b..97e0c10af0 100644 --- a/org.adempiere.replication/META-INF/MANIFEST.MF +++ b/org.adempiere.replication/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Replication Bundle-SymbolicName: org.adempiere.replication;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Export-Package: org.adempiere.process.rpl, org.adempiere.process.rpl.exp, @@ -13,3 +13,4 @@ Import-Package: javax.jms;version="1.1.0", Eclipse-RegisterBuddy: org.adempiere.base Bundle-ClassPath: . Automatic-Module-Name: org.adempiere.replication +Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.replication/src/org/adempiere/process/rpl/exp/ExportHelper.java b/org.adempiere.replication/src/org/adempiere/process/rpl/exp/ExportHelper.java index f5f81c3c6f..35e11b1bcc 100644 --- a/org.adempiere.replication/src/org/adempiere/process/rpl/exp/ExportHelper.java +++ b/org.adempiere.replication/src/org/adempiere/process/rpl/exp/ExportHelper.java @@ -170,7 +170,7 @@ public class ExportHelper { String javaClass = expProcessor_Type.getJavaClass(); try { Class clazz = Class.forName(javaClass); - IExportProcessor exportProcessor = (IExportProcessor)clazz.newInstance(); + IExportProcessor exportProcessor = (IExportProcessor)clazz.getDeclaredConstructor().newInstance(); exportProcessor.process(po.getCtx(), mExportProcessor, outDocument, Trx.get( po.get_TrxName(), false )); @@ -473,11 +473,11 @@ public class ExportHelper { if (variableName != null && !"".equals(variableName) ) { Integer var = variableMap.get(variableName); if (var == null) { - var = new Integer(0); + var = Integer.valueOf(0); } int intValue = var.intValue(); intValue++; - variableMap.put(variableName, new Integer(intValue)); + variableMap.put(variableName, Integer.valueOf(intValue)); } } diff --git a/org.adempiere.replication/src/org/adempiere/process/rpl/imp/ImportHelper.java b/org.adempiere.replication/src/org/adempiere/process/rpl/imp/ImportHelper.java index b439a68ae5..72a26f1a61 100755 --- a/org.adempiere.replication/src/org/adempiere/process/rpl/imp/ImportHelper.java +++ b/org.adempiere.replication/src/org/adempiere/process/rpl/imp/ImportHelper.java @@ -29,6 +29,7 @@ package org.adempiere.process.rpl.imp; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.SQLException; import java.sql.Timestamp; import java.text.ParseException; @@ -128,9 +129,9 @@ public class ImportHelper { throw new Exception(Msg.getMsg(ctx, "XMLVersionAttributeMandatory")); } ///Getting Attributes. - int ReplicationMode = new Integer(rootElement.getAttribute("ReplicationMode")); + int ReplicationMode = Integer.valueOf(rootElement.getAttribute("ReplicationMode")); String ReplicationType = rootElement.getAttribute("ReplicationType"); - int ReplicationEvent = new Integer(rootElement.getAttribute("ReplicationEvent")); + int ReplicationEvent = Integer.valueOf(rootElement.getAttribute("ReplicationEvent")); MClient client = null; client = getAD_ClientByValue(ctx, AD_Client_Value, trxName); @@ -354,7 +355,7 @@ public class ImportHelper { { refRecord_ID = getID(ctx, referencedExpFormat, referencedNode, line.getValue(), po.get_TrxName()); if (log.isLoggable(Level.INFO)) log.info("refRecord_ID = " + refRecord_ID); - value = new Integer(refRecord_ID); + value = Integer.valueOf(refRecord_ID); } else { @@ -485,7 +486,7 @@ public class ImportHelper { if (! Util.isEmpty(value.toString())) { int intValue = Integer.parseInt(value.toString()); - value = new Integer( intValue ); + value = Integer.valueOf( intValue ); }else { value=null; @@ -510,7 +511,7 @@ public class ImportHelper { { value=null; } - //value = new Double( doubleValue ); + //value = Double.valueOf( doubleValue ); if (log.isLoggable(Level.INFO)) log.info("About to set BigDecimal value of column ["+column.getColumnName()+"]=["+value+"]"); @@ -654,7 +655,7 @@ public class ImportHelper { if (log.isLoggable(Level.INFO)) log.info("record_ID = " + record_ID); - cols[col] = new Integer(record_ID); + cols[col] = Integer.valueOf(record_ID); } else { @@ -680,7 +681,7 @@ public class ImportHelper { if (!Util.isEmpty(value.toString())) { //double doubleValue = Double.parseDouble(value.toString()); - value = new Integer(value.toString()); + value = Integer.valueOf(value.toString()); if (DisplayType.ID == column.getAD_Reference_ID()) { replication_id = (Integer) value; @@ -696,7 +697,7 @@ public class ImportHelper { else if( DisplayType.isNumeric(column.getAD_Reference_ID())) { valuecol="Round("+valuecol+",2)"; - params[col] = new BigDecimal((String)cols[col]).setScale(2, BigDecimal.ROUND_HALF_UP); + params[col] = new BigDecimal((String)cols[col]).setScale(2, RoundingMode.HALF_UP); } else { diff --git a/org.adempiere.report.jasper-feature/feature.xml b/org.adempiere.report.jasper-feature/feature.xml index e5155a3dd8..37f8c5c3c0 100644 --- a/org.adempiere.report.jasper-feature/feature.xml +++ b/org.adempiere.report.jasper-feature/feature.xml @@ -2,7 +2,8 @@ + version="5.1.0.qualifier" + provider-name="iDempiere Community"> [Enter Feature Description here.] @@ -431,7 +432,7 @@ id="stax2-api" download-size="0" install-size="0" - version="0.0.0" + version="3.1.4" unpack="false"/> - + + + + + @@ -9,8 +13,6 @@ - - diff --git a/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.report.jasper.library/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF index ef2071b78b..2082db178d 100644 --- a/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper.library/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Library Bundle-SymbolicName: org.adempiere.report.jasper.library;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Fragment-Host: net.sf.jasperreports.engine;bundle-version="6.3.1" Bundle-ClassPath: ., lib/castor-core.jar, @@ -13,9 +13,8 @@ Bundle-ClassPath: ., lib/jasperreports-fonts.jar, lib/jasperreports-functions.jar, lib/olap4j.jar, - lib/spring-beans.jar, - lib/spring-core.jar, lib/xmpcore.jar DynamicImport-Package: * Import-Package: org.w3c.dom.events;version="[3.0.0,4.0.0)" Automatic-Module-Name: org.adempiere.report.jasper.library +Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.report.jasper.library/build.properties b/org.adempiere.report.jasper.library/build.properties index 08faa30823..171ad02aa4 100644 --- a/org.adempiere.report.jasper.library/build.properties +++ b/org.adempiere.report.jasper.library/build.properties @@ -7,6 +7,4 @@ bin.includes = META-INF/,\ lib/jasperreports-fonts.jar,\ lib/jasperreports-functions.jar,\ lib/olap4j.jar,\ - lib/spring-beans.jar,\ - lib/spring-core.jar,\ lib/xmpcore.jar diff --git a/org.adempiere.report.jasper.library/pom.xml b/org.adempiere.report.jasper.library/pom.xml index 096f719ed0..0d13bf78aa 100644 --- a/org.adempiere.report.jasper.library/pom.xml +++ b/org.adempiere.report.jasper.library/pom.xml @@ -53,16 +53,6 @@ olap4j 0.9.7.309-JS-3 - - org.springframework - spring-beans - 2.5 - - - org.springframework - spring-core - 2.5 - com.adobe.xmp xmpcore diff --git a/org.adempiere.report.jasper.swing/.classpath b/org.adempiere.report.jasper.swing/.classpath index cf36b56119..423c974870 100644 --- a/org.adempiere.report.jasper.swing/.classpath +++ b/org.adempiere.report.jasper.swing/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.report.jasper.swing/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF index 094d5661ab..eb785b4f8e 100644 --- a/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper.swing/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: JasperReports Swing Client Bundle-SymbolicName: org.adempiere.report.jasper.swing;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.adempiere.ui.swing;bundle-version="0.0.0", org.adempiere.report.jasper;bundle-version="0.0.0" @@ -17,3 +17,4 @@ Service-Component: OSGI-INF/jrviewerprovider.xml Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Automatic-Module-Name: org.adempiere.report.jasper.swing +Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.report.jasper.webapp/.classpath b/org.adempiere.report.jasper.webapp/.classpath index cf36b56119..423c974870 100644 --- a/org.adempiere.report.jasper.webapp/.classpath +++ b/org.adempiere.report.jasper.webapp/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.adempiere.report.jasper.webapp/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper.webapp/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.report.jasper.webapp/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.report.jasper.webapp/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF index 37bf088441..95fa597246 100644 --- a/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper.webapp/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: iDempiere JasperReport Web App Bundle-SymbolicName: org.adempiere.report.jasper.webapp;singleton:=true Bundle-Version: 5.1.0.qualifier Require-Bundle: org.adempiere.base;bundle-version="0.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Web-ContextPath: JasperReportFiles Import-Package: javax.servlet;version="2.5.0", javax.servlet.http;version="2.5.0", @@ -13,5 +13,6 @@ Import-Package: javax.servlet;version="2.5.0", org.apache.commons.codec.binary Bundle-ClassPath: . Automatic-Module-Name: org.adempiere.report.jasper.webapp +Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.report.jasper/.classpath b/org.adempiere.report.jasper/.classpath index cf36b56119..423c974870 100644 --- a/org.adempiere.report.jasper/.classpath +++ b/org.adempiere.report.jasper/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.report.jasper/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.report.jasper/META-INF/MANIFEST.MF b/org.adempiere.report.jasper/META-INF/MANIFEST.MF index 55624d4410..d5aefab403 100644 --- a/org.adempiere.report.jasper/META-INF/MANIFEST.MF +++ b/org.adempiere.report.jasper/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere JasperReport integration Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Import-Package: net.sourceforge.barbecue, org.apache.commons.codec, org.apache.commons.codec.binary, @@ -16,3 +16,4 @@ Export-Package: org.adempiere.report.jasper Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Automatic-Module-Name: org.adempiere.report.jasper +Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java index dcec5b808d..866794474c 100644 --- a/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java +++ b/org.adempiere.report.jasper/src/org/adempiere/report/jasper/ReportStarter.java @@ -560,16 +560,16 @@ public class ReportStarter implements ProcessCall, ClientProcess } if (Record_ID > 0) - params.put("RECORD_ID", new Integer( Record_ID)); + params.put("RECORD_ID", Integer.valueOf( Record_ID)); // contribution from Ricardo (ralexsander) // in iReports you can 'SELECT' AD_Client_ID, AD_Org_ID and AD_User_ID using only AD_PINSTANCE_ID - params.put("AD_PINSTANCE_ID", new Integer( AD_PInstance_ID)); + params.put("AD_PINSTANCE_ID", Integer.valueOf( AD_PInstance_ID)); // FR [3123850] - Add continuosly needed parameters to Jasper Starter - Carlos Ruiz - GlobalQSS - params.put("AD_CLIENT_ID", new Integer( Env.getAD_Client_ID(Env.getCtx()))); - params.put("AD_ROLE_ID", new Integer( Env.getAD_Role_ID(Env.getCtx()))); - params.put("AD_USER_ID", new Integer( Env.getAD_User_ID(Env.getCtx()))); + params.put("AD_CLIENT_ID", Integer.valueOf( Env.getAD_Client_ID(Env.getCtx()))); + params.put("AD_ROLE_ID", Integer.valueOf( Env.getAD_Role_ID(Env.getCtx()))); + params.put("AD_USER_ID", Integer.valueOf( Env.getAD_User_ID(Env.getCtx()))); params.put("AD_CLIENT_NAME", Env.getContext(Env.getCtx(), "#AD_Client_Name")); params.put("AD_ROLE_NAME", Env.getContext(Env.getCtx(), "#AD_Role_Name")); diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml index 4e4581b15f..8b5116ae38 100644 --- a/org.adempiere.server-feature/feature.xml +++ b/org.adempiere.server-feature/feature.xml @@ -2,7 +2,8 @@ + version="5.1.0.qualifier" + provider-name="iDempiere Community"> [Enter Feature Description here.] @@ -82,13 +83,6 @@ version="0.0.0" unpack="false"/> - - - - - - - - + + + + + + + + + + + + + + diff --git a/org.adempiere.server-feature/pom.xml b/org.adempiere.server-feature/pom.xml index e554646e6f..409bf50ed9 100644 --- a/org.adempiere.server-feature/pom.xml +++ b/org.adempiere.server-feature/pom.xml @@ -31,7 +31,7 @@ commons-beanutils commons-beanutils - 1.7.0 + 1.9.3 commons-betwixt @@ -41,37 +41,37 @@ commons-codec commons-codec - 1.3 + 1.11 commons-collections commons-collections - 3.1 + 3.2.2 commons-dbcp commons-dbcp - 1.2.1 + 1.4 commons-digester commons-digester - 1.7 + 2.1 commons-lang commons-lang - 2.1 + 2.6 commons-logging commons-logging - 1.0.4 + 1.2 commons-pool commons-pool - 1.2 + 1.6 org.apache.ddlutils @@ -81,7 +81,7 @@ dom4j dom4j - 1.4 + 1.6.1 oro @@ -96,7 +96,7 @@ woodstox wstx-asl - 3.0.2 + 3.2.7 ../db/ddlutils/lib diff --git a/org.adempiere.server-feature/server.product b/org.adempiere.server-feature/server.product index bb538b7049..49b83f4c88 100644 --- a/org.adempiere.server-feature/server.product +++ b/org.adempiere.server-feature/server.product @@ -9,7 +9,7 @@ -console - -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml + --add-exports java.desktop/sun.awt=ALL-UNNAMED --add-exports java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports java.naming/com.sun.jndi.ldap=ALL-UNNAMED -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl,org.w3c.dom.events -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-alpn.xml,etc/jetty-http2.xml,etc/jetty-https.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml -Dorg.zkoss.zk.config.path=file://${workspace_loc}/zk.xml -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts @@ -24,7 +24,7 @@ - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10 diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch index 58118a0e8a..78c1751957 100644 --- a/org.adempiere.server-feature/server.product.launch +++ b/org.adempiere.server-feature/server.product.launch @@ -1,39 +1,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini index 6ef6b56860..7d76a2653b 100644 --- a/org.adempiere.server-feature/setup/configuration/config.ini +++ b/org.adempiere.server-feature/setup/configuration/config.ini @@ -14,6 +14,7 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\ org.restlet,\ org.apache.servicemix.bundles.cglib,\ com.sun.mail.javax.mail,\ + javax.activation,\ org.apache.commons.collections,\ org.apache.ant,\ javax.jms,\ @@ -26,18 +27,14 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\ org.apache.felix.scr,\ org.eclipse.core.contenttype,\ org.apache.poi.poi,\ + org.apache.poi.poi-ooxml,\ org.eclipse.core.jobs,\ org.eclipse.equinox.preferences,\ org.eclipse.equinox.event,\ org.apache.commons.logging,\ - javax.management.j2ee-api,\ org.eclipse.osgi,\ org.eclipse.osgi.services,\ - javax.ejb,\ - javax.xml.rpc,\ - javax.xml.soap,\ javax.xml,\ - javax.activation,\ org.apache.activemq.activemq-core,\ org.apache.activemq.kahadb,\ javax.transaction,\ @@ -47,7 +44,6 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\ slf4j.jcl,\ org.apache.commons.codec,\ org.eclipse.osgi.compatibility.state,\ - org.eclipse.osgi.compatibility.plugins,\ org.cryptacular,\ net.sf.supercsv.super-csv,\ com.itextpdf,\ @@ -59,7 +55,9 @@ osgi.bundles=org.eclipse.equinox.ds@1:start,\ bcpkix,\ org.eclipse.equinox.common,\ org.passay,\ - groovy-all,\ + groovy,\ + org.apache.geronimo.specs.geronimo-j2ee-management_1.1_spec,\ + jaxb-api,\ org.eclipse.osgi@start osgi.framework.extensions= osgi.bundles.defaultStartLevel=4 diff --git a/org.adempiere.server/.classpath b/org.adempiere.server/.classpath index f2e5467c7f..581de6dd1b 100644 --- a/org.adempiere.server/.classpath +++ b/org.adempiere.server/.classpath @@ -1,6 +1,11 @@ - + + + + + + diff --git a/org.adempiere.server/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.server/.settings/org.eclipse.jdt.core.prefs index f6fb89ba37..182138f43f 100644 --- a/org.adempiere.server/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.server/.settings/org.eclipse.jdt.core.prefs @@ -10,15 +10,12 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.APILeak=warning org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning @@ -27,7 +24,6 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled @@ -108,4 +104,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.server/META-INF/MANIFEST.MF b/org.adempiere.server/META-INF/MANIFEST.MF index 8b905ddfb9..b1de4ed93b 100644 --- a/org.adempiere.server/META-INF/MANIFEST.MF +++ b/org.adempiere.server/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 5.1.0.qualifier Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.eclipse.equinox.app;bundle-version="0.0.0", org.eclipse.jetty.apache-jsp;bundle-version="0.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Web-ContextPath: / Bundle-ClassPath: ., WEB-INF/lib/jnlp-jardiff.jar, @@ -41,3 +41,4 @@ Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/acctprocessorfactory.xml, OSGI-INF/alertprocessorfactory.xml, OSGI-INF/ldapprocessorfactory.xml, OSGI-INF/requestprocessorfactory.xml, OSGI-INF/schedulerfactory.xml, OSGI-INF/workflowprocessorfactory.xml Bundle-Activator: org.adempiere.server.AdempiereServerActivator Automatic-Module-Name: org.adempiere.server +Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.server/pom.xml b/org.adempiere.server/pom.xml index d627bc0fa7..bdfda1ddda 100644 --- a/org.adempiere.server/pom.xml +++ b/org.adempiere.server/pom.xml @@ -16,8 +16,12 @@ org.eclipse.tycho tycho-compiler-plugin - - -warn:+forbidden + + + -warn:+forbidden + --add-exports + java.naming/com.sun.jndi.ldap=ALL-UNNAMED + diff --git a/org.adempiere.server/src/main/server/org/compiere/server/Scheduler.java b/org.adempiere.server/src/main/server/org/compiere/server/Scheduler.java index 1230844383..97022d89d0 100644 --- a/org.adempiere.server/src/main/server/org/compiere/server/Scheduler.java +++ b/org.adempiere.server/src/main/server/org/compiere/server/Scheduler.java @@ -586,7 +586,7 @@ public class Scheduler extends AdempiereServer */ protected static MScheduler get(Properties ctx, int AD_Scheduler_ID) { - Integer key = new Integer(AD_Scheduler_ID); + Integer key = Integer.valueOf(AD_Scheduler_ID); MScheduler retValue = (MScheduler)s_cache.get(key); if (retValue == null) { diff --git a/org.adempiere.server/src/main/server/org/compiere/server/WorkflowProcessor.java b/org.adempiere.server/src/main/server/org/compiere/server/WorkflowProcessor.java index bcab69ed55..6e9f20c596 100644 --- a/org.adempiere.server/src/main/server/org/compiere/server/WorkflowProcessor.java +++ b/org.adempiere.server/src/main/server/org/compiere/server/WorkflowProcessor.java @@ -381,7 +381,7 @@ public class WorkflowProcessor extends AdempiereServer // To Activity Owner if (m_client.sendEMail(activity.getAD_User_ID(), subject, message, pdf)) counter++; - list.add (new Integer(activity.getAD_User_ID())); + list.add (Integer.valueOf(activity.getAD_User_ID())); // To Process Owner if (toProcess @@ -389,7 +389,7 @@ public class WorkflowProcessor extends AdempiereServer { if (m_client.sendEMail(process.getAD_User_ID(), subject, message, pdf)) counter++; - list.add (new Integer(process.getAD_User_ID())); + list.add (Integer.valueOf(process.getAD_User_ID())); } // To Activity Responsible @@ -409,11 +409,11 @@ public class WorkflowProcessor extends AdempiereServer // Processor SuperVisor if (toSupervisor && m_model.getSupervisor_ID() != 0 - && !list.contains(new Integer(m_model.getSupervisor_ID()))) + && !list.contains(Integer.valueOf(m_model.getSupervisor_ID()))) { if (m_client.sendEMail(m_model.getSupervisor_ID(), subject, message, pdf)) counter++; - list.add (new Integer(m_model.getSupervisor_ID())); + list.add (Integer.valueOf(m_model.getSupervisor_ID())); } return counter; @@ -439,11 +439,11 @@ public class WorkflowProcessor extends AdempiereServer // Human else if (MWFResponsible.RESPONSIBLETYPE_Human.equals(responsible.getResponsibleType()) && responsible.getAD_User_ID() != 0 - && !list.contains(new Integer(responsible.getAD_User_ID()))) + && !list.contains(Integer.valueOf(responsible.getAD_User_ID()))) { if (m_client.sendEMail(responsible.getAD_User_ID(), subject, message, pdf)) counter++; - list.add (new Integer(responsible.getAD_User_ID())); + list.add (Integer.valueOf(responsible.getAD_User_ID())); } // Org of the Document else if (MWFResponsible.RESPONSIBLETYPE_Organization.equals(responsible.getResponsibleType())) @@ -453,11 +453,11 @@ public class WorkflowProcessor extends AdempiereServer { MOrgInfo org = MOrgInfo.get (getCtx(), document.getAD_Org_ID(), null); if (org.getSupervisor_ID() != 0 - && !list.contains(new Integer(org.getSupervisor_ID()))) + && !list.contains(Integer.valueOf(org.getSupervisor_ID()))) { if (m_client.sendEMail(org.getSupervisor_ID(), subject, message, pdf)) counter++; - list.add (new Integer(org.getSupervisor_ID())); + list.add (Integer.valueOf(org.getSupervisor_ID())); } } } @@ -472,11 +472,11 @@ public class WorkflowProcessor extends AdempiereServer if (!roles.isActive()) continue; int AD_User_ID = roles.getAD_User_ID(); - if (!list.contains(new Integer(AD_User_ID))) + if (!list.contains(Integer.valueOf(AD_User_ID))) { if (m_client.sendEMail(AD_User_ID, subject, message, pdf)) counter++; - list.add (new Integer(AD_User_ID)); + list.add (Integer.valueOf(AD_User_ID)); } } } diff --git a/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitorFilter.java b/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitorFilter.java index 2880118a50..348c413e4e 100644 --- a/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitorFilter.java +++ b/org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitorFilter.java @@ -51,7 +51,7 @@ public class AdempiereMonitorFilter implements Filter public AdempiereMonitorFilter () { super (); - m_authorization = new Long (System.currentTimeMillis()); + m_authorization = Long.valueOf(System.currentTimeMillis()); } // AdempiereMonitorFilter /** Logger */ diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml index 0323e0a73a..bbbeee274f 100644 --- a/org.adempiere.target.platform-feature/feature.xml +++ b/org.adempiere.target.platform-feature/feature.xml @@ -155,4 +155,309 @@ version="0.0.0" unpack="false"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.adempiere.ui.swing-feature/feature.xml b/org.adempiere.ui.swing-feature/feature.xml index 77e7066257..fe26b3a05c 100644 --- a/org.adempiere.ui.swing-feature/feature.xml +++ b/org.adempiere.ui.swing-feature/feature.xml @@ -2,7 +2,8 @@ + version="5.1.0.qualifier" + provider-name="iDempiere Community"> [Enter Feature Description here.] @@ -41,7 +42,7 @@ unpack="false"/> - + + + + + + diff --git a/org.adempiere.ui.swing/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui.swing/.settings/org.eclipse.jdt.core.prefs index a8ab4a708b..05b5a63067 100644 --- a/org.adempiere.ui.swing/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.ui.swing/.settings/org.eclipse.jdt.core.prefs @@ -9,11 +9,8 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.APILeak=warning org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning @@ -22,7 +19,6 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled @@ -103,4 +99,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF index b5b3a0ffa0..9467146633 100644 --- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF @@ -72,12 +72,44 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.adempiere.ui;bundle-version="0.0.0", org.restlet;bundle-version="0.0.0", org.restlet.ext.servlet;bundle-version="0.0.0", - groovy-all;bundle-version="0.0.0", org.jfree.chart-osgi;bundle-version="1.0.19" Eclipse-ExtensibleAPI: true Eclipse-RegisterBuddy: org.adempiere.base -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: javax.net.ssl, +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" +Import-Package: groovy.beans;version="2.5.3", + groovy.cli;version="2.5.3", + groovy.grape;version="2.5.3", + groovy.inspect;version="2.5.3", + groovy.inspect.swingui;version="2.5.3", + groovy.io;version="2.5.3", + groovy.jmx.builder;version="2.5.3", + groovy.json;version="2.5.3", + groovy.lang;version="2.5.3", + groovy.model;version="2.5.3", + groovy.security;version="2.5.3", + groovy.servlet;version="2.5.3", + groovy.sql;version="2.5.3", + groovy.swing;version="2.5.3", + groovy.swing.binding;version="2.5.3", + groovy.swing.factory;version="2.5.3", + groovy.swing.impl;version="2.5.3", + groovy.time;version="2.5.3", + groovy.transform;version="2.5.3", + groovy.transform.builder;version="2.5.3", + groovy.transform.options;version="2.5.3", + groovy.transform.stc;version="2.5.3", + groovy.ui;version="2.5.3", + groovy.ui.icons;version="2.5.3", + groovy.ui.text;version="2.5.3", + groovy.ui.view;version="2.5.3", + groovy.util;version="2.5.3", + groovy.util.logging;version="2.5.3", + groovy.util.slurpersupport;version="2.5.3", + groovy.xml;version="2.5.3", + groovy.xml.dom;version="2.5.3", + groovy.xml.jaxb;version="2.5.3", + groovy.xml.streamingmarkupsupport;version="2.5.3", + javax.net.ssl, net.sf.jasperreports.engine, org.apache.ecs, org.apache.ecs.xhtml, @@ -90,3 +122,4 @@ Import-Package: javax.net.ssl, Service-Component: OSGI-INF/*.xml Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.adempiere.ui.swing +Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.ui.swing/pom.xml b/org.adempiere.ui.swing/pom.xml index e67a3516d3..207d31f82a 100644 --- a/org.adempiere.ui.swing/pom.xml +++ b/org.adempiere.ui.swing/pom.xml @@ -16,8 +16,12 @@ org.eclipse.tycho tycho-compiler-plugin - - -warn:+forbidden + + + -warn:+forbidden + --add-exports + java.desktop/sun.awt=ALL-UNNAMED + diff --git a/org.adempiere.ui.swing/src/org/adempiere/apps/graph/PerformanceIndicator.java b/org.adempiere.ui.swing/src/org/adempiere/apps/graph/PerformanceIndicator.java index 8760be95f7..eb7d8b2161 100644 --- a/org.adempiere.ui.swing/src/org/adempiere/apps/graph/PerformanceIndicator.java +++ b/org.adempiere.ui.swing/src/org/adempiere/apps/graph/PerformanceIndicator.java @@ -301,7 +301,7 @@ public class PerformanceIndicator extends JPanel // Lazily create the event: if (e == null) e = new ActionEvent(this, ActionEvent.ACTION_PERFORMED, - "pi", event.getWhen(), event.getModifiers()); + "pi", event.getWhen(), event.getModifiersEx()); listeners[i].actionPerformed(e); } } // fireActionPerformed diff --git a/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereButtonListener.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereButtonListener.java index c025962544..edee8a5f21 100644 --- a/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereButtonListener.java +++ b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereButtonListener.java @@ -13,7 +13,7 @@ *****************************************************************************/ package org.adempiere.plaf; -import java.awt.event.InputEvent; +import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; import javax.swing.AbstractButton; @@ -83,10 +83,10 @@ public class AdempiereButtonListener extends BasicButtonListener } map.clear(); String className = b.getClass().getName(); - int mask = InputEvent.ALT_MASK; // Default Buttons + int mask = ActionEvent.ALT_MASK; // Default Buttons if (b instanceof JCheckBox // In Tab || className.indexOf("VButton") != -1) - mask = InputEvent.SHIFT_MASK + InputEvent.CTRL_MASK; + mask = ActionEvent.SHIFT_MASK + ActionEvent.CTRL_MASK; map.put(KeyStroke.getKeyStroke(m, mask, false), "pressed"); map.put(KeyStroke.getKeyStroke(m, mask, true), "released"); map.put(KeyStroke.getKeyStroke(m, 0, true), "released"); diff --git a/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereComboPopup.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereComboPopup.java index 5e0cb7a7eb..c9f6e18802 100644 --- a/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereComboPopup.java +++ b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereComboPopup.java @@ -40,7 +40,7 @@ public class AdempiereComboPopup extends BasicComboPopup * Constructor * @param combo */ - public AdempiereComboPopup(JComboBox combo) + public AdempiereComboPopup(JComboBox combo) { super(combo); } // AdempiereComboPopup diff --git a/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereTheme.java b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereTheme.java index 69fa7b41bb..d6135f0e71 100644 --- a/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereTheme.java +++ b/org.adempiere.ui.swing/src/org/adempiere/plaf/AdempiereTheme.java @@ -405,8 +405,8 @@ public class AdempiereTheme extends com.jgoodies.looks.plastic.PlasticTheme { "ScrollBar.thumbHighlight", getPrimaryControlHighlight(), PlasticScrollBarUI.MAX_BUMPS_WIDTH_KEY, - new Integer(22), - PlasticScrollBarUI.MAX_BUMPS_WIDTH_KEY, new Integer(30), + Integer.valueOf(22), + PlasticScrollBarUI.MAX_BUMPS_WIDTH_KEY, Integer.valueOf(30), //"TabbedPane.selected", getWhite(), "TabbedPane.selectHighlight", new ColorUIResource(231, 218, 188), ExtendedTheme.ERROR_BG_KEY, diff --git a/org.adempiere.ui.swing/src/org/compiere/acct/AcctViewerData.java b/org.adempiere.ui.swing/src/org/compiere/acct/AcctViewerData.java index 07fc957ff0..0d7826e0aa 100644 --- a/org.adempiere.ui.swing/src/org/compiere/acct/AcctViewerData.java +++ b/org.adempiere.ui.swing/src/org/compiere/acct/AcctViewerData.java @@ -209,7 +209,7 @@ class AcctViewerData // ValueNamePair pp = new ValueNamePair(tableName, name); cb.addItem(pp); - tableInfo.put (tableName, new Integer(id)); + tableInfo.put (tableName, Integer.valueOf(id)); if (id == AD_Table_ID) select = pp; } diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/ADialogDialog.java b/org.adempiere.ui.swing/src/org/compiere/apps/ADialogDialog.java index 45e4f64844..0900121fc7 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/ADialogDialog.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/ADialogDialog.java @@ -19,7 +19,6 @@ package org.compiere.apps; import java.awt.BorderLayout; import java.awt.Dialog; import java.awt.Dimension; -import java.awt.Event; import java.awt.Frame; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; @@ -173,14 +172,14 @@ public final class ADialogDialog extends CDialog implements ActionListener mPrintScreen.addActionListener(this); mScreenShot.setIcon(Env.getImageIcon("ScreenShot16.gif")); mScreenShot.setText(Msg.getMsg(Env.getCtx(), "ScreenShot")); - mScreenShot.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, Event.SHIFT_MASK)); + mScreenShot.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, ActionEvent.SHIFT_MASK)); mScreenShot.addActionListener(this); mPreference.setIcon(Env.getImageIcon("Preference16.gif")); mPreference.setText(Msg.getMsg(Env.getCtx(), "Preference")); mPreference.addActionListener(this); mEnd.setIcon(Env.getImageIcon("End16.gif")); mEnd.setText(Msg.getMsg(Env.getCtx(), "End")); - mEnd.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.ALT_MASK)); + mEnd.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.ALT_MASK)); mEnd.addActionListener(this); // westPanel.setLayout(westLayout); diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java b/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java index f34b624254..62934fb15a 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/AMenu.java @@ -19,7 +19,6 @@ package org.compiere.apps; import java.awt.BorderLayout; import java.awt.Cursor; import java.awt.Dimension; -import java.awt.Event; import java.awt.Frame; import java.awt.GridLayout; import java.awt.Insets; @@ -427,10 +426,10 @@ public final class AMenu extends CFrame JMenu mFile = AEnv.getMenu("File"); menuBar.add(mFile); AEnv.addMenuItem("PrintScreen", null, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, 0), mFile, this); - AEnv.addMenuItem("ScreenShot", null, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, KeyEvent.SHIFT_MASK), mFile, this); + AEnv.addMenuItem("ScreenShot", null, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, ActionEvent.SHIFT_MASK), mFile, this); mFile.addSeparator(); - AEnv.addMenuItem("Logout", null, KeyStroke.getKeyStroke(KeyEvent.VK_L, Event.SHIFT_MASK+Event.ALT_MASK), mFile, this); - AEnv.addMenuItem("Exit", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.SHIFT_MASK+Event.ALT_MASK), mFile, this); + AEnv.addMenuItem("Logout", null, KeyStroke.getKeyStroke(KeyEvent.VK_L, ActionEvent.SHIFT_MASK + ActionEvent.ALT_MASK), mFile, this); + AEnv.addMenuItem("Exit", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.SHIFT_MASK+ActionEvent.ALT_MASK), mFile, this); // View JMenu mView = AEnv.getMenu("View"); @@ -438,15 +437,15 @@ public final class AMenu extends CFrame if (MRole.getDefault().isAllow_Info_Product()) { - AEnv.addMenuItem("InfoProduct", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK), mView, this); + AEnv.addMenuItem("InfoProduct", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK), mView, this); } if (MRole.getDefault().isAllow_Info_BPartner()) { - AEnv.addMenuItem("InfoBPartner", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK+Event.CTRL_MASK), mView, this); + AEnv.addMenuItem("InfoBPartner", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK+ActionEvent.CTRL_MASK), mView, this); } if (MRole.getDefault().isShowAcct() && MRole.getDefault().isAllow_Info_Account()) { - AEnv.addMenuItem("InfoAccount", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK+Event.CTRL_MASK), mView, this); + AEnv.addMenuItem("InfoAccount", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK+ActionEvent.CTRL_MASK), mView, this); } if (MRole.getDefault().isAllow_Info_Schedule()) { @@ -511,7 +510,7 @@ public final class AMenu extends CFrame //Window Menu m_WindowMenu = new WindowMenu(windowManager, this); menuBar.add(m_WindowMenu); - KeyStroke ks = KeyStroke.getKeyStroke(KeyEvent.VK_W, KeyEvent.CTRL_MASK); + KeyStroke ks = KeyStroke.getKeyStroke(KeyEvent.VK_W, ActionEvent.CTRL_MASK); this.getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(ks, "ShowAllWindow"); AppsAction action = new AppsAction("ShowAllWindow", ks, false); this.getRootPane().getActionMap().put("ShowAllWindow", action); diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/APanel.java b/org.adempiere.ui.swing/src/org/compiere/apps/APanel.java index 81517a24c0..a73a42c411 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/APanel.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/APanel.java @@ -28,13 +28,11 @@ import java.awt.Color; import java.awt.Component; import java.awt.Cursor; import java.awt.Dimension; -import java.awt.Event; import java.awt.FlowLayout; import java.awt.Image; import java.awt.Point; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import java.io.File; import java.sql.PreparedStatement; @@ -44,6 +42,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; +import java.util.List; import java.util.Map; import java.util.Properties; import java.util.TreeMap; @@ -357,28 +356,28 @@ public final class APanel extends CPanel JMenu mFile = AEnv.getMenu("File"); menuBar.add(mFile); aPrintScr = addAction("PrintScreen", mFile, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, 0), false); - aScrShot = addAction("ScreenShot", mFile, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, Event.SHIFT_MASK), false); + aScrShot = addAction("ScreenShot", mFile, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, ActionEvent.SHIFT_MASK), false); aReport = addAction("Report", mFile, KeyStroke.getKeyStroke(KeyEvent.VK_F11, 0), false); aPrint = addAction("Print", mFile, KeyStroke.getKeyStroke(KeyEvent.VK_F12, 0), false); - aPrintPreview = addAction("PrintPreview", mFile, KeyStroke.getKeyStroke(KeyEvent.VK_P, Event.SHIFT_MASK+Event.ALT_MASK), false); + aPrintPreview = addAction("PrintPreview", mFile, KeyStroke.getKeyStroke(KeyEvent.VK_P, ActionEvent.SHIFT_MASK+ActionEvent.ALT_MASK), false); if (MRole.getDefault().isCanExport()) { aExport = addAction("Export", mFile, null, false); } mFile.addSeparator(); - aEnd = addAction("End", mFile, KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.ALT_MASK), false); - aLogout = addAction("Logout", mFile, KeyStroke.getKeyStroke(KeyEvent.VK_L, Event.SHIFT_MASK+Event.ALT_MASK), false); - aExit = addAction("Exit", mFile, KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.SHIFT_MASK+Event.ALT_MASK), false); + aEnd = addAction("End", mFile, KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.ALT_MASK), false); + aLogout = addAction("Logout", mFile, KeyStroke.getKeyStroke(KeyEvent.VK_L, ActionEvent.SHIFT_MASK+ActionEvent.ALT_MASK), false); + aExit = addAction("Exit", mFile, KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.SHIFT_MASK+ActionEvent.ALT_MASK), false); // Edit JMenu mEdit = AEnv.getMenu("Edit"); menuBar.add(mEdit); aNew = addAction("New", mEdit, KeyStroke.getKeyStroke(KeyEvent.VK_F2, 0), false); aSave = addAction("Save", mEdit, KeyStroke.getKeyStroke(KeyEvent.VK_F4, 0), false); - aSaveAndCreate = addAction("SaveCreate", mEdit, KeyStroke.getKeyStroke(KeyEvent.VK_Q, KeyEvent.CTRL_MASK), false); + aSaveAndCreate = addAction("SaveCreate", mEdit, KeyStroke.getKeyStroke(KeyEvent.VK_Q, ActionEvent.CTRL_MASK), false); mEdit.addSeparator(); - aCopy = addAction("Copy", mEdit, KeyStroke.getKeyStroke(KeyEvent.VK_F2, Event.SHIFT_MASK), false); + aCopy = addAction("Copy", mEdit, KeyStroke.getKeyStroke(KeyEvent.VK_F2, ActionEvent.SHIFT_MASK), false); aDelete = addAction("Delete", mEdit, KeyStroke.getKeyStroke(KeyEvent.VK_F3, 0), false); - aDeleteSelection = addAction("DeleteSelection", mEdit, KeyStroke.getKeyStroke(KeyEvent.VK_D, Event.CTRL_MASK), false); + aDeleteSelection = addAction("DeleteSelection", mEdit, KeyStroke.getKeyStroke(KeyEvent.VK_D, ActionEvent.CTRL_MASK), false); aIgnore = addAction("Ignore", mEdit, KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), false); aRefresh = addAction("Refresh", mEdit, KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0), false); mEdit.addSeparator(); @@ -390,15 +389,15 @@ public final class APanel extends CPanel menuBar.add(mView); if (MRole.getDefault().isAllow_Info_Product()) { - aProduct = addAction("InfoProduct", mView, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK), false); + aProduct = addAction("InfoProduct", mView, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK), false); } if (MRole.getDefault().isAllow_Info_BPartner()) { - aBPartner = addAction("InfoBPartner", mView, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.SHIFT_MASK+Event.ALT_MASK), false); + aBPartner = addAction("InfoBPartner", mView, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.SHIFT_MASK+ActionEvent.ALT_MASK), false); } if (MRole.getDefault().isShowAcct() && MRole.getDefault().isAllow_Info_Account()) { - aAccount = addAction("InfoAccount",mView, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK+Event.CTRL_MASK), false); + aAccount = addAction("InfoAccount",mView, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK+ActionEvent.CTRL_MASK), false); } if (MRole.getDefault().isAllow_Info_Schedule()) { @@ -455,13 +454,13 @@ public final class APanel extends CPanel // Go JMenu mGo = AEnv.getMenu("Go"); menuBar.add(mGo); - aFirst = addAction("First", mGo, KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, Event.ALT_MASK), false); - aPrevious = addAction("Previous", mGo, KeyStroke.getKeyStroke(KeyEvent.VK_UP, Event.ALT_MASK), false); - aNext = addAction("Next", mGo, KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, Event.ALT_MASK), false); - aLast = addAction("Last", mGo, KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, Event.ALT_MASK), false); + aFirst = addAction("First", mGo, KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, ActionEvent.ALT_MASK), false); + aPrevious = addAction("Previous", mGo, KeyStroke.getKeyStroke(KeyEvent.VK_UP, ActionEvent.ALT_MASK), false); + aNext = addAction("Next", mGo, KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, ActionEvent.ALT_MASK), false); + aLast = addAction("Last", mGo, KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, ActionEvent.ALT_MASK), false); mGo.addSeparator(); - aParent = addAction("Parent", mGo, KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, Event.ALT_MASK), false); - aDetail = addAction("Detail", mGo, KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, Event.ALT_MASK), false); + aParent = addAction("Parent", mGo, KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, ActionEvent.ALT_MASK), false); + aDetail = addAction("Detail", mGo, KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, ActionEvent.ALT_MASK), false); mGo.addSeparator(); aZoomAcross = addAction("ZoomAcross", mGo, null, false); aRequest = addAction("Request", mGo, null, false); @@ -490,7 +489,7 @@ public final class APanel extends CPanel AMenu aMenu = (AMenu)AEnv.getWindow(0); m_WindowMenu = new WindowMenu(aMenu.getWindowManager(), m_window); menuBar.add(m_WindowMenu); - aShowAllWindow = addAction("ShowAllWindow", null, KeyStroke.getKeyStroke(KeyEvent.VK_W, KeyEvent.CTRL_MASK), false); + aShowAllWindow = addAction("ShowAllWindow", null, KeyStroke.getKeyStroke(KeyEvent.VK_W, ActionEvent.CTRL_MASK), false); // Help JMenu mHelp = AEnv.getMenu("Help"); @@ -856,7 +855,7 @@ public final class APanel extends CPanel // Is this tab included? if (includedMap.size() > 0) { - GridController parent = (GridController)includedMap.get(new Integer(gTab.getAD_Tab_ID())); + GridController parent = (GridController)includedMap.get(Integer.valueOf(gTab.getAD_Tab_ID())); if (parent != null) { // FR [ 1757088 ] @@ -2042,10 +2041,10 @@ public final class APanel extends CPanel if(okCancel != null && okCancel == JOptionPane.OK_OPTION) { log.fine("ok"); - Object[] selectedValues = list.getSelectedValues(); - for (int i = 0; i < selectedValues.length; i++) + List selectedValues = list.getSelectedValuesList(); + for (int i = 0; i < selectedValues.size(); i++) { - if (log.isLoggable(Level.FINE)) log.fine(selectedValues[i].toString()); + if (log.isLoggable(Level.FINE)) log.fine(selectedValues.get(i).toString()); } int[] indices = list.getSelectedIndices(); Arrays.sort(indices); @@ -2333,7 +2332,7 @@ public final class APanel extends CPanel { if (queryColumn.endsWith("_ID")) query.addRestriction(queryColumn, MQuery.EQUAL, - new Integer(Env.getContextAsInt(m_ctx, m_curWindowNo, queryColumn)), + Integer.valueOf(Env.getContextAsInt(m_ctx, m_curWindowNo, queryColumn)), infoName, infoDisplay); else query.addRestriction(queryColumn, MQuery.EQUAL, @@ -2366,7 +2365,7 @@ public final class APanel extends CPanel { if (link.endsWith("_ID")) query.addRestriction(link, MQuery.EQUAL, - new Integer(Env.getContextAsInt(m_ctx, m_curWindowNo, link))); + Integer.valueOf(Env.getContextAsInt(m_ctx, m_curWindowNo, link))); else query.addRestriction(link, MQuery.EQUAL, Env.getContext(m_ctx, m_curWindowNo, link)); @@ -2540,7 +2539,7 @@ public final class APanel extends CPanel if (record_ID == -1) // No Key return; // Control Pressed - if ((m_lastModifiers & InputEvent.CTRL_MASK) != 0) + if ((m_lastModifiers & ActionEvent.CTRL_MASK) != 0) { new RecordAccessDialog(AEnv.getFrame(this), m_curTab.getAD_Table_ID(), record_ID); } @@ -3072,26 +3071,26 @@ public final class APanel extends CPanel */ private void initSwitchLineAction() { aSwitchLinesDownAction = new SwitchAction("switchLinesDown", KeyStroke.getKeyStroke( - KeyEvent.VK_DOWN, Event.SHIFT_MASK), this); + KeyEvent.VK_DOWN, ActionEvent.SHIFT_MASK), this); aSwitchLinesUpAction = new SwitchAction("switchLinesUp", KeyStroke.getKeyStroke( - KeyEvent.VK_UP, Event.SHIFT_MASK), this); + KeyEvent.VK_UP, ActionEvent.SHIFT_MASK), this); JTable table = m_curGC.getTable(); table.getInputMap(CPanel.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put( - KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, Event.SHIFT_MASK), "none"); + KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, ActionEvent.SHIFT_MASK), "none"); table.getInputMap(CPanel.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put( - KeyStroke.getKeyStroke(KeyEvent.VK_UP, Event.SHIFT_MASK), "none"); + KeyStroke.getKeyStroke(KeyEvent.VK_UP, ActionEvent.SHIFT_MASK), "none"); table.getInputMap(CPanel.WHEN_FOCUSED).put( - KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, Event.SHIFT_MASK), "none"); + KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, ActionEvent.SHIFT_MASK), "none"); table.getInputMap(CPanel.WHEN_FOCUSED).put( - KeyStroke.getKeyStroke(KeyEvent.VK_UP, Event.SHIFT_MASK), "none"); + KeyStroke.getKeyStroke(KeyEvent.VK_UP, ActionEvent.SHIFT_MASK), "none"); getInputMap(CPanel.WHEN_IN_FOCUSED_WINDOW).put( - KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, Event.SHIFT_MASK), + KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, ActionEvent.SHIFT_MASK), aSwitchLinesDownAction.getName()); getActionMap().put(aSwitchLinesDownAction.getName(), aSwitchLinesDownAction); getInputMap(CPanel.WHEN_IN_FOCUSED_WINDOW).put( - KeyStroke.getKeyStroke(KeyEvent.VK_UP, Event.SHIFT_MASK), + KeyStroke.getKeyStroke(KeyEvent.VK_UP, ActionEvent.SHIFT_MASK), aSwitchLinesUpAction.getName()); getActionMap().put(aSwitchLinesUpAction.getName(), aSwitchLinesUpAction); } diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/ARequest.java b/org.adempiere.ui.swing/src/org/compiere/apps/ARequest.java index a19a232bee..65a1c01faf 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/ARequest.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/ARequest.java @@ -220,47 +220,47 @@ public class ARequest implements ActionListener { GridTab tab = frame.getAPanel().getCurrentTab(); tab.dataNew (false); - tab.setValue("AD_Table_ID", new Integer(m_AD_Table_ID)); - tab.setValue("Record_ID", new Integer(m_Record_ID)); + tab.setValue("AD_Table_ID", Integer.valueOf(m_AD_Table_ID)); + tab.setValue("Record_ID", Integer.valueOf(m_Record_ID)); // if (m_C_BPartner_ID != 0) - tab.setValue("C_BPartner_ID", new Integer(m_C_BPartner_ID)); + tab.setValue("C_BPartner_ID", Integer.valueOf(m_C_BPartner_ID)); // if (m_AD_Table_ID == MBPartner.Table_ID) - tab.setValue("C_BPartner_ID", new Integer(m_Record_ID)); + tab.setValue("C_BPartner_ID", Integer.valueOf(m_Record_ID)); else if (m_AD_Table_ID == MUser.Table_ID) - tab.setValue("AD_User_ID", new Integer(m_Record_ID)); + tab.setValue("AD_User_ID", Integer.valueOf(m_Record_ID)); // else if (m_AD_Table_ID == MProject.Table_ID) - tab.setValue("C_Project_ID", new Integer(m_Record_ID)); + tab.setValue("C_Project_ID", Integer.valueOf(m_Record_ID)); else if (m_AD_Table_ID == MAsset.Table_ID) - tab.setValue("A_Asset_ID", new Integer(m_Record_ID)); + tab.setValue("A_Asset_ID", Integer.valueOf(m_Record_ID)); // else if (m_AD_Table_ID == MOrder.Table_ID) - tab.setValue("C_Order_ID", new Integer(m_Record_ID)); + tab.setValue("C_Order_ID", Integer.valueOf(m_Record_ID)); else if (m_AD_Table_ID == MInvoice.Table_ID) - tab.setValue("C_Invoice_ID", new Integer(m_Record_ID)); + tab.setValue("C_Invoice_ID", Integer.valueOf(m_Record_ID)); // else if (m_AD_Table_ID == MProduct.Table_ID) - tab.setValue("M_Product_ID", new Integer(m_Record_ID)); + tab.setValue("M_Product_ID", Integer.valueOf(m_Record_ID)); else if (m_AD_Table_ID == MPayment.Table_ID) - tab.setValue("C_Payment_ID", new Integer(m_Record_ID)); + tab.setValue("C_Payment_ID", Integer.valueOf(m_Record_ID)); // else if (m_AD_Table_ID == MInOut.Table_ID) - tab.setValue("M_InOut_ID", new Integer(m_Record_ID)); + tab.setValue("M_InOut_ID", Integer.valueOf(m_Record_ID)); else if (m_AD_Table_ID == MRMA.Table_ID) - tab.setValue("M_RMA_ID", new Integer(m_Record_ID)); + tab.setValue("M_RMA_ID", Integer.valueOf(m_Record_ID)); // else if (m_AD_Table_ID == MCampaign.Table_ID) - tab.setValue("C_Campaign_ID", new Integer(m_Record_ID)); + tab.setValue("C_Campaign_ID", Integer.valueOf(m_Record_ID)); // else if (m_AD_Table_ID == MRequest.Table_ID) - tab.setValue(MRequest.COLUMNNAME_R_RequestRelated_ID, new Integer(m_Record_ID)); + tab.setValue(MRequest.COLUMNNAME_R_RequestRelated_ID, Integer.valueOf(m_Record_ID)); // FR [2842165] - Order Ref link from SO line creating new request else if (m_AD_Table_ID == MOrderLine.Table_ID) { MOrderLine oLine = new MOrderLine(Env.getCtx(), m_Record_ID, null); if (oLine != null) { - tab.setValue(MOrderLine.COLUMNNAME_C_Order_ID, new Integer(oLine.getC_Order_ID())); + tab.setValue(MOrderLine.COLUMNNAME_C_Order_ID, Integer.valueOf(oLine.getC_Order_ID())); } } } diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/AppsAction.java b/org.adempiere.ui.swing/src/org/compiere/apps/AppsAction.java index 3cb2fb48d8..935aae5aaf 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/AppsAction.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/AppsAction.java @@ -97,11 +97,11 @@ public final class AppsAction extends AbstractAction int pos = toolTipText.indexOf('&'); if (pos != -1 && toolTipText.length() > pos) // We have a nemonic - creates ALT-_ { - Character ch = new Character(toolTipText.toUpperCase().charAt(pos+1)); + Character ch = Character.valueOf(toolTipText.toUpperCase().charAt(pos+1)); if (ch != ' ') { toolTipText = toolTipText.substring(0, pos) + toolTipText.substring(pos+1); - putValue(Action.MNEMONIC_KEY, new Integer(ch.hashCode())); + putValue(Action.MNEMONIC_KEY, Integer.valueOf(ch.hashCode())); } } // @@ -126,7 +126,7 @@ public final class AppsAction extends AbstractAction putValue(Action.SHORT_DESCRIPTION, toolTipText); // Tooltip putValue(Action.ACTION_COMMAND_KEY, m_action); // ActionCammand putValue(Action.ACCELERATOR_KEY, accelerator); // KeyStroke - // putValue(Action.MNEMONIC_KEY, new Integer(0)); // Mnemonic + // putValue(Action.MNEMONIC_KEY, Integer.valueOf(0)); // Mnemonic // putValue(Action.DEFAULT, text); // Not Used // Create Button diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/ConfirmPanel.java b/org.adempiere.ui.swing/src/org/compiere/apps/ConfirmPanel.java index 0d36c9fcb5..d46a86b3b3 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/ConfirmPanel.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/ConfirmPanel.java @@ -20,6 +20,7 @@ import java.awt.BorderLayout; import java.awt.Component; import java.awt.FlowLayout; import java.awt.Insets; +import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyEvent; @@ -242,7 +243,7 @@ public final class ConfirmPanel extends CPanel public static final CButton createProcessButton (String text) { AppsAction aa = new AppsAction (A_PROCESS, - KeyStroke.getKeyStroke(KeyEvent.VK_F4, KeyEvent.SHIFT_MASK), text); + KeyStroke.getKeyStroke(KeyEvent.VK_F4, ActionEvent.SHIFT_MASK), text); CButton button = (CButton)aa.getButton(); button.setMargin(s_insets); return button; diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/FieldRecordInfo.java b/org.adempiere.ui.swing/src/org/compiere/apps/FieldRecordInfo.java index fb88a8dc26..d5723d555b 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/FieldRecordInfo.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/FieldRecordInfo.java @@ -258,9 +258,9 @@ public class FieldRecordInfo extends CDialog else if (column.getAD_Reference_ID() == DisplayType.Integer) { if (OldValue != null) - showOldValue = m_intFormat.format (new Integer (OldValue)); + showOldValue = m_intFormat.format (Integer.valueOf(OldValue)); if (NewValue != null) - showNewValue = m_intFormat.format (new Integer (NewValue)); + showNewValue = m_intFormat.format (Integer.valueOf(NewValue)); } else if (DisplayType.isNumeric (column.getAD_Reference_ID ())) { diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/OnlineHelp.java b/org.adempiere.ui.swing/src/org/compiere/apps/OnlineHelp.java index 5bb445c93f..7d25c265c7 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/OnlineHelp.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/OnlineHelp.java @@ -268,7 +268,7 @@ class Worker extends Thread InputStream is = conn.getInputStream(); HTMLEditorKit kit = new HTMLEditorKit(); HTMLDocument doc = (HTMLDocument)kit.createDefaultDocument(); - doc.putProperty("IgnoreCharsetDirective", new Boolean(true)); + doc.putProperty("IgnoreCharsetDirective", Boolean.TRUE); kit.read (new InputStreamReader(is), doc, 0); // Get The Links to the Help Pages diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/RecordInfo.java b/org.adempiere.ui.swing/src/org/compiere/apps/RecordInfo.java index 2c9dab5aa5..1c8fbe26be 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/RecordInfo.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/RecordInfo.java @@ -325,9 +325,9 @@ public class RecordInfo extends CDialog else if (column.getAD_Reference_ID() == DisplayType.Integer) { if (OldValue != null) - showOldValue = m_intFormat.format (new Integer (OldValue)); + showOldValue = m_intFormat.format (Integer.valueOf(OldValue)); if (NewValue != null) - showNewValue = m_intFormat.format (new Integer (NewValue)); + showNewValue = m_intFormat.format (Integer.valueOf(NewValue)); } else if (DisplayType.isNumeric (column.getAD_Reference_ID ())) { diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/WindowMenu.java b/org.adempiere.ui.swing/src/org/compiere/apps/WindowMenu.java index 9ec024000a..2134a701a7 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/WindowMenu.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/WindowMenu.java @@ -134,7 +134,7 @@ public class WindowMenu extends JMenu { } }); setEnvText(expose, "ShowAllWindow"); - expose.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_W, KeyEvent.CTRL_MASK)); + expose.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_W, ActionEvent.CTRL_MASK)); setEnvText(closeOthers, "CloseOtherWindows"); addMenuListener(new MenuListener() { public void menuCanceled (MenuEvent e) {} diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/FormFrame.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/FormFrame.java index e575e7af81..c02715d626 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/form/FormFrame.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/FormFrame.java @@ -17,7 +17,6 @@ package org.compiere.apps.form; import java.awt.Cursor; -import java.awt.Event; import java.awt.GraphicsConfiguration; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -148,11 +147,11 @@ public class FormFrame extends CFrame JMenu mFile = AEnv.getMenu("File"); menuBar.add(mFile); AEnv.addMenuItem("PrintScreen", null, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, 0), mFile, this); - AEnv.addMenuItem("ScreenShot", null, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, Event.SHIFT_MASK), mFile, this); - AEnv.addMenuItem("Report", null, KeyStroke.getKeyStroke(KeyEvent.VK_P, Event.ALT_MASK), mFile, this); + AEnv.addMenuItem("ScreenShot", null, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, ActionEvent.SHIFT_MASK), mFile, this); + AEnv.addMenuItem("Report", null, KeyStroke.getKeyStroke(KeyEvent.VK_P, ActionEvent.ALT_MASK), mFile, this); mFile.addSeparator(); - AEnv.addMenuItem("End", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.ALT_MASK), mFile, this); - AEnv.addMenuItem("Exit", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.SHIFT_MASK+Event.ALT_MASK), mFile, this); + AEnv.addMenuItem("End", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.ALT_MASK), mFile, this); + AEnv.addMenuItem("Exit", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.SHIFT_MASK+ActionEvent.ALT_MASK), mFile, this); // View JMenu mView = AEnv.getMenu("View"); @@ -160,15 +159,15 @@ public class FormFrame extends CFrame if (MRole.getDefault().isAllow_Info_Product()) { - AEnv.addMenuItem("InfoProduct", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK), mView, this); + AEnv.addMenuItem("InfoProduct", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK), mView, this); } if (MRole.getDefault().isAllow_Info_BPartner()) { - AEnv.addMenuItem("InfoBPartner", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK+Event.CTRL_MASK), mView, this); + AEnv.addMenuItem("InfoBPartner", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK+ActionEvent.CTRL_MASK), mView, this); } if (MRole.getDefault().isShowAcct() && MRole.getDefault().isAllow_Info_Account()) { - AEnv.addMenuItem("InfoAccount", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK+Event.CTRL_MASK), mView, this); + AEnv.addMenuItem("InfoAccount", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK+ActionEvent.CTRL_MASK), mView, this); } if (MRole.getDefault().isAllow_Info_Schedule()) { diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/VAllocation.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VAllocation.java index cead1dfac2..514b1cfe41 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/form/VAllocation.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/VAllocation.java @@ -255,7 +255,7 @@ public class VAllocation extends Allocation int AD_Column_ID = COLUMN_C_INVOICE_C_CURRENCY_ID; // C_Invoice.C_Currency_ID MLookup lookupCur = MLookupFactory.get (Env.getCtx(), m_WindowNo, 0, AD_Column_ID, DisplayType.TableDir); currencyPick = new VLookup("C_Currency_ID", true, false, true, lookupCur); - currencyPick.setValue(new Integer(m_C_Currency_ID)); + currencyPick.setValue(Integer.valueOf(m_C_Currency_ID)); currencyPick.addVetoableChangeListener(this); // Organization filter selection @@ -283,7 +283,7 @@ public class VAllocation extends Allocation AD_Column_ID = 61804; // C_AllocationLine.C_Charge_ID MLookup lookupCharge = MLookupFactory.get (Env.getCtx(), m_WindowNo, 0, AD_Column_ID, DisplayType.TableDir); chargePick = new VLookup("C_Charge_ID", false, false, true, lookupCharge); - chargePick.setValue(new Integer(m_C_Charge_ID)); + chargePick.setValue(Integer.valueOf(m_C_Charge_ID)); chargePick.addVetoableChangeListener(this); } // dynInit diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/VBOMDrop.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VBOMDrop.java index 358c973afc..7da35141d1 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/form/VBOMDrop.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/VBOMDrop.java @@ -422,7 +422,7 @@ public class VBOMDrop extends CPanel this.add(b, new ALayoutConstraint(m_bomLine++, 0)); } // Add to List & display - m_productList.add (new Integer(M_Product_ID)); + m_productList.add (Integer.valueOf(M_Product_ID)); VNumber qty = new VNumber ("Qty", true, false, true, DisplayType.Quantity, name); qty.setValue(lineQty); qty.setReadWrite(selected); diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/VPayPrint.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VPayPrint.java index 1b506efcd2..8c3535ceb5 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/form/VPayPrint.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/VPayPrint.java @@ -245,7 +245,7 @@ public class VPayPrint extends PayPrint implements FormPanel, ActionListener, Ve return; m_C_PaySelection_ID = C_PaySelection_ID; - paySelectSearch.setValue(new Integer(m_C_PaySelection_ID)); + paySelectSearch.setValue(Integer.valueOf(m_C_PaySelection_ID)); loadPaySelectInfo(); } // setsetPaySelection diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/VStatementCreateFromBatch.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VStatementCreateFromBatch.java index d2090577be..5eb8579999 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/form/VStatementCreateFromBatch.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/VStatementCreateFromBatch.java @@ -149,7 +149,7 @@ public class VStatementCreateFromBatch extends StatementCreateFromBatch implemen bankAccountField = new VLookup ("C_BankAccount_ID", true, true, true, lookup); // Set Default int C_BankAccount_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BankAccount_ID"); - bankAccountField.setValue(new Integer(C_BankAccount_ID)); + bankAccountField.setValue(Integer.valueOf(C_BankAccount_ID)); bankAccountField.addActionListener(this); // initial Loading authorizationField = new VString ("authorization", false, false, true, 10, 30, null, null); @@ -302,7 +302,7 @@ public class VStatementCreateFromBatch extends StatementCreateFromBatch implemen m_frame.getGridTab())); } - protected void loadTableOIS (Vector data) + protected void loadTableOIS (Vector data) { // Remove previous listeners form.getMiniTable().getModel().removeTableModelListener(form); diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/form/VTreeBOM.java b/org.adempiere.ui.swing/src/org/compiere/apps/form/VTreeBOM.java index b6ca42300c..e361690041 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/form/VTreeBOM.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/form/VTreeBOM.java @@ -28,6 +28,7 @@ import java.awt.event.KeyListener; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.Enumeration; import java.util.List; import java.util.Properties; @@ -477,8 +478,8 @@ public class VTreeBOM extends CPanel implements FormPanel, ActionListener, TreeS treeInfo.setText ("Selected Product: "+M_Product.getValue()); Vector line = new Vector(10); - line.add( new Boolean(M_Product.isActive())); // 0 IsActive - line.add( new Integer(0).toString()); // 1 Line + line.add( Boolean.valueOf(M_Product.isActive())); // 0 IsActive + line.add( Integer.valueOf(0).toString()); // 1 Line KeyNamePair pp = new KeyNamePair(M_Product.getM_Product_ID(),M_Product.getValue().concat("_").concat(M_Product.getName())); line.add(pp); // 2 M_Product_ID MUOM u = new MUOM(M_Product.getCtx(), M_Product.getC_UOM_ID(), M_Product.get_TrxName()); @@ -560,8 +561,8 @@ public class VTreeBOM extends CPanel implements FormPanel, ActionListener, TreeS MProduct M_Product = MProduct.get(getCtx(), bomline.getM_ProductBOM_ID()); Vector line = new Vector(10); - line.add( new Boolean(bomline.isActive())); // 0 IsActive - line.add( new Integer(bomline.getLine()).toString()); // 1 Line + line.add( Boolean.valueOf(bomline.isActive())); // 0 IsActive + line.add( Integer.valueOf(bomline.getLine()).toString()); // 1 Line KeyNamePair pp = new KeyNamePair(M_Product.getM_Product_ID(),M_Product.getValue().concat("_").concat(M_Product.getName())); line.add(pp); // 2 M_Product_ID MUOM u = new MUOM(M_Product.getCtx(), M_Product.getC_UOM_ID(), M_Product.get_TrxName()); @@ -588,8 +589,8 @@ public class VTreeBOM extends CPanel implements FormPanel, ActionListener, TreeS MProduct M_Product = MProduct.get(getCtx(), bom.getM_Product_ID()); Vector line = new Vector(10); - line.add( new Boolean(M_Product.isActive())); // 0 IsActive - line.add( new Integer(bom.getLine()).toString()); // 1 Line + line.add( Boolean.valueOf(M_Product.isActive())); // 0 IsActive + line.add( Integer.valueOf(bom.getLine()).toString()); // 1 Line KeyNamePair pp = new KeyNamePair(M_Product.getM_Product_ID(),M_Product.getValue().concat("_").concat(M_Product.getName())); line.add(pp); // 2 M_Product_ID MUOM u = new MUOM(M_Product.getCtx(), M_Product.getC_UOM_ID(), M_Product.get_TrxName()); @@ -718,7 +719,7 @@ class myJTree extends JTree sb.append(" ["+((KeyNamePair) userObject.elementAt(3)).getName().trim()+"]"); //BOMQty BigDecimal BOMQty = (BigDecimal)(userObject.elementAt(4)); - sb.append("x"+BOMQty.setScale(2, BigDecimal.ROUND_HALF_UP).stripTrailingZeros()); + sb.append("x"+BOMQty.setScale(2, RoundingMode.HALF_UP).stripTrailingZeros()); return sb.toString(); } diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/search/Find.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/Find.java index 212f02edc6..9677d7b428 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/search/Find.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/search/Find.java @@ -25,7 +25,6 @@ import java.awt.GridBagLayout; import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; @@ -531,7 +530,7 @@ public final class Find extends CDialog /**/ // TargetFields - m_targetFields.put (new Integer(mField.getAD_Column_ID()), mField); + m_targetFields.put (Integer.valueOf(mField.getAD_Column_ID()), mField); } // for all target tab fields // Disable simple query fields @@ -646,7 +645,7 @@ public final class Find extends CDialog } }; advancedTable.getActionMap().put(im.get(tab), tabActionWrapper); - KeyStroke shiftTab = KeyStroke.getKeyStroke(KeyEvent.VK_TAB, InputEvent.SHIFT_MASK); + KeyStroke shiftTab = KeyStroke.getKeyStroke(KeyEvent.VK_TAB, ActionEvent.SHIFT_MASK); final Action shiftTabAction = advancedTable.getActionMap().get(im.get(shiftTab)); Action shiftTabActionWrapper = new AbstractAction() { @@ -1444,7 +1443,7 @@ public final class Find extends CDialog if (in instanceof Integer) return in; int i = Integer.parseInt(in.toString()); - return new Integer(i); + return Integer.valueOf(i); } // Return BigDecimal else if (DisplayType.isNumeric(dt)) @@ -1512,7 +1511,7 @@ public final class Find extends CDialog || (DisplayType.isID(dt) && field.getColumnName().endsWith("_ID"))) { int i = Integer.parseInt(in); - return new Integer(i); + return Integer.valueOf(i); } // Return BigDecimal else if (DisplayType.isNumeric(dt)) diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/search/Info.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/Info.java index 4c3016b143..96d01c2d5f 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/search/Info.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/search/Info.java @@ -1215,15 +1215,15 @@ public abstract class Info extends CDialog ((IDColumn)data).setSelected(isDefaultSelected()); } else if (c == Boolean.class) - data = new Boolean("Y".equals(m_rs.getString(colIndex))); + data = Boolean.valueOf("Y".equals(m_rs.getString(colIndex))); else if (c == Timestamp.class) data = m_rs.getTimestamp(colIndex); else if (c == BigDecimal.class) data = m_rs.getBigDecimal(colIndex); else if (c == Double.class) - data = new Double(m_rs.getDouble(colIndex)); + data = Double.valueOf(m_rs.getDouble(colIndex)); else if (c == Integer.class) - data = new Integer(m_rs.getInt(colIndex)); + data = Integer.valueOf(m_rs.getInt(colIndex)); else if (c == KeyNamePair.class) { String display = m_rs.getString(colIndex); diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoInOut.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoInOut.java index ce9965462c..a8acede1c1 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoInOut.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoInOut.java @@ -212,7 +212,7 @@ public class InfoInOut extends Info // Set Defaults String bp = Env.getContext(Env.getCtx(), p_WindowNo, "C_BPartner_ID"); if (bp != null && bp.length() != 0) - fBPartner_ID.setValue(new Integer(bp)); + fBPartner_ID.setValue(Integer.valueOf(bp)); // prepare table StringBuilder where = new StringBuilder("i.IsActive='Y'"); diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoInvoice.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoInvoice.java index 84b563a2ac..9e052da1a2 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoInvoice.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoInvoice.java @@ -252,7 +252,7 @@ public class InfoInvoice extends Info // Set Defaults String bp = Env.getContext(Env.getCtx(), p_WindowNo, "C_BPartner_ID"); if (bp != null && bp.length() != 0) - fBPartner_ID.setValue(new Integer(bp)); + fBPartner_ID.setValue(Integer.valueOf(bp)); // prepare table StringBuilder where = new StringBuilder("i.IsActive='Y'"); diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoOrder.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoOrder.java index 91b4e1a87a..fb000407aa 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoOrder.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoOrder.java @@ -230,7 +230,7 @@ public class InfoOrder extends Info // Set Defaults String bp = Env.getContext(Env.getCtx(), p_WindowNo, "C_BPartner_ID"); if (bp != null && bp.length() != 0) - fBPartner_ID.setValue(new Integer(bp)); + fBPartner_ID.setValue(Integer.valueOf(bp)); // prepare table StringBuilder where = new StringBuilder("o.IsActive='Y'"); diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoPayment.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoPayment.java index 86553081d7..87afc3e650 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoPayment.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoPayment.java @@ -229,7 +229,7 @@ public class InfoPayment extends Info // Set Defaults String bp = Env.getContext(Env.getCtx(), p_WindowNo, "C_BPartner_ID"); if (bp != null && bp.length() != 0) - fBPartner_ID.setValue(new Integer(bp)); + fBPartner_ID.setValue(Integer.valueOf(bp)); // prepare table StringBuilder where = new StringBuilder("p.IsActive='Y'"); diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoProduct.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoProduct.java index 1fba267726..d9d600e5bd 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoProduct.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/search/InfoProduct.java @@ -1272,10 +1272,10 @@ public class InfoProduct extends Info implements ActionListener, ChangeListener line.add(null); // Date double qtyOnHand = rs.getDouble(1); qty += qtyOnHand; - line.add(new Double(qtyOnHand)); // Qty + line.add(Double.valueOf(qtyOnHand)); // Qty line.add(null); // BPartner - line.add(new Double(rs.getDouble(3))); // QtyOrdered - line.add(new Double(rs.getDouble(2))); // QtyReserved + line.add(Double.valueOf(rs.getDouble(3))); // QtyOrdered + line.add(Double.valueOf(rs.getDouble(2))); // QtyReserved line.add(rs.getString(7)); // Locator String asi = rs.getString(4); if (showDetail && (asi == null || asi.length() == 0)) @@ -1331,15 +1331,15 @@ public class InfoProduct extends Info implements ActionListener, ChangeListener Double qtyOrdered = null; if (MDocType.DOCBASETYPE_PurchaseOrder.equals(DocBaseType)) { - qtyOrdered = new Double(oq); + qtyOrdered = Double.valueOf(oq); qty += oq; } else { - qtyReserved = new Double(oq); + qtyReserved = Double.valueOf(oq); qty -= oq; } - line.add(new Double(qty)); // Qty + line.add(Double.valueOf(qty)); // Qty line.add(rs.getString(6)); // BPartner line.add(qtyOrdered); // QtyOrdered line.add(qtyReserved); // QtyReserved diff --git a/org.adempiere.ui.swing/src/org/compiere/apps/search/InvoiceHistory.java b/org.adempiere.ui.swing/src/org/compiere/apps/search/InvoiceHistory.java index e4410396fd..7fdba6ab75 100644 --- a/org.adempiere.ui.swing/src/org/compiere/apps/search/InvoiceHistory.java +++ b/org.adempiere.ui.swing/src/org/compiere/apps/search/InvoiceHistory.java @@ -276,7 +276,7 @@ public class InvoiceHistory extends CDialog // 0-Name, 1-PriceActual, 2-QtyInvoiced, 3-Discount, 4-DocumentNo, 5-DateInvoiced line.add(rs.getString(1)); // Name line.add(rs.getBigDecimal(2)); // Price - line.add(new Double(rs.getDouble(4))); // Qty + line.add(Double.valueOf(rs.getDouble(4))); // Qty BigDecimal discountBD = rs.getBigDecimal(8); if (discountBD == null) { double priceList = rs.getDouble(3); @@ -505,9 +505,9 @@ public class InvoiceHistory extends CDialog Vector line = new Vector(6); // 1-Name, 2-MovementQty, 3-MovementDate, 4-IsSOTrx, 5-DocumentNo line.add(rs.getString(1)); // Name - line.add(new Double(rs.getDouble(2))); // Qty + line.add(Double.valueOf(rs.getDouble(2))); // Qty line.add(rs.getTimestamp(3)); // Date - line.add(new Boolean("Y".equals(rs.getString(4)))); // IsSOTrx + line.add(Boolean.valueOf("Y".equals(rs.getString(4)))); // IsSOTrx line.add(rs.getString(5)); // DocNo line.add(rs.getString(6)); // Warehouse data.add(line); @@ -598,10 +598,10 @@ public class InvoiceHistory extends CDialog line.add(null); // Date double qtyOnHand = rs.getDouble(1); qty += qtyOnHand; - line.add(new Double(qtyOnHand)); // Qty + line.add(Double.valueOf(qtyOnHand)); // Qty line.add(null); // BPartner - line.add(new Double(rs.getDouble(3))); // QtyOrdered - line.add(new Double(rs.getDouble(2))); // QtyReserved + line.add(Double.valueOf(rs.getDouble(3))); // QtyOrdered + line.add(Double.valueOf(rs.getDouble(2))); // QtyReserved line.add(rs.getString(7)); // Locator String asi = rs.getString(4); if (showDetail && (asi == null || asi.length() == 0)) @@ -657,15 +657,15 @@ public class InvoiceHistory extends CDialog Double qtyOrdered = null; if (MDocType.DOCBASETYPE_PurchaseOrder.equals(DocBaseType)) { - qtyOrdered = new Double(oq); + qtyOrdered = Double.valueOf(oq); qty += oq; } else { - qtyReserved = new Double(oq); + qtyReserved = Double.valueOf(oq); qty -= oq; } - line.add(new Double(qty)); // Qty + line.add(Double.valueOf(qty)); // Qty line.add(rs.getString(6)); // BPartner line.add(qtyOrdered); // QtyOrdered line.add(qtyReserved); // QtyReserved diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromDepositBatchUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromDepositBatchUI.java index 4846481808..8f07f32ab6 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromDepositBatchUI.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromDepositBatchUI.java @@ -152,7 +152,7 @@ public class VCreateFromDepositBatchUI extends CreateFromDepositBatch implements bankAccountField = new VLookup ("C_BankAccount_ID", true, true, true, lookup); // Set Default int C_BankAccount_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BankAccount_ID"); - bankAccountField.setValue(new Integer(C_BankAccount_ID)); + bankAccountField.setValue(Integer.valueOf(C_BankAccount_ID)); bankAccountField.addActionListener(this); // initial Loading authorizationField = new VString ("authorization", false, false, true, 10, 30, null, null); @@ -161,7 +161,7 @@ public class VCreateFromDepositBatchUI extends CreateFromDepositBatch implements MLookup lookupDocument = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, MColumn.getColumn_ID(MPayment.Table_Name, MPayment.COLUMNNAME_C_DocType_ID), DisplayType.TableDir); documentTypeField = new VLookup (MPayment.COLUMNNAME_C_DocType_ID,false,false,true,lookupDocument); int C_DocType_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_DocType_ID"); - documentTypeField.setValue(new Integer(C_DocType_ID)); + documentTypeField.setValue(Integer.valueOf(C_DocType_ID)); documentTypeField.addActionListener(this); MLookup lookupTender = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, MColumn.getColumn_ID(MPayment.Table_Name, MPayment.COLUMNNAME_TenderType), DisplayType.List); @@ -306,7 +306,7 @@ public class VCreateFromDepositBatchUI extends CreateFromDepositBatch implements documentTypeField.getValue(), tenderTypeField.getValue(), authorizationField.getText())); } - protected void loadTableOIS (Vector data) + protected void loadTableOIS (Vector data) { // Remove previous listeners dialog.getMiniTable().getModel().removeTableModelListener(dialog); diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromInvoiceUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromInvoiceUI.java index 7206955c04..194b7f98ed 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromInvoiceUI.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromInvoiceUI.java @@ -256,7 +256,7 @@ public class VCreateFromInvoiceUI extends CreateFromInvoice implements ActionLis bPartnerField = new VLookup ("C_BPartner_ID", true, false, true, lookup); // int C_BPartner_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BPartner_ID"); - bPartnerField.setValue(new Integer(C_BPartner_ID)); + bPartnerField.setValue(Integer.valueOf(C_BPartner_ID)); // initial loading initBPOrderDetails(C_BPartner_ID, forInvoice); @@ -360,7 +360,7 @@ public class VCreateFromInvoiceUI extends CreateFromInvoice implements ActionLis * Load Order/Invoice/Shipment data into Table * @param data data */ - protected void loadTableOIS (Vector data) + protected void loadTableOIS (Vector data) { // Remove previous listeners dialog.getMiniTable().getModel().removeTableModelListener(dialog); diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromPackageShipmentUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromPackageShipmentUI.java index 44ede962c2..277aa3e9ca 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromPackageShipmentUI.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromPackageShipmentUI.java @@ -80,7 +80,7 @@ public class VCreateFromPackageShipmentUI extends CreateFromPackageShipment return true; } - protected void loadTableOIS (Vector data) + protected void loadTableOIS (Vector data) { // Remove previous listeners dialog.getMiniTable().getModel().removeTableModelListener(dialog); diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromRMAUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromRMAUI.java index b41b3b642c..e489214b3d 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromRMAUI.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromRMAUI.java @@ -160,7 +160,7 @@ public class VCreateFromRMAUI extends CreateFromRMA implements VetoableChangeLis bPartnerField = new VLookup ("C_BPartner_ID", true, false, true, lookup); // int C_BPartner_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BPartner_ID"); - bPartnerField.setValue(new Integer(C_BPartner_ID)); + bPartnerField.setValue(Integer.valueOf(C_BPartner_ID)); } // initBPartner protected void loadRMA() @@ -172,7 +172,7 @@ public class VCreateFromRMAUI extends CreateFromRMA implements VetoableChangeLis * Load Order/Invoice/Shipment data into Table * @param data data */ - protected void loadTableOIS (Vector data) + protected void loadTableOIS (Vector data) { // Remove previous listeners dialog.getMiniTable().getModel().removeTableModelListener(dialog); diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromShipmentUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromShipmentUI.java index 842ba9bb96..a5993a16d1 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromShipmentUI.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromShipmentUI.java @@ -307,7 +307,7 @@ public class VCreateFromShipmentUI extends CreateFromShipment implements ActionL bPartnerField = new VLookup ("C_BPartner_ID", true, false, true, lookup); // int C_BPartner_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BPartner_ID"); - bPartnerField.setValue(new Integer(C_BPartner_ID)); + bPartnerField.setValue(Integer.valueOf(C_BPartner_ID)); // initial loading initBPOrderDetails(C_BPartner_ID, forInvoice); @@ -423,7 +423,7 @@ public class VCreateFromShipmentUI extends CreateFromShipment implements ActionL * Load Order/Invoice/Shipment data into Table * @param data data */ - protected void loadTableOIS (Vector data) + protected void loadTableOIS (Vector data) { // Remove previous listeners dialog.getMiniTable().getModel().removeTableModelListener(dialog); diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromStatementUI.java b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromStatementUI.java index 252df438b0..1c0ed1cb78 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromStatementUI.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/VCreateFromStatementUI.java @@ -152,7 +152,7 @@ public class VCreateFromStatementUI extends CreateFromStatement implements Actio bankAccountField = new VLookup ("C_BankAccount_ID", true, true, true, lookup); // Set Default int C_BankAccount_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BankAccount_ID"); - bankAccountField.setValue(new Integer(C_BankAccount_ID)); + bankAccountField.setValue(Integer.valueOf(C_BankAccount_ID)); bankAccountField.addActionListener(this); // initial Loading authorizationField = new VString ("authorization", false, false, true, 10, 30, null, null); @@ -304,7 +304,7 @@ public class VCreateFromStatementUI extends CreateFromStatement implements Actio documentTypeField.getValue(), tenderTypeField.getValue(), authorizationField.getText())); } - protected void loadTableOIS (Vector data) + protected void loadTableOIS (Vector data) { // Remove previous listeners dialog.getMiniTable().getModel().removeTableModelListener(dialog); diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormCash.java b/org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormCash.java index 5ccc4e6d68..8c7c75db74 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormCash.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormCash.java @@ -130,7 +130,7 @@ public class VPaymentFormCash extends PaymentFormCash implements ActionListener bDateField.setValue(m_DateAcct); // Is the currency an EMU currency? - Integer C_Currency_ID = new Integer(m_C_Currency_ID); + Integer C_Currency_ID = Integer.valueOf(m_C_Currency_ID); if (s_Currencies.containsKey(C_Currency_ID)) { Enumeration en = s_Currencies.keys(); while (en.hasMoreElements()) { diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormCheck.java b/org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormCheck.java index 7bb15f412b..ed7400b1ea 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormCheck.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/VPaymentFormCheck.java @@ -132,7 +132,7 @@ public class VPaymentFormCheck extends PaymentFormCheck implements ActionListene } // Is the currency an EMU currency? - Integer C_Currency_ID = new Integer(m_C_Currency_ID); + Integer C_Currency_ID = Integer.valueOf(m_C_Currency_ID); if (s_Currencies.containsKey(C_Currency_ID)) { Enumeration en = s_Currencies.keys(); diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/VSortTab.java b/org.adempiere.ui.swing/src/org/compiere/grid/VSortTab.java index 5c69e7de99..b5702475b6 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/VSortTab.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/VSortTab.java @@ -39,6 +39,7 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Arrays; +import java.util.List; import java.util.logging.Level; import javax.swing.DefaultListCellRenderer; @@ -525,11 +526,11 @@ public class VSortTab extends CPanel implements APanelTab void migrateValueAcrossLists (AWTEvent event) { Object source = event.getSource(); - Object[] selObjects = (source == bAdd || source == noList) ? - noList.getSelectedValues() : yesList.getSelectedValues(); - for (int i = 0; i < selObjects.length; i++) + List selObjects = (source == bAdd || source == noList) ? + noList.getSelectedValuesList() : yesList.getSelectedValuesList(); + for (int i = 0; i < selObjects.size(); i++) { - ListItem selObject = (ListItem)selObjects[i]; + ListItem selObject = (ListItem)selObjects.get(i); if (selObject == null || !selObject.isUpdateable()) continue; @@ -554,10 +555,10 @@ public class VSortTab extends CPanel implements APanelTab */ void migrateValueWithinYesList (AWTEvent event) { - Object[] selObjects = yesList.getSelectedValues(); + List selObjects = yesList.getSelectedValuesList(); if (selObjects == null) return; - int length = selObjects.length; + int length = selObjects.size(); if (length == 0) return; // Object selObject = selObjects[0]; @@ -572,7 +573,7 @@ public class VSortTab extends CPanel implements APanelTab if (source == bUp) { for (int i = 0; i < length; i++) { - ListItem selObject = (ListItem)selObjects[i]; + ListItem selObject = (ListItem)selObjects.get(i); int index = indices[i]; if (index == 0) break; @@ -589,7 +590,7 @@ public class VSortTab extends CPanel implements APanelTab else if (source == bDown) { for (int i = length - 1; i >= 0; i--) { - ListItem selObject = (ListItem)selObjects[i]; + ListItem selObject = (ListItem)selObjects.get(i); int index = indices[i]; if (index >= yesModel.size () - 1) break; diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/Calculator.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/Calculator.java index 96484105c3..24f70113ea 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/Calculator.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/Calculator.java @@ -28,6 +28,7 @@ import java.awt.event.ActionListener; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; @@ -485,7 +486,7 @@ public final class Calculator extends CDialog char op = token.charAt(0); if (op == '%') { - firstNo = firstNo.divide(Env.ONEHUNDRED, m_format.getMaximumFractionDigits(), BigDecimal.ROUND_HALF_UP); + firstNo = firstNo.divide(Env.ONEHUNDRED, m_format.getMaximumFractionDigits(), RoundingMode.HALF_UP); m_number = firstNo; } @@ -523,13 +524,13 @@ public final class Calculator extends CDialog // Percent operation if (op2 == '%') - secondNo = secondNo.divide(Env.ONEHUNDRED, m_format.getMaximumFractionDigits(), BigDecimal.ROUND_HALF_UP); + secondNo = secondNo.divide(Env.ONEHUNDRED, m_format.getMaximumFractionDigits(), RoundingMode.HALF_UP); switch (op) { case '/': m_number = firstNo - .divide(secondNo, m_format.getMaximumFractionDigits(), BigDecimal.ROUND_HALF_UP); + .divide(secondNo, m_format.getMaximumFractionDigits(), RoundingMode.HALF_UP); break; case '*': m_number = firstNo.multiply(secondNo); @@ -543,7 +544,7 @@ public final class Calculator extends CDialog default: break; } - return m_number.setScale(m_format.getMaximumFractionDigits(), BigDecimal.ROUND_HALF_UP); + return m_number.setScale(m_format.getMaximumFractionDigits(), RoundingMode.HALF_UP); } // evaluate diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/Calendar.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/Calendar.java index 5e6ca43ebe..6b07cfcf67 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/Calendar.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/Calendar.java @@ -300,7 +300,7 @@ public class Calendar extends CDialog // Years m_currentYear = m_calendar.get(java.util.Calendar.YEAR); cYear.setEditor(new JSpinner.NumberEditor(cYear, "0000")); - cYear.setValue(new Integer(m_currentYear)); + cYear.setValue(Integer.valueOf(m_currentYear)); // Months -> 0=Jan 12=_ String[] months = formatDate.getDateFormatSymbols().getMonths(); @@ -443,7 +443,7 @@ public class Calendar extends CDialog // --- Set Month & Year m_setting = true; cMonth.setSelectedIndex(m_currentMonth-1); - cYear.setValue(new Integer(m_currentYear)); + cYear.setValue(Integer.valueOf(m_currentYear)); m_setting = false; // --- Set Day @@ -503,7 +503,7 @@ public class Calendar extends CDialog fHour.setSelectedIndex(index); // Set Minute int m = m_currentMinute; - fMinute.setValue(new Integer(m)); + fMinute.setValue(Integer.valueOf(m)); // Set PM cbPM.setSelected(pm); // Set TZ @@ -880,7 +880,7 @@ class MinuteModel extends SpinnerNumberModel minutes -= 60; // int steps = minutes / m_snapSize; - return new Integer(steps * m_snapSize); + return Integer.valueOf(steps * m_snapSize); } // getNextValue @@ -900,7 +900,7 @@ class MinuteModel extends SpinnerNumberModel steps++; if (steps * m_snapSize > 59) steps = 0; - return new Integer(steps * m_snapSize); + return Integer.valueOf(steps * m_snapSize); } // getNextValue } // MinuteModel diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocNumber.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocNumber.java index d3c567beb6..4416b9afac 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocNumber.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/MDocNumber.java @@ -17,6 +17,7 @@ package org.compiere.grid.ed; import java.math.BigDecimal; +import java.math.RoundingMode; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.text.ParseException; @@ -228,7 +229,7 @@ public final class MDocNumber extends PlainDocument { Number number = m_format.parse(value); percentValue = new BigDecimal (number.toString()); - percentValue = percentValue.divide(Env.ONEHUNDRED, m_format.getMaximumFractionDigits(), BigDecimal.ROUND_HALF_UP); + percentValue = percentValue.divide(Env.ONEHUNDRED, m_format.getMaximumFractionDigits(), RoundingMode.HALF_UP); m_tc.setText(m_format.format(percentValue)); } } diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccount.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccount.java index 85ea4c6678..23c1725e2f 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccount.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccount.java @@ -298,7 +298,7 @@ public final class VAccount extends JComponent */ public Object getValue() { - return new Integer (m_mAccount.C_ValidCombination_ID); + return Integer.valueOf(m_mAccount.C_ValidCombination_ID); } // getValue /** @@ -420,7 +420,7 @@ public final class VAccount extends JComponent // We have a Value if (C_ValidCombination_ID > 0) { - Integer newValue = new Integer(C_ValidCombination_ID); + Integer newValue = Integer.valueOf(C_ValidCombination_ID); // set & redisplay setValue(newValue); diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccountDialog.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccountDialog.java index 3b8c83c908..15607409f2 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccountDialog.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAccountDialog.java @@ -579,7 +579,7 @@ public final class VAccountDialog extends CDialog if (rs.wasNull()) editor.setValue(null); else - editor.setValue(new Integer (intValue)); + editor.setValue(Integer.valueOf(intValue)); } // loadInfoOf @@ -1126,7 +1126,7 @@ public final class VAccountDialog extends CDialog if (log.isLoggable(Level.CONFIG)) log.config("C_ValidCombination_ID=" + m_C_ValidCombination_ID + ", Changed=" + m_changed); if (!m_changed || m_C_ValidCombination_ID == 0) return null; - return new Integer(m_C_ValidCombination_ID); + return Integer.valueOf(m_C_ValidCombination_ID); } /** diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAssignment.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAssignment.java index 4c925c1140..f5479221c1 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAssignment.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VAssignment.java @@ -435,7 +435,7 @@ public class VAssignment extends JComponent // Set Value if (ma != null && ma.getS_ResourceAssignment_ID() != 0) { - setValue(new Integer(ma.getS_ResourceAssignment_ID())); + setValue(Integer.valueOf(ma.getS_ResourceAssignment_ID())); try { fireVetoableChange(this.getName(), new Object(), getValue()); diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VBPartner.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VBPartner.java index bf42718e98..669d72b9c7 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VBPartner.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VBPartner.java @@ -316,7 +316,7 @@ public final class VBPartner extends CDialog implements ActionListener if (m_pLocation != null) { int location = m_pLocation.getC_Location_ID(); - fAddress.setValue (new Integer(location)); + fAddress.setValue (Integer.valueOf(location)); // fPhone.setText(m_pLocation.getPhone()); fPhone2.setText(m_pLocation.getPhone2()); diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VCheckBox.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VCheckBox.java index 611fbd7bdd..6ee336b465 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VCheckBox.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VCheckBox.java @@ -190,7 +190,7 @@ public class VCheckBox extends CCheckBox */ public Object getValue() { - return new Boolean (isSelected()); + return Boolean.valueOf(isSelected()); } // getValue /** diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VComboBox.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VComboBox.java index 75996b4d3d..94c1bc6fb5 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VComboBox.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VComboBox.java @@ -145,7 +145,7 @@ public class VComboBox extends CComboBox { if (p.getID() == null) // -1 return null return null; - return new Integer(((KeyNamePair)p).getID()); + return Integer.valueOf(((KeyNamePair)p).getID()); } return p.getID(); } // getValue diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VImage.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VImage.java index 8d13ec2e29..35c3ee6673 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VImage.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VImage.java @@ -136,7 +136,7 @@ public class VImage extends JButton { if (m_mImage == null || m_mImage.get_ID() == 0) return null; - return new Integer(m_mImage.get_ID()); + return Integer.valueOf(m_mImage.get_ID()); } // getValue /** @@ -229,7 +229,7 @@ public class VImage extends JButton int AD_Image_ID = vid.getAD_Image_ID(); Integer newValue = null; if (AD_Image_ID != 0) - newValue = new Integer (AD_Image_ID); + newValue = Integer.valueOf(AD_Image_ID); // m_mImage = null; // force reload setValue(newValue); // set explicitly diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocation.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocation.java index 6ae6998909..7d085750b9 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocation.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocation.java @@ -333,7 +333,7 @@ public class VLocation extends JComponent { if (m_value == null) return null; - return new Integer(m_value.getC_Location_ID()); + return Integer.valueOf(m_value.getC_Location_ID()); } // getValue /** @@ -389,7 +389,7 @@ public class VLocation extends JComponent int C_Location_ID = 0; if (m_value != null) C_Location_ID = m_value.getC_Location_ID(); - Integer ii = new Integer(C_Location_ID); + Integer ii = Integer.valueOf(C_Location_ID); if (C_Location_ID != 0) fireVetoableChange(m_columnName, oldValue, ii); diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocator.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocator.java index 055eac9123..06e3870a31 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocator.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocator.java @@ -516,7 +516,7 @@ public class VLocator extends JComponent if (M_Locator_ID == 0) return false; - setValue (new Integer(M_Locator_ID), true); + setValue (Integer.valueOf(M_Locator_ID), true); return true; } // actionText diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocatorDialog.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocatorDialog.java index 32df02ba03..e3431e730e 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocatorDialog.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLocatorDialog.java @@ -486,7 +486,7 @@ public class VLocatorDialog extends CDialog { MLocator l = (MLocator) fLocator.getSelectedItem(); if (l != null && l.getM_Locator_ID() != 0) - return new Integer (l.getM_Locator_ID()); + return Integer.valueOf(l.getM_Locator_ID()); return null; } // getValue diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java index 1d1bb470cf..79abb36910 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VLookup.java @@ -165,7 +165,7 @@ public class VLookup extends JComponent Action action = (binding==null) ? null : am.get(binding); if(action!=null){ return SwingUtilities.notifyAction(action, ks, e, editorComp, - e.getModifiers()); + e.getModifiersEx()); } } return false; @@ -1145,7 +1145,7 @@ public class VLookup extends JComponent if (log.isLoggable(Level.FINE)) log.fine(m_columnName + " - Unique ID=" + id); m_value = null; // forces re-display if value is unchanged but text updated and still unique resetTabInfo(); - actionCombo (new Integer(id)); // data binding + actionCombo (Integer.valueOf(id)); // data binding // // Don't request focus if value was solved - teo_sarca [ 2552901 ] if (id <= 0) @@ -1369,9 +1369,9 @@ public class VLookup extends JComponent && result == BPartner_ID) // the same return; // Maybe new BPartner - put in cache - m_lookup.getDirect(new Integer(result), false, true); + m_lookup.getDirect(Integer.valueOf(result), false, true); - actionCombo (new Integer(result)); // data binding + actionCombo (Integer.valueOf(result)); // data binding } // actionBPartner private void actionLocation () diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VNumber.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VNumber.java index 8a96a17e8a..713871d31d 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VNumber.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VNumber.java @@ -37,6 +37,7 @@ import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyVetoException; import java.math.BigDecimal; +import java.math.RoundingMode; import java.text.DecimalFormat; import java.text.ParseException; import java.util.logging.Level; @@ -443,7 +444,7 @@ public final class VNumber extends JComponent if (!m_modified) return null; if (m_displayType == DisplayType.Integer) - return new Integer(0); + return Integer.valueOf(0); return Env.ZERO; } if (value.equals(".") || value.equals(",") || value.equals("-")) @@ -459,10 +460,10 @@ public final class VNumber extends JComponent value = number.toString(); // converts it to US w/o thousands BigDecimal bd = new BigDecimal(value); if (m_displayType == DisplayType.Integer) - return new Integer(bd.intValue()); + return Integer.valueOf(bd.intValue()); if (bd.signum() == 0) return bd; - return bd.setScale(m_format.getMaximumFractionDigits(), BigDecimal.ROUND_HALF_UP); + return bd.setScale(m_format.getMaximumFractionDigits(), RoundingMode.HALF_UP); } catch (Exception e) { @@ -470,7 +471,7 @@ public final class VNumber extends JComponent } m_text.setText(m_format.format(0)); if (m_displayType == DisplayType.Integer) - return new Integer(0); + return Integer.valueOf(0); return Env.ZERO; } // getValue @@ -503,7 +504,7 @@ public final class VNumber extends JComponent if (value == null) { if (m_displayType == DisplayType.Integer) - value = new Integer(0); + value = Integer.valueOf(0); else value = Env.ZERO; } @@ -511,7 +512,7 @@ public final class VNumber extends JComponent if (value instanceof BigDecimal) value = ((BigDecimal)value).add(Env.ONE); else - value = new Integer(((Integer)value).intValue() + 1); + value = Integer.valueOf(((Integer)value).intValue() + 1); // setValue(value); return value; @@ -529,7 +530,7 @@ public final class VNumber extends JComponent if (value == null) { if (m_displayType == DisplayType.Integer) - value = new Integer(minimum); + value = Integer.valueOf(minimum); else value = new BigDecimal(minimum); setValue(value); @@ -552,7 +553,7 @@ public final class VNumber extends JComponent i--; if (i < minimum) i = minimum; - value = new Integer(i); + value = Integer.valueOf(i); } // setValue(value); @@ -672,12 +673,12 @@ public final class VNumber extends JComponent if (ii < m_minValue) { error = oo + " < " + m_minValue; - oo = new Integer(m_minValue.intValue()); + oo = Integer.valueOf(m_minValue.intValue()); } else if (ii > m_maxValue) { error = oo + " > " + m_maxValue; - oo = new Integer(m_maxValue.intValue()); + oo = Integer.valueOf(m_maxValue.intValue()); } } else if (oo instanceof BigDecimal) @@ -824,7 +825,7 @@ public final class VNumber extends JComponent int modifiers = 0; AWTEvent currentEvent = EventQueue.getCurrentEvent(); if (currentEvent instanceof InputEvent) - modifiers = ((InputEvent)currentEvent).getModifiers(); + modifiers = ((InputEvent)currentEvent).getModifiersEx(); else if (currentEvent instanceof ActionEvent) modifiers = ((ActionEvent)currentEvent).getModifiers(); ActionEvent ae = new ActionEvent (this, ActionEvent.ACTION_PERFORMED, diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttribute.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttribute.java index 51cf3c35bb..60bd77cb7c 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttribute.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VPAttribute.java @@ -204,7 +204,7 @@ public class VPAttribute extends JComponent private int m_AD_Column_ID = 0; private GridField m_mField; /** No Instance Key */ - private static Integer NO_INSTANCE = new Integer(0); + private static Integer NO_INSTANCE = Integer.valueOf(0); /** Logger */ private static CLogger log = CLogger.getCLogger(VPAttribute.class); @@ -452,7 +452,7 @@ public class VPAttribute extends JComponent if (M_AttributeSetInstance_ID == 0) setValue(null); else - setValue(new Integer(M_AttributeSetInstance_ID)); + setValue(Integer.valueOf(M_AttributeSetInstance_ID)); // Change Locator if (m_GridTab != null && M_Locator_ID > 0) { diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VRowIDEditor.java b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VRowIDEditor.java index 8846ba3cde..ab294f3f57 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/ed/VRowIDEditor.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/ed/VRowIDEditor.java @@ -117,7 +117,7 @@ public class VRowIDEditor extends AbstractCellEditor implements TableCellEditor if (log.isLoggable(Level.FINE)) log.fine("" + m_cb.isSelected()); if (m_rid == null) return null; - m_rid[1] = new Boolean (m_cb.isSelected()); + m_rid[1] = Boolean.valueOf(m_cb.isSelected()); return m_rid; } // getCellEditorValue diff --git a/org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreePanel.java b/org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreePanel.java index 75e3119fb3..d671fc4ca9 100644 --- a/org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreePanel.java +++ b/org.adempiere.ui.swing/src/org/compiere/grid/tree/VTreePanel.java @@ -514,7 +514,7 @@ public final class VTreePanel extends CPanel // *** Tree *** if (e.getSource() instanceof JTree - || (e.getSource() == treeSearch && e.getModifiers() != 0)) // InputEvent.CTRL_MASK + || (e.getSource() == treeSearch && e.getModifiersEx() != 0)) // InputEvent.CTRL_MASK { TreePath tp = tree.getSelectionPath(); if (tp == null) diff --git a/org.adempiere.ui.swing/src/org/compiere/minigrid/MiniTable.java b/org.adempiere.ui.swing/src/org/compiere/minigrid/MiniTable.java index 744a5ae830..1025d02cc9 100644 --- a/org.adempiere.ui.swing/src/org/compiere/minigrid/MiniTable.java +++ b/org.adempiere.ui.swing/src/org/compiere/minigrid/MiniTable.java @@ -211,7 +211,7 @@ public class MiniTable extends CTable implements IMiniTable return false; // is the column RW? - if (m_readWriteColumn.contains(new Integer(column))) + if (m_readWriteColumn.contains(Integer.valueOf(column))) return true; return false; } // isCellEditable @@ -224,7 +224,7 @@ public class MiniTable extends CTable implements IMiniTable public void setColumnReadOnly (int column, boolean readOnly) { // Column is ReadWrite - if (m_readWriteColumn.contains(new Integer(column))) + if (m_readWriteColumn.contains(Integer.valueOf(column))) { // Remove from list if (readOnly) @@ -242,7 +242,7 @@ public class MiniTable extends CTable implements IMiniTable } // current column is R/O - ReadWrite - add to list else if (!readOnly) - m_readWriteColumn.add(new Integer(column)); + m_readWriteColumn.add(Integer.valueOf(column)); } // setColumnReadOnly @@ -367,7 +367,7 @@ public class MiniTable extends CTable implements IMiniTable { tc.setCellEditor(new ROCellEditor()); } - m_minWidth.add(new Integer(10)); + m_minWidth.add(Integer.valueOf(10)); tc.setMaxWidth(20); tc.setPreferredWidth(20); tc.setResizable(false); @@ -387,7 +387,7 @@ public class MiniTable extends CTable implements IMiniTable check.setHorizontalAlignment(SwingConstants.CENTER); tc.setCellEditor(new DefaultCellEditor(check)); } - m_minWidth.add(new Integer(30)); + m_minWidth.add(Integer.valueOf(30)); tc.setHeaderRenderer(new VHeaderRenderer(DisplayType.YesNo)); } @@ -399,7 +399,7 @@ public class MiniTable extends CTable implements IMiniTable tc.setCellEditor(new ROCellEditor()); else tc.setCellEditor(new MiniCellEditor(c)); - m_minWidth.add(new Integer(30)); + m_minWidth.add(Integer.valueOf(30)); tc.setHeaderRenderer(new VHeaderRenderer(DisplayType.DateTime)); } @@ -410,12 +410,12 @@ public class MiniTable extends CTable implements IMiniTable if (readOnly) { tc.setCellEditor(new ROCellEditor()); - m_minWidth.add(new Integer(70)); + m_minWidth.add(Integer.valueOf(70)); } else { tc.setCellEditor(new MiniCellEditor(c)); - m_minWidth.add(new Integer(80)); + m_minWidth.add(Integer.valueOf(80)); } tc.setHeaderRenderer(new VHeaderRenderer(DisplayType.Number)); @@ -427,12 +427,12 @@ public class MiniTable extends CTable implements IMiniTable if (readOnly) { tc.setCellEditor(new ROCellEditor()); - m_minWidth.add(new Integer(70)); + m_minWidth.add(Integer.valueOf(70)); } else { tc.setCellEditor(new MiniCellEditor(c)); - m_minWidth.add(new Integer(80)); + m_minWidth.add(Integer.valueOf(80)); } tc.setHeaderRenderer(new VHeaderRenderer(DisplayType.Number)); @@ -445,7 +445,7 @@ public class MiniTable extends CTable implements IMiniTable tc.setCellEditor(new ROCellEditor()); else tc.setCellEditor(new MiniCellEditor(c)); - m_minWidth.add(new Integer(30)); + m_minWidth.add(Integer.valueOf(30)); tc.setHeaderRenderer(new VHeaderRenderer(DisplayType.Number)); } @@ -457,7 +457,7 @@ public class MiniTable extends CTable implements IMiniTable tc.setCellEditor(new ROCellEditor()); else tc.setCellEditor(new MiniCellEditor(String.class)); - m_minWidth.add(new Integer(30)); + m_minWidth.add(Integer.valueOf(30)); tc.setHeaderRenderer(new VHeaderRenderer(DisplayType.String)); } @@ -509,7 +509,7 @@ public class MiniTable extends CTable implements IMiniTable if (c == IDColumn.class) data = new IDColumn(rs.getInt(colIndex)); else if (c == Boolean.class) - data = new Boolean("Y".equals(rs.getString(colIndex))); + data = Boolean.valueOf("Y".equals(rs.getString(colIndex))); else if (c == Timestamp.class) data = rs.getTimestamp(colIndex); else if (c == BigDecimal.class) @@ -580,7 +580,7 @@ public class MiniTable extends CTable implements IMiniTable if (c == IDColumn.class) data = new IDColumn(((Integer)data).intValue()); else if (c == Double.class) - data = new Double(((BigDecimal)data).doubleValue()); + data = Double.valueOf(((BigDecimal)data).doubleValue()); } // store setValueAt(data, row, col); @@ -790,15 +790,15 @@ public class MiniTable extends CTable implements IMiniTable } else if (c == Double.class) { - Double subtotal = new Double(0); + Double subtotal = Double.valueOf(0); if(total[col] != null) subtotal = (Double)(total[col]); Double amt = (Double) data; if(subtotal == null) - subtotal = new Double(0); + subtotal = Double.valueOf(0); if(amt == null ) - amt = new Double(0); + amt = Double.valueOf(0); total[col] = subtotal + amt; } @@ -865,15 +865,15 @@ public class MiniTable extends CTable implements IMiniTable } else if (c == Double.class) { - Double subtotal = new Double(0); + Double subtotal = Double.valueOf(0); if(total[col] != null) subtotal = (Double)(total[col]); Double amt = (Double) data; if(subtotal == null) - subtotal = new Double(0); + subtotal = Double.valueOf(0); if(amt == null ) - amt = new Double(0); + amt = Double.valueOf(0); total[col] = subtotal + amt; } diff --git a/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereButtonListener.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereButtonListener.java index 89ecb6fbc0..252fa8afc1 100644 --- a/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereButtonListener.java +++ b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereButtonListener.java @@ -16,7 +16,7 @@ *****************************************************************************/ package org.compiere.plaf; -import java.awt.event.InputEvent; +import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; import javax.swing.AbstractButton; @@ -86,10 +86,10 @@ public class CompiereButtonListener extends BasicButtonListener } map.clear(); String className = b.getClass().getName(); - int mask = InputEvent.ALT_MASK; // Default Buttons + int mask = ActionEvent.ALT_MASK; // Default Buttons if (b instanceof JCheckBox // In Tab || className.indexOf("VButton") != -1) - mask = InputEvent.SHIFT_MASK + InputEvent.CTRL_MASK; + mask = ActionEvent.SHIFT_MASK + ActionEvent.CTRL_MASK; map.put(KeyStroke.getKeyStroke(m, mask, false), "pressed"); map.put(KeyStroke.getKeyStroke(m, mask, true), "released"); map.put(KeyStroke.getKeyStroke(m, 0, true), "released"); diff --git a/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereComboPopup.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereComboPopup.java index a73c2abfd6..e30a6816bd 100644 --- a/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereComboPopup.java +++ b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereComboPopup.java @@ -39,7 +39,7 @@ public class CompiereComboPopup extends BasicComboPopup * Constructor * @param combo */ - public CompiereComboPopup(JComboBox combo) + public CompiereComboPopup(JComboBox combo) { super(combo); } // AdempiereComboPopup diff --git a/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereTextAreaUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereTextAreaUI.java index 1cbe08af9b..e3649cd9d8 100644 --- a/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereTextAreaUI.java +++ b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereTextAreaUI.java @@ -18,7 +18,7 @@ package org.compiere.plaf; import java.awt.AWTKeyStroke; import java.awt.KeyboardFocusManager; -import java.awt.event.InputEvent; +import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.beans.PropertyChangeEvent; import java.util.HashSet; @@ -63,7 +63,7 @@ public class CompiereTextAreaUI extends BasicTextAreaUI /** The Editor */ private JTextComponent m_editor = null; /** Tab Stroke */ - private static KeyStroke s_stroke = KeyStroke.getKeyStroke (KeyEvent.VK_TAB, InputEvent.CTRL_MASK); + private static KeyStroke s_stroke = KeyStroke.getKeyStroke (KeyEvent.VK_TAB, ActionEvent.CTRL_MASK); /** Tab Action */ private static Action s_action = new DefaultEditorKit.InsertTabAction(); @@ -109,7 +109,7 @@ public class CompiereTextAreaUI extends BasicTextAreaUI // forwardTraversalKeys.add (KeyStroke.getKeyStroke (KeyEvent.VK_TAB, 0)); forwardTraversalKeys.remove(s_stroke); - backwardTraversalKeys.add (KeyStroke.getKeyStroke (KeyEvent.VK_TAB, InputEvent.SHIFT_MASK)); + backwardTraversalKeys.add (KeyStroke.getKeyStroke (KeyEvent.VK_TAB, ActionEvent.SHIFT_MASK)); // LookAndFeel.installProperty (m_editor, "focusTraversalKeysForward", forwardTraversalKeys); LookAndFeel.installProperty (m_editor, "focusTraversalKeysBackward", backwardTraversalKeys); diff --git a/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereToolTipUI.java b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereToolTipUI.java index 66f900cedb..a8bb4d214a 100644 --- a/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereToolTipUI.java +++ b/org.adempiere.ui.swing/src/org/compiere/plaf/CompiereToolTipUI.java @@ -79,7 +79,7 @@ public class CompiereToolTipUI extends MetalToolTipUI int condition = comp.getConditionForKeyStroke (keys[i]); if (condition == JComponent.WHEN_IN_FOCUSED_WINDOW) { - String prefix = KeyEvent.getKeyModifiersText (mod); + String prefix = KeyEvent.getModifiersExText (mod); if (prefix.length() > 1) { if (controlKeyStr.length() > 0) diff --git a/org.adempiere.ui.swing/src/org/compiere/pos/SubCurrentLine.java b/org.adempiere.ui.swing/src/org/compiere/pos/SubCurrentLine.java index c1264376cd..7605ddb62f 100644 --- a/org.adempiere.ui.swing/src/org/compiere/pos/SubCurrentLine.java +++ b/org.adempiere.ui.swing/src/org/compiere/pos/SubCurrentLine.java @@ -14,7 +14,6 @@ package org.compiere.pos; -import java.awt.Event; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.FocusEvent; @@ -131,7 +130,7 @@ public class SubCurrentLine extends PosSubPanel implements ActionListener, Focus String buttonSize = "w 50!, h 50!,"; // - f_bSearch = createButtonAction ("Product", KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.CTRL_MASK)); + f_bSearch = createButtonAction ("Product", KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.CTRL_MASK)); f_bSearch.setName("ProductSearch"); add (f_bSearch, buttonSize ); @@ -179,7 +178,7 @@ public class SubCurrentLine extends PosSubPanel implements ActionListener, Focus add (f_down, buttonSize); - f_delete = createButtonAction("Cancel", KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, Event.SHIFT_MASK)); + f_delete = createButtonAction("Cancel", KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, ActionEvent.SHIFT_MASK)); add (f_delete, buttonSize); // diff --git a/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java b/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java index 3e7362b07b..40ee7f5b6d 100644 --- a/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java +++ b/org.adempiere.ui.swing/src/org/compiere/print/Viewer.java @@ -22,7 +22,6 @@ import java.awt.BorderLayout; import java.awt.Component; import java.awt.Cursor; import java.awt.Dimension; -import java.awt.Event; import java.awt.GraphicsConfiguration; import java.awt.Point; import java.awt.Rectangle; @@ -339,7 +338,7 @@ public class Viewer extends CFrame summary.addActionListener(this); // Max Page m_pageMax = m_viewPanel.getPageCount(); - spinnerModel.setMaximum(new Integer(m_pageMax)); + spinnerModel.setMaximum(Integer.valueOf(m_pageMax)); spinner.addChangeListener(this); fillComboReport(m_reportEngine.getPrintFormat().get_ID()); @@ -490,7 +489,7 @@ public class Viewer extends CFrame public void revalidate() { m_pageMax = m_viewPanel.getPageCount(); - spinnerModel.setMaximum(new Integer(m_pageMax)); + spinnerModel.setMaximum(Integer.valueOf(m_pageMax)); // scroll area (page size dependent) centerScrollPane.setPreferredSize(new Dimension @@ -522,21 +521,21 @@ public class Viewer extends CFrame JMenu mFile = AEnv.getMenu("File"); menuBar.add(mFile); AEnv.addMenuItem("PrintScreen", null, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, 0), mFile, this); - AEnv.addMenuItem("ScreenShot", null, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, Event.SHIFT_MASK), mFile, this); - AEnv.addMenuItem("Report", null, KeyStroke.getKeyStroke(KeyEvent.VK_P, Event.ALT_MASK), mFile, this); + AEnv.addMenuItem("ScreenShot", null, KeyStroke.getKeyStroke(KeyEvent.VK_PRINTSCREEN, ActionEvent.SHIFT_MASK), mFile, this); + AEnv.addMenuItem("Report", null, KeyStroke.getKeyStroke(KeyEvent.VK_P, ActionEvent.ALT_MASK), mFile, this); mFile.addSeparator(); AEnv.addMenuItem("PrintCustomize", "Preference", null, mFile, this); AEnv.addMenuItem("Translate", null, null, mFile, this); - AEnv.addMenuItem("Find", null, KeyStroke.getKeyStroke(KeyEvent.VK_F, Event.CTRL_MASK), mFile, this); + AEnv.addMenuItem("Find", null, KeyStroke.getKeyStroke(KeyEvent.VK_F, ActionEvent.CTRL_MASK), mFile, this); mFile.addSeparator(); AEnv.addMenuItem("PageSetup", null, null, mFile, this); - AEnv.addMenuItem("Print", null, KeyStroke.getKeyStroke(KeyEvent.VK_P, Event.CTRL_MASK), mFile, this); + AEnv.addMenuItem("Print", null, KeyStroke.getKeyStroke(KeyEvent.VK_P, ActionEvent.CTRL_MASK), mFile, this); if (m_isCanExport) AEnv.addMenuItem("Export", null, null, mFile, this); mFile.addSeparator(); - AEnv.addMenuItem("End", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.ALT_MASK), mFile, this); - AEnv.addMenuItem("Logout", null, KeyStroke.getKeyStroke(KeyEvent.VK_L, Event.SHIFT_MASK+Event.ALT_MASK), mFile, this); - AEnv.addMenuItem("Exit", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, Event.SHIFT_MASK+Event.ALT_MASK), mFile, this); + AEnv.addMenuItem("End", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.ALT_MASK), mFile, this); + AEnv.addMenuItem("Logout", null, KeyStroke.getKeyStroke(KeyEvent.VK_L, ActionEvent.SHIFT_MASK+ActionEvent.ALT_MASK), mFile, this); + AEnv.addMenuItem("Exit", null, KeyStroke.getKeyStroke(KeyEvent.VK_X, ActionEvent.SHIFT_MASK+ActionEvent.ALT_MASK), mFile, this); // View JMenu mView = AEnv.getMenu("View"); @@ -544,15 +543,15 @@ public class Viewer extends CFrame if (MRole.getDefault().isAllow_Info_Product()) { - AEnv.addMenuItem("InfoProduct", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK), mView, this); + AEnv.addMenuItem("InfoProduct", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK), mView, this); } if (MRole.getDefault().isAllow_Info_BPartner()) { - AEnv.addMenuItem("InfoBPartner", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK+Event.CTRL_MASK), mView, this); + AEnv.addMenuItem("InfoBPartner", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK+ActionEvent.CTRL_MASK), mView, this); } if (MRole.getDefault().isShowAcct() && MRole.getDefault().isAllow_Info_Account()) { - AEnv.addMenuItem("InfoAccount", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, Event.ALT_MASK+Event.CTRL_MASK), mView, this); + AEnv.addMenuItem("InfoAccount", null, KeyStroke.getKeyStroke(KeyEvent.VK_I, ActionEvent.ALT_MASK+ActionEvent.CTRL_MASK), mView, this); } if (MRole.getDefault().isAllow_Info_Schedule()) { @@ -601,10 +600,10 @@ public class Viewer extends CFrame // Go JMenu mGo = AEnv.getMenu("Go"); menuBar.add(mGo); - AEnv.addMenuItem("First", "First", KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, Event.ALT_MASK), mGo, this); - AEnv.addMenuItem("PreviousPage", "Previous", KeyStroke.getKeyStroke(KeyEvent.VK_UP, Event.ALT_MASK), mGo, this); - AEnv.addMenuItem("NextPage", "Next", KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, Event.ALT_MASK), mGo, this); - AEnv.addMenuItem("Last", "Last", KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, Event.ALT_MASK), mGo, this); + AEnv.addMenuItem("First", "First", KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, ActionEvent.ALT_MASK), mGo, this); + AEnv.addMenuItem("PreviousPage", "Previous", KeyStroke.getKeyStroke(KeyEvent.VK_UP, ActionEvent.ALT_MASK), mGo, this); + AEnv.addMenuItem("NextPage", "Next", KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, ActionEvent.ALT_MASK), mGo, this); + AEnv.addMenuItem("Last", "Last", KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, ActionEvent.ALT_MASK), mGo, this); // Tools JMenu mTools = AEnv.getMenu("Tools"); @@ -791,7 +790,7 @@ public class Viewer extends CFrame // System.out.println("scrollTo " + pageRectangle); // Set Page - spinnerModel.setValue(new Integer(m_pageNo)); + spinnerModel.setValue(Integer.valueOf(m_pageNo)); StringBuffer sb = new StringBuffer (Msg.getMsg(m_ctx, "Page")) .append(" ").append(m_pageNo) .append(m_viewPanel.getPageInfo(m_pageNo)) @@ -1359,7 +1358,7 @@ public class Viewer extends CFrame Login.initTest(true); MQuery q = new MQuery("C_Invoice"); - q.addRestriction("C_Invoice_ID", MQuery.EQUAL, new Integer(103)); + q.addRestriction("C_Invoice_ID", MQuery.EQUAL, Integer.valueOf(103)); // 102 = Invoice - 100 = Order PrintInfo i = new PrintInfo("test", X_C_Invoice.Table_ID, 102, 0); diff --git a/org.adempiere.ui.swing/src/org/compiere/swing/CButton.java b/org.adempiere.ui.swing/src/org/compiere/swing/CButton.java index e1c807717f..9b15112726 100644 --- a/org.adempiere.ui.swing/src/org/compiere/swing/CButton.java +++ b/org.adempiere.ui.swing/src/org/compiere/swing/CButton.java @@ -26,7 +26,7 @@ package org.compiere.swing; import java.awt.Color; -import java.awt.event.InputEvent; +import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import javax.swing.Action; @@ -331,7 +331,7 @@ public class CButton extends JButton implements CEditor { JComponent.WHEN_IN_FOCUSED_WINDOW, map); } map.clear(); - int mask = InputEvent.ALT_MASK + InputEvent.CTRL_MASK; // Default + int mask = ActionEvent.ALT_MASK + ActionEvent.CTRL_MASK; // Default // Buttons map.put(KeyStroke.getKeyStroke(mnemonic, mask, false), "pressed"); map.put(KeyStroke.getKeyStroke(mnemonic, mask, true), "released"); diff --git a/org.adempiere.ui.swing/src/org/compiere/swing/CCheckBox.java b/org.adempiere.ui.swing/src/org/compiere/swing/CCheckBox.java index f2133c80b4..5a385503c1 100644 --- a/org.adempiere.ui.swing/src/org/compiere/swing/CCheckBox.java +++ b/org.adempiere.ui.swing/src/org/compiere/swing/CCheckBox.java @@ -26,7 +26,7 @@ package org.compiere.swing; import java.awt.Color; -import java.awt.event.InputEvent; +import java.awt.event.ActionEvent; import javax.swing.Action; import javax.swing.Icon; @@ -266,7 +266,7 @@ public class CCheckBox extends JCheckBox implements CEditor { public Object getValue() { if (m_value instanceof String) return super.isSelected() ? "Y" : "N"; - return new Boolean(isSelected()); + return Boolean.valueOf(isSelected()); } // getValue /** @@ -334,10 +334,10 @@ public class CCheckBox extends JCheckBox implements CEditor { } map.clear(); String className = this.getClass().getName(); - int mask = InputEvent.ALT_MASK; // Default Buttons + int mask = ActionEvent.ALT_MASK; // Default Buttons if (this instanceof JCheckBox // In Tab || className.indexOf("VButton") != -1) - mask = InputEvent.SHIFT_MASK + InputEvent.CTRL_MASK; + mask = ActionEvent.SHIFT_MASK + ActionEvent.CTRL_MASK; map.put(KeyStroke.getKeyStroke(mnemonic, mask, false), "pressed"); map.put(KeyStroke.getKeyStroke(mnemonic, mask, true), "released"); map.put(KeyStroke.getKeyStroke(mnemonic, 0, true), "released"); diff --git a/org.adempiere.ui.swing/src/org/compiere/swing/CDialog.java b/org.adempiere.ui.swing/src/org/compiere/swing/CDialog.java index 39d43360cd..9dec64fdd4 100644 --- a/org.adempiere.ui.swing/src/org/compiere/swing/CDialog.java +++ b/org.adempiere.ui.swing/src/org/compiere/swing/CDialog.java @@ -24,7 +24,6 @@ import java.awt.HeadlessException; import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; @@ -255,7 +254,7 @@ public class CDialog extends JDialog protected static DialogAction s_dialogAction = new DialogAction(ACTION_DISPOSE); /** ALT-EXCAPE */ protected static KeyStroke s_disposeKeyStroke = - KeyStroke.getKeyStroke(KeyEvent.VK_PAUSE, InputEvent.ALT_MASK); + KeyStroke.getKeyStroke(KeyEvent.VK_PAUSE, ActionEvent.ALT_MASK); /** * Adempiere Dialog Action diff --git a/org.adempiere.ui.swing/src/org/compiere/swing/CField.java b/org.adempiere.ui.swing/src/org/compiere/swing/CField.java index 7ec5ec8fbe..249c9551da 100644 --- a/org.adempiere.ui.swing/src/org/compiere/swing/CField.java +++ b/org.adempiere.ui.swing/src/org/compiere/swing/CField.java @@ -178,14 +178,14 @@ public class CField extends JComboBox Constructor constructor = m_popupClass.getConstructor (new Class[] {Dialog.class, String.class, Boolean.class}); popup = (CFieldPopup)constructor.newInstance(new Object[] - {(Dialog)win, m_title, new Boolean(true)}); + {(Dialog)win, m_title, Boolean.TRUE}); } else if (win instanceof Frame) { Constructor constructor = m_popupClass.getConstructor (new Class[] {Frame.class, String.class, Boolean.class}); popup = (CFieldPopup)constructor.newInstance(new Object[] - {(Frame)win, m_title, new Boolean(true)}); + {(Frame)win, m_title, Boolean.TRUE}); } if (popup == null) return false; diff --git a/org.adempiere.ui.swing/src/org/compiere/swing/CPanel.java b/org.adempiere.ui.swing/src/org/compiere/swing/CPanel.java index abb81ef0b2..e72be47ad2 100644 --- a/org.adempiere.ui.swing/src/org/compiere/swing/CPanel.java +++ b/org.adempiere.ui.swing/src/org/compiere/swing/CPanel.java @@ -165,7 +165,7 @@ public class CPanel extends JPanel if (level == 0) putClientProperty(AdempiereLookAndFeel.TABLEVEL, null); else - putClientProperty(AdempiereLookAndFeel.TABLEVEL, new Integer(level)); + putClientProperty(AdempiereLookAndFeel.TABLEVEL, Integer.valueOf(level)); } // setTabLevel /** diff --git a/org.adempiere.ui.swing/src/org/compiere/swing/CTabbedPane.java b/org.adempiere.ui.swing/src/org/compiere/swing/CTabbedPane.java index 2e365b6151..661c9f5240 100644 --- a/org.adempiere.ui.swing/src/org/compiere/swing/CTabbedPane.java +++ b/org.adempiere.ui.swing/src/org/compiere/swing/CTabbedPane.java @@ -18,7 +18,6 @@ package org.compiere.swing; import java.awt.Color; import java.awt.Component; -import java.awt.Event; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.util.ArrayList; @@ -221,10 +220,10 @@ public class CTabbedPane extends JTabbedPane { if (index < 9) getInputMap(WHEN_IN_FOCUSED_WINDOW) - .put(KeyStroke.getKeyStroke(KeyEvent.VK_1+index, Event.ALT_MASK), ACTION_SELECT); + .put(KeyStroke.getKeyStroke(KeyEvent.VK_1+index, ActionEvent.ALT_MASK), ACTION_SELECT); else if (index == 9) getInputMap(WHEN_IN_FOCUSED_WINDOW) - .put(KeyStroke.getKeyStroke(KeyEvent.VK_0, Event.ALT_MASK), ACTION_SELECT); + .put(KeyStroke.getKeyStroke(KeyEvent.VK_0, ActionEvent.ALT_MASK), ACTION_SELECT); } // } // insertTab @@ -261,7 +260,7 @@ public class CTabbedPane extends JTabbedPane char keyCode = m_mnemonic.get(index); if (keyCode != 0) getInputMap(WHEN_IN_FOCUSED_WINDOW) - .remove(KeyStroke.getKeyStroke(keyCode, Event.ALT_MASK)); + .remove(KeyStroke.getKeyStroke(keyCode, ActionEvent.ALT_MASK)); m_mnemonic.set(index, (char)0); // if (!text.startsWith("")) diff --git a/org.adempiere.ui.zk-feature/feature.xml b/org.adempiere.ui.zk-feature/feature.xml index eec2ae972d..2a184bb65e 100644 --- a/org.adempiere.ui.zk-feature/feature.xml +++ b/org.adempiere.ui.zk-feature/feature.xml @@ -2,7 +2,8 @@ + version="5.1.0.qualifier" + provider-name="iDempiere Community"> [Enter Feature Description here.] diff --git a/org.adempiere.ui.zk/.classpath b/org.adempiere.ui.zk/.classpath index 62a255bbe7..6a9ce5244c 100644 --- a/org.adempiere.ui.zk/.classpath +++ b/org.adempiere.ui.zk/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.ui.zk/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.ui.zk/META-INF/MANIFEST.MF b/org.adempiere.ui.zk/META-INF/MANIFEST.MF index 933f0e738f..3def0aa91f 100644 --- a/org.adempiere.ui.zk/META-INF/MANIFEST.MF +++ b/org.adempiere.ui.zk/META-INF/MANIFEST.MF @@ -3,18 +3,18 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Web Client Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Import-Package: groovy.transform.stc;version="2.4.7", - javax.activation, - javax.annotation;version="1.2.0", + javax.annotation, javax.annotation.processing, - javax.annotation.security;version="1.2.0", - javax.annotation.sql;version="1.2.0", + javax.annotation.security, + javax.annotation.sql, javax.servlet, javax.servlet.annotation;version="3.1.0", javax.servlet.http, javax.servlet.jsp.resources;version="2.3.0", javax.servlet.resources;version="3.1.0", + javax.xml.bind;version="2.3.0", net.sf.jasperreports.engine, net.sf.jasperreports.engine.export, net.sf.jasperreports.engine.util, @@ -31,6 +31,7 @@ Import-Package: groovy.transform.stc;version="2.4.7", org.apache.tools.ant, org.apache.tools.ant.taskdefs, org.compiere.css, + org.eclipse.core.runtime;version="3.4.0", org.jfree.chart, org.jfree.chart.encoders, org.jfree.chart.entity, @@ -39,7 +40,6 @@ Import-Package: groovy.transform.stc;version="2.4.7", org.jfree.data.general, org.jfree.data.time, org.jfree.util, - org.eclipse.core.runtime;version="3.4.0", org.osgi.framework;version="1.7.0", org.osgi.service.event;version="1.3.0", org.osgi.util.tracker;version="1.5.0", @@ -153,10 +153,12 @@ Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.junit;bundle-version="0.0.0", org.apache.commons.io;bundle-version="0.0.0", com.itextpdf;bundle-version="0.0.0", - org.atmosphere.runtime;bundle-version="0.0.0" + org.atmosphere.runtime;bundle-version="0.0.0", + javax.activation;bundle-version="1.1.0" Bundle-Activator: org.adempiere.webui.WebUIActivator Eclipse-ExtensibleAPI: true Web-ContextPath: webui Service-Component: OSGI-INF/reportviewerprovider.xml, OSGI-INF/defaultinfofactory.xml, OSGI-INF/defaulteditorfactory.xml, OSGI-INF/jrviewerprovider.xml, OSGI-INF/resourcefinder.xml, OSGI-INF/defaultpaymentformfactory.xml, OSGI-INF/processfactory.xml, OSGI-INF/defaultprintshippinglabel.xml, OSGI-INF/defaultcreatefromfactory.xml, OSGI-INF/defaultformfactory.xml, OSGI-INF/feedbackservice.xml, OSGI-INF/zulgadgetfactory.xml, OSGI-INF/jfgchartrenderer.xml Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.adempiere.ui.zk +Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java index 90519902d4..133e677705 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java @@ -350,7 +350,7 @@ public class AdempiereWebUI extends Window implements EventListener, IWeb try { Class clazz = this.getClass().getClassLoader().loadClass(className); - appDesktop = (IDesktop) clazz.newInstance(); + appDesktop = (IDesktop) clazz.getDeclaredConstructor().newInstance(); } catch (Throwable t) { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ShowMaskWrapper.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ShowMaskWrapper.java index 870ee87d7a..da3e325a5f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ShowMaskWrapper.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/ShowMaskWrapper.java @@ -103,7 +103,7 @@ public class ShowMaskWrapper implements ISupportMask { * @param comp */ public static void setFlagShowMask (Component comp){ - comp.setAttribute(ISupportMask.READY_SHOW_MASK_FLAG, new Integer(1), Component.REQUEST_SCOPE); + comp.setAttribute(ISupportMask.READY_SHOW_MASK_FLAG, Integer.valueOf(1), Component.REQUEST_SCOPE); } /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WRequest.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WRequest.java index ccb5a1a0c0..69258c35c4 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WRequest.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/WRequest.java @@ -230,47 +230,47 @@ public class WRequest implements EventListener { GridTab tab = frame.getADWindowContent().getActiveGridTab(); tab.dataNew (false); - tab.setValue("AD_Table_ID", new Integer(m_AD_Table_ID)); - tab.setValue("Record_ID", new Integer(m_Record_ID)); + tab.setValue("AD_Table_ID", Integer.valueOf(m_AD_Table_ID)); + tab.setValue("Record_ID", Integer.valueOf(m_Record_ID)); // if (m_C_BPartner_ID != 0) - tab.setValue("C_BPartner_ID", new Integer(m_C_BPartner_ID)); + tab.setValue("C_BPartner_ID", Integer.valueOf(m_C_BPartner_ID)); // if (m_AD_Table_ID == MBPartner.Table_ID) - tab.setValue("C_BPartner_ID", new Integer(m_Record_ID)); + tab.setValue("C_BPartner_ID", Integer.valueOf(m_Record_ID)); else if (m_AD_Table_ID == MUser.Table_ID) - tab.setValue("AD_User_ID", new Integer(m_Record_ID)); + tab.setValue("AD_User_ID", Integer.valueOf(m_Record_ID)); // else if (m_AD_Table_ID == MProject.Table_ID) - tab.setValue("C_Project_ID", new Integer(m_Record_ID)); + tab.setValue("C_Project_ID", Integer.valueOf(m_Record_ID)); else if (m_AD_Table_ID == MAsset.Table_ID) - tab.setValue("A_Asset_ID", new Integer(m_Record_ID)); + tab.setValue("A_Asset_ID", Integer.valueOf(m_Record_ID)); // else if (m_AD_Table_ID == MOrder.Table_ID) - tab.setValue("C_Order_ID", new Integer(m_Record_ID)); + tab.setValue("C_Order_ID", Integer.valueOf(m_Record_ID)); else if (m_AD_Table_ID == MInvoice.Table_ID) - tab.setValue("C_Invoice_ID", new Integer(m_Record_ID)); + tab.setValue("C_Invoice_ID", Integer.valueOf(m_Record_ID)); // else if (m_AD_Table_ID == MProduct.Table_ID) - tab.setValue("M_Product_ID", new Integer(m_Record_ID)); + tab.setValue("M_Product_ID", Integer.valueOf(m_Record_ID)); else if (m_AD_Table_ID == MPayment.Table_ID) - tab.setValue("C_Payment_ID", new Integer(m_Record_ID)); + tab.setValue("C_Payment_ID", Integer.valueOf(m_Record_ID)); // else if (m_AD_Table_ID == MInOut.Table_ID) - tab.setValue("M_InOut_ID", new Integer(m_Record_ID)); + tab.setValue("M_InOut_ID", Integer.valueOf(m_Record_ID)); else if (m_AD_Table_ID == MRMA.Table_ID) - tab.setValue("M_RMA_ID", new Integer(m_Record_ID)); + tab.setValue("M_RMA_ID", Integer.valueOf(m_Record_ID)); // else if (m_AD_Table_ID == MCampaign.Table_ID) - tab.setValue("C_Campaign_ID", new Integer(m_Record_ID)); + tab.setValue("C_Campaign_ID", Integer.valueOf(m_Record_ID)); // else if (m_AD_Table_ID == MRequest.Table_ID) - tab.setValue(MRequest.COLUMNNAME_R_RequestRelated_ID, new Integer(m_Record_ID)); + tab.setValue(MRequest.COLUMNNAME_R_RequestRelated_ID, Integer.valueOf(m_Record_ID)); // FR [2842165] - Order Ref link from SO line creating new request else if (m_AD_Table_ID == MOrderLine.Table_ID) { MOrderLine oLine = new MOrderLine(Env.getCtx(), m_Record_ID, null); if (oLine != null) { - tab.setValue(MOrderLine.COLUMNNAME_C_Order_ID, new Integer(oLine.getC_Order_ID())); + tab.setValue(MOrderLine.COLUMNNAME_C_Order_ID, Integer.valueOf(oLine.getC_Order_ID())); } } } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java index 6ba01d5a99..6a4385a0dd 100755 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/acct/WAcctViewerData.java @@ -241,7 +241,7 @@ public class WAcctViewerData ValueNamePair pp = new ValueNamePair(tableName, name); cb.appendItem(pp.getName(),pp); - tableInfo.put (tableName, new Integer(id)); + tableInfo.put (tableName, Integer.valueOf(id)); if (id == AD_Table_ID) select = pp; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java index 6c76294bd3..4f8a4e9993 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/AbstractADWindowContent.java @@ -2609,7 +2609,7 @@ public abstract class AbstractADWindowContent extends AbstractUIPart implements { if (link.endsWith("_ID")) query.addRestriction(link, MQuery.EQUAL, - new Integer(Env.getContextAsInt(ctx, curWindowNo, link))); + Integer.valueOf(Env.getContextAsInt(ctx, curWindowNo, link))); else query.addRestriction(link, MQuery.EQUAL, Env.getContext(ctx, curWindowNo, link)); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java index ae6aa3f3c9..7adcedeca7 100755 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WAllocation.java @@ -436,7 +436,7 @@ public class WAllocation extends Allocation int AD_Column_ID = COLUMN_C_INVOICE_C_CURRENCY_ID; // C_Invoice.C_Currency_ID MLookup lookupCur = MLookupFactory.get (Env.getCtx(), form.getWindowNo(), 0, AD_Column_ID, DisplayType.TableDir); currencyPick = new WTableDirEditor("C_Currency_ID", true, false, true, lookupCur); - currencyPick.setValue(new Integer(m_C_Currency_ID)); + currencyPick.setValue(Integer.valueOf(m_C_Currency_ID)); currencyPick.addValueChangeListener(this); // Organization filter selection @@ -471,14 +471,14 @@ public class WAllocation extends Allocation AD_Column_ID = 61804; // C_AllocationLine.C_Charge_ID MLookup lookupCharge = MLookupFactory.get (Env.getCtx(), form.getWindowNo(), 0, AD_Column_ID, DisplayType.TableDir); chargePick = new WTableDirEditor("C_Charge_ID", false, false, true, lookupCharge); - chargePick.setValue(new Integer(m_C_Charge_ID)); + chargePick.setValue(Integer.valueOf(m_C_Charge_ID)); chargePick.addValueChangeListener(this); // Charge AD_Column_ID = 212213; // C_AllocationLine.C_Charge_ID MLookup lookupDocType = MLookupFactory.get (Env.getCtx(), form.getWindowNo(), 0, AD_Column_ID, DisplayType.TableDir); DocTypePick = new WTableDirEditor("C_DocType_ID", false, false, true, lookupDocType); - DocTypePick.setValue(new Integer(m_C_DocType_ID)); + DocTypePick.setValue(Integer.valueOf(m_C_DocType_ID)); DocTypePick.addValueChangeListener(this); } // dynInit diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WBOMDrop.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WBOMDrop.java index a8c64247b5..c878505a5c 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WBOMDrop.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WBOMDrop.java @@ -573,7 +573,7 @@ public class WBOMDrop extends ADForm implements EventListener productPanel.appendChild(rightInden); // Add to List - m_productList.add (new Integer(M_Product_ID)); + m_productList.add (Integer.valueOf(M_Product_ID)); // add product name selectPanel = createDivPanel(200); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromDepositBatchUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromDepositBatchUI.java index 530b0b2e1a..f89f0d667f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromDepositBatchUI.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromDepositBatchUI.java @@ -154,7 +154,7 @@ public class WCreateFromDepositBatchUI extends CreateFromDepositBatch implements bankAccountField = new WTableDirEditor ("C_BankAccount_ID", true, false, true, lookup); // Set Default int C_BankAccount_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BankAccount_ID"); - bankAccountField.setValue(new Integer(C_BankAccount_ID)); + bankAccountField.setValue(Integer.valueOf(C_BankAccount_ID)); // initial Loading authorizationField = new WStringEditor ("authorization", false, false, true, 10, 30, null, null); // authorizationField.getComponent().addEventListener(Events.ON_CHANGE, this); @@ -162,7 +162,7 @@ public class WCreateFromDepositBatchUI extends CreateFromDepositBatch implements lookup = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, MColumn.getColumn_ID(MPayment.Table_Name, MPayment.COLUMNNAME_C_DocType_ID), DisplayType.TableDir); documentTypeField = new WTableDirEditor (MPayment.COLUMNNAME_C_DocType_ID,false,false,true,lookup); int C_DocType_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_DocType_ID"); - documentTypeField.setValue(new Integer(C_DocType_ID)); + documentTypeField.setValue(Integer.valueOf(C_DocType_ID)); // documentTypeField.getComponent().addEventListener(Events.ON_CHANGE, this); lookup = MLookupFactory.get (Env.getCtx(), p_WindowNo, 0, MColumn.getColumn_ID(MPayment.Table_Name, MPayment.COLUMNNAME_TenderType), DisplayType.List); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromForm.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromForm.java index acc5c79908..95d4603f9f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromForm.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromForm.java @@ -178,7 +178,7 @@ public class WCreateFromForm extends ADForm implements EventListener, WTa int rows = model.getSize(); for (int i = 0; i < rows; i++) { - model.setValueAt(new Boolean(true), i, 0); + model.setValueAt(Boolean.TRUE, i, 0); } //refresh dataTable.setModel(model); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoiceUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoiceUI.java index e0f7f91ada..962cb9d92e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoiceUI.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromInvoiceUI.java @@ -295,7 +295,7 @@ public class WCreateFromInvoiceUI extends CreateFromInvoice implements EventList bPartnerField = new WSearchEditor ("C_BPartner_ID", true, false, true, lookup); // int C_BPartner_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BPartner_ID"); - bPartnerField.setValue(new Integer(C_BPartner_ID)); + bPartnerField.setValue(Integer.valueOf(C_BPartner_ID)); // initial loading initBPOrderDetails(C_BPartner_ID, forInvoice); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromRMAUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromRMAUI.java index c8ddb471fe..47ac42af45 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromRMAUI.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromRMAUI.java @@ -153,7 +153,7 @@ public class WCreateFromRMAUI extends CreateFromRMA implements ValueChangeListen bPartnerField = new WSearchEditor ("C_BPartner_ID", true, false, true, lookup); // int C_BPartner_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BPartner_ID"); - bPartnerField.setValue(new Integer(C_BPartner_ID)); + bPartnerField.setValue(Integer.valueOf(C_BPartner_ID)); } // initBPartner protected void loadRMA() diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java index 8e9f4fc7c4..3e7b265b51 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromShipmentUI.java @@ -412,7 +412,7 @@ public class WCreateFromShipmentUI extends CreateFromShipment implements EventLi bPartnerField = new WSearchEditor ("C_BPartner_ID", true, false, true, lookup); // int C_BPartner_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BPartner_ID"); - bPartnerField.setValue(new Integer(C_BPartner_ID)); + bPartnerField.setValue(Integer.valueOf(C_BPartner_ID)); // initial loading initBPOrderDetails(C_BPartner_ID, forInvoice); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java index 637127696e..e9253c63d1 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WCreateFromStatementUI.java @@ -155,7 +155,7 @@ public class WCreateFromStatementUI extends CreateFromStatement implements Event bankAccountField = new WTableDirEditor ("C_BankAccount_ID", true, false, true, lookup); // Set Default int C_BankAccount_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BankAccount_ID"); - bankAccountField.setValue(new Integer(C_BankAccount_ID)); + bankAccountField.setValue(Integer.valueOf(C_BankAccount_ID)); // initial Loading authorizationField = new WStringEditor ("authorization", false, false, true, 10, 30, null, null); authorizationField.getComponent().addEventListener(Events.ON_CHANGE, this); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java index c67c55cb63..84f7018ac9 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPayPrint.java @@ -267,7 +267,7 @@ public class WPayPrint extends PayPrint implements IFormController, EventListene return; // m_C_PaySelection_ID = C_PaySelection_ID; - paySelectSearch.setValue(new Integer(m_C_PaySelection_ID)); + paySelectSearch.setValue(Integer.valueOf(m_C_PaySelection_ID)); loadPaySelectInfo(); } // setsetPaySelection diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCash.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCash.java index 828cd6ad32..8782052149 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCash.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCash.java @@ -134,7 +134,7 @@ public class WPaymentFormCash extends PaymentFormCash implements EventListener en = s_Currencies.keys(); while (en.hasMoreElements()) { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCheck.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCheck.java index 5d89ace766..1b4638158e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCheck.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WPaymentFormCheck.java @@ -160,7 +160,7 @@ public class WPaymentFormCheck extends PaymentFormCheck implements EventListener } // Is the currency an EMU currency? - Integer C_Currency_ID = new Integer(m_C_Currency_ID); + Integer C_Currency_ID = Integer.valueOf(m_C_Currency_ID); if (s_Currencies.containsKey(C_Currency_ID)) { Enumeration en = s_Currencies.keys(); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WStatementCreateFromBatch.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WStatementCreateFromBatch.java index 31e3d67ba1..d7ff610192 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WStatementCreateFromBatch.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WStatementCreateFromBatch.java @@ -155,7 +155,7 @@ public class WStatementCreateFromBatch extends StatementCreateFromBatch implemen bankAccountField = new WTableDirEditor ("C_BankAccount_ID", true, false, true, lookup); // Set Default int C_BankAccount_ID = Env.getContextAsInt(Env.getCtx(), p_WindowNo, "C_BankAccount_ID"); - bankAccountField.setValue(new Integer(C_BankAccount_ID)); + bankAccountField.setValue(Integer.valueOf(C_BankAccount_ID)); // initial Loading authorizationField = new WStringEditor ("authorization", false, false, true, 10, 30, null, null); authorizationField.getComponent().addEventListener(Events.ON_CHANGE, this); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java index 6d97119c78..433ae654a0 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/form/WTreeBOM.java @@ -16,6 +16,7 @@ package org.adempiere.webui.apps.form; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.ArrayList; import java.util.List; import java.util.Properties; @@ -320,14 +321,14 @@ public class WTreeBOM extends TreeBOM implements IFormController, EventListener< treeInfo.setText (Msg.getElement(Env.getCtx(), "Sel_Product_ID")+": "+product.getValue()); Vector line = new Vector(10); - line.add( new Boolean(product.isActive())); // 0 IsActive - line.add( new Integer(0).toString()); // 1 Line + line.add( Boolean.valueOf(product.isActive())); // 0 IsActive + line.add( Integer.valueOf(0).toString()); // 1 Line KeyNamePair pp = new KeyNamePair(product.getM_Product_ID(),product.getValue().concat("_").concat(product.getName())); line.add(pp); // 2 M_Product_ID MUOM u = new MUOM(product.getCtx(), product.getC_UOM_ID(), product.get_TrxName()); KeyNamePair uom = new KeyNamePair(u.get_ID(),u.getUOMSymbol()); line.add(uom); // 3 C_UOM_ID - line.add((BigDecimal) (Env.ONE).setScale(4, BigDecimal.ROUND_HALF_UP).stripTrailingZeros()); // 4 QtyBOM + line.add((BigDecimal) (Env.ONE).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros()); // 4 QtyBOM // dummy root node, as first node is not displayed in tree mySimpleTreeNode parent = new mySimpleTreeNode("Root",new ArrayList>()); @@ -442,14 +443,14 @@ public class WTreeBOM extends TreeBOM implements IFormController, EventListener< MProduct M_Product = MProduct.get(getCtx(), bomline.getM_ProductBOM_ID()); Vector line = new Vector(10); - line.add( new Boolean(bomline.isActive())); // 0 IsActive - line.add( new Integer(bomline.getLine()).toString()); // 1 Line + line.add( Boolean.valueOf(bomline.isActive())); // 0 IsActive + line.add( Integer.valueOf(bomline.getLine()).toString()); // 1 Line KeyNamePair pp = new KeyNamePair(M_Product.getM_Product_ID(),M_Product.getValue().concat("_").concat(M_Product.getName())); line.add(pp); // 2 M_Product_ID MUOM u = new MUOM(M_Product.getCtx(), M_Product.getC_UOM_ID(), M_Product.get_TrxName()); KeyNamePair uom = new KeyNamePair(u.get_ID(),u.getUOMSymbol()); line.add(uom); // 3 C_UOM_ID - line.add((BigDecimal) ((bomline.getBOMQty()!=null) ? bomline.getBOMQty() : Env.ZERO).setScale(4, BigDecimal.ROUND_HALF_UP).stripTrailingZeros()); // 4 QtyBOM + line.add((BigDecimal) ((bomline.getBOMQty()!=null) ? bomline.getBOMQty() : Env.ZERO).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros()); // 4 QtyBOM mySimpleTreeNode child = new mySimpleTreeNode(line,new ArrayList>()); if (!reload) @@ -471,14 +472,14 @@ public class WTreeBOM extends TreeBOM implements IFormController, EventListener< MProduct M_Product = MProduct.get(getCtx(), bom.getM_Product_ID()); Vector line = new Vector(10); - line.add( new Boolean(M_Product.isActive())); // 0 IsActive - line.add( new Integer(bom.getLine()).toString()); // 1 Line + line.add( Boolean.valueOf(M_Product.isActive())); // 0 IsActive + line.add( Integer.valueOf(bom.getLine()).toString()); // 1 Line KeyNamePair pp = new KeyNamePair(M_Product.getM_Product_ID(),M_Product.getValue().concat("_").concat(M_Product.getName())); line.add(pp); // 2 M_Product_ID MUOM u = new MUOM(M_Product.getCtx(), M_Product.getC_UOM_ID(), M_Product.get_TrxName()); KeyNamePair uom = new KeyNamePair(u.get_ID(),u.getUOMSymbol()); line.add(uom); // 3 C_UOM_ID - line.add((BigDecimal) ((bom.getBOMQty()!=null) ? bom.getBOMQty() : Env.ZERO).setScale(4, BigDecimal.ROUND_HALF_UP).stripTrailingZeros()); // 4 QtyBOM + line.add((BigDecimal) ((bom.getBOMQty()!=null) ? bom.getBOMQty() : Env.ZERO).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros()); // 4 QtyBOM if(m_selected_id == bom.getM_ProductBOM_ID() || getM_Product_ID() == bom.getM_ProductBOM_ID()) dataBOM.add(line); @@ -563,7 +564,7 @@ class mySimpleTreeNode extends DefaultTreeNode sb.append(" ["+((KeyNamePair) userObject.elementAt(3)).getName().trim()+"]"); // BOMQty BigDecimal BOMQty = (BigDecimal)(userObject.elementAt(4)); - sb.append("x"+BOMQty.setScale(2, BigDecimal.ROUND_HALF_UP).stripTrailingZeros()); + sb.append("x"+BOMQty.setScale(2, RoundingMode.HALF_UP).stripTrailingZeros()); return sb.toString(); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java index 7006a6000a..28f0b8d3b4 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/graph/WGraph.java @@ -15,6 +15,7 @@ package org.adempiere.webui.apps.graph; import java.awt.Point; import java.math.BigDecimal; +import java.math.RoundingMode; import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Collections; @@ -417,7 +418,7 @@ public class WGraph extends Div implements IdSpace { td.setSclass("pa-tdcontent"); tr.appendChild(td); text = new Text(format.format(m_goal.getMeasureTarget().setScale(2, - BigDecimal.ROUND_HALF_UP))); + RoundingMode.HALF_UP))); td.appendChild(text); tr = new Tr(); @@ -432,7 +433,7 @@ public class WGraph extends Div implements IdSpace { td.setSclass("pa-tdcontent"); tr.appendChild(td); text = new Text(format.format(m_goal.getMeasureActual().setScale(2, - BigDecimal.ROUND_HALF_UP))); + RoundingMode.HALF_UP))); td.appendChild(text); GraphColumn[] bList = getGraphColumnList(); @@ -483,11 +484,11 @@ public class WGraph extends Div implements IdSpace { }); a.setDynamicProperty("href", "javascript:;"); - text = new Text(format.format(value.setScale(2, BigDecimal.ROUND_HALF_UP))); + text = new Text(format.format(value.setScale(2, RoundingMode.HALF_UP))); a.appendChild(text); } else { - text = new Text(format.format(value.setScale(2, BigDecimal.ROUND_HALF_UP))); + text = new Text(format.format(value.setScale(2, RoundingMode.HALF_UP))); } } tr = new Tr(); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WAppsAction.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WAppsAction.java index 4e58a77893..1790361444 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WAppsAction.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WAppsAction.java @@ -78,7 +78,7 @@ public class WAppsAction int pos = newToolTipText.indexOf('&'); if (pos != -1 && newToolTipText.length() > pos) // We have a nemonic - creates ALT-_ { - Character ch = new Character(newToolTipText.toLowerCase().charAt(pos + 1)); + Character ch = Character.valueOf(newToolTipText.toLowerCase().charAt(pos + 1)); if (ch != ' ') { // remove ampersand diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java index 0fa2bea022..59ffdce261 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/component/WListbox.java @@ -219,7 +219,7 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis } // is the column read/write? - if (m_readWriteColumn.contains(new Integer(column))) + if (m_readWriteColumn.contains(Integer.valueOf(column))) { return true; } @@ -302,7 +302,7 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis */ public void setColumnReadOnly (int index, boolean readOnly) { - Integer indexObject = new Integer(index); + Integer indexObject = Integer.valueOf(index); // Column is ReadWrite if (m_readWriteColumn.contains(indexObject)) @@ -611,7 +611,7 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis } else if (columnClass == Boolean.class) { - data = new Boolean(rs.getString(rsColIndex).equals("Y")); + data = Boolean.valueOf(rs.getString(rsColIndex).equals("Y")); } else if (columnClass == Timestamp.class) { @@ -623,11 +623,11 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis } else if (columnClass == Double.class) { - data = new Double(rs.getDouble(rsColIndex)); + data = Double.valueOf(rs.getDouble(rsColIndex)); } else if (columnClass == Integer.class) { - data = new Integer(rs.getInt(rsColIndex)); + data = Integer.valueOf(rs.getInt(rsColIndex)); } else if (columnClass == KeyNamePair.class) { @@ -731,7 +731,7 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis } else if (columnClass == Double.class) { - data = new Double(((BigDecimal)data).doubleValue()); + data = Double.valueOf(((BigDecimal)data).doubleValue()); } } // store @@ -1202,15 +1202,15 @@ public class WListbox extends Listbox implements IMiniTable, TableValueChangeLis } else if (c == Double.class) { - Double subtotal = new Double(0); + Double subtotal = Double.valueOf(0); if(total[col] != null) subtotal = (Double)(total[col]); Double amt = (Double) data; if(subtotal == null) - subtotal = new Double(0); + subtotal = Double.valueOf(0); if(amt == null ) - amt = new Double(0); + amt = Double.valueOf(0); total[col] = subtotal + amt; } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java index a632c2e1dd..79c64da72f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/dashboard/CalendarWindow.java @@ -359,7 +359,7 @@ public class CalendarWindow extends Window implements EventListener, ITab String key = (String) keys.nextElement(); BigDecimal value = ht.get(key); String name = (String) htTypes.get(key); - pieDataset.setValue(name == null ? "" : name, new Double(size > 0 ? value.doubleValue()/size*100 : 0)); + pieDataset.setValue(name == null ? "" : name, Double.valueOf(size > 0 ? value.doubleValue()/size*100 : 0)); } JFreeChart chart = ChartFactory.createPieChart3D(Msg.getMsg(Env.getCtx(),"EventsAnalysis"), pieDataset, true, true, true); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java index 2796cd1889..8b55c20837 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAccountEditor.java @@ -87,7 +87,7 @@ public class WAccountEditor extends WEditor implements ContextMenuListener { if (m_mAccount.C_ValidCombination_ID == 0) return null; - return new Integer (m_mAccount.C_ValidCombination_ID); + return Integer.valueOf(m_mAccount.C_ValidCombination_ID); } @Override @@ -201,7 +201,7 @@ public class WAccountEditor extends WEditor implements ContextMenuListener // We have a Value if (C_ValidCombination_ID > 0) { - Integer newValue = new Integer(C_ValidCombination_ID); + Integer newValue = Integer.valueOf(C_ValidCombination_ID); Object oldValue = m_value; m_value = newValue; ValueChangeEvent changeEvent = new ValueChangeEvent(this, this.getColumnName(), oldValue, newValue); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAssignmentEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAssignmentEditor.java index 05d1485a7d..515d99824a 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAssignmentEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WAssignmentEditor.java @@ -221,7 +221,7 @@ public class WAssignmentEditor extends WEditor implements ContextMenuListener { // Set Value if (ma != null && ma.getS_ResourceAssignment_ID() != 0) { - setValue(new Integer(ma.getS_ResourceAssignment_ID())); + setValue(Integer.valueOf(ma.getS_ResourceAssignment_ID())); ValueChangeEvent vce = new ValueChangeEvent(WAssignmentEditor.this, gridField.getColumnName(), oldValue, getValue()); fireValueChange(vce); } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java index cf0d2108e1..697e1afcc4 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WImageEditor.java @@ -80,7 +80,7 @@ public class WImageEditor extends WEditor { if (m_mImage == null || m_mImage.get_ID() == 0) return null; - return new Integer(m_mImage.get_ID()); + return Integer.valueOf(m_mImage.get_ID()); } @Override @@ -171,7 +171,7 @@ public class WImageEditor extends WEditor Object oldValue = getValue(); Integer newValue = null; if (AD_Image_ID != 0) - newValue = new Integer (AD_Image_ID); + newValue = Integer.valueOf(AD_Image_ID); // m_mImage = null; // force reload setValue(newValue); // set explicitly diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java index 358e2247b8..36d513c307 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocationEditor.java @@ -111,7 +111,7 @@ public class WLocationEditor extends WEditor implements EventListener, Pr { if (m_value == null) return null; - return new Integer(m_value.getC_Location_ID()); + return Integer.valueOf(m_value.getC_Location_ID()); } @Override @@ -194,7 +194,7 @@ public class WLocationEditor extends WEditor implements EventListener, Pr int C_Location_ID = 0; if (m_value != null) C_Location_ID = m_value.getC_Location_ID(); - Integer ii = new Integer(C_Location_ID); + Integer ii = Integer.valueOf(C_Location_ID); if (C_Location_ID != 0 && oldValue == 0) { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java index 35f4531da9..0eefaebfee 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WLocatorEditor.java @@ -427,7 +427,7 @@ public class WLocatorEditor extends WEditor implements EventListener, Pro if (M_Locator_ID == 0) return false; - setValue (new Integer(M_Locator_ID), true); + setValue (Integer.valueOf(M_Locator_ID), true); return true; } // actionText diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java index d42c7901b7..6a68e7e154 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WNumberEditor.java @@ -18,6 +18,7 @@ package org.adempiere.webui.editor; import java.math.BigDecimal; +import java.math.RoundingMode; import java.text.DecimalFormat; import org.adempiere.webui.ClientInfo; @@ -176,10 +177,10 @@ public class WNumberEditor extends WEditor implements ContextMenuListener if (displayType == DisplayType.Integer) { if (newValue != null && newValue instanceof BigDecimal) { - newValue = new Integer(((BigDecimal)newValue).intValue()); + newValue = Integer.valueOf(((BigDecimal)newValue).intValue()); } if (oldValue != null && oldValue instanceof BigDecimal) { - oldValue = new Integer(((BigDecimal)oldValue).intValue()); + oldValue = Integer.valueOf(((BigDecimal)oldValue).intValue()); } } @@ -221,7 +222,7 @@ public class WNumberEditor extends WEditor implements ContextMenuListener divisor = BigDecimal.TEN; else divisor = BigDecimal.TEN.pow(decimalPlaces); - BigDecimal newValue = oldValue.divide(divisor, decimalPlaces, BigDecimal.ROUND_HALF_UP); + BigDecimal newValue = oldValue.divide(divisor, decimalPlaces, RoundingMode.HALF_UP); return newValue; } //getAddDecimalPlaces diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java index 0ae327287e..319095c56e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WPAttributeEditor.java @@ -59,7 +59,7 @@ public class WPAttributeEditor extends WEditor implements ContextMenuListener private GridTab m_GridTab; /** No Instance Key */ - private static Integer NO_INSTANCE = new Integer(0); + private static Integer NO_INSTANCE = Integer.valueOf(0); public WPAttributeEditor(GridTab gridTab, GridField gridField) { @@ -275,7 +275,7 @@ public class WPAttributeEditor extends WEditor implements ContextMenuListener if (M_AttributeSetInstance_ID == 0) setValue(null); else - setValue(new Integer(M_AttributeSetInstance_ID)); + setValue(Integer.valueOf(M_AttributeSetInstance_ID)); ValueChangeEvent vce = new ValueChangeEvent(this, gridField.getColumnName(), new Object(), getValue()); fireValueChange(vce); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java index 09fc87c0bf..682fa7e213 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WSearchEditor.java @@ -392,7 +392,7 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value if (log.isLoggable(Level.FINE)) log.fine(getColumnName() + " - Unique ID=" + id); - actionCombo(new Integer(id)); // data binding + actionCombo(Integer.valueOf(id)); // data binding Searchbox comp = getComponent(); Component parent = comp.getParent(); @@ -507,9 +507,9 @@ public class WSearchEditor extends WEditor implements ContextMenuListener, Value return; // Maybe new Record - put in cache - lookup.getDirect(new Integer(result), false, true); - setValue(new Integer(result)); - actionCombo (new Integer(result)); // data binding + lookup.getDirect(Integer.valueOf(result), false, true); + setValue(Integer.valueOf(result)); + actionCombo (Integer.valueOf(result)); // data binding lookup.refresh(); //setValue(getValue()); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java index 1639834671..ae46c5d9f1 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java @@ -565,9 +565,9 @@ ContextMenuListener, IZoomableEditor return; // Maybe new Record - put in cache - Object newValue = new Integer(result); + Object newValue = Integer.valueOf(result); lookup.getDirect(newValue, false, true); - setValue(new Integer(result)); + setValue(Integer.valueOf(result)); ValueChangeEvent changeEvent = new ValueChangeEvent(this, getColumnName(), oldValue, newValue); fireValueChange(changeEvent); oldValue = newValue; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WYesNoEditor.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WYesNoEditor.java index 667424fabb..ad135b7ab8 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WYesNoEditor.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WYesNoEditor.java @@ -107,7 +107,7 @@ public class WYesNoEditor extends WEditor implements ContextMenuListener @Override public Object getValue() { - return new Boolean(getComponent().isChecked()); + return Boolean.valueOf(getComponent().isChecked()); } @Override diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFormFactory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFormFactory.java index b444cc18f8..f87f87b1b1 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFormFactory.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/factory/DefaultFormFactory.java @@ -86,7 +86,7 @@ public class DefaultFormFactory implements IFormFactory { if (clazz != null) { try { - form = clazz.newInstance(); + form = clazz.getDeclaredConstructor().newInstance(); } catch (Exception e) { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java index b3107baf55..9e571de890 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/grid/WBPartner.java @@ -343,7 +343,7 @@ public class WBPartner extends Window implements EventListener, ValueChan if (m_pLocation != null) { int location = m_pLocation.getC_Location_ID(); - fAddress.setValue (new Integer(location)); + fAddress.setValue (Integer.valueOf(location)); fPhone.setText(m_pLocation.getPhone()); fPhone2.setText(m_pLocation.getPhone2()); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java index b6c92bb009..7d7cb30700 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java @@ -706,10 +706,10 @@ public class InfoProductWindow extends InfoWindow { line.add(null); // Date double qtyOnHand = rs.getDouble(1); qty += qtyOnHand; - line.add(new Double(qtyOnHand)); // Qty + line.add(Double.valueOf(qtyOnHand)); // Qty line.add(null); // BPartner - line.add(new Double(rs.getDouble(3))); // QtyOrdered - line.add(new Double(rs.getDouble(2))); // QtyReserved + line.add(Double.valueOf(rs.getDouble(3))); // QtyOrdered + line.add(Double.valueOf(rs.getDouble(2))); // QtyReserved line.add(rs.getString(7)); // Locator String asi = rs.getString(4); if (showDetail && (asi == null || asi.length() == 0)) @@ -765,15 +765,15 @@ public class InfoProductWindow extends InfoWindow { Double qtyOrdered = null; if (MDocType.DOCBASETYPE_PurchaseOrder.equals(DocBaseType)) { - qtyOrdered = new Double(oq); + qtyOrdered = Double.valueOf(oq); qty += oq; } else { - qtyReserved = new Double(oq); + qtyReserved = Double.valueOf(oq); qty -= oq; } - line.add(new Double(qty)); // Qty + line.add(Double.valueOf(qty)); // Qty line.add(rs.getString(6)); // BPartner line.add(qtyOrdered); // QtyOrdered line.add(qtyReserved); // QtyReserved diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java index 0a26400341..11751005b4 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java @@ -337,7 +337,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL } // save process_id, handle event will use - btProcess.setAttribute(PROCESS_ID_KEY, new Integer(infoProcess.getAD_Process_ID())); + btProcess.setAttribute(PROCESS_ID_KEY, Integer.valueOf(infoProcess.getAD_Process_ID())); btProcess.addEventListener(Events.ON_CLICK, this); // save info process to use in handle event btProcess.setAttribute(ATT_INFO_PROCESS_KEY, process); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/RelatedInfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/RelatedInfoWindow.java index 8cdd578352..ea38cd7714 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/RelatedInfoWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/RelatedInfoWindow.java @@ -426,15 +426,15 @@ public class RelatedInfoWindow implements EventListener, Sortable value = new IDColumn(rs.getInt(colIndex)); } else if (c == Boolean.class) - value = new Boolean("Y".equals(rs.getString(colIndex))); + value = Boolean.valueOf("Y".equals(rs.getString(colIndex))); else if (c == Timestamp.class) value = rs.getTimestamp(colIndex); else if (c == BigDecimal.class) value = rs.getBigDecimal(colIndex); else if (c == Double.class) - value = new Double(rs.getDouble(colIndex)); + value = Double.valueOf(rs.getDouble(colIndex)); else if (c == Integer.class) - value = new Integer(rs.getInt(colIndex)); + value = Integer.valueOf(rs.getInt(colIndex)); else if (c == KeyNamePair.class) { if (columnsLayout[col].isKeyPairCol()) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java index f67bb7bb20..c2f551c128 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInOutPanel.java @@ -272,7 +272,7 @@ public class InfoInOutPanel extends InfoPanel implements ValueChangeListener, Ev String bp = Env.getContext(Env.getCtx(), p_WindowNo, "C_BPartner_ID"); if (bp != null && bp.length() != 0) - fBPartner_ID.setValue(new Integer(bp)); + fBPartner_ID.setValue(Integer.valueOf(bp)); // Prepare table diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java index 3665f1dc03..dbae3c33d5 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoInvoicePanel.java @@ -305,7 +305,7 @@ public class InfoInvoicePanel extends InfoPanel implements ValueChangeListener // Set Defaults String bp = Env.getContext(Env.getCtx(), p_WindowNo, "C_BPartner_ID"); if (bp != null && bp.length() != 0) - editorBPartner.setValue(new Integer(bp)); + editorBPartner.setValue(Integer.valueOf(bp)); // prepare table StringBuilder where = new StringBuilder("i.IsActive='Y'"); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java index 111bc79c8f..c8f6766095 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoOrderPanel.java @@ -282,7 +282,7 @@ public class InfoOrderPanel extends InfoPanel implements ValueChangeListener // Set Defaults String bp = Env.getContext(Env.getCtx(), p_WindowNo, "C_BPartner_ID"); if (bp != null && bp.length() != 0) - editorBPartner.setValue(new Integer(bp)); + editorBPartner.setValue(Integer.valueOf(bp)); // prepare table StringBuilder where = new StringBuilder("o.IsActive='Y'"); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java index ee414959aa..e71a68e8f0 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPanel.java @@ -591,15 +591,15 @@ public abstract class InfoPanel extends Window implements EventListener, } else if (c == Boolean.class) - value = new Boolean("Y".equals(rs.getString(colIndex))); + value = Boolean.valueOf("Y".equals(rs.getString(colIndex))); else if (c == Timestamp.class) value = rs.getTimestamp(colIndex); else if (c == BigDecimal.class) value = rs.getBigDecimal(colIndex); else if (c == Double.class) - value = new Double(rs.getDouble(colIndex)); + value = Double.valueOf(rs.getDouble(colIndex)); else if (c == Integer.class) - value = new Integer(rs.getInt(colIndex)); + value = Integer.valueOf(rs.getInt(colIndex)); else if (c == KeyNamePair.class) { if (p_layout[col].isKeyPairCol()) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java index 7347500add..eed2d4e6cd 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoPaymentPanel.java @@ -281,7 +281,7 @@ public class InfoPaymentPanel extends InfoPanel implements ValueChangeListener, String bp = Env.getContext(Env.getCtx(), p_WindowNo, "C_BPartner_ID"); if (bp != null && bp.length() != 0) - fBPartner_ID.setValue(new Integer(bp)); + fBPartner_ID.setValue(Integer.valueOf(bp)); // Prepare table StringBuilder where = new StringBuilder("p.IsActive='Y'"); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java index 32ba5bf78a..3423be95f5 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InfoProductPanel.java @@ -810,12 +810,12 @@ public class InfoProductPanel extends InfoPanel implements EventListener ResultSet rs = null; try { - pickPriceList.appendItem("",new Integer(0)); + pickPriceList.appendItem("",Integer.valueOf(0)); pstmt = DB.prepareStatement(SQL, null); rs = pstmt.executeQuery(); while (rs.next()) { - pickPriceList.appendItem(rs.getString(2),new Integer(rs.getInt(1))); + pickPriceList.appendItem(rs.getString(2),Integer.valueOf(rs.getInt(1))); } DB.close(rs, pstmt); rs = null; pstmt = null; @@ -827,12 +827,12 @@ public class InfoProductPanel extends InfoPanel implements EventListener + "WHERE IsActive='Y'", "M_Warehouse", MRole.SQL_NOTQUALIFIED, MRole.SQL_RO) + " ORDER BY Value"; - pickWarehouse.appendItem("", new Integer(0)); + pickWarehouse.appendItem("", Integer.valueOf(0)); pstmt = DB.prepareStatement(SQL, null); rs = pstmt.executeQuery(); while (rs.next()) { - pickWarehouse.appendItem(rs.getString("ValueName"), new Integer(rs.getInt("M_Warehouse_ID"))); + pickWarehouse.appendItem(rs.getString("ValueName"), Integer.valueOf(rs.getInt("M_Warehouse_ID"))); } DB.close(rs, pstmt); rs = null; pstmt = null; @@ -1506,10 +1506,10 @@ public class InfoProductPanel extends InfoPanel implements EventListener line.add(null); // Date double qtyOnHand = rs.getDouble(1); qty += qtyOnHand; - line.add(new Double(qtyOnHand)); // Qty + line.add(Double.valueOf(qtyOnHand)); // Qty line.add(null); // BPartner - line.add(new Double(rs.getDouble(3))); // QtyOrdered - line.add(new Double(rs.getDouble(2))); // QtyReserved + line.add(Double.valueOf(rs.getDouble(3))); // QtyOrdered + line.add(Double.valueOf(rs.getDouble(2))); // QtyReserved line.add(rs.getString(7)); // Locator String asi = rs.getString(4); if (showDetail && (asi == null || asi.length() == 0)) @@ -1565,15 +1565,15 @@ public class InfoProductPanel extends InfoPanel implements EventListener Double qtyOrdered = null; if (MDocType.DOCBASETYPE_PurchaseOrder.equals(DocBaseType)) { - qtyOrdered = new Double(oq); + qtyOrdered = Double.valueOf(oq); qty += oq; } else { - qtyReserved = new Double(oq); + qtyReserved = Double.valueOf(oq); qty -= oq; } - line.add(new Double(qty)); // Qty + line.add(Double.valueOf(qty)); // Qty line.add(rs.getString(6)); // BPartner line.add(qtyOrdered); // QtyOrdered line.add(qtyReserved); // QtyReserved diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java index 5aeffebed6..d1266da85c 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/InvoiceHistory.java @@ -337,7 +337,7 @@ public class InvoiceHistory extends Window implements EventListener line.add(rs.getString(1)); // Name line.add(rs.getBigDecimal(2)); // Price line.add(rs.getString(3)); // Currency - line.add(new Double(rs.getDouble(5))); // Qty + line.add(Double.valueOf(rs.getDouble(5))); // Qty BigDecimal discountBD = rs.getBigDecimal(9); if (discountBD == null) { double priceList = rs.getDouble(4); @@ -571,9 +571,9 @@ public class InvoiceHistory extends Window implements EventListener Vector line = new Vector(6); // 1-Name, 2-MovementQty, 3-MovementDate, 4-IsSOTrx, 5-DocumentNo line.add(rs.getString(1)); // Name - line.add(new Double(rs.getDouble(2))); // Qty + line.add(Double.valueOf(rs.getDouble(2))); // Qty line.add(rs.getTimestamp(3)); // Date - line.add(new Boolean("Y".equals(rs.getString(4)))); // IsSOTrx + line.add(Boolean.valueOf("Y".equals(rs.getString(4)))); // IsSOTrx line.add(rs.getString(5)); // DocNo line.add(rs.getString(6)); // Warehouse data.add(line); @@ -664,10 +664,10 @@ public class InvoiceHistory extends Window implements EventListener line.add(null); // Date double qtyOnHand = rs.getDouble(1); qty += qtyOnHand; - line.add(new Double(qtyOnHand)); // Qty + line.add(Double.valueOf(qtyOnHand)); // Qty line.add(null); // BPartner - line.add(new Double(rs.getDouble(3))); // QtyOrdered - line.add(new Double(rs.getDouble(2))); // QtyReserved + line.add(Double.valueOf(rs.getDouble(3))); // QtyOrdered + line.add(Double.valueOf(rs.getDouble(2))); // QtyReserved line.add(rs.getString(7)); // Locator String asi = rs.getString(4); if (showDetailATP && (asi == null || asi.length() == 0)) @@ -723,15 +723,15 @@ public class InvoiceHistory extends Window implements EventListener Double qtyOrdered = null; if (MDocType.DOCBASETYPE_PurchaseOrder.equals(DocBaseType)) { - qtyOrdered = new Double(oq); + qtyOrdered = Double.valueOf(oq); qty += oq; } else { - qtyReserved = new Double(oq); + qtyReserved = Double.valueOf(oq); qty -= oq; } - line.add(new Double(qty)); // Qty + line.add(Double.valueOf(qty)); // Qty line.add(rs.getString(6)); // BPartner line.add(qtyOrdered); // QtyOrdered line.add(qtyReserved); // QtyReserved diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java index b92ef2e7d8..739cf32c04 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/RolePanel.java @@ -402,7 +402,7 @@ public class RolePanel extends Window implements EventListener, Deferrabl { initDefault=m_userpreference.getProperty( UserPreference.P_ROLE ); } - KeyNamePair clientKNPair = new KeyNamePair(new Integer((String)lstItemClient.getValue()), lstItemClient.getLabel()); + KeyNamePair clientKNPair = new KeyNamePair(Integer.valueOf((String)lstItemClient.getValue()), lstItemClient.getLabel()); KeyNamePair roleKNPairs[] = login.getRoles(m_userName, clientKNPair); if (roleKNPairs != null && roleKNPairs.length > 0) { @@ -457,7 +457,7 @@ public class RolePanel extends Window implements EventListener, Deferrabl { initDefault=m_userpreference.getProperty( UserPreference.P_ORG ); } - KeyNamePair RoleKNPair = new KeyNamePair(new Integer((String)lstItemRole.getValue()), lstItemRole.getLabel()); + KeyNamePair RoleKNPair = new KeyNamePair(Integer.valueOf((String)lstItemRole.getValue()), lstItemRole.getLabel()); KeyNamePair orgKNPairs[] = login.getOrgs(RoleKNPair); if(orgKNPairs != null && orgKNPairs.length > 0) { @@ -496,7 +496,7 @@ public class RolePanel extends Window implements EventListener, Deferrabl { initDefault=m_userpreference.getProperty( UserPreference.P_WAREHOUSE ); } - KeyNamePair organisationKNPair = new KeyNamePair(new Integer((String)lstItemOrganisation.getValue()), lstItemOrganisation.getLabel()); + KeyNamePair organisationKNPair = new KeyNamePair(Integer.valueOf((String)lstItemOrganisation.getValue()), lstItemOrganisation.getLabel()); KeyNamePair warehouseKNPairs[] = login.getWarehouses(organisationKNPair); if(warehouseKNPairs != null && warehouseKNPairs.length > 0) { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java index 0c38b31066..21595d04ed 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/panel/WAttachment.java @@ -20,6 +20,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.ArrayList; import java.util.List; import java.util.logging.Level; @@ -416,7 +417,7 @@ public class WAttachment extends Window implements EventListener size = size.divide(new BigDecimal("1024")); unit = " MB"; } - size = size.setScale(2, BigDecimal.ROUND_HALF_EVEN); + size = size.setScale(2, RoundingMode.HALF_EVEN); sizeLabel.setText(size.toPlainString() + unit); bSave.setEnabled(true); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/DunningPrint.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/DunningPrint.java index 21f1567fb5..a56528f1ba 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/DunningPrint.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/DunningPrint.java @@ -170,7 +170,7 @@ public class DunningPrint extends SvrProcess // query MQuery query = new MQuery("C_Dunning_Header_v"); query.addRestriction("C_DunningRunEntry_ID", MQuery.EQUAL, - new Integer(entry.getC_DunningRunEntry_ID())); + Integer.valueOf(entry.getC_DunningRunEntry_ID())); // Engine PrintInfo info = new PrintInfo( diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java index 60116946a2..1b3fde0133 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/process/InvoicePrint.java @@ -241,7 +241,7 @@ public class InvoicePrint extends SvrProcess format.setTranslationLanguage(language); // query MQuery query = new MQuery("C_Invoice_Header_v"); - query.addRestriction("C_Invoice_ID", MQuery.EQUAL, new Integer(C_Invoice_ID)); + query.addRestriction("C_Invoice_ID", MQuery.EQUAL, Integer.valueOf(C_Invoice_ID)); // Engine PrintInfo info = new PrintInfo( diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/OSTask.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/OSTask.java index 4489dc3fb1..9b21ed6aa8 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/OSTask.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/OSTask.java @@ -127,7 +127,7 @@ public class OSTask extends Thread if (checkInterrupted()) return; int i = m_child.exitValue(); - exitValue = new Integer(i); + exitValue = Integer.valueOf(i); } catch (Exception ie) { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ProcessFactoryImpl.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ProcessFactoryImpl.java index 9a553df352..171e0734f9 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ProcessFactoryImpl.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/ProcessFactoryImpl.java @@ -36,7 +36,7 @@ public class ProcessFactoryImpl implements IProcessFactory { ProcessCall process = null; try { Class clazz = getClass().getClassLoader().loadClass(className); - process = (ProcessCall) clazz.newInstance(); + process = (ProcessCall) clazz.getDeclaredConstructor().newInstance(); } catch (Exception e) { } return process; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java index d3ef8419dc..120cd03d23 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/AboutWindow.java @@ -502,7 +502,7 @@ public class AboutWindow extends Window implements EventListener { BundleContext bundleCtx = WebUIActivator.getBundleContext(); for (Bundle bundle : bundleCtx.getBundles()) { Vector line = new Vector(); - Integer bundl = new Long(bundle.getBundleId()).intValue(); // potential problem converting Long to Integer, but WListBox cannot order Long + Integer bundl = Long.valueOf(bundle.getBundleId()).intValue(); // potential problem converting Long to Integer, but WListBox cannot order Long line.add(new IDColumn(bundl)); line.add(bundl); line.add(state(bundle.getState())); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java index 549b4e7459..6087295f32 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/FindWindow.java @@ -1516,7 +1516,7 @@ public class FindWindow extends Window implements EventListener, ValueCha || (DisplayType.isID(dt) && field.getColumnName().endsWith("_ID"))) { int i = Integer.parseInt(in); - editor.setValue(new Integer(i)); + editor.setValue(Integer.valueOf(i)); } // Return BigDecimal else if (DisplayType.isNumeric(dt)) @@ -2427,7 +2427,7 @@ public class FindWindow extends Window implements EventListener, ValueCha if (in instanceof Integer) return in; int i = Integer.parseInt(in.toString()); - return new Integer(i); + return Integer.valueOf(i); } // Return BigDecimal else if (DisplayType.isNumeric(dt)) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java index 3ba2df914d..ed559bc40f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WAccountDialog.java @@ -673,7 +673,7 @@ public final class WAccountDialog extends Window if (rs.wasNull()) editor.setValue(null); else - editor.setValue(new Integer (intValue)); + editor.setValue(Integer.valueOf(intValue)); } // loadInfoOf @@ -1290,7 +1290,7 @@ public final class WAccountDialog extends Window if (log.isLoggable(Level.CONFIG)) log.config("C_ValidCombination_ID=" + m_C_ValidCombination_ID + ", Changed=" + m_changed); if (!m_changed || m_C_ValidCombination_ID == 0) return null; - return new Integer(m_C_ValidCombination_ID); + return Integer.valueOf(m_C_ValidCombination_ID); } /** diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java index 92c7ff6c10..73e826fd54 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WFieldRecordInfo.java @@ -292,9 +292,9 @@ public class WFieldRecordInfo extends Window implements EventListener else if (column.getAD_Reference_ID() == DisplayType.Integer) { if (OldValue != null) - showOldValue = m_intFormat.format (new Integer (OldValue)); + showOldValue = m_intFormat.format (Integer.valueOf(OldValue)); if (NewValue != null) - showNewValue = m_intFormat.format (new Integer (NewValue)); + showNewValue = m_intFormat.format (Integer.valueOf(NewValue)); } else if (DisplayType.isNumeric (column.getAD_Reference_ID ())) { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java index dfb732b49f..43034f1339 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WLocatorDialog.java @@ -659,7 +659,7 @@ public class WLocatorDialog extends Window implements EventListener MLocator l = (MLocator) listitem.getValue(); if (l != null && l.getM_Locator_ID() != 0) - return new Integer (l.getM_Locator_ID()); + return Integer.valueOf(l.getM_Locator_ID()); return null; } // getValue diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java index 534f80532d..85e3c6fc14 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WMediaDialog.java @@ -261,7 +261,7 @@ public class WMediaDialog extends Window implements EventListener { Clob clob = (Clob)m_data; long length = clob.length() > 100 ? 100 : clob.length(); - String data = ((Clob)m_data).getSubString(1, new Long(length).intValue()); + String data = ((Clob)m_data).getSubString(1, Long.valueOf(length).intValue()); if (data.toUpperCase().indexOf("") >= 0) { contentType = "text/html"; diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java index eeb220be64..f63a84c353 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WPAttributeDialog.java @@ -19,6 +19,7 @@ package org.adempiere.webui.window; import static org.compiere.model.SystemIDs.COLUMN_M_MOVEMENTLINE_M_ATTRIBUTESETINSTANCE_ID; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.Timestamp; @@ -1061,7 +1062,7 @@ public class WPAttributeDialog extends Window implements EventListener mandatory += " - " + attributes[i].getName(); //setMAttributeInstance doesn't work without decimal point if (value != null && value.scale() == 0) - value = value.setScale(1, BigDecimal.ROUND_HALF_UP); + value = value.setScale(1, RoundingMode.HALF_UP); attributes[i].setMAttributeInstance(m_M_AttributeSetInstance_ID, value); } else if (MAttribute.ATTRIBUTEVALUETYPE_Date.equals(attributes[i].getAttributeValueType())) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java index 89c9fc55ec..b4e0ca569e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/WRecordInfo.java @@ -423,9 +423,9 @@ public class WRecordInfo extends Window implements EventListener else if (column.getAD_Reference_ID() == DisplayType.Integer) { if (OldValue != null) - showOldValue = m_intFormat.format (new Integer (OldValue)); + showOldValue = m_intFormat.format (Integer.valueOf(OldValue)); if (NewValue != null) - showNewValue = m_intFormat.format (new Integer (NewValue)); + showNewValue = m_intFormat.format (Integer.valueOf(NewValue)); } else if (DisplayType.isNumeric (column.getAD_Reference_ID ())) { diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java index 376cf2614c..ac0f4e675f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkJRViewer.java @@ -53,11 +53,12 @@ import net.sf.jasperreports.engine.DefaultJasperReportsContext; import net.sf.jasperreports.engine.JRException; import net.sf.jasperreports.engine.JasperPrint; import net.sf.jasperreports.engine.JasperReport; +import net.sf.jasperreports.engine.JasperReportsContext; +import net.sf.jasperreports.engine.SimpleJasperReportsContext; import net.sf.jasperreports.engine.export.HtmlExporter; import net.sf.jasperreports.engine.export.JRCsvExporter; import net.sf.jasperreports.engine.export.JRPdfExporter; import net.sf.jasperreports.engine.export.JRXlsExporter; -import net.sf.jasperreports.engine.util.LocalJasperReportsContext; import net.sf.jasperreports.export.SimpleCsvExporterConfiguration; import net.sf.jasperreports.export.SimpleExporterInput; import net.sf.jasperreports.export.SimpleHtmlExporterOutput; @@ -454,8 +455,7 @@ public class ZkJRViewer extends Window implements EventListener, ITabOnCl log.log(Level.FINE, "Path="+path + " Prefix="+prefix); } File file = new File(FileUtil.getTempMailName(prefix, ".pdf")); - LocalJasperReportsContext context = new LocalJasperReportsContext(DefaultJasperReportsContext.getInstance()); - context.setClassLoader(JRPdfExporter.class.getClassLoader()); + JasperReportsContext context = new SimpleJasperReportsContext(DefaultJasperReportsContext.getInstance()); JRPdfExporter exporter = new JRPdfExporter(context); if (!isList){ jasperPrintList = new ArrayList<>(); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/zkforge/keylistener/Keylistener.java b/org.adempiere.ui.zk/WEB-INF/src/org/zkforge/keylistener/Keylistener.java index 5e41b16698..3c9f1b07c8 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/zkforge/keylistener/Keylistener.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/zkforge/keylistener/Keylistener.java @@ -112,7 +112,7 @@ public class Keylistener extends HtmlBasedComponent { } if (k == j + 1) throw new WrongValueException(MCommon.UNEXPECTED_CHARACTER, - new Object[] { new Character(cc), keys }); + new Object[] { Character.valueOf(cc), keys }); final String s = keys.substring(j + 1, k).toLowerCase(); if ("pgup".equals(s)) @@ -166,7 +166,7 @@ public class Keylistener extends HtmlBasedComponent { if (sbcur == null || ((cc > 'Z' || cc < 'A') && (cc > 'z' || cc < 'a') && (cc > '9' || cc < '0'))) throw new WrongValueException(MCommon.UNEXPECTED_CHARACTER, - new Object[] { new Character(cc), keys }); + new Object[] { Character.valueOf(cc), keys }); if (sbcur == sbsft) throw new WrongValueException("$" + cc + " not supported: " + keys); diff --git a/org.adempiere.ui/.classpath b/org.adempiere.ui/.classpath index be02a70081..3e551e9bf2 100644 --- a/org.adempiere.ui/.classpath +++ b/org.adempiere.ui/.classpath @@ -1,9 +1,14 @@ - + + + + + + diff --git a/org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.ui/META-INF/MANIFEST.MF b/org.adempiere.ui/META-INF/MANIFEST.MF index 46c74f8c94..94a524fafc 100644 --- a/org.adempiere.ui/META-INF/MANIFEST.MF +++ b/org.adempiere.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere UI base Bundle-SymbolicName: org.adempiere.ui;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.apache.xerces;bundle-version="0.0.0", org.eclipse.equinox.app;bundle-version="0.0.0" @@ -27,5 +27,7 @@ Export-Package: org.compiere.apps, org.netbeans.api.visual.widget Bundle-ClassPath: ., lib/org-netbeans-api-visual.jar, - lib/org-openide-util.jar + lib/org-openide-util.jar, + lib/org-openide-util-lookup.jar Automatic-Module-Name: org.adempiere.ui +Bundle-Vendor: iDempiere Community diff --git a/org.adempiere.ui/build.properties b/org.adempiere.ui/build.properties index 92fa867dd9..47a81e85e6 100644 --- a/org.adempiere.ui/build.properties +++ b/org.adempiere.ui/build.properties @@ -1,6 +1,7 @@ bin.includes = META-INF/,\ .,\ lib/org-netbeans-api-visual.jar,\ - lib/org-openide-util.jar + lib/org-openide-util.jar,\ + lib/org-openide-util-lookup.jar source.. = src/ output.. = target/classes/ diff --git a/org.adempiere.ui/pom.xml b/org.adempiere.ui/pom.xml index b77b7ee42c..ebc23fa460 100644 --- a/org.adempiere.ui/pom.xml +++ b/org.adempiere.ui/pom.xml @@ -34,12 +34,17 @@ org.netbeans.api org-netbeans-api-visual - RELEASE65 + ${netbeans.lib.version} org.netbeans.api org-openide-util - RELEASE65 + ${netbeans.lib.version} + + + org.netbeans.api + org-openide-util-lookup + ${netbeans.lib.version} lib diff --git a/org.adempiere.ui/src/org/compiere/apps/form/Allocation.java b/org.adempiere.ui/src/org/compiere/apps/form/Allocation.java index 46f989b93e..12c4d70920 100644 --- a/org.adempiere.ui/src/org/compiere/apps/form/Allocation.java +++ b/org.adempiere.ui/src/org/compiere/apps/form/Allocation.java @@ -101,7 +101,7 @@ public class Allocation return; // Async BPartner Test - Integer key = new Integer(m_C_BPartner_ID); + Integer key = Integer.valueOf(m_C_BPartner_ID); if (!m_bpartnerCheck.contains(key)) { new Thread() @@ -160,7 +160,7 @@ public class Allocation while (rs.next()) { Vector line = new Vector(); - line.add(new Boolean(false)); // 0-Selection + line.add(Boolean.FALSE); // 0-Selection line.add(rs.getTimestamp(1)); // 1-TrxDate KeyNamePair pp = new KeyNamePair(rs.getInt(3), rs.getString(2)); line.add(pp); // 2-DocumentNo @@ -294,7 +294,7 @@ public class Allocation while (rs.next()) { Vector line = new Vector(); - line.add(new Boolean(false)); // 0-Selection + line.add(Boolean.FALSE); // 0-Selection line.add(rs.getTimestamp(1)); // 1-TrxDate KeyNamePair pp = new KeyNamePair(rs.getInt(3), rs.getString(2)); line.add(pp); // 2-Value @@ -639,7 +639,7 @@ public class Allocation KeyNamePair pp = (KeyNamePair)payment.getValueAt(i, 2); // Value // Payment variables int C_Payment_ID = pp.getKey(); - paymentList.add(new Integer(C_Payment_ID)); + paymentList.add(Integer.valueOf(C_Payment_ID)); // BigDecimal PaymentAmt = (BigDecimal)payment.getValueAt(i, i_payment); // Applied Payment amountList.add(PaymentAmt); diff --git a/org.adempiere.ui/src/org/compiere/apps/form/Charge.java b/org.adempiere.ui/src/org/compiere/apps/form/Charge.java index f124b26435..8f74cd4243 100644 --- a/org.adempiere.ui/src/org/compiere/apps/form/Charge.java +++ b/org.adempiere.ui/src/org/compiere/apps/form/Charge.java @@ -81,12 +81,12 @@ public class Charge while (rs.next()) { Vector line = new Vector(4); - line.add(new Boolean(false)); // 0-Selection + line.add(Boolean.FALSE); // 0-Selection KeyNamePair pp = new KeyNamePair(rs.getInt(1), rs.getString(2)); line.add(pp); // 1-Value line.add(rs.getString(3)); // 2-Name boolean isExpenseType = rs.getString(4).equals("E"); - line.add(new Boolean(isExpenseType)); // 3-Expense + line.add(Boolean.valueOf(isExpenseType)); // 3-Expense data.add(line); } } @@ -400,7 +400,7 @@ public class Charge listCreated.append(name); } // reset selection - dataTable.setValueAt(new Boolean(false), i, 0); + dataTable.setValueAt(Boolean.FALSE, i, 0); } } } // createAccount diff --git a/org.adempiere.ui/src/org/compiere/apps/form/FactReconcile.java b/org.adempiere.ui/src/org/compiere/apps/form/FactReconcile.java index 05b68014b2..553d554dcf 100644 --- a/org.adempiere.ui/src/org/compiere/apps/form/FactReconcile.java +++ b/org.adempiere.ui/src/org/compiere/apps/form/FactReconcile.java @@ -162,7 +162,7 @@ public class FactReconcile { //line.add(rs.getBigDecimal(1)); // 1-Amt line.add(rs.getBigDecimal(2)); // 2-AmtAcct line.add(rs.getString(3)); // 3-DR/CR - line.add(new Boolean(false)); // 4-Fact_Acct_ID + line.add(Boolean.FALSE); // 4-Fact_Acct_ID line.add(rs.getString(5)); // 5-BP line.add(rs.getTimestamp(6)); // 6-DateAcct line.add(rs.getString(7)); // 7-GL Category diff --git a/org.adempiere.ui/src/org/compiere/apps/form/PayPrint.java b/org.adempiere.ui/src/org/compiere/apps/form/PayPrint.java index 7dd2c792eb..4de2d1afb6 100644 --- a/org.adempiere.ui/src/org/compiere/apps/form/PayPrint.java +++ b/org.adempiere.ui/src/org/compiere/apps/form/PayPrint.java @@ -219,8 +219,8 @@ public class PayPrint { // if (rs.next()) { - documentNo = new Integer(rs.getInt(1)); - printFormatId = new Integer(rs.getInt(2)); + documentNo = Integer.valueOf(rs.getInt(1)); + printFormatId = Integer.valueOf(rs.getInt(2)); } else { @@ -264,7 +264,7 @@ public class PayPrint { if (m_PaymentExport == null) { Class clazz = Class.forName (m_PaymentExportClass); - m_PaymentExport = (PaymentExport)clazz.newInstance(); + m_PaymentExport = (PaymentExport)clazz.getDeclaredConstructor().newInstance(); } } diff --git a/org.adempiere.ui/src/org/compiere/apps/form/StatementCreateFromBatch.java b/org.adempiere.ui/src/org/compiere/apps/form/StatementCreateFromBatch.java index b518e7b54f..55f338e20e 100644 --- a/org.adempiere.ui/src/org/compiere/apps/form/StatementCreateFromBatch.java +++ b/org.adempiere.ui/src/org/compiere/apps/form/StatementCreateFromBatch.java @@ -200,7 +200,7 @@ public abstract class StatementCreateFromBatch extends CreateFromForm while(rs.next()) { Vector line = new Vector(5); - line.add(new Boolean(false)); // 0-Selection + line.add(Boolean.FALSE); // 0-Selection line.add(rs.getTimestamp(3)); // 1-DateDeposit KeyNamePair pp = new KeyNamePair(rs.getInt(1), rs.getString(2)); line.add(pp); // 2-C_DepositBatch diff --git a/org.adempiere.ui/src/org/compiere/grid/CreateFrom.java b/org.adempiere.ui/src/org/compiere/grid/CreateFrom.java index 0b951fe694..fe6547c314 100644 --- a/org.adempiere.ui/src/org/compiere/grid/CreateFrom.java +++ b/org.adempiere.ui/src/org/compiere/grid/CreateFrom.java @@ -206,7 +206,7 @@ public abstract class CreateFrom implements ICreateFrom while (rs.next()) { Vector line = new Vector(); - line.add(new Boolean(false)); // 0-Selection + line.add(Boolean.FALSE); // 0-Selection BigDecimal qtyOrdered = rs.getBigDecimal(1); BigDecimal multiplier = rs.getBigDecimal(2); BigDecimal qtyEntered = qtyOrdered.multiply(multiplier); diff --git a/org.adempiere.ui/src/org/compiere/grid/CreateFromDepositBatch.java b/org.adempiere.ui/src/org/compiere/grid/CreateFromDepositBatch.java index bbb292277e..2e9be672f7 100644 --- a/org.adempiere.ui/src/org/compiere/grid/CreateFromDepositBatch.java +++ b/org.adempiere.ui/src/org/compiere/grid/CreateFromDepositBatch.java @@ -83,7 +83,7 @@ public abstract class CreateFromDepositBatch extends CreateFromBatch while(rs.next()) { Vector line = new Vector(6); - line.add(new Boolean(false)); // 0-Selection + line.add(Boolean.FALSE); // 0-Selection line.add(rs.getTimestamp(1)); // 1-DateTrx KeyNamePair pp = new KeyNamePair(rs.getInt(2), rs.getString(3)); line.add(pp); // 2-C_Payment_ID diff --git a/org.adempiere.ui/src/org/compiere/grid/CreateFromInvoice.java b/org.adempiere.ui/src/org/compiere/grid/CreateFromInvoice.java index 13c96ac176..3bb315cc9a 100644 --- a/org.adempiere.ui/src/org/compiere/grid/CreateFromInvoice.java +++ b/org.adempiere.ui/src/org/compiere/grid/CreateFromInvoice.java @@ -14,6 +14,7 @@ package org.compiere.grid; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -235,7 +236,7 @@ public abstract class CreateFromInvoice extends CreateFrom while (rs.next()) { Vector line = new Vector(7); - line.add(new Boolean(false)); // 0-Selection + line.add(Boolean.FALSE); // 0-Selection BigDecimal qtyMovement = rs.getBigDecimal(1); BigDecimal multiplier = rs.getBigDecimal(2); BigDecimal qtyEntered = qtyMovement.multiply(multiplier); @@ -326,7 +327,7 @@ public abstract class CreateFromInvoice extends CreateFrom while (rs.next()) { Vector line = new Vector(7); - line.add(new Boolean(false)); // 0-Selection + line.add(Boolean.FALSE); // 0-Selection line.add(rs.getBigDecimal(3)); // 1-Qty KeyNamePair pp = new KeyNamePair(rs.getInt(6), rs.getString(7)); line.add(pp); // 2-UOM @@ -448,7 +449,7 @@ public abstract class CreateFromInvoice extends CreateFrom product = MProduct.get(Env.getCtx(), M_Product_ID); precision = product.getUOMPrecision(); } - QtyEntered = QtyEntered.setScale(precision, BigDecimal.ROUND_HALF_DOWN); + QtyEntered = QtyEntered.setScale(precision, RoundingMode.HALF_DOWN); // if (log.isLoggable(Level.FINE)) log.fine("Line QtyEntered=" + QtyEntered + ", Product_ID=" + M_Product_ID @@ -586,7 +587,7 @@ public abstract class CreateFromInvoice extends CreateFrom BigDecimal igt = invoice.getGrandTotal(); BigDecimal percent = Env.ONE; if (ogt.compareTo(igt) != 0) - percent = igt.divide(ogt, 10, BigDecimal.ROUND_HALF_UP); + percent = igt.divide(ogt, 10, RoundingMode.HALF_UP); MCurrency cur = MCurrency.get(p_order.getCtx(), p_order.getC_Currency_ID()); int scale = cur.getStdPrecision(); @@ -596,7 +597,7 @@ public abstract class CreateFromInvoice extends CreateFrom if (percent != Env.ONE) { BigDecimal propDueAmt = ops.getDueAmt().multiply(percent); if (propDueAmt.scale() > scale) - propDueAmt = propDueAmt.setScale(scale, BigDecimal.ROUND_HALF_UP); + propDueAmt = propDueAmt.setScale(scale, RoundingMode.HALF_UP); ips.setDueAmt(propDueAmt); } ips.setC_Invoice_ID(invoice.getC_Invoice_ID()); diff --git a/org.adempiere.ui/src/org/compiere/grid/CreateFromPackageShipment.java b/org.adempiere.ui/src/org/compiere/grid/CreateFromPackageShipment.java index 69d821a8b7..6f968a0ccd 100644 --- a/org.adempiere.ui/src/org/compiere/grid/CreateFromPackageShipment.java +++ b/org.adempiere.ui/src/org/compiere/grid/CreateFromPackageShipment.java @@ -75,7 +75,7 @@ public abstract class CreateFromPackageShipment extends CreateFrom while (rs.next()) { Vector line = new Vector(6); - line.add(new Boolean(false)); // 0-Selection + line.add(Boolean.FALSE); // 0-Selection KeyNamePair lineKNPair = new KeyNamePair(rs.getInt(1), rs.getString(2)); // M_InOutLine_ID, Line line.add(lineKNPair); line.add(rs.getBigDecimal(3)); //Qty diff --git a/org.adempiere.ui/src/org/compiere/grid/CreateFromRMA.java b/org.adempiere.ui/src/org/compiere/grid/CreateFromRMA.java index 1462ae3be9..cbd7f490be 100644 --- a/org.adempiere.ui/src/org/compiere/grid/CreateFromRMA.java +++ b/org.adempiere.ui/src/org/compiere/grid/CreateFromRMA.java @@ -94,7 +94,7 @@ public abstract class CreateFromRMA extends CreateFrom { while (rs.next()) { Vector line = new Vector(8); - line.add(new Boolean(false)); // 0-Selection + line.add(Boolean.FALSE); // 0-Selection KeyNamePair lineKNPair = new KeyNamePair(rs.getInt(1), rs.getString(2)); // 1-Line line.add(lineKNPair); diff --git a/org.adempiere.ui/src/org/compiere/grid/CreateFromShipment.java b/org.adempiere.ui/src/org/compiere/grid/CreateFromShipment.java index f359325e89..5a11dc9e6a 100644 --- a/org.adempiere.ui/src/org/compiere/grid/CreateFromShipment.java +++ b/org.adempiere.ui/src/org/compiere/grid/CreateFromShipment.java @@ -15,6 +15,7 @@ package org.compiere.grid; import java.math.BigDecimal; +import java.math.RoundingMode; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -232,7 +233,7 @@ public abstract class CreateFromShipment extends CreateFrom while (rs.next()) { Vector line = new Vector(); - line.add(new Boolean(false)); // 0-Selection + line.add(Boolean.FALSE); // 0-Selection BigDecimal qtyOrdered = rs.getBigDecimal(1); BigDecimal multiplier = rs.getBigDecimal(2); BigDecimal qtyEntered = qtyOrdered.multiply(multiplier); @@ -340,7 +341,7 @@ public abstract class CreateFromShipment extends CreateFrom while (rs.next()) { Vector line = new Vector(7); - line.add(new Boolean(false)); // 0-Selection + line.add(Boolean.FALSE); // 0-Selection line.add(rs.getBigDecimal(3)); // 1-Qty KeyNamePair pp = new KeyNamePair(rs.getInt(6), rs.getString(7)); line.add(pp); // 2-UOM @@ -414,7 +415,7 @@ public abstract class CreateFromShipment extends CreateFrom while (rs.next()) { Vector line = new Vector(7); - line.add(new Boolean(false)); // 0-Selection + line.add(Boolean.FALSE); // 0-Selection BigDecimal qtyInvoiced = rs.getBigDecimal(1); BigDecimal multiplier = rs.getBigDecimal(2); BigDecimal qtyEntered = qtyInvoiced.multiply(multiplier); @@ -595,7 +596,7 @@ public abstract class CreateFromShipment extends CreateFrom MProduct product = MProduct.get(Env.getCtx(), M_Product_ID); precision = product.getUOMPrecision(); } - QtyEntered = QtyEntered.setScale(precision, BigDecimal.ROUND_HALF_DOWN); + QtyEntered = QtyEntered.setScale(precision, RoundingMode.HALF_DOWN); // if (log.isLoggable(Level.FINE)) log.fine("Line QtyEntered=" + QtyEntered + ", Product=" + M_Product_ID @@ -620,7 +621,7 @@ public abstract class CreateFromShipment extends CreateFrom { iol.setMovementQty(QtyEntered .multiply(ol.getQtyOrdered()) - .divide(ol.getQtyEntered(), 12, BigDecimal.ROUND_HALF_UP)); + .divide(ol.getQtyEntered(), 12, RoundingMode.HALF_UP)); iol.setC_UOM_ID(ol.getC_UOM_ID()); } iol.setM_AttributeSetInstance_ID(ol.getM_AttributeSetInstance_ID()); @@ -641,7 +642,7 @@ public abstract class CreateFromShipment extends CreateFrom { iol.setQtyEntered(QtyEntered .multiply(il.getQtyInvoiced()) - .divide(il.getQtyEntered(), 12, BigDecimal.ROUND_HALF_UP)); + .divide(il.getQtyEntered(), 12, RoundingMode.HALF_UP)); iol.setC_UOM_ID(il.getC_UOM_ID()); } iol.setDescription(il.getDescription()); diff --git a/org.adempiere.ui/src/org/compiere/grid/CreateFromStatement.java b/org.adempiere.ui/src/org/compiere/grid/CreateFromStatement.java index 081b8b2759..73fd39c0ad 100644 --- a/org.adempiere.ui/src/org/compiere/grid/CreateFromStatement.java +++ b/org.adempiere.ui/src/org/compiere/grid/CreateFromStatement.java @@ -77,7 +77,7 @@ public abstract class CreateFromStatement extends CreateFromBatch while(rs.next()) { Vector line = new Vector(6); - line.add(new Boolean(false)); // 0-Selection + line.add(Boolean.FALSE); // 0-Selection line.add(rs.getTimestamp(1)); // 1-DateTrx KeyNamePair pp = new KeyNamePair(rs.getInt(2), rs.getString(3)); line.add(pp); // 2-C_Payment_ID diff --git a/org.adempiere.ui/src/org/compiere/grid/PaymentForm.java b/org.adempiere.ui/src/org/compiere/grid/PaymentForm.java index ffd2718012..a8eccd7d10 100644 --- a/org.adempiere.ui/src/org/compiere/grid/PaymentForm.java +++ b/org.adempiere.ui/src/org/compiere/grid/PaymentForm.java @@ -186,7 +186,7 @@ public abstract class PaymentForm implements IPaymentForm { { int id = rs.getInt(1); String name = rs.getString(2); - s_Currencies.put(new Integer(id), new KeyNamePair(id, name)); + s_Currencies.put(Integer.valueOf(id), new KeyNamePair(id, name)); } } catch (SQLException e) diff --git a/org.adempiere.ui/src/org/compiere/grid/PaymentFormCash.java b/org.adempiere.ui/src/org/compiere/grid/PaymentFormCash.java index c5caba8dbc..767c8309ac 100644 --- a/org.adempiere.ui/src/org/compiere/grid/PaymentFormCash.java +++ b/org.adempiere.ui/src/org/compiere/grid/PaymentFormCash.java @@ -404,7 +404,7 @@ public abstract class PaymentFormCash extends PaymentForm { if (m_mPayment.getC_Payment_ID() == 0) getGridTab().setValue("C_Payment_ID", null); else - getGridTab().setValue("C_Payment_ID", new Integer(m_mPayment.getC_Payment_ID())); + getGridTab().setValue("C_Payment_ID", Integer.valueOf(m_mPayment.getC_Payment_ID())); } // Set Cash if (newC_CashLine_ID != m_C_CashLine_ID) @@ -412,7 +412,7 @@ public abstract class PaymentFormCash extends PaymentForm { if (newC_CashLine_ID == 0) getGridTab().setValue("C_CashLine_ID", null); else - getGridTab().setValue("C_CashLine_ID", new Integer(newC_CashLine_ID)); + getGridTab().setValue("C_CashLine_ID", Integer.valueOf(newC_CashLine_ID)); } return true; } diff --git a/org.adempiere.ui/src/org/compiere/grid/PaymentFormCheck.java b/org.adempiere.ui/src/org/compiere/grid/PaymentFormCheck.java index 187ec31009..ec33a788c3 100644 --- a/org.adempiere.ui/src/org/compiere/grid/PaymentFormCheck.java +++ b/org.adempiere.ui/src/org/compiere/grid/PaymentFormCheck.java @@ -262,7 +262,7 @@ public abstract class PaymentFormCheck extends PaymentForm { if (m_mPayment.getC_Payment_ID() == 0) getGridTab().setValue("C_Payment_ID", null); else - getGridTab().setValue("C_Payment_ID", new Integer(m_mPayment.getC_Payment_ID())); + getGridTab().setValue("C_Payment_ID", Integer.valueOf(m_mPayment.getC_Payment_ID())); } return true; } diff --git a/org.adempiere.ui/src/org/compiere/grid/PaymentFormCreditCard.java b/org.adempiere.ui/src/org/compiere/grid/PaymentFormCreditCard.java index d748e8d9df..321e72f74d 100644 --- a/org.adempiere.ui/src/org/compiere/grid/PaymentFormCreditCard.java +++ b/org.adempiere.ui/src/org/compiere/grid/PaymentFormCreditCard.java @@ -387,7 +387,7 @@ public abstract class PaymentFormCreditCard extends PaymentForm { if (m_mPayment.getC_Payment_ID() == 0) getGridTab().setValue("C_Payment_ID", null); else - getGridTab().setValue("C_Payment_ID", new Integer(m_mPayment.getC_Payment_ID())); + getGridTab().setValue("C_Payment_ID", Integer.valueOf(m_mPayment.getC_Payment_ID())); } return true; diff --git a/org.adempiere.ui/src/org/compiere/grid/PaymentFormDirect.java b/org.adempiere.ui/src/org/compiere/grid/PaymentFormDirect.java index 209b96670e..7d5b6efff8 100644 --- a/org.adempiere.ui/src/org/compiere/grid/PaymentFormDirect.java +++ b/org.adempiere.ui/src/org/compiere/grid/PaymentFormDirect.java @@ -250,7 +250,7 @@ public abstract class PaymentFormDirect extends PaymentForm { if (m_mPayment.getC_Payment_ID() == 0) getGridTab().setValue("C_Payment_ID", null); else - getGridTab().setValue("C_Payment_ID", new Integer(m_mPayment.getC_Payment_ID())); + getGridTab().setValue("C_Payment_ID", Integer.valueOf(m_mPayment.getC_Payment_ID())); } return true; diff --git a/org.adempiere.ui/src/org/compiere/grid/PaymentFormOnCredit.java b/org.adempiere.ui/src/org/compiere/grid/PaymentFormOnCredit.java index eb31219957..9bcd98a42b 100644 --- a/org.adempiere.ui/src/org/compiere/grid/PaymentFormOnCredit.java +++ b/org.adempiere.ui/src/org/compiere/grid/PaymentFormOnCredit.java @@ -101,7 +101,7 @@ public abstract class PaymentFormOnCredit extends PaymentForm { public boolean save(int newC_PaymentTerm_ID) { if (newC_PaymentTerm_ID != m_C_PaymentTerm_ID) - getGridTab().setValue("C_PaymentTerm_ID", new Integer(newC_PaymentTerm_ID)); + getGridTab().setValue("C_PaymentTerm_ID", Integer.valueOf(newC_PaymentTerm_ID)); return true; } } diff --git a/org.adempiere.ui/src/org/compiere/minigrid/IDColumn.java b/org.adempiere.ui/src/org/compiere/minigrid/IDColumn.java index 18dccefe67..d0b569adb6 100644 --- a/org.adempiere.ui/src/org/compiere/minigrid/IDColumn.java +++ b/org.adempiere.ui/src/org/compiere/minigrid/IDColumn.java @@ -30,7 +30,7 @@ public class IDColumn */ public IDColumn (int record_ID) { - this(new Integer(record_ID)); + this(Integer.valueOf(record_ID)); } // IDColumn /** diff --git a/org.adempiere.webstore-feature/feature.xml b/org.adempiere.webstore-feature/feature.xml index 0364643ffa..41d1395fa6 100644 --- a/org.adempiere.webstore-feature/feature.xml +++ b/org.adempiere.webstore-feature/feature.xml @@ -2,7 +2,8 @@ + version="5.1.0.qualifier" + provider-name="iDempiere Community"> [Enter Feature Description here.] diff --git a/org.adempiere.webstore.resource/.classpath b/org.adempiere.webstore.resource/.classpath index cf36b56119..423c974870 100644 --- a/org.adempiere.webstore.resource/.classpath +++ b/org.adempiere.webstore.resource/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.webstore.resource/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF index 29b5295dd8..5eee9819e9 100644 --- a/org.adempiere.webstore.resource/META-INF/MANIFEST.MF +++ b/org.adempiere.webstore.resource/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.adempiere.webstore.resource Bundle-Version: 5.1.0.qualifier Bundle-Vendor: Adempiere.org Fragment-Host: org.adempiere.webstore;bundle-version="0.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Import-Package: org.compiere.wstore Jetty-WarPatchFragmentFolderPath: / Bundle-ClassPath: . diff --git a/org.adempiere.webstore.servlet/.classpath b/org.adempiere.webstore.servlet/.classpath index cf36b56119..423c974870 100644 --- a/org.adempiere.webstore.servlet/.classpath +++ b/org.adempiere.webstore.servlet/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.webstore.servlet/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF index a3787fbb50..f1d7e0b901 100644 --- a/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF +++ b/org.adempiere.webstore.servlet/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: iDempiere Web Store Servlets Bundle-SymbolicName: org.adempiere.webstore.servlet Bundle-Version: 5.1.0.qualifier Bundle-Vendor: Adempiere.org -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Export-Package: org.compiere.wstore Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Import-Package: javax.servlet, diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/ProductCategoryListTag.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/ProductCategoryListTag.java index 7f38e83579..e611d518fb 100644 --- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/ProductCategoryListTag.java +++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/ProductCategoryListTag.java @@ -99,7 +99,7 @@ public class ProductCategoryListTag extends TagSupport */ private option[] getCategories (int AD_Client_ID) { - option[] options = (option[])s_categories.get(new Integer(AD_Client_ID)); + option[] options = (option[])s_categories.get(Integer.valueOf(AD_Client_ID)); if (options != null) return options; @@ -125,7 +125,7 @@ public class ProductCategoryListTag extends TagSupport } } // - s_categories.put(new Integer(AD_Client_ID), options); + s_categories.put(Integer.valueOf(AD_Client_ID), options); return options; } // getCountries diff --git a/org.adempiere.webstore.servlet/src/org/compiere/wstore/SearchServlet.java b/org.adempiere.webstore.servlet/src/org/compiere/wstore/SearchServlet.java index 45c82300c5..31c57634c9 100644 --- a/org.adempiere.webstore.servlet/src/org/compiere/wstore/SearchServlet.java +++ b/org.adempiere.webstore.servlet/src/org/compiere/wstore/SearchServlet.java @@ -445,7 +445,7 @@ public class SearchServlet extends HttpServlet while (rs.next ()) { MBPartner partner = new MBPartner (ctx, rs, null); - //s_cache.put (new Integer (partner.getAD_Client_ID()), partner); + //s_cache.put (Integer.valueOf(partner.getAD_Client_ID()), partner); list.add (partner); } } diff --git a/org.adempiere.webstore/.classpath b/org.adempiere.webstore/.classpath index cf36b56119..423c974870 100644 --- a/org.adempiere.webstore/.classpath +++ b/org.adempiere.webstore/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs b/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs +++ b/org.adempiere.webstore/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.adempiere.webstore/META-INF/MANIFEST.MF b/org.adempiere.webstore/META-INF/MANIFEST.MF index d04f4101a1..60a21bdf5e 100644 --- a/org.adempiere.webstore/META-INF/MANIFEST.MF +++ b/org.adempiere.webstore/META-INF/MANIFEST.MF @@ -5,8 +5,8 @@ Bundle-SymbolicName: org.adempiere.webstore;singleton:=true Bundle-Version: 5.1.0.qualifier Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.adempiere.report.jasper.webapp;bundle-version="0.0.0", - org.eclipse.jdt.core.compiler.batch;bundle-version="0.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 + org.eclipse.jdt.core;bundle-version="3.15.0" +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Web-ContextPath: wstore Import-Package: javax.servlet;version="3.0.0", javax.servlet.http;version="3.0.0", @@ -83,6 +83,7 @@ Import-Package: javax.servlet;version="3.0.0", Bundle-Activator: org.adempiere.webstore.Activator Bundle-ClassPath: . Automatic-Module-Name: org.adempiere.webstore +Bundle-Vendor: iDempiere Community diff --git a/org.apache.ecs/.classpath b/org.apache.ecs/.classpath index cf36b56119..423c974870 100644 --- a/org.apache.ecs/.classpath +++ b/org.apache.ecs/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs b/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs +++ b/org.apache.ecs/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.apache.ecs/META-INF/MANIFEST.MF b/org.apache.ecs/META-INF/MANIFEST.MF index 1881c4239d..ed2d00f1e4 100644 --- a/org.apache.ecs/META-INF/MANIFEST.MF +++ b/org.apache.ecs/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.apache.ecs Bundle-Version: 5.1.0.qualifier Bundle-Activator: org.apache.ecs.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Import-Package: org.osgi.framework;version="1.3.0" Export-Package: org.apache.ecs;uses:="org.apache.ecs.xhtml", org.apache.ecs.filter;uses:="org.apache.ecs", @@ -14,3 +14,4 @@ Export-Package: org.apache.ecs;uses:="org.apache.ecs.xhtml", org.apache.ecs.xml;uses:="org.apache.ecs" Bundle-ClassPath: . Automatic-Module-Name: org.apache.ecs +Bundle-Vendor: iDempiere Community diff --git a/org.apache.ecs/src/org/apache/ecs/ECSDefaults.java b/org.apache.ecs/src/org/apache/ecs/ECSDefaults.java index 544819064b..0dfb95b9c5 100644 --- a/org.apache.ecs/src/org/apache/ecs/ECSDefaults.java +++ b/org.apache.ecs/src/org/apache/ecs/ECSDefaults.java @@ -42,9 +42,9 @@ public class ECSDefaults } } - private static boolean filter_state = new Boolean(resource.getString("filter_state")).booleanValue(); + private static boolean filter_state = Boolean.valueOf(resource.getString("filter_state")).booleanValue(); - private static boolean filter_attribute_state = new Boolean(resource.getString("filter_attribute_state")).booleanValue(); + private static boolean filter_attribute_state = Boolean.valueOf(resource.getString("filter_attribute_state")).booleanValue(); private static char attribute_equality_sign = resource.getString("attribute_equality_sign").charAt(1); @@ -58,9 +58,9 @@ public class ECSDefaults private static char attribute_quote_char = resource.getString("attribute_quote_char").charAt(0); - private static boolean attribute_quote = new Boolean(resource.getString("attribute_quote")).booleanValue(); + private static boolean attribute_quote = Boolean.valueOf(resource.getString("attribute_quote")).booleanValue(); - private static boolean end_element = new Boolean(resource.getString("end_element")).booleanValue(); + private static boolean end_element = Boolean.valueOf(resource.getString("end_element")).booleanValue(); private static String codeset = resource.getString("codeset"); @@ -72,7 +72,7 @@ public class ECSDefaults private static char end_tag = resource.getString("end_tag").charAt(0); - private static boolean pretty_print = new Boolean(resource.getString("pretty_print")).booleanValue(); + private static boolean pretty_print = Boolean.valueOf(resource.getString("pretty_print")).booleanValue(); /** diff --git a/org.apache.ecs/src/org/apache/ecs/ElementAttributes.java b/org.apache.ecs/src/org/apache/ecs/ElementAttributes.java index 927a9ae9ae..7cb2a59577 100644 --- a/org.apache.ecs/src/org/apache/ecs/ElementAttributes.java +++ b/org.apache.ecs/src/org/apache/ecs/ElementAttributes.java @@ -234,7 +234,7 @@ public abstract class ElementAttributes extends GenericElement implements Attrib /** Add an attribute to the element. */ public Element addAttribute(String attribute_name, int attribute_value) { - getElementHashEntry().put(attribute_name, new Integer(attribute_value)); + getElementHashEntry().put(attribute_name, Integer.valueOf(attribute_value)); return(this); } diff --git a/org.apache.ecs/src/org/apache/ecs/xhtml/var.java b/org.apache.ecs/src/org/apache/ecs/xhtml/Var.java similarity index 89% rename from org.apache.ecs/src/org/apache/ecs/xhtml/var.java rename to org.apache.ecs/src/org/apache/ecs/xhtml/Var.java index 73f6d46987..33c9e31bb5 100644 --- a/org.apache.ecs/src/org/apache/ecs/xhtml/var.java +++ b/org.apache.ecs/src/org/apache/ecs/xhtml/Var.java @@ -42,7 +42,7 @@ import org.apache.ecs.Printable; */ -public class var extends MultiPartElement implements Printable, MouseEvents, KeyEvents +public class Var extends MultiPartElement implements Printable, MouseEvents, KeyEvents { @@ -75,7 +75,7 @@ public class var extends MultiPartElement implements Printable, MouseEvents, Key */ - public var() + public Var() { @@ -91,7 +91,7 @@ public class var extends MultiPartElement implements Printable, MouseEvents, Key */ - public var(Element element) + public Var(Element element) { @@ -109,7 +109,7 @@ public class var extends MultiPartElement implements Printable, MouseEvents, Key */ - public var(String element) + public Var(String element) { @@ -151,7 +151,7 @@ public class var extends MultiPartElement implements Printable, MouseEvents, Key */ - public var addElement(String hashcode,Element element) + public Var addElement(String hashcode,Element element) { @@ -173,7 +173,7 @@ public class var extends MultiPartElement implements Printable, MouseEvents, Key */ - public var addElement(String hashcode,String element) + public Var addElement(String hashcode,String element) { @@ -193,7 +193,7 @@ public class var extends MultiPartElement implements Printable, MouseEvents, Key */ - public var addElement(Element element) + public Var addElement(Element element) { @@ -213,7 +213,7 @@ public class var extends MultiPartElement implements Printable, MouseEvents, Key */ - public var addElement(String element) + public Var addElement(String element) { @@ -231,7 +231,7 @@ public class var extends MultiPartElement implements Printable, MouseEvents, Key */ - public var removeElement(String hashcode) + public Var removeElement(String hashcode) { diff --git a/org.compiere.db.oracle.provider/.classpath b/org.compiere.db.oracle.provider/.classpath index 7832374cd1..68b6058e5e 100644 --- a/org.compiere.db.oracle.provider/.classpath +++ b/org.compiere.db.oracle.provider/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs b/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs +++ b/org.compiere.db.oracle.provider/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF index 2c5117642f..d19a2d57d7 100644 --- a/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.oracle.provider/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Oracle Provider Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.adempiere.install;bundle-version="0.0.0" Bundle-ClassPath: ., @@ -18,4 +18,5 @@ Bundle-ActivationPolicy: lazy Bundle-Activator: org.adempiere.db.oracle.OracleBundleActivator Service-Component: OSGI-INF/oracleprovider.xml Automatic-Module-Name: org.compiere.db.oracle.provider +Bundle-Vendor: iDempiere Community diff --git a/org.compiere.db.oracle.provider/pom.xml b/org.compiere.db.oracle.provider/pom.xml index 2b4bdab2e6..ef79b36aa2 100644 --- a/org.compiere.db.oracle.provider/pom.xml +++ b/org.compiere.db.oracle.provider/pom.xml @@ -26,12 +26,12 @@ com.mchange c3p0 - 0.9.5 + 0.9.5.2 com.mchange mchange-commons-java - 0.2.9 + 0.2.15 com.google.code.maven-play-plugin.com.mchange diff --git a/org.compiere.db.oracle.provider/src/org/compiere/db/DB_Oracle.java b/org.compiere.db.oracle.provider/src/org/compiere/db/DB_Oracle.java index b589e1ebb0..688f76b5a5 100644 --- a/org.compiere.db.oracle.provider/src/org/compiere/db/DB_Oracle.java +++ b/org.compiere.db.oracle.provider/src/org/compiere/db/DB_Oracle.java @@ -23,6 +23,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; +import java.math.RoundingMode; import java.net.URL; import java.sql.Connection; import java.sql.DatabaseMetaData; @@ -514,7 +515,7 @@ public class DB_Oracle implements AdempiereDatabase { try { - result = number.setScale(scale, BigDecimal.ROUND_HALF_UP); + result = number.setScale(scale, RoundingMode.HALF_UP); } catch (Exception e) { diff --git a/org.compiere.db.postgresql.provider/.classpath b/org.compiere.db.postgresql.provider/.classpath index e87f919210..838d301005 100644 --- a/org.compiere.db.postgresql.provider/.classpath +++ b/org.compiere.db.postgresql.provider/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs b/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs +++ b/org.compiere.db.postgresql.provider/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF index 40ff7440da..38c9e6bf2f 100644 --- a/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF +++ b/org.compiere.db.postgresql.provider/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: iDempiere Postgresql Provider Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Bundle-ClassPath: ., lib/c3p0.jar, lib/mchange-commons-java.jar, @@ -19,3 +19,4 @@ Bundle-ActivationPolicy: lazy Bundle-Activator: org.adempiere.db.postgresql.PostgreSQLBundleActivator Service-Component: OSGI-INF/pgprovider.xml Automatic-Module-Name: org.compiere.db.postgresql.provider +Bundle-Vendor: iDempiere Community diff --git a/org.compiere.db.postgresql.provider/pom.xml b/org.compiere.db.postgresql.provider/pom.xml index d3f989960b..047356632d 100644 --- a/org.compiere.db.postgresql.provider/pom.xml +++ b/org.compiere.db.postgresql.provider/pom.xml @@ -31,12 +31,12 @@ com.mchange mchange-commons-java - 0.2.12 + 0.2.15 org.postgresql postgresql - 42.1.4 + 42.2.5 lib diff --git a/org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java b/org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java index f4194b8527..e65fa74e81 100755 --- a/org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java +++ b/org.compiere.db.postgresql.provider/src/org/compiere/db/DB_PostgreSQL.java @@ -25,6 +25,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.math.BigDecimal; +import java.math.RoundingMode; import java.net.URL; import java.sql.Connection; import java.sql.DriverManager; @@ -495,7 +496,7 @@ public class DB_PostgreSQL implements AdempiereDatabase { try { - result = number.setScale(scale, BigDecimal.ROUND_HALF_UP); + result = number.setScale(scale, RoundingMode.HALF_UP); } catch (Exception e) { diff --git a/org.compiere.db.provider-feature/feature.xml b/org.compiere.db.provider-feature/feature.xml index df98b1f91e..d12b92c2aa 100644 --- a/org.compiere.db.provider-feature/feature.xml +++ b/org.compiere.db.provider-feature/feature.xml @@ -2,7 +2,8 @@ + version="5.1.0.qualifier" + provider-name="iDempiere Community"> [Enter Feature Description here.] diff --git a/org.idempiere.felix.webconsole-feature/feature.xml b/org.idempiere.felix.webconsole-feature/feature.xml index 1bf97d6515..c608311eac 100644 --- a/org.idempiere.felix.webconsole-feature/feature.xml +++ b/org.idempiere.felix.webconsole-feature/feature.xml @@ -2,7 +2,8 @@ + version="5.1.0.qualifier" + provider-name="iDempiere Community"> [Enter Feature Description here.] diff --git a/org.idempiere.felix.webconsole/.classpath b/org.idempiere.felix.webconsole/.classpath index cf36b56119..423c974870 100644 --- a/org.idempiere.felix.webconsole/.classpath +++ b/org.idempiere.felix.webconsole/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs +++ b/org.idempiere.felix.webconsole/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF index 58a6970ce3..7862c8dc8b 100644 --- a/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF +++ b/org.idempiere.felix.webconsole/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.idempiere.felix.webconsole Bundle-Version: 5.1.0.qualifier Bundle-Activator: org.idempiere.felix.webconsole.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Import-Package: javax.servlet;version="2.5.0", javax.servlet.http;version="2.5.0", javax.servlet.jsp;version="2.1.0", @@ -29,3 +29,4 @@ Web-ContextPath: osgi Service-Component: OSGI-INF/securityprovider.xml Bundle-ClassPath: . Automatic-Module-Name: org.idempiere.felix.webconsole +Bundle-Vendor: iDempiere Community diff --git a/org.idempiere.fitnesse-feature/feature.xml b/org.idempiere.fitnesse-feature/feature.xml index 3b1d1950de..49573eb4ac 100644 --- a/org.idempiere.fitnesse-feature/feature.xml +++ b/org.idempiere.fitnesse-feature/feature.xml @@ -2,7 +2,8 @@ + version="5.1.0.qualifier" + provider-name="iDempiere Community"> [Enter Feature Description here.] diff --git a/org.idempiere.fitnesse.fixture/.classpath b/org.idempiere.fitnesse.fixture/.classpath index cf36b56119..423c974870 100644 --- a/org.idempiere.fitnesse.fixture/.classpath +++ b/org.idempiere.fitnesse.fixture/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.idempiere.fitnesse.fixture/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.fitnesse.fixture/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.idempiere.fitnesse.fixture/.settings/org.eclipse.jdt.core.prefs +++ b/org.idempiere.fitnesse.fixture/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF b/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF index b0875e246a..e6c453c431 100644 --- a/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF +++ b/org.idempiere.fitnesse.fixture/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.idempiere.fitnesse.fixture Bundle-Version: 5.1.0.qualifier Bundle-Activator: org.idempiere.fitnesse.fixture.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Import-Package: fit, fit.decorator, fit.decorator.exceptions, @@ -65,3 +65,4 @@ Service-Component: OSGI-INF/fitfixturefactory.xml, OSGI-INF/slimfixturefactory.x Export-Package: org.idempiere.fitnesse.fixture Bundle-ClassPath: . Automatic-Module-Name: org.idempiere.fitnesse.fixture +Bundle-Vendor: iDempiere Community diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/CreateRecord.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/CreateRecord.java index ebed4bd806..1822868eab 100644 --- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/CreateRecord.java +++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/CreateRecord.java @@ -169,9 +169,9 @@ public class CreateRecord extends TableFixture { continue; } else if (columnClass == Boolean.class) { if ("Y".equalsIgnoreCase(value_evaluated) || "true".equalsIgnoreCase(value_evaluated)) - value = new Boolean(true); + value = Boolean.TRUE; else if ("N".equalsIgnoreCase(value_evaluated) || "false".equalsIgnoreCase(value_evaluated)) - value = new Boolean(false); + value = Boolean.FALSE; else { exception(getCell(i, 1), new Exception("Wrong value for boolean, allowed Y/N/true/false")); continue; diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/FitFixtureFactory.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/FitFixtureFactory.java index 7c6c11d1e6..4c74faa11d 100644 --- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/FitFixtureFactory.java +++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/FitFixtureFactory.java @@ -13,6 +13,8 @@ *****************************************************************************/ package org.idempiere.fitnesse.fixture; +import java.lang.reflect.InvocationTargetException; + import org.idempiere.fitnesse.server.fit.IFitFixtureFactory; import fit.FixtureName; @@ -40,20 +42,20 @@ public class FitFixtureFactory implements IFitFixtureFactory { String className = fixtureName.toString(); try { Class clazz = getClass().getClassLoader().loadClass(className); - return clazz.newInstance(); + return clazz.getDeclaredConstructor().newInstance(); } catch (ClassNotFoundException e) { } catch (InstantiationException e) { - } catch (IllegalAccessException e) { + } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { } if (!fixtureName.isFullyQualified()) { className = DEFAULT_PACKAGE + "." + fixtureName.toString(); try { Class clazz = getClass().getClassLoader().loadClass(className); - return clazz.newInstance(); + return clazz.getDeclaredConstructor().newInstance(); } catch (ClassNotFoundException e) { } catch (InstantiationException e) { - } catch (IllegalAccessException e) { + } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { } } return null; diff --git a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java index 0f318fd28c..035c1aa73d 100644 --- a/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java +++ b/org.idempiere.fitnesse.fixture/src/org/idempiere/fitnesse/fixture/UpdateRecord.java @@ -200,9 +200,9 @@ public class UpdateRecord extends TableFixture { continue; } else if (columnClass == Boolean.class) { if ("Y".equalsIgnoreCase(value_evaluated) || "true".equalsIgnoreCase(value_evaluated)) - value = new Boolean(true); + value = Boolean.TRUE; else if ("N".equalsIgnoreCase(value_evaluated) || "false".equalsIgnoreCase(value_evaluated)) - value = new Boolean(false); + value = Boolean.FALSE; else { exception(getCell(i, 1), new Exception("Wrong value for boolean, allowed Y/N/true/false")); continue; diff --git a/org.idempiere.fitnesse.server/.classpath b/org.idempiere.fitnesse.server/.classpath index b4669936c8..02877fa41d 100644 --- a/org.idempiere.fitnesse.server/.classpath +++ b/org.idempiere.fitnesse.server/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.idempiere.fitnesse.server/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.fitnesse.server/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.idempiere.fitnesse.server/.settings/org.eclipse.jdt.core.prefs +++ b/org.idempiere.fitnesse.server/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF index 639c1fcc19..40026c8f89 100644 --- a/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF +++ b/org.idempiere.fitnesse.server/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.idempiere.fitnesse.server Bundle-Version: 5.1.0.qualifier Bundle-Activator: org.idempiere.fitnesse.server.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Import-Package: javax.servlet;version="3.0.0", javax.servlet.http;version="3.0.0", org.adempiere.base, @@ -329,3 +329,4 @@ Export-Package: fit, org.openqa.selenium.support.pagefactory.internal, org.openqa.selenium.support.ui Automatic-Module-Name: org.idempiere.fitnesse.server +Bundle-Vendor: iDempiere Community diff --git a/org.idempiere.fitrecorder/.classpath b/org.idempiere.fitrecorder/.classpath index cf36b56119..423c974870 100644 --- a/org.idempiere.fitrecorder/.classpath +++ b/org.idempiere.fitrecorder/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.idempiere.fitrecorder/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.fitrecorder/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.idempiere.fitrecorder/.settings/org.eclipse.jdt.core.prefs +++ b/org.idempiere.fitrecorder/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF index 9ea2bdb0f4..71cf57d325 100644 --- a/org.idempiere.fitrecorder/META-INF/MANIFEST.MF +++ b/org.idempiere.fitrecorder/META-INF/MANIFEST.MF @@ -8,9 +8,10 @@ Import-Package: org.adempiere.base, org.adempiere.plugin.utils, org.compiere.model, org.osgi.framework;version="1.3.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Service-Component: plugin.xml Require-Bundle: org.adempiere.base;bundle-version="0.0.0" Bundle-ActivationPolicy: lazy Bundle-ClassPath: . Automatic-Module-Name: org.idempiere.fitrecorder +Bundle-Vendor: iDempiere Community diff --git a/org.idempiere.hazelcast.service-feature/feature.xml b/org.idempiere.hazelcast.service-feature/feature.xml index 3dd8644621..c1e242bfec 100644 --- a/org.idempiere.hazelcast.service-feature/feature.xml +++ b/org.idempiere.hazelcast.service-feature/feature.xml @@ -2,7 +2,8 @@ + version="5.1.0.qualifier" + provider-name="iDempiere Community"> [Enter Feature Description here.] diff --git a/org.idempiere.hazelcast.service.config/.classpath b/org.idempiere.hazelcast.service.config/.classpath index cf36b56119..423c974870 100644 --- a/org.idempiere.hazelcast.service.config/.classpath +++ b/org.idempiere.hazelcast.service.config/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.idempiere.hazelcast.service.config/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.hazelcast.service.config/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.idempiere.hazelcast.service.config/.settings/org.eclipse.jdt.core.prefs +++ b/org.idempiere.hazelcast.service.config/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF index 2a7d510d45..8233ebc2de 100644 --- a/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF +++ b/org.idempiere.hazelcast.service.config/META-INF/MANIFEST.MF @@ -4,6 +4,7 @@ Bundle-Name: iDempiere Hazelcast Service Configuration Bundle-SymbolicName: org.idempiere.hazelcast.service.config Bundle-Version: 5.1.0.qualifier Fragment-Host: org.idempiere.hazelcast.service;bundle-version="0.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Bundle-ClassPath: . Automatic-Module-Name: org.idempiere.hazelcast.service.config +Bundle-Vendor: iDempiere Community diff --git a/org.idempiere.hazelcast.service/.classpath b/org.idempiere.hazelcast.service/.classpath index bcaca9cc37..cf47451aff 100644 --- a/org.idempiere.hazelcast.service/.classpath +++ b/org.idempiere.hazelcast.service/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.idempiere.hazelcast.service/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.hazelcast.service/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.idempiere.hazelcast.service/.settings/org.eclipse.jdt.core.prefs +++ b/org.idempiere.hazelcast.service/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF index 0d6391318e..75a8cff0c8 100644 --- a/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF +++ b/org.idempiere.hazelcast.service/META-INF/MANIFEST.MF @@ -30,6 +30,7 @@ Bundle-ClassPath: ., lib/hazelcast-aws.jar, lib/hazelcast.jar Service-Component: OSGI-INF/clusterservice.xml, OSGI-INF/cacheservice.xml, OSGI-INF/messageservice.xml -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Require-Bundle: org.eclipse.osgi Automatic-Module-Name: org.idempiere.hazelcast.service +Bundle-Vendor: iDempiere Community diff --git a/org.idempiere.hazelcast.service/pom.xml b/org.idempiere.hazelcast.service/pom.xml index acf9aa286a..6e87b4e4f1 100644 --- a/org.idempiere.hazelcast.service/pom.xml +++ b/org.idempiere.hazelcast.service/pom.xml @@ -26,12 +26,12 @@ com.hazelcast hazelcast - 3.9.3 + 3.10.6 com.hazelcast hazelcast-aws - 2.1.0 + 2.3 lib diff --git a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml index 0788e165b3..761adf2efa 100644 --- a/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml +++ b/org.idempiere.maven.to.p2/org.idempiere.maven.to.p2/pom.xml @@ -10,19 +10,28 @@ org.idempiere.maven.to.p2 pom - https://www.zkoss.org/zkdownload/downloadEvalFile?id=1245081552 + https://sourceforge.net/projects/zk1/files/ZK/zk-8.5.0/zk-bin-osgi-8.5.0.zip 1.1.3.v20160715 - 8.5.24.2 + 8.5.33 8.1.12.v20180117 3.1.0.M3 - 1.1.0 + 1.2.5 + 2.5.3 + 1.60 + 1.4.0 2.9.5 3.1.4 1.1.0.Final 5.0.3 20171018 1.7.25 + 2.3.1 + 2.4 + 3.2.6 + 3.1.17 + 1.2.0 + 1.3.2 @@ -70,7 +79,7 @@ true - org.passay:passay:jar:1.3.0 + org.passay:passay:jar:1.3.1 true false @@ -91,7 +100,13 @@ false - org.eclipse.jetty.orbit:org.eclipse.jdt.core:jar:3.8.2.v20130121 + org.eclipse.jetty:jetty-continuation:jar:${jetty.version} + true + false + + + + org.eclipse.jdt:org.eclipse.jdt.core:jar:${jdtVersion} true false @@ -101,17 +116,13 @@ false - javax.annotation:javax.annotation-api:jar:1.3.1 + javax.annotation:javax.annotation-api:jar:${annotation.version} true false - javax.management.j2ee:javax.management.j2ee-api:jar:1.1.1 - true - false - - - com.sun.mail:javax.mail:jar:1.6.0 + + com.sun.mail:javax.mail:jar:1.6.2 true false @@ -121,22 +132,22 @@ org.ow2.asm:asm:jar:6.0 true false --> - org.apache.taglibs:taglibs-standard-impl:jar:1.2.5 + org.apache.taglibs:taglibs-standard-impl:jar:${org.apache.taglibs.version} true false - org.apache.taglibs:taglibs-standard-spec:jar:1.2.5 + org.apache.taglibs:taglibs-standard-spec:jar:${org.apache.taglibs.version} true false - org.apache.taglibs:taglibs-standard-jstlel:jar:1.2.5 + org.apache.taglibs:taglibs-standard-jstlel:jar:${org.apache.taglibs.version} true false - org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.0.10 + org.apache.aries.spifly:org.apache.aries.spifly.dynamic.bundle:jar:1.0.14 true false @@ -146,7 +157,7 @@ false - org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib:jar:3.2.5_1 + org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib:jar:3.2.6_1 true false @@ -161,17 +172,17 @@ false - org.apache.felix:org.apache.felix.webconsole:jar:4.3.4 + org.apache.felix:org.apache.felix.webconsole:jar:4.3.8 true false - org.apache.felix:org.apache.felix.webconsole.plugins.ds:jar:2.0.8 + org.apache.felix:org.apache.felix.webconsole.plugins.ds:jar:2.1.0 true false - org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage:jar:1.0.6 + org.apache.felix:org.apache.felix.webconsole.plugins.memoryusage:jar:1.0.8 true false @@ -186,22 +197,22 @@ false - com.itextpdf:itextpdf:jar:5.5.12 + com.itextpdf:itextpdf:jar:5.5.13 true false - org.bouncycastle:bcpkix-jdk15on:jar:1.58 + org.bouncycastle:bcpkix-jdk15on:jar:${org.bouncycastle.version} true false - org.bouncycastle:bcprov-jdk15on:jar:1.58 + org.bouncycastle:bcprov-jdk15on:jar:${org.bouncycastle.version} true false - org.bouncycastle:bcmail-jdk15on:jar:1.58 + org.bouncycastle:bcmail-jdk15on:jar:${org.bouncycastle.version} true false @@ -226,7 +237,7 @@ false - org.cryptacular:cryptacular:jar:1.2.1 + org.cryptacular:cryptacular:jar:1.2.2 true false @@ -236,7 +247,7 @@ false - org.atmosphere:atmosphere-runtime:jar:2.4.16 + org.atmosphere:atmosphere-runtime:jar:2.5.0 true false @@ -246,22 +257,107 @@ false - org.codehaus.groovy:groovy-all:jar:2.4.13 + org.codehaus.groovy:groovy:jar:${groovy.version} true false - com.ibm.icu:icu4j:jar:60.2 + org.codehaus.groovy:groovy-ant:jar:${groovy.version} true false - joda-time:joda-time:jar:2.9.9 + org.codehaus.groovy:groovy-cli-commons:jar:${groovy.version} true false - org.apache.commons:commons-configuration2:jar:2.2 + org.codehaus.groovy:groovy-cli-picocli:jar:${groovy.version} + true + false + + + org.codehaus.groovy:groovy-console:jar:${groovy.version} + true + false + + + org.codehaus.groovy:groovy-datetime:jar:${groovy.version} + true + false + + + org.codehaus.groovy:groovy-docgenerator:jar:${groovy.version} + true + false + + + org.codehaus.groovy:groovy-groovydoc:jar:${groovy.version} + true + false + + + org.codehaus.groovy:groovy-groovysh:jar:${groovy.version} + true + false + + + org.codehaus.groovy:groovy-jmx:jar:${groovy.version} + true + false + + + org.codehaus.groovy:groovy-json:jar:${groovy.version} + true + false + + + org.codehaus.groovy:groovy-jsr223:jar:${groovy.version} + true + false + + + org.codehaus.groovy:groovy-macro:jar:${groovy.version} + true + false + + + org.codehaus.groovy:groovy-nio:jar:${groovy.version} + true + false + + + org.codehaus.groovy:groovy-servlet:jar:${groovy.version} + true + false + + + org.codehaus.groovy:groovy-sql:jar:${groovy.version} + true + false + + + org.codehaus.groovy:groovy-swing:jar:${groovy.version} + true + false + + + org.codehaus.groovy:groovy-xml:jar:${groovy.version} + true + false + + + com.ibm.icu:icu4j:jar:63.1 + true + false + + + joda-time:joda-time:jar:2.10 + true + false + + + org.apache.commons:commons-configuration2:jar:2.3 true false @@ -305,6 +401,703 @@ true false + + javax.transaction:javax.transaction-api:jar:1.3 + true + false + + + + com.sun.activation:javax.activation:jar:${activation.version} + true + false + + + javax.xml.bind:jaxb-api:jar:${xml.ws.version} + true + false + + + com.sun.xml.bind:jaxb-core:jar:2.3.0.1 + true + false + + + com.sun.xml.bind:jaxb-impl:jar:${xml.ws.version} + true + false + + + com.sun.xml.ws:jaxws-rt:jar:${xml.ws.version} + true + false + + + javax.xml.ws:jaxws-api:jar:${xml.ws.version} + true + false + true + + jaxws-api + ${xml.ws.version} + + javax.xml.ws;version="${xml.ws.export.version}";uses:="javax.xml.bind,javax.xml.bind.anno + tation,javax.xml.namespace,javax.xml.transform,javax.xml.ws.handler,j + avax.xml.ws.spi,javax.xml.ws.spi.http,org.w3c.dom",javax.xml.ws.handl + er;version="${xml.ws.export.version}";uses:="javax.xml.namespace,javax.xml.ws",javax.xml.ws.handler.soap + ;version="${xml.ws.export.version}";uses:="javax.xml.bind,javax.xml.namespace,javax.xml.soap,javax.xml.w + s.handler",javax.xml.ws.http;version="${xml.ws.export.version}";uses:="javax.xml.ws",javax.xml.ws.soap;version="${xml.ws.export.version}";u + ses:="javax.xml.soap,javax.xml.ws,javax.xml.ws.spi",javax.xml.ws.spi;version="${xml.ws.export.version}"; + uses:="javax.xml.bind,javax.xml.namespace,javax.xml.transform,javax.x + ml.ws,javax.xml.ws.handler,javax.xml.ws.wsaddressing,org.w3c.dom",jav + ax.xml.ws.spi.http;version="${xml.ws.export.version}",javax.xml.ws.wsaddressing;version="${xml.ws.export.version}";uses:="javax.xml.bind.an + notation,javax.xml.namespace,javax.xml.transform,javax.xml.ws,org.w3c + .dom" + + org.glassfish.hk2.osgiresourcelocator + + javax.xml.bind;version="[2.3,3)",javax.xml.bind.annota + tion;version="[2.3,3)",javax.xml.namespace,javax.xml.soap;version="[1 + .4,2)",javax.xml.transform,javax.xml.transform.stream,org.w3c.dom + osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=9.0))" + + + + javax.interceptor:javax.interceptor-api:jar:1.2.2 + true + false + + + javax.enterprise:cdi-api:jar:2.0.SP1 + true + false + + + + org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:jar:1.0.1 + true + false + + + + org.apache.cxf:cxf-core:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-frontend-jaxws:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-frontend-jaxrs:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-transports-http:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-transports-http-jetty:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-bindings-soap:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-bindings-xml:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-frontend-simple:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-wsdl:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-spring-boot-autoconfigure:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-rs-http-sci:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-databinding-jaxb:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-ws-addr:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-ws-policy:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-rs-service-description:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-management:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-ws-transfer:jar:${apache.cxf.version} + true + false + + + org.apache.cxf:cxf-rt-rs-extension-providers:jar:${apache.cxf.databinding.version} + + true + false + + + org.apache.cxf:cxf-rt-databinding-xmlbeans:jar:${apache.cxf.databinding.version} + true + false + + + org.apache.cxf:cxf-rt-bindings-object:jar:${apache.cxf.databinding.version} + true + false + + + org.apache.xmlbeans:xmlbeans:jar:3.0.1 + true + false + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.wsdl4j:jar:1.6.3_1 + true + false + + + org.apache.neethi:neethi:jar:3.1.1 + true + false + + + org.apache.ws.xmlschema:xmlschema-core:jar:2.2.3 + true + false + + + commons-discovery:commons-discovery:jar:0.5 + true + false + + + javax.ws.rs:jsr311-api:jar:1.1.1 + true + false + + + javax.ws.rs:javax.ws.rs-api:jar:2.1.1 + true + false + + + javax.jws:javax.jws-api:jar:1.1 + true + false + + + javax.xml.soap:javax.xml.soap-api:jar:1.4.0 + true + false + + + javax.xml.rpc:javax.xml.rpc-api:jar:1.1.1 + true + false + + + org.codehaus.woodstox:stax2-api:jar:4.1 + true + false + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-beans:jar:${springframework.version} + false + false + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-beans:jar:sources:${springframework.version} + false + false + true + + + + + + org.apache.servicemix.bundles.spring-beans.source + spring-expression.source + org.apache.servicemix.bundles.spring-beans;version="${springframework.version}";roots:="." + + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-core:jar:${springframework.version} + false + false + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-core:jar:sources:${springframework.version} + false + false + true + + + + + + org.apache.servicemix.bundles.spring-core.source + spring-expression.source + org.apache.servicemix.bundles.spring-core;version="${springframework.version}";roots:="." + + + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context:jar:${springframework.version} + false + false + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context:jar:sources:${springframework.version} + false + false + true + + + + + + org.apache.servicemix.bundles.spring-context.source + spring-expression.source + org.apache.servicemix.bundles.spring-context;version="${springframework.version}";roots:="." + + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-expression:jar:${springframework.version} + false + false + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-expression:jar:sources:${springframework.version} + false + false + true + + + + + + org.apache.servicemix.bundles.spring-expression.source + spring-expression.source + org.apache.servicemix.bundles.spring-expression;version="${springframework.version}";roots:="." + + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-aop:jar:sources:${springframework.version} + false + false + true + + + + + + org.apache.servicemix.bundles.spring-aop.source + spring-aop.source + org.apache.servicemix.bundles.spring-aop;version="${springframework.version}";roots:="." + + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-aop:jar:${springframework.version} + false + false + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-web:jar:sources:${springframework.version} + false + false + true + + + + + + org.apache.servicemix.bundles.spring-web.source + spring-web.source + org.apache.servicemix.bundles.spring-web;version="${springframework.version}";roots:="." + + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-web:jar:${springframework.version} + false + false + true + + + org.springframework.http;version="4.3.19.RELEASE";uses + :="org.springframework.core.io,org.springframework.core.io.support,or + g.springframework.util",org.springframework.http.client;version="4.3. + 19.RELEASE";uses:="com.squareup.okhttp,io.netty.channel,io.netty.chan + nel.socket,io.netty.handler.ssl,okhttp3,org.apache.http.client,org.ap + ache.http.client.config,org.apache.http.client.methods,org.apache.htt + p.impl.client,org.apache.http.impl.nio.client,org.apache.http.nio.cli + ent,org.apache.http.protocol,org.springframework.beans.factory,org.sp + ringframework.core.task,org.springframework.http,org.springframework. + util.concurrent",org.springframework.http.client.support;version="4.3 + .19.RELEASE";uses:="org.apache.commons.logging,org.springframework.be + ans.factory,org.springframework.http,org.springframework.http.client" + ,org.springframework.http.converter;version="4.3.19.RELEASE";uses:="j + avax.imageio,org.apache.commons.logging,org.springframework.core,org. + springframework.core.convert,org.springframework.core.io,org.springfr + amework.core.io.support,org.springframework.http,org.springframework. + util",org.springframework.http.converter.feed;version="4.3.19.RELEASE + ";uses:="com.rometools.rome.feed,com.rometools.rome.feed.atom,com.rom + etools.rome.feed.rss,org.springframework.http,org.springframework.htt + p.converter",org.springframework.http.converter.json;version="4.3.19. + RELEASE";uses:="com.fasterxml.jackson.annotation,com.fasterxml.jackso + n.core,com.fasterxml.jackson.databind,com.fasterxml.jackson.databind. + cfg,com.fasterxml.jackson.databind.deser,com.fasterxml.jackson.databi + nd.introspect,com.fasterxml.jackson.databind.jsontype,com.fasterxml.j + ackson.databind.ser,com.fasterxml.jackson.databind.util,com.google.gs + on,com.google.gson.reflect,org.springframework.beans.factory,org.spri + ngframework.beans.factory.config,org.springframework.context,org.spri + ngframework.http,org.springframework.http.converter",org.springframew + ork.http.converter.protobuf;version="4.3.19.RELEASE";uses:="com.googl + e.protobuf,org.springframework.http,org.springframework.http.converte + r",org.springframework.http.converter.support;version="4.3.19.RELEASE + ";uses:="org.springframework.http.converter",org.springframework.http + .converter.xml;version="4.3.19.RELEASE";uses:="com.fasterxml.jackson. + databind,javax.xml.bind,javax.xml.stream,javax.xml.transform,org.spri + ngframework.http,org.springframework.http.converter,org.springframewo + rk.http.converter.json,org.springframework.oxm",org.springframework.h + ttp.server;version="4.3.19.RELEASE";uses:="javax.servlet,javax.servle + t.http,org.springframework.http",org.springframework.remoting.caucho; + version="4.3.19.RELEASE";uses:="com.caucho.burlap.client,com.caucho.h + essian.client,com.caucho.hessian.io,com.caucho.hessian.server,com.sun + .net.httpserver,javax.servlet,javax.servlet.http,org.aopalliance.inte + rcept,org.springframework.beans.factory,org.springframework.remoting, + org.springframework.remoting.support,org.springframework.web",org.spr + ingframework.remoting.httpinvoker;version="4.3.19.RELEASE";uses:="com + .sun.net.httpserver,javax.servlet,javax.servlet.http,org.aopalliance. + intercept,org.apache.commons.logging,org.apache.http,org.apache.http. + client,org.apache.http.client.config,org.apache.http.client.methods,o + rg.springframework.beans.factory,org.springframework.remoting,org.spr + ingframework.remoting.rmi,org.springframework.remoting.support,org.sp + ringframework.web",org.springframework.remoting.jaxws;version="4.3.19 + .RELEASE";uses:="com.sun.net.httpserver,javax.jws,javax.xml.namespace + ,javax.xml.soap,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.soap,o + rg.aopalliance.intercept,org.apache.commons.logging,org.springframewo + rk.beans.factory,org.springframework.core.io,org.springframework.remo + ting.soap",org.springframework.web;version="4.3.19.RELEASE";uses:="ja + vax.servlet,javax.servlet.annotation,javax.servlet.http,org.springfra + mework.http",org.springframework.web.accept;version="4.3.19.RELEASE"; + uses:="javax.servlet,org.springframework.beans.factory,org.springfram + ework.core.io,org.springframework.http,org.springframework.web,org.sp + ringframework.web.context,org.springframework.web.context.request,org + .springframework.web.util",org.springframework.web.bind;version="4.3. + 19.RELEASE";uses:="javax.servlet,org.springframework.beans,org.spring + framework.core,org.springframework.validation,org.springframework.web + .multipart,org.springframework.web.util",org.springframework.web.bind + .annotation;version="4.3.19.RELEASE";uses:="org.springframework.core. + annotation,org.springframework.http,org.springframework.stereotype",o + rg.springframework.web.bind.annotation.support;version="4.3.19.RELEAS + E";uses:="org.springframework.core,org.springframework.http,org.sprin + gframework.http.converter,org.springframework.ui,org.springframework. + web.bind,org.springframework.web.bind.annotation,org.springframework. + web.bind.support,org.springframework.web.context.request",org.springf + ramework.web.bind.support;version="4.3.19.RELEASE";uses:="javax.valid + ation,org.springframework.beans,org.springframework.core,org.springfr + amework.core.convert,org.springframework.validation,org.springframewo + rk.web.bind,org.springframework.web.context,org.springframework.web.c + ontext.request",org.springframework.web.client;version="4.3.19.RELEAS + E";uses:="org.springframework.core,org.springframework.core.task,org. + springframework.http,org.springframework.http.client,org.springframew + ork.http.client.support,org.springframework.http.converter,org.spring + framework.util.concurrent,org.springframework.web.util",org.springfra + mework.web.client.support;version="4.3.19.RELEASE";uses:="org.apache. + commons.logging,org.springframework.http.client,org.springframework.w + eb.client",org.springframework.web.context;version="4.3.19.RELEASE";u + ses:="javax.servlet,org.apache.commons.logging,org.springframework.be + ans.factory,org.springframework.context,org.springframework.core.env, + org.springframework.web",org.springframework.web.context.annotation;v + ersion="4.3.19.RELEASE";uses:="org.springframework.context.annotation + ,org.springframework.core.annotation",org.springframework.web.context + .request;version="4.3.19.RELEASE";uses:="javax.faces.context,javax.se + rvlet,javax.servlet.http,org.apache.log4j,org.springframework.beans.f + actory,org.springframework.beans.factory.config,org.springframework.h + ttp,org.springframework.ui",org.springframework.web.context.request.a + sync;version="4.3.19.RELEASE";uses:="javax.servlet,javax.servlet.http + ,org.springframework.beans.factory,org.springframework.core.task,org. + springframework.web.context.request",org.springframework.web.context. + support;version="4.3.19.RELEASE";uses:="groovy.lang,javax.servlet,jav + ax.servlet.http,org.apache.commons.logging,org.springframework.beans, + org.springframework.beans.factory,org.springframework.beans.factory.c + onfig,org.springframework.beans.factory.groovy,org.springframework.be + ans.factory.support,org.springframework.beans.factory.xml,org.springf + ramework.context,org.springframework.context.annotation,org.springfra + mework.context.support,org.springframework.core.env,org.springframewo + rk.core.io,org.springframework.core.io.support,org.springframework.ui + .context,org.springframework.web.context",org.springframework.web.cor + s;version="4.3.19.RELEASE";uses:="javax.servlet.http,org.springframew + ork.http,org.springframework.http.server,org.springframework.util,org + .springframework.web.util",org.springframework.web.filter;version="4. + 3.19.RELEASE";uses:="javax.servlet,javax.servlet.http,org.apache.comm + ons.logging,org.apache.log4j,org.springframework.beans,org.springfram + ework.beans.factory,org.springframework.context,org.springframework.c + ore.env,org.springframework.http,org.springframework.http.converter,o + rg.springframework.web.context,org.springframework.web.cors",org.spri + ngframework.web.jsf;version="4.3.19.RELEASE";uses:="javax.faces.appli + cation,javax.faces.context,javax.faces.event,org.springframework.bean + s.factory,org.springframework.web.context",org.springframework.web.js + f.el;version="4.3.19.RELEASE";uses:="javax.el,org.apache.commons.logg + ing,org.springframework.beans.factory,org.springframework.beans.facto + ry.access.el,org.springframework.web.context",org.springframework.web + .method;version="4.3.19.RELEASE";uses:="org.apache.commons.logging,or + g.springframework.beans.factory,org.springframework.context,org.sprin + gframework.core,org.springframework.core.annotation,org.springframewo + rk.http,org.springframework.util",org.springframework.web.method.anno + tation;version="4.3.19.RELEASE";uses:="javax.servlet,org.apache.commo + ns.logging,org.springframework.beans,org.springframework.beans.factor + y.config,org.springframework.core,org.springframework.core.convert,or + g.springframework.util,org.springframework.web.bind,org.springframewo + rk.web.bind.support,org.springframework.web.context.request,org.sprin + gframework.web.method,org.springframework.web.method.support,org.spri + ngframework.web.util",org.springframework.web.method.support;version= + "4.3.19.RELEASE";uses:="org.apache.commons.logging,org.springframewor + k.core,org.springframework.core.convert,org.springframework.http,org. + springframework.ui,org.springframework.web.bind.support,org.springfra + mework.web.context.request,org.springframework.web.method,org.springf + ramework.web.util",org.springframework.web.multipart;version="4.3.19. + RELEASE";uses:="javax.servlet.http,org.springframework.core,org.sprin + gframework.core.io,org.springframework.http,org.springframework.util" + ,org.springframework.web.multipart.commons;version="4.3.19.RELEASE";u + ses:="javax.servlet,javax.servlet.http,org.apache.commons.fileupload, + org.apache.commons.fileupload.disk,org.apache.commons.logging,org.spr + ingframework.core.io,org.springframework.util,org.springframework.web + .context,org.springframework.web.multipart",org.springframework.web.m + ultipart.support;version="4.3.19.RELEASE";uses:="javax.servlet,javax. + servlet.http,org.springframework.beans.propertyeditors,org.springfram + ework.core,org.springframework.http,org.springframework.http.server,o + rg.springframework.util,org.springframework.web.filter,org.springfram + ework.web.multipart",org.springframework.web.util;version="4.3.19.REL + EASE";uses:="javax.servlet,javax.servlet.http,javax.servlet.jsp.tagex + t,org.apache.commons.logging,org.springframework.http,org.springframe + work.util" + + com.squareup.okhttp.internal.http;resolution:=optional + ,javax.net.ssl,okhttp3.internal.http;resolution:=optional,com.caucho. + burlap.client;version="[4,5)";resolution:=optional,com.caucho.burlap. + io;version="[4,5)";resolution:=optional,com.caucho.burlap.server;vers + ion="[4,5)";resolution:=optional,com.caucho.hessian;version="[4,5)";r + esolution:=optional,com.caucho.hessian.client;version="[4,5)";resolut + ion:=optional,com.caucho.hessian.io;version="[4,5)";resolution:=optio + nal,com.caucho.hessian.server;version="[4,5)";resolution:=optional,co + m.fasterxml.jackson.annotation;version="[2,3)";resolution:=optional,c + om.fasterxml.jackson.core;version="[2,3)";resolution:=optional,com.fa + sterxml.jackson.core.util;version="[2,3)";resolution:=optional,com.fa + sterxml.jackson.databind;version="[2,3)";resolution:=optional,com.fas + terxml.jackson.databind.cfg;version="[2,3)";resolution:=optional,com. + fasterxml.jackson.databind.deser;version="[2,3)";resolution:=optional + ,com.fasterxml.jackson.databind.introspect;version="[2,3)";resolution + :=optional,com.fasterxml.jackson.databind.jsontype;version="[2,3)";re + solution:=optional,com.fasterxml.jackson.databind.module;version="[2, + 3)";resolution:=optional,com.fasterxml.jackson.databind.ser;version=" + [2,3)";resolution:=optional,com.fasterxml.jackson.databind.type;versi + on="[2,3)";resolution:=optional,com.fasterxml.jackson.databind.util;v + ersion="[2,3)";resolution:=optional,com.fasterxml.jackson.dataformat. + xml;version="[2,3)";resolution:=optional,com.google.gson;version="[2. + 3,3)";resolution:=optional,com.google.gson.reflect;version="[2.3,3)"; + resolution:=optional,com.google.protobuf;version="[2.6,3)";resolution + :=optional,com.googlecode.protobuf.format;resolution:=optional,com.sq + uareup.okhttp;version="[2.4,3)";resolution:=optional,com.rometools.ro + me.feed;version="[1.5,2)";resolution:=optional,com.rometools.rome.fee + d.atom;version="[1.5,2)";resolution:=optional,com.rometools.rome.feed + .rss;version="[1.5,2)";resolution:=optional,com.rometools.rome.io;ver + sion="[1.5,2)";resolution:=optional,com.sun.net.httpserver;resolution + :=optional,groovy.lang;version="[2.4,3)";resolution:=optional,io.nett + y.bootstrap;resolution:=optional,io.netty.buffer;resolution:=optional + ,io.netty.channel;resolution:=optional,io.netty.channel.nio;resolutio + n:=optional,io.netty.channel.socket;resolution:=optional,io.netty.cha + nnel.socket.nio;resolution:=optional,io.netty.handler.codec.http;reso + lution:=optional,io.netty.handler.ssl;resolution:=optional,io.netty.h + andler.timeout;resolution:=optional,io.netty.util.concurrent;resoluti + on:=optional,javax.activation;resolution:=optional,javax.el;resolutio + n:=optional,javax.faces.application;resolution:=optional,javax.faces. + component;resolution:=optional,javax.faces.context;resolution:=option + al,javax.faces.event;resolution:=optional,javax.imageio;resolution:=o + ptional,javax.imageio.metadata;resolution:=optional,javax.imageio.str + eam;resolution:=optional,javax.jws;resolution:=optional,javax.mail.in + ternet;resolution:=optional,javax.portlet;resolution:=optional,javax. + servlet,javax.servlet.http,javax.servlet.annotation;resolution:=optio + nal,javax.servlet.jsp.tagext;resolution:=optional,javax.validation;re + solution:=optional,javax.xml.bind;resolution:=optional,javax.xml.bind + .annotation;resolution:=optional,javax.xml.namespace;resolution:=opti + onal,javax.xml.parsers;resolution:=optional,javax.xml.soap;resolution + :=optional,javax.xml.stream;resolution:=optional,javax.xml.transform; + resolution:=optional,javax.xml.transform.dom;resolution:=optional,jav + ax.xml.transform.sax;resolution:=optional,javax.xml.transform.stax;re + solution:=optional,javax.xml.transform.stream;resolution:=optional,ja + vax.xml.ws;resolution:=optional,javax.xml.ws.handler;resolution:=opti + onal,javax.xml.ws.soap;resolution:=optional,okhttp3;resolution:=optio + nal,org.aopalliance.aop;version="[1,2)",org.aopalliance.intercept;ver + sion="[1,2)",org.apache.commons.fileupload;version="[1.3,2)";resoluti + on:=optional,org.apache.commons.fileupload.disk;version="[1.3,2)";res + olution:=optional,org.apache.commons.fileupload.servlet;version="[1.3 + ,2)";resolution:=optional,org.apache.commons.logging;version="[1.1.1, + 2)",org.apache.http;version="[4,5)";resolution:=optional,org.apache.h + ttp.client;version="[4,5)";resolution:=optional,org.apache.http.clien + t.config;version="[4,5)";resolution:=optional,org.apache.http.client. + methods;version="[4,5)";resolution:=optional,org.apache.http.client.p + rotocol;version="[4,5)";resolution:=optional,org.apache.http.concurre + nt;version="[4,5)";resolution:=optional,org.apache.http.config;versio + n="[4,5)";resolution:=optional,org.apache.http.conn;version="[4,5)";r + esolution:=optional,org.apache.http.conn.socket;version="[4,5)";resol + ution:=optional,org.apache.http.conn.ssl;version="[4,5)";resolution:= + optional,org.apache.http.entity;version="[4,5)";resolution:=optional, + org.apache.http.impl.client;version="[4,5)";resolution:=optional,org. + apache.http.impl.conn;version="[4,5)";resolution:=optional,org.apache + .http.impl.nio.client;version="[4,5)";resolution:=optional,org.apache + .http.message;version="[4,5)";resolution:=optional,org.apache.http.ni + o.client;version="[4,5)";resolution:=optional,org.apache.http.nio.ent + ity;version="[4,5)";resolution:=optional,org.apache.http.params;versi + on="[4,5)";resolution:=optional,org.apache.http.protocol;version="[4, + 5)";resolution:=optional,org.apache.http.util;version="[4,5)";resolut + ion:=optional,org.apache.log4j;version="[1.2,2)";resolution:=optional + ,org.springframework.aop.framework;version="[4.3.19.RELEASE,4.4)",org + .springframework.aop.support;version="[4.3.19.RELEASE,4.4)",org.sprin + gframework.beans;version="[4.3.19.RELEASE,4.4)",org.springframework.b + eans.factory;version="[4.3.19.RELEASE,4.4)",org.springframework.beans + .factory.access;version="[4.3.19.RELEASE,4.4)",org.springframework.be + ans.factory.access.el;version="[4.3.19.RELEASE,4.4)",org.springframew + ork.beans.factory.annotation;version="[4.3.19.RELEASE,4.4)",org.sprin + gframework.beans.factory.config;version="[4.3.19.RELEASE,4.4)",org.sp + ringframework.beans.factory.groovy;version="[4.3.19.RELEASE,4.4)",org + .springframework.beans.factory.support;version="[4.3.19.RELEASE,4.4)" + ,org.springframework.beans.factory.xml;version="[4.3.19.RELEASE,4.4)" + ,org.springframework.beans.propertyeditors;version="[4.3.19.RELEASE,4 + .4)",org.springframework.context;version="[4.3.19.RELEASE,4.4)",org.s + pringframework.context.access;version="[4.3.19.RELEASE,4.4)",org.spri + ngframework.context.annotation;version="[4.3.19.RELEASE,4.4)",org.spr + ingframework.context.i18n;version="[4.3.19.RELEASE,4.4)",org.springfr + amework.context.support;version="[4.3.19.RELEASE,4.4)",org.springfram + ework.core;version="[4.3.19.RELEASE,4.4)",org.springframework.core.an + notation;version="[4.3.19.RELEASE,4.4)",org.springframework.core.conv + ert;version="[4.3.19.RELEASE,4.4)",org.springframework.core.env;versi + on="[4.3.19.RELEASE,4.4)",org.springframework.core.io;version="[4.3.1 + 9.RELEASE,4.4)",org.springframework.core.io.support;version="[4.3.19. + RELEASE,4.4)",org.springframework.core.task;version="[4.3.19.RELEASE, + 4.4)",org.springframework.format.support;version="[4.3.19.RELEASE,4.4 + )";resolution:=optional,org.springframework.jndi;version="[4.3.19.REL + EASE,4.4)";resolution:=optional,org.springframework.oxm;version="[4.3 + .19.RELEASE,4.4)";resolution:=optional,org.springframework.remoting;v + ersion="[4.3.19.RELEASE,4.4)";resolution:=optional,org.springframewor + k.remoting.rmi;version="[4.3.19.RELEASE,4.4)";resolution:=optional,or + g.springframework.remoting.soap;version="[4.3.19.RELEASE,4.4)";resolu + tion:=optional,org.springframework.remoting.support;version="[4.3.19. + RELEASE,4.4)";resolution:=optional,org.springframework.stereotype;ver + sion="[4.3.19.RELEASE,4.4)";resolution:=optional,org.springframework. + ui;version="[4.3.19.RELEASE,4.4)",org.springframework.ui.context;vers + ion="[4.3.19.RELEASE,4.4)",org.springframework.ui.context.support;ver + sion="[4.3.19.RELEASE,4.4)",org.springframework.util;version="[4.3.19 + .RELEASE,4.4)",org.springframework.util.comparator;version="[4.3.19.R + ELEASE,4.4)",org.springframework.util.concurrent;version="[4.3.19.REL + EASE,4.4)",org.springframework.validation;version="[4.3.19.RELEASE,4. + 4)",org.springframework.validation.annotation;version="[4.3.19.RELEAS + E,4.4)",org.springframework.validation.support;version="[4.3.19.RELEA + SE,4.4)",org.xml.sax;resolution:=optional,org.xml.sax.helpers;resolut + ion:=optional,org.w3c.dom;resolution:=optional,org.joda.time;version= + "[2,3)";resolution:=optional,org.joda.time.format;version="[2,3)";res + olution:=optional + + + + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context-support:jar:sources:${springframework.version} + false + false + true + + + + + + org.apache.servicemix.bundles.spring-context-support.source + spring-context-support.source + org.apache.servicemix.bundles.spring-context-support;version="${springframework.version}";roots:="." + + + + org.apache.servicemix.bundles:org.apache.servicemix.bundles.spring-context-support:jar:${springframework.version} + false + false + + + org.springframework:spring-jcl:jar:5.1.1.RELEASE + true + false + 8.1.12.v20180117 - + RELEASE731 org.idempiere.p2.targetplatform http://download.eclipse.org/eclipse/updates/4.9 @@ -32,6 +33,10 @@ http://downloads.sourceforge.net/project/idempiere/binary.file org.eclipse.equinox.p2.director, org.idempiere.equinox.p2.director.feature.feature.group, org.idempiere.fitnesse.feature.feature.group org.adempiere.server.product + 2.8.5 + + 3.15.0 + 1.3.300 @@ -315,6 +320,47 @@ org.eclipse.tycho tycho-compiler-plugin ${tycho.version} + + true + + + + + org.codehaus.plexus + plexus-utils + 3.1.0 + + + org.codehaus.plexus + plexus-compiler-manager + ${codehaus.plexus} + + + org.codehaus.plexus + plexus-compiler-api + ${codehaus.plexus} + + + org.apache.commons + commons-exec + 1.3 + + + org.eclipse.jdt + org.eclipse.jdt.compiler.tool + 1.2.300 + + + org.eclipse.jdt + org.eclipse.jdt.core + ${jdtVersion} + + + org.eclipse.jdt + org.eclipse.jdt.compiler.apt + ${jdtAptVersion} + + org.eclipse.tycho @@ -354,7 +400,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.1.0 + 3.2.0 org.apache.maven.plugins @@ -454,7 +500,6 @@ ${tycho.version} honor - @@ -493,8 +538,8 @@ x86_64 - JavaSE-1.8 - JavaSE-1.8 + JavaSE-10 + JavaSE-10 diff --git a/org.idempiere.ui.zk.selenium/.classpath b/org.idempiere.ui.zk.selenium/.classpath index cf36b56119..423c974870 100644 --- a/org.idempiere.ui.zk.selenium/.classpath +++ b/org.idempiere.ui.zk.selenium/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.idempiere.ui.zk.selenium/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.ui.zk.selenium/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.idempiere.ui.zk.selenium/.settings/org.eclipse.jdt.core.prefs +++ b/org.idempiere.ui.zk.selenium/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF index bb8e071428..7644fe330f 100644 --- a/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF +++ b/org.idempiere.ui.zk.selenium/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.idempiere.ui.zk.selenium Bundle-Version: 5.1.0.qualifier Bundle-Activator: org.idempiere.ui.zk.selenium.fitnesse.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Import-Package: fit, fit.decorator, fit.decorator.exceptions, @@ -343,3 +343,4 @@ Import-Package: fit, Service-Component: OSGI-INF/fitfixturefactory.xml Bundle-ClassPath: . Automatic-Module-Name: org.idempiere.ui.zk.selenium +Bundle-Vendor: iDempiere Community diff --git a/org.idempiere.ui.zk.selenium/src/org/idempiere/ui/zk/selenium/fitnesse/FitFixtureFactory.java b/org.idempiere.ui.zk.selenium/src/org/idempiere/ui/zk/selenium/fitnesse/FitFixtureFactory.java index 17a657fde8..e1839467a6 100644 --- a/org.idempiere.ui.zk.selenium/src/org/idempiere/ui/zk/selenium/fitnesse/FitFixtureFactory.java +++ b/org.idempiere.ui.zk.selenium/src/org/idempiere/ui/zk/selenium/fitnesse/FitFixtureFactory.java @@ -13,6 +13,8 @@ *****************************************************************************/ package org.idempiere.ui.zk.selenium.fitnesse; +import java.lang.reflect.InvocationTargetException; + import org.idempiere.fitnesse.server.fit.IFitFixtureFactory; import fit.FixtureName; @@ -41,22 +43,23 @@ public class FitFixtureFactory implements IFitFixtureFactory { Object obj = null; try { Class clazz = getClass().getClassLoader().loadClass(className); - obj = clazz.newInstance(); + obj = clazz.getDeclaredConstructor().newInstance(); return obj; } catch (ClassNotFoundException e) { } catch (InstantiationException e) { - } catch (IllegalAccessException e) { + } catch (IllegalAccessException | NoSuchMethodException | InvocationTargetException e) { } if (!fixtureName.isFullyQualified()) { className = DEFAULT_PACKAGE + "." + fixtureName.toString(); try { Class clazz = (Class) getClass().getClassLoader().loadClass(className); - obj = clazz.newInstance(); + obj = clazz.getDeclaredConstructor().newInstance(); return obj; } catch (ClassNotFoundException e) { } catch (InstantiationException e) { } catch (IllegalAccessException e) { + } catch (InvocationTargetException | NoSuchMethodException ex) { } } return null; diff --git a/org.idempiere.webservices/.classpath b/org.idempiere.webservices/.classpath index ec1bc64688..83a96b9803 100644 --- a/org.idempiere.webservices/.classpath +++ b/org.idempiere.webservices/.classpath @@ -1,27 +1,12 @@ - + + + + + - - - - - - - - - - - - - - - - - - - diff --git a/org.idempiere.webservices/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.webservices/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.idempiere.webservices/.settings/org.eclipse.jdt.core.prefs +++ b/org.idempiere.webservices/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.idempiere.webservices/META-INF/MANIFEST.MF b/org.idempiere.webservices/META-INF/MANIFEST.MF index a17f70a8d1..056913af09 100644 --- a/org.idempiere.webservices/META-INF/MANIFEST.MF +++ b/org.idempiere.webservices/META-INF/MANIFEST.MF @@ -4,20 +4,16 @@ Bundle-Name: iDempiere Webservices Bundle-SymbolicName: org.idempiere.webservices;singleton:=true Bundle-Version: 5.1.0.qualifier Bundle-Activator: org.idempiere.webservices.Activator -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Service-Component: OSGI-INF/ws_modelfactory.xml Import-Package: javax.activation, + javax.jws;version="1.1.0", + javax.jws.soap;version="1.1.0", + javax.mail;version="1.4.1", javax.mail.internet;version="1.5", javax.servlet;version="3.0.0", javax.servlet.http;version="3.0.0", - javax.xml.rpc, - javax.xml.rpc.encoding, - javax.xml.rpc.handler, - javax.xml.rpc.handler.soap, - javax.xml.rpc.holders, - javax.xml.rpc.server, - javax.xml.rpc.soap, - javax.xml.soap;version="1.3.0", + javax.xml.bind;version="2.3.0", net.sf.jasperreports.engine, net.sf.jasperreports.engine.base, net.sf.jasperreports.engine.util, @@ -61,161 +57,59 @@ Import-Package: javax.activation, org.osgi.framework;version="1.6.0" Require-Bundle: org.adempiere.base;bundle-version="0.0.0", org.adempiere.ui;bundle-version="0.0.0", - org.apache.ecs;bundle-version="0.0.0" + org.apache.ecs;bundle-version="0.0.0", + org.apache.cxf.cxf-core;bundle-version="3.2.6", + org.apache.neethi;bundle-version="3.1.1", + org.apache.ws.xmlschema.core;bundle-version="2.2.3", + org.apache.commons.discovery;bundle-version="0.5.0", + stax2-api;bundle-version="4.1.0", + org.apache.cxf.cxf-rt-frontend-jaxrs;bundle-version="3.2.6", + org.apache.cxf.cxf-rt-frontend-jaxws;bundle-version="3.2.6", + org.apache.cxf.cxf-rt-bindings-soap;bundle-version="3.2.6", + org.apache.cxf.cxf-rt-bindings-xml;bundle-version="3.2.6", + org.apache.cxf.cxf-rt-databinding-jaxb;bundle-version="3.2.6", + org.apache.cxf.cxf-rt-frontend-simple;bundle-version="3.2.6", + org.apache.cxf.cxf-rt-transports-http;bundle-version="3.2.6", + org.apache.cxf.cxf-rt-wsdl;bundle-version="3.2.6", + org.aopalliance;bundle-version="1.0.0", + org.apache.xml.resolver;bundle-version="1.2.0", + org.apache.cxf.cxf-rt-transports-http-jetty;bundle-version="3.2.6", + org.apache.cxf.cxf-rt-ws-addr;bundle-version="3.2.6", + org.apache.cxf.cxf-rt-ws-policy;bundle-version="3.2.6", + org.apache.cxf.cxf-rt-databinding-xmlbeans;bundle-version="3.1.17", + org.apache.xmlbeans;bundle-version="3.0.1", + javax.ws.rs-api;bundle-version="2.1.99", + org.apache.servicemix.bundles.spring-aop, + org.apache.servicemix.bundles.spring-beans, + org.apache.servicemix.bundles.spring-context, + org.apache.servicemix.bundles.spring-context-support, + org.apache.servicemix.bundles.spring-core, + org.apache.servicemix.bundles.spring-expression, + org.springframework.spring-jcl;bundle-version="5.1.1", + org.apache.servicemix.bundles.spring-web, + org.apache.cxf.cxf-rt-rs-extension-providers;bundle-version="3.1.17", + javax.xml.soap-api;bundle-version="1.4.0", + org.apache.axis;bundle-version="1.4.0", + javax.xml.soap;bundle-version="1.3.0", + jaxws-api;bundle-version="2.3.1", + javax.annotation-api;bundle-version="1.3.2", + org.glassfish.jersey.core.jersey-common;bundle-version="2.22.1", + org.apache.cxf.cxf-rt-rs-service-description;bundle-version="3.2.6", + org.glassfish.hk2.osgi-resource-locator;bundle-version="2.5.0", + org.glassfish.hk2.api;bundle-version="2.5.0", + org.glassfish.hk2.locator;bundle-version="2.5.0", + org.glassfish.hk2.utils;bundle-version="2.5.0", + org.glassfish.jersey.bundles.repackaged.jersey-guava;bundle-version="2.22.1" Bundle-ClassPath: ., - WEB-INF/lib/aopalliance.jar, - WEB-INF/lib/axis.jar, - WEB-INF/lib/commons-discovery.jar, - WEB-INF/lib/cxf-bundle.jar, - WEB-INF/lib/cxf-rt-frontend-jaxws.jar, - WEB-INF/lib/idempiere-xmlbeans.jar, - WEB-INF/lib/jsr311-api.jar, - WEB-INF/lib/neethi.jar, - WEB-INF/lib/spring-aop.jar, - WEB-INF/lib/spring-asm.jar, - WEB-INF/lib/spring-beans.jar, - WEB-INF/lib/spring-context.jar, - WEB-INF/lib/spring-core.jar, - WEB-INF/lib/spring-expression.jar, - WEB-INF/lib/spring-osgi-extender.jar, - WEB-INF/lib/spring-web.jar, - WEB-INF/lib/stax2-api.jar, - WEB-INF/lib/wsdl4j.jar, - WEB-INF/lib/xmlbeans.jar, - WEB-INF/lib/xmlschema-core.jar -Export-Package: javax.ws.rs, - javax.ws.rs.core, - javax.ws.rs.ext, - javax.wsdl, - javax.wsdl.extensions, - javax.wsdl.extensions.http, - javax.wsdl.extensions.mime, - javax.wsdl.extensions.schema, - javax.wsdl.extensions.soap, - javax.wsdl.extensions.soap12, - javax.wsdl.factory, - javax.wsdl.xml, - org.apache.axis, - org.apache.axis.attachments, - org.apache.axis.client, - org.apache.axis.client.async, - org.apache.axis.collections, - org.apache.axis.components.compiler, - org.apache.axis.components.encoding, - org.apache.axis.components.image, - org.apache.axis.components.jms, - org.apache.axis.components.logger, - org.apache.axis.components.net, - org.apache.axis.components.script, - org.apache.axis.components.threadpool, - org.apache.axis.components.uuid, - org.apache.axis.configuration, - org.apache.axis.constants, - org.apache.axis.deployment.wsdd, - org.apache.axis.deployment.wsdd.providers, - org.apache.axis.description, - org.apache.axis.encoding, - org.apache.axis.encoding.ser, - org.apache.axis.encoding.ser.castor, - org.apache.axis.handlers, - org.apache.axis.handlers.http, - org.apache.axis.handlers.soap, - org.apache.axis.holders, - org.apache.axis.i18n, - org.apache.axis.management, - org.apache.axis.management.jmx, - org.apache.axis.message, - org.apache.axis.monitor, - org.apache.axis.providers, - org.apache.axis.providers.java, - org.apache.axis.schema, - org.apache.axis.security, - org.apache.axis.security.servlet, - org.apache.axis.security.simple, - org.apache.axis.server, - org.apache.axis.session, - org.apache.axis.soap, - org.apache.axis.strategies, - org.apache.axis.transport.http, - org.apache.axis.transport.java, - org.apache.axis.transport.jms, - org.apache.axis.transport.local, - org.apache.axis.transport.mail, - org.apache.axis.types, - org.apache.axis.utils, - org.apache.axis.utils.bytecode, - org.apache.axis.utils.cache, - org.apache.axis.wsdl, - org.apache.axis.wsdl.fromJava, - org.apache.axis.wsdl.gen, - org.apache.axis.wsdl.symbolTable, - org.apache.axis.wsdl.toJava, - org.apache.commons.discovery, - org.apache.commons.discovery.ant, - org.apache.commons.discovery.jdk, - org.apache.commons.discovery.log, - org.apache.commons.discovery.resource, - org.apache.commons.discovery.resource.classes, - org.apache.commons.discovery.resource.names, - org.apache.commons.discovery.tools, - org.apache.cxf, - org.apache.cxf.jaxws, - org.apache.cxf.jaxws.spring, - org.apache.cxf.transport.servlet, - org.apache.cxf.xmlbeans, - org.apache.xmlbeans, - org.apache.xmlbeans.impl.common, - org.apache.xmlbeans.impl.config, - org.apache.xmlbeans.impl.inst2xsd, - org.apache.xmlbeans.impl.inst2xsd.util, - org.apache.xmlbeans.impl.jam, - org.apache.xmlbeans.impl.jam.annotation, - org.apache.xmlbeans.impl.jam.internal, - org.apache.xmlbeans.impl.jam.internal.classrefs, - org.apache.xmlbeans.impl.jam.internal.elements, - org.apache.xmlbeans.impl.jam.internal.javadoc, - org.apache.xmlbeans.impl.jam.internal.parser, - org.apache.xmlbeans.impl.jam.internal.reflect, - org.apache.xmlbeans.impl.jam.mutable, - org.apache.xmlbeans.impl.jam.provider, - org.apache.xmlbeans.impl.jam.visitor, - org.apache.xmlbeans.impl.jam.xml, - org.apache.xmlbeans.impl.regex, - org.apache.xmlbeans.impl.richParser, - org.apache.xmlbeans.impl.schema, - org.apache.xmlbeans.impl.soap, - org.apache.xmlbeans.impl.store, - org.apache.xmlbeans.impl.tool, - org.apache.xmlbeans.impl.util, - org.apache.xmlbeans.impl.validator, - org.apache.xmlbeans.impl.values, - org.apache.xmlbeans.impl.xb.ltgfmt, - org.apache.xmlbeans.impl.xb.ltgfmt.impl, - org.apache.xmlbeans.impl.xb.substwsdl, - org.apache.xmlbeans.impl.xb.substwsdl.impl, - org.apache.xmlbeans.impl.xb.xmlconfig, - org.apache.xmlbeans.impl.xb.xmlconfig.impl, - org.apache.xmlbeans.impl.xb.xmlschema, - org.apache.xmlbeans.impl.xb.xmlschema.impl, - org.apache.xmlbeans.impl.xb.xsdownload, - org.apache.xmlbeans.impl.xb.xsdownload.impl, - org.apache.xmlbeans.impl.xb.xsdschema, - org.apache.xmlbeans.impl.xb.xsdschema.impl, - org.apache.xmlbeans.impl.xpathgen, - org.apache.xmlbeans.impl.xsd2inst, - org.apache.xmlbeans.soap, - org.apache.xmlbeans.xml.stream, - org.apache.xmlbeans.xml.stream.events, - org.apache.xmlbeans.xml.stream.utils, - org.compiere.model, + WEB-INF/lib/idempiere-xmlbeans.jar +Export-Package: org.compiere.model, org.idempiere.adInterface.x10, org.idempiere.adInterface.x10.impl, org.idempiere.adinterface, org.idempiere.webservices, org.idempiere.webservices.client, - org.idempiere.webservices.fault, - org.springframework.web.context, - org.springframework.web.util + org.idempiere.webservices.fault Web-ContextPath: ADInterface Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.idempiere.webservices +Bundle-Vendor: iDempiere Community diff --git a/org.idempiere.webservices/META-INF/cxf/cxf-servlet.xml b/org.idempiere.webservices/META-INF/cxf/cxf-servlet.xml new file mode 100644 index 0000000000..31cc1e4fd4 --- /dev/null +++ b/org.idempiere.webservices/META-INF/cxf/cxf-servlet.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/org.idempiere.webservices/META-INF/spring.handlers b/org.idempiere.webservices/META-INF/spring.handlers new file mode 100644 index 0000000000..1b110fa321 --- /dev/null +++ b/org.idempiere.webservices/META-INF/spring.handlers @@ -0,0 +1,22 @@ +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# +http\://cxf.apache.org/jaxws=org.apache.cxf.jaxws.spring.NamespaceHandler +http\://cxf.apache.org/jaxrs=org.apache.cxf.jaxrs.spring.NamespaceHandler \ No newline at end of file diff --git a/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/data/DBDataSource.java b/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/data/DBDataSource.java index 47d926d85d..8167c59840 100644 --- a/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/data/DBDataSource.java +++ b/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/data/DBDataSource.java @@ -108,7 +108,7 @@ public class DBDataSource extends compiereDataSource } else if (clazz.equals(java.lang.Byte.class)) { - objValue = new Byte(m_resultSet.getByte(field.getName())); + objValue = Byte.valueOf(m_resultSet.getByte(field.getName())); if(m_resultSet.wasNull()) { objValue = null; @@ -140,7 +140,7 @@ public class DBDataSource extends compiereDataSource } else if (clazz.equals(java.lang.Double.class)) { - objValue = new Double(m_resultSet.getDouble(field.getName())); + objValue = Double.valueOf(m_resultSet.getDouble(field.getName())); if(m_resultSet.wasNull()) { objValue = null; @@ -148,7 +148,7 @@ public class DBDataSource extends compiereDataSource } else if (clazz.equals(java.lang.Float.class)) { - objValue = new Float(m_resultSet.getFloat(field.getName())); + objValue = Float.valueOf(m_resultSet.getFloat(field.getName())); if(m_resultSet.wasNull()) { objValue = null; @@ -156,7 +156,7 @@ public class DBDataSource extends compiereDataSource } else if (clazz.equals(java.lang.Integer.class)) { - objValue = new Integer(m_resultSet.getInt(field.getName())); + objValue = Integer.valueOf(m_resultSet.getInt(field.getName())); if(m_resultSet.wasNull()) { objValue = null; @@ -164,7 +164,7 @@ public class DBDataSource extends compiereDataSource } else if (clazz.equals(java.lang.Long.class)) { - objValue = new Long(m_resultSet.getLong(field.getName())); + objValue = Long.valueOf(m_resultSet.getLong(field.getName())); if(m_resultSet.wasNull()) { objValue = null; @@ -172,7 +172,7 @@ public class DBDataSource extends compiereDataSource } else if (clazz.equals(java.lang.Short.class)) { - objValue = new Short(m_resultSet.getShort(field.getName())); + objValue = Short.valueOf(m_resultSet.getShort(field.getName())); if(m_resultSet.wasNull()) { objValue = null; diff --git a/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportPool.java b/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportPool.java index ff52acdd99..f49fe7bc06 100644 --- a/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportPool.java +++ b/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportPool.java @@ -48,7 +48,7 @@ public class ReportPool public ReportInfo getReport (int AD_Process_ID ) { -/* ReportInfo reportinfo = (ReportInfo) pool.get(new Integer(AD_Process_ID)); +/* ReportInfo reportinfo = (ReportInfo) pool.get(Integer.valueOf(AD_Process_ID)); if (reportinfo == null) { reportinfo = loadReport(AD_Process_ID); @@ -78,7 +78,7 @@ public class ReportPool { if(refresh) { - pool.put(new Integer(AD_Process_ID), reportinfo); + pool.put(Integer.valueOf(AD_Process_ID), reportinfo); } else { @@ -95,7 +95,7 @@ public class ReportPool size--; } - pool.put(new Integer(AD_Process_ID), reportinfo); + pool.put(Integer.valueOf(AD_Process_ID), reportinfo); size++; } if (log.isLoggable(Level.INFO)) log.info("Load " + reportinfo + " into Report Pool" + " Size=" + size); diff --git a/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportProcessor.java b/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportProcessor.java index 3dcc4121ba..22d1a57bb6 100644 --- a/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportProcessor.java +++ b/org.idempiere.webservices/WEB-INF/src/net/sf/compilo/report/ReportProcessor.java @@ -96,7 +96,7 @@ public class ReportProcessor // add parameter m_Param.putAll(reportInfo.getSubReport()); addProcessParameters( m_AD_PInstance_ID, m_Param); - m_Param.put("RECORD_ID", new Integer( m_Record_ID)); + m_Param.put("RECORD_ID", Integer.valueOf( m_Record_ID)); // Marco LOMBARDO: REPORT_HOME used to express subreports path. m_Param.put("REPORT_HOME", REPORT_HOME); // End Marco LOMBARDO. @@ -145,8 +145,8 @@ public class ReportProcessor MPInstancePara[] pinstancePara = pinstance.getParameters(); m_Record_ID = pinstance.getRecord_ID(); - params.put("AD_Client_ID",new Integer(pinstance.getAD_Client_ID())); - params.put("AD_Org_ID",new Integer(pinstance.getAD_Org_ID())); + params.put("AD_Client_ID",Integer.valueOf(pinstance.getAD_Client_ID())); + params.put("AD_Org_ID",Integer.valueOf(pinstance.getAD_Org_ID())); for(int i=0; i - org.apache.maven.plugins - maven-dependency-plugin - - - validate - - copy - - - - - org.springframework.osgi - spring-osgi-extender - 1.2.1 - - - org.springframework - spring-aop - 3.0.7.RELEASE - - - org.codehaus.woodstox - stax2-api - 3.1.1 - - - org.springframework - spring-web - 3.0.7.RELEASE - - - org.springframework - spring-context - 3.0.7.RELEASE - - - org.springframework - spring-beans - 3.0.7.RELEASE - - - org.springframework - spring-core - 3.0.7.RELEASE - - - org.springframework - spring-asm - 3.0.7.RELEASE - - - org.springframework - spring-expression - 3.0.7.RELEASE - - - wsdl4j - wsdl4j - 1.6.2 - - - org.apache.cxf - cxf-bundle - 2.6.2 - - - org.apache.neethi - neethi - 3.0.2 - - - org.apache.ws.xmlschema - xmlschema-core - 2.0.3 - - - org.apache.cxf - cxf-rt-frontend-jaxws - 2.6.1 - - - org.apache.xmlbeans - xmlbeans - 3.0.0 - - - aopalliance - aopalliance - 1.0 - - - org.apache.axis - axis - 1.4 - - - commons-discovery - commons-discovery - 0.5 - - - javax.ws.rs - jsr311-api - 1.1 - - - WEB-INF/lib - true - true - true - - - + org.eclipse.tycho + tycho-compiler-plugin + + + + -warn:+forbidden + + com.googlecode.maven-download-plugin diff --git a/org.idempiere.zk-feature/feature.xml b/org.idempiere.zk-feature/feature.xml index 0df8f9c0b6..65604ce205 100644 --- a/org.idempiere.zk-feature/feature.xml +++ b/org.idempiere.zk-feature/feature.xml @@ -2,7 +2,8 @@ + version="5.1.0.qualifier" + provider-name="iDempiere Community"> [Enter Feature Description here.] diff --git a/org.idempiere.zk.extra/.classpath b/org.idempiere.zk.extra/.classpath index 6c3abab069..85036c7cc4 100644 --- a/org.idempiere.zk.extra/.classpath +++ b/org.idempiere.zk.extra/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs b/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs index 0c68a61dca..6783713ef0 100644 --- a/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs +++ b/org.idempiere.zk.extra/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,3 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled diff --git a/org.idempiere.zk.extra/META-INF/MANIFEST.MF b/org.idempiere.zk.extra/META-INF/MANIFEST.MF index f89e8316e3..52235f6753 100644 --- a/org.idempiere.zk.extra/META-INF/MANIFEST.MF +++ b/org.idempiere.zk.extra/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: extra zk library Bundle-SymbolicName: org.idempiere.zk.extra Bundle-Version: 5.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=1.10))" Bundle-ClassPath: ., lib/breeze.jar, lib/calendar.jar, @@ -16,9 +16,11 @@ Export-Package: com.google.common.annotations, com.google.common.cache, com.google.common.collect, com.google.common.escape, + com.google.common.graph, com.google.common.hash, com.google.common.io, com.google.common.math, + com.google.common.net, com.google.common.primitives, com.google.common.reflect, com.google.common.util.concurrent, @@ -33,11 +35,13 @@ Export-Package: com.google.common.annotations, com.google.gson.internal.bind.util, com.google.gson.reflect, com.google.gson.stream, + com.google.j2objc.annotations, com.google.javascript.jscomp, com.google.javascript.jscomp.ant, com.google.javascript.jscomp.bundle, com.google.javascript.jscomp.deps, com.google.javascript.jscomp.graph, + com.google.javascript.jscomp.ijs, com.google.javascript.jscomp.js, com.google.javascript.jscomp.js.es6, com.google.javascript.jscomp.js.es6.array, @@ -49,7 +53,6 @@ Export-Package: com.google.common.annotations, com.google.javascript.jscomp.js.es6.util, com.google.javascript.jscomp.js.util, com.google.javascript.jscomp.lint, - com.google.javascript.jscomp.newtypes, com.google.javascript.jscomp.parsing, com.google.javascript.jscomp.parsing.parser, com.google.javascript.jscomp.parsing.parser.trees, @@ -66,10 +69,12 @@ Export-Package: com.google.common.annotations, google.protobuf, google.protobuf.compiler, javax.annotation, - javax.annotation.concurrent, javax.annotation.meta, jsinterop.annotations, metainfo.zk, + org.checkerframework.checker.nullness.qual, + org.checkerframework.framework.qual, + org.codehaus.mojo.animal_sniffer, org.kohsuke.args4j, org.kohsuke.args4j.spi, org.zkforge.json.simple, @@ -198,3 +203,4 @@ Import-Package: javax.servlet;version="3.1.0", javax.servlet.http;version="3.1.0", org.slf4j;version="1.7.2" Automatic-Module-Name: org.idempiere.zk.extra +Bundle-Vendor: iDempiere Community diff --git a/org.idempiere.zk.extra/pom.xml b/org.idempiere.zk.extra/pom.xml index 83b4cb14fd..c4b1721a3b 100644 --- a/org.idempiere.zk.extra/pom.xml +++ b/org.idempiere.zk.extra/pom.xml @@ -52,7 +52,7 @@ com.google.javascript closure-compiler - v20171112 + v20181008 lib