diff --git a/base/src/org/compiere/model/MContainer.java b/base/src/org/compiere/model/MContainer.java index 3318bffde2..44be62824e 100644 --- a/base/src/org/compiere/model/MContainer.java +++ b/base/src/org/compiere/model/MContainer.java @@ -354,7 +354,7 @@ public class MContainer extends X_CM_Container protected void updateTTables (MWebProject project, MCStage stage, String trxName) { - int[] tableKeys = X_CM_CStageTTable.getAllIDs ("CM_CStageTTable", + int[] tableKeys = X_CM_CStageTTable.getAllIDs (I_CM_CStageTTable.Table_Name, "CM_CStage_ID=" + stage.get_ID (), trxName); if (tableKeys != null && tableKeys.length > 0) { @@ -363,7 +363,7 @@ public class MContainer extends X_CM_Container X_CM_CStageTTable thisStageTTable = new X_CM_CStageTTable ( project.getCtx (), tableKeys[i], trxName); int[] thisContainerTTableKeys = X_CM_ContainerTTable.getAllIDs ( - "CM_ContainerTTable", "CM_Container_ID=" + stage.get_ID () + I_CM_ContainerTTable.Table_Name, "CM_Container_ID=" + stage.get_ID () + " AND CM_TemplateTable_ID=" + thisStageTTable.getCM_TemplateTable_ID (), trxName); X_CM_ContainerTTable thisContainerTTable; diff --git a/base/src/org/compiere/model/PO.java b/base/src/org/compiere/model/PO.java index 28bdaed542..33c55f4875 100644 --- a/base/src/org/compiere/model/PO.java +++ b/base/src/org/compiere/model/PO.java @@ -102,7 +102,7 @@ public abstract class PO static protected final String ENTITYTYPE_Dictionary = "D"; /************************************************************************** - * Create New Persisent Object + * Create New Persistent Object * @param ctx context */ public PO (Properties ctx) @@ -175,7 +175,7 @@ public abstract class PO /** * Create New PO by Copying existing (key not copied). * @param ctx context - * @param source souce object + * @param source source object * @param AD_Client_ID client * @param AD_Org_ID org */ @@ -202,7 +202,7 @@ public abstract class PO /** Original Values */ private Object[] m_oldValues = null; - /** New Valies */ + /** New Values */ private Object[] m_newValues = null; /** Record_IDs */ @@ -211,7 +211,7 @@ public abstract class PO private String[] m_KeyColumns = null; /** Create New for Multi Key */ private boolean m_createNew = false; - /** Attachment with entriess */ + /** Attachment with entries */ private MAttachment m_attachment = null; /** Deleted ID */ private int m_idOld = 0; @@ -223,7 +223,7 @@ public abstract class PO /** Accounting Columns */ private ArrayList s_acctColumns = null; - /** TODO - Trifon */ + /** Trifon - Indicates that this record is created by replication functionality.*/ private boolean m_isReplication = false; /** Access Level S__ 100 4 System info */ @@ -266,7 +266,7 @@ public abstract class PO /** * Equals based on ID - * @param cmp comperator + * @param cmp comparator * @return true if ID the same */ public boolean equals (Object cmp) @@ -581,11 +581,11 @@ public abstract class PO /** * Return new - old. - * - New Value if Old Valus is null + * - New Value if Old Value is null * - New Value - Old Value if Number * - otherwise null * @param index index - * @return new - old or null if not appropiate or not changed + * @return new - old or null if not appropriate or not changed */ public final Object get_ValueDifference (int index) { @@ -620,11 +620,11 @@ public abstract class PO /** * Return new - old. - * - New Value if Old Valus is null + * - New Value if Old Value is null * - New Value - Old Value if Number * - otherwise null * @param columnName column name - * @return new - old or null if not appropiate or not changed + * @return new - old or null if not appropriate or not changed */ public final Object get_ValueDifference (String columnName) { @@ -677,7 +677,7 @@ public abstract class PO } // setValueE /** - * Set Value if updateable and correct class. + * Set Value if updteable and correct class. * (and to NULL if not mandatory) * @param index index * @param value value @@ -2564,8 +2564,8 @@ public abstract class PO /** * Get ID for new record during save. - * You can overwite this to explicitly set the ID - * @return ID to be used or 0 for fedault logic + * You can overwrite this to explicitly set the ID + * @return ID to be used or 0 for default logic */ protected int saveNew_getID() { @@ -2738,7 +2738,7 @@ public abstract class PO .append(" WHERE ") .append(get_WhereClause(true)); int no = DB.executeUpdate(sql.toString(), localTrxName); - success = no == 1; + success = no == 1; // Save ID m_idOld = get_ID(); diff --git a/base/src/org/compiere/model/PO_Record.java b/base/src/org/compiere/model/PO_Record.java index 7743870dc8..495f1bf525 100644 --- a/base/src/org/compiere/model/PO_Record.java +++ b/base/src/org/compiere/model/PO_Record.java @@ -25,7 +25,7 @@ import org.compiere.util.DB; import org.compiere.util.Env; /** - * Maintain AD_Table_ID/Record_ID contraint + * Maintain AD_Table_ID/Record_ID constraint * * @author Jorg Janke * @version $Id: PO_Record.java,v 1.4 2006/07/30 00:58:04 jjanke Exp $ diff --git a/base/src/org/compiere/util/Trace.java b/base/src/org/compiere/util/Trace.java index c3cae5dcd8..1526f27e7c 100644 --- a/base/src/org/compiere/util/Trace.java +++ b/base/src/org/compiere/util/Trace.java @@ -30,7 +30,7 @@ public class Trace /** * Get Caller Array * - * @param caller Optional Thowable/Exception + * @param caller Optional Throwable/Exception * @param maxNestLevel maximum call nesting level - 0 is all * @return Array of class.method(file:line) */ @@ -86,7 +86,7 @@ public class Trace } // isCalledFrom /** - * Print Stack Tace Info (raw) adempiereOnly - first9only + * Print Stack Trace Info (raw) adempiereOnly - first9only */ public static void printStack() { @@ -94,7 +94,7 @@ public class Trace } // printStack /** - * Print Stack Tace Info (raw) + * Print Stack Trace Info (raw) */ public static void printStack (boolean adempiereOnly, boolean first9only) { diff --git a/base/src/org/eevolution/model/wrapper/AbstractPOWrapper.java b/base/src/org/eevolution/model/wrapper/AbstractPOWrapper.java index 4eb705d9de..5256bdf827 100644 --- a/base/src/org/eevolution/model/wrapper/AbstractPOWrapper.java +++ b/base/src/org/eevolution/model/wrapper/AbstractPOWrapper.java @@ -53,7 +53,7 @@ public abstract class AbstractPOWrapper { /** * Equals based on ID - * @param cmp comperator + * @param cmp comparator * @return true if ID the same */ public boolean equals(Object cmp) { @@ -190,11 +190,11 @@ public abstract class AbstractPOWrapper { /** * Return new - old. - * - New Value if Old Valus is null + * - New Value if Old Value is null * - New Value - Old Value if Number * - otherwise null * @param index index - * @return new - old or null if not appropiate or not changed + * @return new - old or null if not appropriate or not changed */ public Object get_ValueDifference(int index) { @@ -203,11 +203,11 @@ public abstract class AbstractPOWrapper { /** * Return new - old. - * - New Value if Old Valus is null + * - New Value if Old Value is null * - New Value - Old Value if Number * - otherwise null * @param columnName column name - * @return new - old or null if not appropiate or not changed + * @return new - old or null if not appropriate or not changed */ public Object get_ValueDifference(String columnName) { diff --git a/base/src/org/eevolution/model/wrapper/BOMWrapper.java b/base/src/org/eevolution/model/wrapper/BOMWrapper.java index a73faa4bea..1f7f928aad 100644 --- a/base/src/org/eevolution/model/wrapper/BOMWrapper.java +++ b/base/src/org/eevolution/model/wrapper/BOMWrapper.java @@ -20,6 +20,8 @@ import java.sql.Timestamp; import java.util.Properties; import org.compiere.model.PO; +import org.eevolution.model.I_PP_Order_BOM; +import org.eevolution.model.I_PP_Product_BOM; import org.eevolution.model.MPPOrderBOM; import org.eevolution.model.MPPProductBOM; import org.eevolution.model.reasoner.StorageReasoner; @@ -35,14 +37,11 @@ public class BOMWrapper extends AbstractPOWrapper { public static String tableName(String type) { - if(BOM_TYPE_PRODUCT.equals(type)) { - - return MPPProductBOM.Table_Name; + if (BOM_TYPE_PRODUCT.equals(type)) { + return I_PP_Product_BOM.Table_Name; } else if(BOM_TYPE_ORDER.equals(type)) { - - //eevolution vpj-cd new version return MPPOrderBOM.Table_Name; - return MPPOrderBOM.Table_Name; + return I_PP_Order_BOM.Table_Name; } return ""; @@ -51,15 +50,11 @@ public class BOMWrapper extends AbstractPOWrapper { public static String idColumn(String type) { String value = null; - if(BOM_TYPE_PRODUCT.equals(type)) { - -// eevolution vpj-cd new version value = MPPProductBOM.Table_Name; - return "PP_Product_BOM"; + if (BOM_TYPE_PRODUCT.equals(type)) { + return I_PP_Product_BOM.Table_Name; } else if(BOM_TYPE_ORDER.equals(type)) { - -// eevolution vpj-cd new version value = MPPOrderBOM.Table_Name; - return "PP_Order_BOM"; + return I_PP_Order_BOM.Table_Name; } return value+"_ID";