From e7177049db2fc5d39baa64ac34824e6a90c3625b Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 3 Mar 2010 21:43:37 +0000 Subject: [PATCH] peer review for 11533, 11537, 11540 FR: [ 2214883 ] Remove SQL code and Replace for Query Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2214883 --- .../process/ExpenseTypesFromAccounts.java | 30 ++++++++++++++----- base/src/org/compiere/model/MCash.java | 2 +- base/src/org/compiere/model/MContainer.java | 8 +++-- .../org/compiere/model/MConversionRate.java | 3 +- base/src/org/compiere/model/MCurrency.java | 2 +- .../src/org/compiere/model/MProductPrice.java | 5 ---- base/src/org/eevolution/model/MDDOrder.java | 4 +-- 7 files changed, 34 insertions(+), 20 deletions(-) diff --git a/base/src/org/adempiere/process/ExpenseTypesFromAccounts.java b/base/src/org/adempiere/process/ExpenseTypesFromAccounts.java index 87279bf280..8036029d88 100644 --- a/base/src/org/adempiere/process/ExpenseTypesFromAccounts.java +++ b/base/src/org/adempiere/process/ExpenseTypesFromAccounts.java @@ -1,4 +1,4 @@ -/********************************************************************** +/*********************************************************************** * This file is part of Adempiere ERP Bazaar * * http://www.adempiere.org * * * @@ -23,16 +23,32 @@ * Sponsors: * * - Company (http://www.notima.se) * * - Company (http://www.cyberphoto.se) * - ***********************************************************************/ + **********************************************************************/ package org.adempiere.process; import java.math.BigDecimal; -import java.util.*; -import java.util.logging.*; -import org.compiere.model.*; -import org.compiere.process.*; -import org.compiere.util.*; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.logging.Level; + +import org.compiere.model.I_C_ElementValue; +import org.compiere.model.I_C_ValidCombination; +import org.compiere.model.I_M_Product; +import org.compiere.model.I_M_Product_Acct; +import org.compiere.model.MAccount; +import org.compiere.model.MElementValue; +import org.compiere.model.MPriceList; +import org.compiere.model.MPriceListVersion; +import org.compiere.model.MProduct; +import org.compiere.model.MProductPrice; +import org.compiere.model.Query; +import org.compiere.model.X_M_Product_Acct; +import org.compiere.process.ProcessInfoParameter; +import org.compiere.process.SvrProcess; +import org.compiere.util.Env; /** * Creates expense type products from a given range of expense account diff --git a/base/src/org/compiere/model/MCash.java b/base/src/org/compiere/model/MCash.java index 110050e7b1..ba74971354 100644 --- a/base/src/org/compiere/model/MCash.java +++ b/base/src/org/compiere/model/MCash.java @@ -217,7 +217,7 @@ public class MCash extends X_C_Cash implements DocAction return m_lines; } - final String whereClause =MCashLine.COLUMNNAME_C_Cash_ID+"=?"; + final String whereClause =MCashLine.COLUMNNAME_C_Cash_ID+"=?"; List list = new Query(getCtx(),I_C_CashLine.Table_Name, whereClause, get_TrxName()) .setParameters(getC_Cash_ID()) .setOrderBy(I_C_CashLine.COLUMNNAME_Line) diff --git a/base/src/org/compiere/model/MContainer.java b/base/src/org/compiere/model/MContainer.java index 59450a05c2..ac22bf2d05 100644 --- a/base/src/org/compiere/model/MContainer.java +++ b/base/src/org/compiere/model/MContainer.java @@ -32,9 +32,11 @@ import org.compiere.util.DB; */ public class MContainer extends X_CM_Container { - /** serialVersionUID */ - private static final long serialVersionUID = 395679572291279730L; - + /** + * + */ + private static final long serialVersionUID = 3999588662066631303L; + /** * get Container by Relative URL * @param ctx diff --git a/base/src/org/compiere/model/MConversionRate.java b/base/src/org/compiere/model/MConversionRate.java index fa7a782bb9..225dadb3f2 100644 --- a/base/src/org/compiere/model/MConversionRate.java +++ b/base/src/org/compiere/model/MConversionRate.java @@ -46,7 +46,8 @@ public class MConversionRate extends X_C_Conversion_Rate /** * */ - private static final long serialVersionUID = -2753651400799848008L; + private static final long serialVersionUID = -8171829790483133141L; + /** Logger */ private static CLogger s_log = CLogger.getCLogger (MConversionRate.class); diff --git a/base/src/org/compiere/model/MCurrency.java b/base/src/org/compiere/model/MCurrency.java index 9f7410dc1a..493af59a88 100644 --- a/base/src/org/compiere/model/MCurrency.java +++ b/base/src/org/compiere/model/MCurrency.java @@ -105,7 +105,7 @@ public class MCurrency extends X_C_Currency return retValue; // Try database - Query query = new Query(ctx, I_C_Currency.Table_Name, "iso_code=?", null); + Query query = new Query(ctx, I_C_Currency.Table_Name, "ISO_Code=?", null); query.setParameters(ISOcode); retValue = (MCurrency)query.firstOnly(); diff --git a/base/src/org/compiere/model/MProductPrice.java b/base/src/org/compiere/model/MProductPrice.java index c06b52ea89..e35bef4eb9 100644 --- a/base/src/org/compiere/model/MProductPrice.java +++ b/base/src/org/compiere/model/MProductPrice.java @@ -17,14 +17,10 @@ package org.compiere.model; import java.math.BigDecimal; -import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.util.List; import java.util.Properties; -import java.util.logging.Level; import org.compiere.util.CLogger; -import org.compiere.util.DB; import org.compiere.util.Env; /** @@ -35,7 +31,6 @@ import org.compiere.util.Env; */ public class MProductPrice extends X_M_ProductPrice { - /** * */ diff --git a/base/src/org/eevolution/model/MDDOrder.java b/base/src/org/eevolution/model/MDDOrder.java index 571550bf30..1ac5b9954f 100644 --- a/base/src/org/eevolution/model/MDDOrder.java +++ b/base/src/org/eevolution/model/MDDOrder.java @@ -66,7 +66,7 @@ public class MDDOrder extends X_DD_Order implements DocAction /** * */ - private static final long serialVersionUID = -2407222565384020843L; + private static final long serialVersionUID = -5997157712614274458L; /** * Create new Order by copying @@ -433,7 +433,7 @@ public class MDDOrder extends X_DD_Order implements DocAction { StringBuffer whereClauseFinal = new StringBuffer(MDDOrderLine.COLUMNNAME_DD_Order_ID).append("=?"); if (!Util.isEmpty(whereClause, true)) - whereClauseFinal.append("AND (").append(whereClause).append(")"); + whereClauseFinal.append(" AND (").append(whereClause).append(")"); // List list = new Query(getCtx(), I_DD_OrderLine.Table_Name, whereClauseFinal.toString(), get_TrxName()) .setParameters(getDD_Order_ID())