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

FR: [ 2214883 ] Remove SQL code and Replace for Query 

-- JUnit test in next commit (no failures)
Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2214883
This commit is contained in:
Redhuan D. Oon 2010-03-21 02:59:39 +00:00
parent 93fbc42293
commit d8cf0e8621
1 changed files with 25 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
base/src/org/compiere/model/MDistribution.java
View File

@ -17,22 +17,21 @@
package org.compiere.model; package org.compiere.model;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import java.util.Properties; import java.util.Properties;
import java.util.logging.Level;
import org.compiere.util.CCache; import org.compiere.util.CCache;
import org.compiere.util.CLogMgt; import org.compiere.util.CLogMgt;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.DB;
import org.compiere.util.Env; import org.compiere.util.Env;
/** /**
* GL Distribution Model * GL Distribution Model
* *
* @author Jorg Janke * @author Jorg Janke
* @author red1 FR: [ 2214883 ] Remove SQL code and Replace for Query
* @version $Id: MDistribution.java,v 1.3 2006/07/30 00:51:03 jjanke Exp $ * @version $Id: MDistribution.java,v 1.3 2006/07/30 00:51:03 jjanke Exp $
*/ */
public class MDistribution extends X_GL_Distribution public class MDistribution extends X_GL_Distribution
@ -158,36 +157,11 @@ public class MDistribution extends X_GL_Distribution
MDistribution[] retValue = (MDistribution[])s_accounts.get(key); MDistribution[] retValue = (MDistribution[])s_accounts.get(key);
if (retValue != null) if (retValue != null)
return retValue; return retValue;
final String whereClause = I_GL_Distribution.COLUMNNAME_Account_ID;
String sql = "SELECT * FROM GL_Distribution "
+ "WHERE Account_ID=?"; List<MDistribution> list = new Query(ctx,I_GL_Distribution.Table_Name,whereClause+"=?",null)
ArrayList<MDistribution> list = new ArrayList<MDistribution>(); .setParameters(Account_ID)
PreparedStatement pstmt = null; .list();
try
{
pstmt = DB.prepareStatement (sql, null);
pstmt.setInt (1, Account_ID);
ResultSet rs = pstmt.executeQuery ();
while (rs.next ())
list.add (new MDistribution (ctx, rs, null));
rs.close ();
pstmt.close ();
pstmt = null;
}
catch (Exception e)
{
s_log.log(Level.SEVERE, sql, e);
}
try
{
if (pstmt != null)
pstmt.close ();
pstmt = null;
}
catch (Exception e)
{
pstmt = null;
}
// //
retValue = new MDistribution[list.size ()]; retValue = new MDistribution[list.size ()];
list.toArray (retValue); list.toArray (retValue);
@ -259,56 +233,32 @@ public class MDistribution extends X_GL_Distribution
if (m_lines != null && !reload) { if (m_lines != null && !reload) {
set_TrxName(m_lines, get_TrxName()); set_TrxName(m_lines, get_TrxName());
return m_lines; return m_lines;
} }
BigDecimal PercentTotal = Env.ZERO; BigDecimal PercentTotal = Env.ZERO;
ArrayList<MDistributionLine> list = new ArrayList<MDistributionLine>(); //red1 Query
String sql = "SELECT * FROM GL_DistributionLine " final String whereClause = I_GL_DistributionLine.COLUMNNAME_GL_Distribution_ID+"=?";
+ "WHERE GL_Distribution_ID=? ORDER BY Line"; List<MDistributionLine> list = new Query(getCtx(),I_GL_DistributionLine.Table_Name,whereClause,get_TrxName())
.setParameters(getGL_Distribution_ID())
.setOrderBy("Line")
.list();
//red1 Query -end-
boolean hasNullRemainder = false; boolean hasNullRemainder = false;
PreparedStatement pstmt = null; for (MDistributionLine dl:list){
try if (dl.isActive())
{
pstmt = DB.prepareStatement (sql, get_TrxName());
pstmt.setInt (1, getGL_Distribution_ID());
ResultSet rs = pstmt.executeQuery ();
while (rs.next ())
{
MDistributionLine dl = new MDistributionLine (getCtx(), rs, get_TrxName());
if (dl.isActive())
{ {
PercentTotal = PercentTotal.add(dl.getPercent()); PercentTotal = PercentTotal.add(dl.getPercent());
hasNullRemainder = Env.ZERO.compareTo(dl.getPercent()) == 0; hasNullRemainder = Env.ZERO.compareTo(dl.getPercent()) == 0;
} }
dl.setParent(this); dl.setParent(this);
list.add (dl); // Update Ratio when saved and difference
if (hasNullRemainder)
PercentTotal = Env.ONEHUNDRED;
if (get_ID() != 0 && PercentTotal.compareTo(getPercentTotal()) != 0)
{
setPercentTotal(PercentTotal);
save();
}
} }
rs.close ();
pstmt.close ();
pstmt = null;
}
catch (Exception e)
{
log.log(Level.SEVERE, "getLines", e);
}
try
{
if (pstmt != null)
pstmt.close ();
pstmt = null;
}
catch (Exception e)
{
pstmt = null;
}
// Update Ratio when saved and difference
if (hasNullRemainder)
PercentTotal = Env.ONEHUNDRED;
if (get_ID() != 0 && PercentTotal.compareTo(getPercentTotal()) != 0)
{
setPercentTotal(PercentTotal);
save();
}
// return // return
m_lines = new MDistributionLine[list.size ()]; m_lines = new MDistributionLine[list.size ()];
list.toArray (m_lines); list.toArray (m_lines);