From cf7a8ea39c80b6c8083e17bda7d92fc7229cba4b Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 1 Jan 2008 22:45:33 +0000 Subject: [PATCH] [ 1712241 ] Delete hard code to set a Column, Tab , Window - partial revert of revision 2414 - enhance logging --- base/src/org/compiere/model/MColumn.java | 5 ++++ base/src/org/compiere/model/MProcess.java | 1 + base/src/org/compiere/model/MTab.java | 6 ++++ base/src/org/compiere/model/MTable.java | 1 + base/src/org/compiere/model/MWindow.java | 2 ++ base/src/org/compiere/print/MPrintFormat.java | 28 +------------------ 6 files changed, 16 insertions(+), 27 deletions(-) diff --git a/base/src/org/compiere/model/MColumn.java b/base/src/org/compiere/model/MColumn.java index c3b7cdc398..8131668843 100644 --- a/base/src/org/compiere/model/MColumn.java +++ b/base/src/org/compiere/model/MColumn.java @@ -18,6 +18,8 @@ package org.compiere.model; import java.sql.*; import java.util.*; +import java.util.logging.Level; + import org.compiere.util.*; /** @@ -63,6 +65,8 @@ public class MColumn extends X_AD_Column /** Cache */ private static CCache s_cache = new CCache("AD_Column", 20); + /** Static Logger */ + private static CLogger s_log = CLogger.getCLogger (MColumn.class); /************************************************************************** * Standard Constructor @@ -509,6 +513,7 @@ public class MColumn extends X_AD_Column } catch (SQLException e) { + s_log.log(Level.SEVERE, SQL, e); retValue = -1; } return retValue; diff --git a/base/src/org/compiere/model/MProcess.java b/base/src/org/compiere/model/MProcess.java index 3c125095c4..75b12123b2 100644 --- a/base/src/org/compiere/model/MProcess.java +++ b/base/src/org/compiere/model/MProcess.java @@ -435,6 +435,7 @@ public class MProcess extends X_AD_Process } catch (Exception e) { + s_log.log(Level.SEVERE, SQL, e); retValue = -1; } return retValue; diff --git a/base/src/org/compiere/model/MTab.java b/base/src/org/compiere/model/MTab.java index 11845329fc..1cbd3f51a0 100644 --- a/base/src/org/compiere/model/MTab.java +++ b/base/src/org/compiere/model/MTab.java @@ -20,6 +20,7 @@ import java.sql.*; import java.util.*; import java.util.logging.*; + import org.compiere.util.*; /** @@ -99,6 +100,10 @@ public class MTab extends X_AD_Tab /** The Fields */ private MField[] m_fields = null; + /** Static Logger */ + private static CLogger s_log = CLogger.getCLogger (MTab.class); + + /** Packages for Model Classes */ /** * Get Fields * @param reload reload data @@ -179,6 +184,7 @@ public class MTab extends X_AD_Tab } catch (SQLException e) { + s_log.log(Level.SEVERE, SQL, e); retValue = -1; } return retValue; diff --git a/base/src/org/compiere/model/MTable.java b/base/src/org/compiere/model/MTable.java index c1a398573e..7189c5d481 100644 --- a/base/src/org/compiere/model/MTable.java +++ b/base/src/org/compiere/model/MTable.java @@ -761,6 +761,7 @@ public class MTable extends X_AD_Table } catch (Exception e) { + s_log.log(Level.SEVERE, SQL, e); retValue = -1; } return retValue; diff --git a/base/src/org/compiere/model/MWindow.java b/base/src/org/compiere/model/MWindow.java index 8d96eba19d..d5d8d7d0ab 100644 --- a/base/src/org/compiere/model/MWindow.java +++ b/base/src/org/compiere/model/MWindow.java @@ -20,6 +20,7 @@ import java.awt.*; import java.sql.*; import java.util.*; import java.util.logging.*; + import org.compiere.util.*; /** @@ -234,6 +235,7 @@ public class MWindow extends X_AD_Window } catch (SQLException e) { + s_log.log(Level.SEVERE, SQL, e); retValue = -1; } return retValue; diff --git a/base/src/org/compiere/print/MPrintFormat.java b/base/src/org/compiere/print/MPrintFormat.java index 49737dc1ca..fa71d32f21 100644 --- a/base/src/org/compiere/print/MPrintFormat.java +++ b/base/src/org/compiere/print/MPrintFormat.java @@ -79,6 +79,7 @@ public class MPrintFormat extends X_AD_PrintFormat /** Table Format */ private MPrintTableFormat m_tFormat; + /** Static Logger */ private static CLogger s_log = CLogger.getCLogger (MPrintFormat.class); /** @@ -841,33 +842,6 @@ public class MPrintFormat extends X_AD_PrintFormat s_formats.put(key, null); } // deleteFromCache - //begin vpj-cd e-evolution - /** - * Get ID of Print Format use Name - * @param String formatName - * @return int retValue - */ - public static int getPrintFormat_ID(String formatName) { - int retValue = 0; - String SQL = "SELECT AD_PrintFormat_ID FROM AD_PrintFormat WHERE Name = ?"; - try - { - PreparedStatement pstmt = DB.prepareStatement(SQL, null); - pstmt.setString(1, formatName); - ResultSet rs = pstmt.executeQuery(); - if (rs.next()) - retValue = rs.getInt(1); - rs.close(); - pstmt.close(); - } - catch (SQLException e) - { - retValue = -1; - } - return retValue; - } - //end vpj-cd e-evolution - /** * @param AD_Table_ID * @param AD_Client_ID use -1 to retrieve from all client