midsuit
/
core-jgi
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

peer review for 11547 - minor changes 

FR: [ 2214883 ] Remove SQL code and Replace for Query
Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2214883
This commit is contained in:
Carlos Ruiz 2010-03-03 23:04:46 +00:00
parent 98c74ef980
commit 1a06e21024
7 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
base/src/org/compiere/model/MDocType.java
View File

@ -77,9 +77,8 @@ public class MDocType extends X_C_DocType
*/ */
static public MDocType[] getOfClient (Properties ctx) static public MDocType[] getOfClient (Properties ctx)
{ {
final String whereClause = "AD_Client_ID=?"; List<MDocType> list = new Query(ctx, Table_Name, null, null)
List<MDocType> list = new Query(ctx, Table_Name, whereClause, null) .setClient_ID()
.setParameters(Env.getAD_Client_ID(ctx))
.setOnlyActiveRecords(true) .setOnlyActiveRecords(true)
.list(); .list();
return list.toArray(new MDocType[list.size()]); return list.toArray(new MDocType[list.size()]);

16
base/src/org/compiere/model/MEXPFormat.java
View File

@ -130,18 +130,18 @@ public class MEXPFormat extends X_EXP_Format {
if(retValue!=null) if(retValue!=null)
return retValue; return retValue;
StringBuffer whereCluse = new StringBuffer(X_EXP_Format.COLUMNNAME_Value).append("=?") StringBuffer whereClause = new StringBuffer(X_EXP_Format.COLUMNNAME_Value).append("=?")
.append(" AND AD_Client_ID = ?") .append(" AND AD_Client_ID = ?")
.append(" AND ").append(X_EXP_Format.COLUMNNAME_Version).append(" = ?"); .append(" AND ").append(X_EXP_Format.COLUMNNAME_Version).append(" = ?");
retValue = (MEXPFormat) new Query(ctx,X_EXP_Format.Table_Name,whereCluse.toString(),trxName) retValue = (MEXPFormat) new Query(ctx,X_EXP_Format.Table_Name,whereClause.toString(),trxName)
.setParameters(value,AD_Client_ID,version).first(); .setParameters(value,AD_Client_ID,version).first();
if(retValue != null) if(retValue != null)
{ {
retValue.getFormatLines(); retValue.getFormatLines();
s_cache.put (key, retValue); s_cache.put (key, retValue);
exp_format_by_id_cache.put(retValue.getEXP_Format_ID(), retValue); exp_format_by_id_cache.put(retValue.getEXP_Format_ID(), retValue);
} }
return retValue; return retValue;
@ -165,9 +165,9 @@ public class MEXPFormat extends X_EXP_Format {
.first(); .first();
if(retValue!=null) if(retValue!=null)
{ {
retValue.getFormatLines(); retValue.getFormatLines();
s_cache.put (key, retValue); s_cache.put (key, retValue);
exp_format_by_id_cache.put(retValue.getEXP_Format_ID(), retValue); exp_format_by_id_cache.put(retValue.getEXP_Format_ID(), retValue);
} }
return retValue; return retValue;

6
base/src/org/compiere/model/MFreightCategory.java
View File

@ -32,8 +32,6 @@ package org.compiere.model;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.util.Properties; import java.util.Properties;
import org.compiere.util.Env;
/** /**
* *
* @author Daniel Tamm * @author Daniel Tamm
@ -80,8 +78,8 @@ public class MFreightCategory extends X_M_FreightCategory {
*/ */
public static MFreightCategory getByValue(Properties ctx, String value, String trxName) { public static MFreightCategory getByValue(Properties ctx, String value, String trxName) {
Query q = new Query(ctx, I_M_FreightCategory.Table_Name, "Value=? AND AD_Client_ID=?", trxName); Query q = new Query(ctx, I_M_FreightCategory.Table_Name, "Value=?", trxName);
q.setParameters(value, Env.getAD_Client_ID(ctx)); q.setParameters(value).setClient_ID();
return q.first(); return q.first();
} }

5
base/src/org/compiere/model/MInventory.java
View File

@ -48,8 +48,7 @@ public class MInventory extends X_M_Inventory implements DocAction
/** /**
* *
*/ */
private static final long serialVersionUID = 910998472569265447L; private static final long serialVersionUID = -7137974064086172763L;
/** /**
* Get Inventory from Cache * Get Inventory from Cache
@ -145,7 +144,7 @@ public class MInventory extends X_M_Inventory implements DocAction
return m_lines; return m_lines;
} }
// //
List<MInventoryLine> list = new Query(getCtx(), MInventoryLine.Table_Name, "M_Inventory_ID=?", get_TrxName()) List<MInventoryLine> list = new Query(getCtx(), I_M_InventoryLine.Table_Name, "M_Inventory_ID=?", get_TrxName())
.setParameters(get_ID()) .setParameters(get_ID())
.setOrderBy(MInventoryLine.COLUMNNAME_Line) .setOrderBy(MInventoryLine.COLUMNNAME_Line)
.list(); .list();

3
base/src/org/compiere/model/MInventoryLine.java
View File

@ -39,8 +39,7 @@ public class MInventoryLine extends X_M_InventoryLine
/** /**
* *
*/ */
private static final long serialVersionUID = 1336000922103246463L; private static final long serialVersionUID = 5649152656460089476L;
/** /**
* Get Inventory Line with parameters * Get Inventory Line with parameters

2
base/src/org/compiere/model/MJournal.java
View File

@ -216,7 +216,7 @@ public class MJournal extends X_GL_Journal implements DocAction
{ {
//FR: [ 2214883 ] Remove SQL code and Replace for Query - red1 //FR: [ 2214883 ] Remove SQL code and Replace for Query - red1
final String whereClause = "GL_Journal_ID=?"; final String whereClause = "GL_Journal_ID=?";
List <MJournalLine> list = new Query(getCtx(), I_GL_JournalLine.Table_Name, whereClause.toString(), null) List <MJournalLine> list = new Query(getCtx(), I_GL_JournalLine.Table_Name, whereClause, null)
.setParameters(getGL_Journal_ID()) .setParameters(getGL_Journal_ID())
.setOrderBy("Line") .setOrderBy("Line")
.list(); .list();

1
base/src/org/compiere/model/MLanguage.java
View File

@ -138,7 +138,6 @@ public class MLanguage extends X_AD_Language
* @param LanguageISO language code * @param LanguageISO language code
* @param trxName transaction * @param trxName transaction
*/ */
@SuppressWarnings("unused")
private MLanguage (Properties ctx, String AD_Language, String Name, private MLanguage (Properties ctx, String AD_Language, String Name,
String CountryCode, String LanguageISO, String trxName) String CountryCode, String LanguageISO, String trxName)
{ {