From f95f2f2f6dd492eddc4842db6f68d31c6bc03a75 Mon Sep 17 00:00:00 2001 From: "Redhuan D. Oon" Date: Sat, 6 Mar 2010 16:22:12 +0000 Subject: [PATCH] FR: [ 2214883 ] Remove SQL code and Replace for Query -- JUnit test pending Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2214883 --- base/src/org/compiere/model/MWindow.java | 44 +++--------------------- 1 file changed, 5 insertions(+), 39 deletions(-) diff --git a/base/src/org/compiere/model/MWindow.java b/base/src/org/compiere/model/MWindow.java index 357fed5ff3..a0cd83fd6c 100644 --- a/base/src/org/compiere/model/MWindow.java +++ b/base/src/org/compiere/model/MWindow.java @@ -20,7 +20,6 @@ import java.awt.Dimension; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.ArrayList; import java.util.List; import java.util.Properties; import java.util.logging.Level; @@ -98,27 +97,11 @@ public class MWindow extends X_AD_Window { if (m_tabs != null && !reload) return m_tabs; - String sql = "SELECT * FROM AD_Tab WHERE AD_Window_ID=? ORDER BY SeqNo"; - ArrayList list = new ArrayList(); - PreparedStatement pstmt = null; - ResultSet rs = null; - try - { - pstmt = DB.prepareStatement (sql, trxName); - pstmt.setInt (1, getAD_Window_ID()); - rs = pstmt.executeQuery (); - while (rs.next ()) - list.add (new MTab (getCtx(), rs, trxName)); - } - catch (Exception e) - { - log.log(Level.SEVERE, sql, e); - } - finally - { - DB.close(rs, pstmt); - rs = null; pstmt = null; - } + final String whereClause = I_AD_Window.COLUMNNAME_AD_Window_ID+"=?"; + List list = new Query(getCtx(),I_AD_Window.Table_Name,whereClause,trxName) + .setParameters(getAD_Window_ID()) + .setOrderBy("SeqNo") + .list(); // m_tabs = new MTab[list.size ()]; list.toArray (m_tabs); @@ -196,23 +179,6 @@ public class MWindow extends X_AD_Window List list = new Query(ctx,X_AD_WF_Node.Table_Name,whereClause,trxName) .list(); - PreparedStatement pstmt = null; - ResultSet rs = null; - try - { - pstmt = DB.prepareStatement (sql, trxName); - rs = pstmt.executeQuery (); - while (rs.next ()) - list.add (new X_AD_WF_Node (ctx, rs, trxName)); - } - catch (Exception e) - { - s_log.log(Level.SEVERE, sql, e); - } - finally { - DB.close(rs, pstmt); - rs = null; pstmt = null; - } X_AD_WF_Node[] retValue = new X_AD_WF_Node[list.size()]; list.toArray (retValue); return retValue;