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

IDEMPIERE-455 Discover and fix FindBugs problems / Eclipse warning -> dead code / drop unused cache

This commit is contained in:
Carlos Ruiz 2012-12-20 14:59:03 -05:00
parent c7ed781ae4
commit c39047eb17
1 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
org.adempiere.base/src/org/compiere/model/MAssetAcct.java
View File

@ -6,11 +6,6 @@ import java.sql.Timestamp;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Properties; import java.util.Properties;
import org.apache.commons.collections.keyvalue.MultiKey;
import org.compiere.model.MAccount;
import org.compiere.model.MAcctSchema;
import org.compiere.model.ProductCost;
import org.compiere.model.Query;
import org.compiere.util.CCache; import org.compiere.util.CCache;
import org.compiere.util.Env; import org.compiere.util.Env;
import org.compiere.util.TimeUtil; import org.compiere.util.TimeUtil;
@ -21,8 +16,6 @@ import org.compiere.util.TimeUtil;
*/ */
public class MAssetAcct extends X_A_Asset_Acct public class MAssetAcct extends X_A_Asset_Acct
{ {
/** /**
* *
*/ */
@ -47,8 +40,6 @@ public class MAssetAcct extends X_A_Asset_Acct
/** Static Cache: A_Asset_Acct_ID -> MAssetAcct */ /** Static Cache: A_Asset_Acct_ID -> MAssetAcct */
private static CCache<Integer,MAssetAcct> s_cache = new CCache<Integer,MAssetAcct>(Table_Name, 5); private static CCache<Integer,MAssetAcct> s_cache = new CCache<Integer,MAssetAcct>(Table_Name, 5);
/** Static Cache: Asset,PostingType,DateAcct -> MAssetAcct */
private static CCache<MultiKey,MAssetAcct> s_cacheAsset = new CCache<MultiKey,MAssetAcct>(Table_Name, Table_Name+"_Asset", 5, false);
/** /**
* Get Asset Accounting (from cache) * Get Asset Accounting (from cache)
@ -66,7 +57,7 @@ public class MAssetAcct extends X_A_Asset_Acct
acct = new MAssetAcct(ctx, A_Asset_Acct_ID, null); acct = new MAssetAcct(ctx, A_Asset_Acct_ID, null);
if (acct.get_ID() > 0) if (acct.get_ID() > 0)
{ {
addToCache(acct, null); addToCache(acct);
} }
else else
{ {
@ -85,17 +76,6 @@ public class MAssetAcct extends X_A_Asset_Acct
*/ */
public static MAssetAcct forA_Asset_ID (Properties ctx, int A_Asset_ID, String postingType, Timestamp dateAcct, String trxName) public static MAssetAcct forA_Asset_ID (Properties ctx, int A_Asset_ID, String postingType, Timestamp dateAcct, String trxName)
{ {
MultiKey key = new MultiKey(A_Asset_ID, postingType, dateAcct);
MAssetAcct acct = null;
if (trxName == null)
{
// do not use cache
//acct = s_cacheAsset.get(key);
}
if (acct != null)
{
return acct;
}
// //
ArrayList<Object> params = new ArrayList<Object>(); ArrayList<Object> params = new ArrayList<Object>();
StringBuilder whereClause = new StringBuilder(COLUMNNAME_A_Asset_ID+"=? AND "+COLUMNNAME_PostingType+"=?"); StringBuilder whereClause = new StringBuilder(COLUMNNAME_A_Asset_ID+"=? AND "+COLUMNNAME_PostingType+"=?");
@ -106,28 +86,24 @@ public class MAssetAcct extends X_A_Asset_Acct
whereClause.append(" AND " + COLUMNNAME_ValidFrom).append("<=?"); whereClause.append(" AND " + COLUMNNAME_ValidFrom).append("<=?");
params.add(dateAcct); params.add(dateAcct);
} }
acct = new Query(ctx, Table_Name, whereClause.toString(), trxName) MAssetAcct acct = new Query(ctx, Table_Name, whereClause.toString(), trxName)
.setParameters(params) .setParameters(params)
.setOrderBy(COLUMNNAME_ValidFrom+" DESC NULLS LAST") .setOrderBy(COLUMNNAME_ValidFrom+" DESC NULLS LAST")
.first(); .first();
if (trxName == null) if (trxName == null)
{ {
addToCache(acct, key); addToCache(acct);
} }
return acct; return acct;
} }
private static void addToCache(MAssetAcct acct, MultiKey keyAsset) private static void addToCache(MAssetAcct acct)
{ {
if (acct == null || acct.get_ID() <= 0) if (acct == null || acct.get_ID() <= 0)
{ {
return; return;
} }
s_cache.put(acct.get_ID(), acct); s_cache.put(acct.get_ID(), acct);
if (keyAsset != null)
{
s_cacheAsset.put(keyAsset, acct);
}
} }
/** /**