From cb40da8cc6b34a2c0f3d43c6d7ce567e2e71233a Mon Sep 17 00:00:00 2001 From: vpj-cd Date: Tue, 9 Sep 2008 18:26:55 +0000 Subject: [PATCH] Current ADempiere use DB.getNextID for get next sequence vs MSequence.getNextID, so in the future the developer need use only DB.getNextID --- base/src/org/adempiere/pipo/AbstractElementHandler.java | 6 +++--- base/src/org/adempiere/pipo/PackInHandler.java | 4 ++-- .../adempiere/pipo/handler/CodeSnipitElementHandler.java | 2 +- .../org/adempiere/pipo/handler/DistFileElementHandler.java | 2 +- base/src/org/adempiere/pipo/handler/MenuElementHandler.java | 2 +- .../org/adempiere/pipo/handler/ProcessElementHandler.java | 2 +- base/src/org/adempiere/process/PrepareMigrationScripts.java | 2 +- .../src/main/ejb/org/compiere/session/ServerBean.java | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/base/src/org/adempiere/pipo/AbstractElementHandler.java b/base/src/org/adempiere/pipo/AbstractElementHandler.java index 4da8d38423..ae1341fcd2 100644 --- a/base/src/org/adempiere/pipo/AbstractElementHandler.java +++ b/base/src/org/adempiere/pipo/AbstractElementHandler.java @@ -100,7 +100,7 @@ public abstract class AbstractElementHandler implements ElementHandler { //String sql2 = "SELECT MAX(AD_PACKAGE_IMP_DETAIL_ID) FROM AD_PACKAGE_IMP_DETAIL"; //int id = DB.getSQLValue(m_trxName, sql2)+1; - id = MSequence.getNextID (Env.getAD_Client_ID(ctx), "AD_Package_Imp_Detail", getTrxName(ctx)); + id = DB.getNextID (Env.getAD_Client_ID(ctx), "AD_Package_Imp_Detail", getTrxName(ctx)); StringBuffer sqlB = new StringBuffer ("Insert INTO AD_Package_Imp_Detail") .append( "(AD_Client_ID, AD_Org_ID, CreatedBy, UpdatedBy, " ) @@ -147,7 +147,7 @@ public abstract class AbstractElementHandler implements ElementHandler { //String sql2 = "SELECT MAX(AD_PACKAGE_IMP_DETAIL_ID) FROM AD_PACKAGE_IMP_DETAIL"; //int id = DB.getSQLValue(m_trxName,sql2)+1; - id = MSequence.getNextID (Env.getAD_Client_ID(ctx), "AD_Package_Imp_Detail", getTrxName(ctx)); + id = DB.getNextID (Env.getAD_Client_ID(ctx), "AD_Package_Imp_Detail", getTrxName(ctx)); StringBuffer sqlB = new StringBuffer ("Insert INTO AD_Package_Imp_Detail") .append( "(AD_Client_ID, AD_Org_ID, CreatedBy, UpdatedBy, " ) @@ -249,7 +249,7 @@ public abstract class AbstractElementHandler implements ElementHandler { StringBuffer sqlD = new StringBuffer("SELECT AD_Reference_ID FROM AD_COLUMN WHERE AD_Column_ID = '"+columnID+"'"); int referenceID = DB.getSQLValue(getTrxName(ctx),sqlD.toString()); - idBackup = MSequence.getNextID (getClientId(ctx), "AD_Package_Imp_Backup", getTrxName(ctx)); + idBackup = DB.getNextID (getClientId(ctx), "AD_Package_Imp_Backup", getTrxName(ctx)); sqlD = new StringBuffer("SELECT MAX(AD_PACKAGE_IMP_DETAIL_ID) FROM AD_PACKAGE_IMP_DETAIL"); int idDetail = DB.getSQLValue(getTrxName(ctx),sqlD.toString())+1; diff --git a/base/src/org/adempiere/pipo/PackInHandler.java b/base/src/org/adempiere/pipo/PackInHandler.java index fa23f2ae35..6b5e707517 100644 --- a/base/src/org/adempiere/pipo/PackInHandler.java +++ b/base/src/org/adempiere/pipo/PackInHandler.java @@ -314,7 +314,7 @@ public class PackInHandler extends DefaultHandler { + "' AND PK_VERSION ='" + atts.getValue("Version") + "'"; int PK_preInstalled = DB.getSQLValue(m_trxName,sql2); - AD_Package_Imp_ID = MSequence.getNextID (Env.getAD_Client_ID(m_ctx), "AD_Package_Imp", null); + AD_Package_Imp_ID = DB.getNextID (Env.getAD_Client_ID(m_ctx), "AD_Package_Imp", null); StringBuffer sqlB = new StringBuffer ("Insert INTO AD_Package_Imp") .append( "(AD_Client_ID, AD_Org_ID, CreatedBy, UpdatedBy, " ) @@ -344,7 +344,7 @@ public class PackInHandler extends DefaultHandler { log.info("Insert to Package import failed"); if ( PK_preInstalled == -1){ - AD_Package_Imp_Inst_ID = MSequence.getNextID (Env.getAD_Client_ID(m_ctx), "AD_Package_Imp_Inst", null); + AD_Package_Imp_Inst_ID = DB.getNextID (Env.getAD_Client_ID(m_ctx), "AD_Package_Imp_Inst", null); //Insert Package into package install log sqlB = new StringBuffer ("Insert INTO AD_Package_Imp_Inst") diff --git a/base/src/org/adempiere/pipo/handler/CodeSnipitElementHandler.java b/base/src/org/adempiere/pipo/handler/CodeSnipitElementHandler.java index cc70e398ff..b600cc678f 100644 --- a/base/src/org/adempiere/pipo/handler/CodeSnipitElementHandler.java +++ b/base/src/org/adempiere/pipo/handler/CodeSnipitElementHandler.java @@ -127,7 +127,7 @@ public class CodeSnipitElementHandler extends AbstractElementHandler { int success = readReplace(targetDirectoryModified+sourceName, oldCode, newCode); // Record in log - int idBackup = MSequence.getNextID (getClientId(ctx), "AD_Package_Imp_Backup", getTrxName(ctx)); + int idBackup = DB.getNextID (getClientId(ctx), "AD_Package_Imp_Backup", getTrxName(ctx)); if (success != -1){ try { idDetail = record_log (ctx, 1, sourceName,"codesnipit", 0,0, Object_Status,sourceName,0); diff --git a/base/src/org/adempiere/pipo/handler/DistFileElementHandler.java b/base/src/org/adempiere/pipo/handler/DistFileElementHandler.java index 4c5fe04328..3c7494dd49 100644 --- a/base/src/org/adempiere/pipo/handler/DistFileElementHandler.java +++ b/base/src/org/adempiere/pipo/handler/DistFileElementHandler.java @@ -139,7 +139,7 @@ public class DistFileElementHandler extends AbstractElementHandler { //Copy File int success = copyFile (inputStream,outputStream); //Record in log - int idBackup = MSequence.getNextID (getClientId(ctx), "AD_Package_Imp_Backup", getTrxName(ctx)); + int idBackup = DB.getNextID (getClientId(ctx), "AD_Package_Imp_Backup", getTrxName(ctx)); if (success != -1){ try { idDetail = record_log (ctx, 1, fileName,"file", 0,0, Object_Status,fileName,0); diff --git a/base/src/org/adempiere/pipo/handler/MenuElementHandler.java b/base/src/org/adempiere/pipo/handler/MenuElementHandler.java index f8ce98708c..0db783d8d0 100644 --- a/base/src/org/adempiere/pipo/handler/MenuElementHandler.java +++ b/base/src/org/adempiere/pipo/handler/MenuElementHandler.java @@ -193,7 +193,7 @@ public class MenuElementHandler extends AbstractElementHandler { + (columnID == -1 ? "null" : columnID)); int referenceID = DB.getSQLValue(getTrxName(ctx), sql .toString()); - int idBackup = MSequence.getNextID(Env + int idBackup = DB.getNextID(Env .getAD_Client_ID(ctx), "AD_Package_Imp_Backup", getTrxName(ctx)); if (referenceID == 20 || referenceID == 28) diff --git a/base/src/org/adempiere/pipo/handler/ProcessElementHandler.java b/base/src/org/adempiere/pipo/handler/ProcessElementHandler.java index fc71ee6345..f811b60452 100644 --- a/base/src/org/adempiere/pipo/handler/ProcessElementHandler.java +++ b/base/src/org/adempiere/pipo/handler/ProcessElementHandler.java @@ -68,7 +68,7 @@ public class ProcessElementHandler extends AbstractElementHandler { Object_Status = "Update"; } else { m_Process = new X_AD_Process(ctx, id, getTrxName(ctx)); - id = MSequence.getNextID(Env.getAD_Client_ID(ctx), + id = DB.getNextID(Env.getAD_Client_ID(ctx), "AD_Process", getTrxName(ctx)); m_Process.setAD_Process_ID(id); Object_Status = "New"; diff --git a/base/src/org/adempiere/process/PrepareMigrationScripts.java b/base/src/org/adempiere/process/PrepareMigrationScripts.java index d5db2a5be3..67efdc6161 100644 --- a/base/src/org/adempiere/process/PrepareMigrationScripts.java +++ b/base/src/org/adempiere/process/PrepareMigrationScripts.java @@ -181,7 +181,7 @@ public class PrepareMigrationScripts extends SvrProcess { isFirstLine = false; } scanner.close(); - int seqID = MSequence.getNextID(0, "AD_MigrationScript", this + int seqID = DB.getNextID(0, "AD_MigrationScript", this .get_TrxName()); String sql = "INSERT INTO ad_migrationscript (ad_client_id, ad_org_id, " + "ad_migrationscript_id, createdby, " diff --git a/serverRoot/src/main/ejb/org/compiere/session/ServerBean.java b/serverRoot/src/main/ejb/org/compiere/session/ServerBean.java index 5fe61d9e73..63cf69c5b7 100644 --- a/serverRoot/src/main/ejb/org/compiere/session/ServerBean.java +++ b/serverRoot/src/main/ejb/org/compiere/session/ServerBean.java @@ -464,7 +464,7 @@ public class ServerBean implements SessionBean throw new RuntimeException("Transaction lost - " + trxName); } } - int retValue = MSequence.getNextID (AD_Client_ID, TableName, trxName); + int retValue = DB.getNextID (AD_Client_ID, TableName, trxName); log.finer("[" + m_no + "] " + TableName + " = " + retValue); m_nextSeqCount++; return retValue;