From 8b2806797f872ff7a64e2c4875ac1492cb72f245 Mon Sep 17 00:00:00 2001 From: Elaine Tan Date: Fri, 5 Jul 2013 15:27:02 +0800 Subject: [PATCH] IDEMPIERE-1129 Missing MPrintFont constructor - add the missing loader constructor to MColor, MQualityTestResult, MReplicationStrategy, MReplicationRun, MReplicationLog, MReplication, MSearchDefinition, MPrintColor, MReportColumnSet, MReportLineSet and regenerate serialVersionUID --- .../src/org/compiere/model/MColor.java | 7 ++++++- .../org/compiere/model/MQualityTestResult.java | 8 +++++++- .../src/org/compiere/model/MReplication.java | 8 +++++++- .../src/org/compiere/model/MReplicationLog.java | 10 ++++++++-- .../src/org/compiere/model/MReplicationRun.java | 8 +++++++- .../org/compiere/model/MReplicationStrategy.java | 15 ++++++++++----- .../src/org/compiere/model/MSearchDefinition.java | 6 +++++- .../src/org/compiere/print/MPrintColor.java | 9 +++++++-- .../src/org/compiere/print/MPrintFont.java | 2 +- .../src/org/compiere/report/MReportColumnSet.java | 7 ++++++- .../src/org/compiere/report/MReportLineSet.java | 7 ++++++- 11 files changed, 70 insertions(+), 17 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MColor.java b/org.adempiere.base/src/org/compiere/model/MColor.java index ae63a0900b..fb5958306b 100644 --- a/org.adempiere.base/src/org/compiere/model/MColor.java +++ b/org.adempiere.base/src/org/compiere/model/MColor.java @@ -34,7 +34,7 @@ public class MColor extends X_AD_Color /** * */ - private static final long serialVersionUID = 8672637038417465668L; + private static final long serialVersionUID = 3054697070898921956L; /** * Color Model @@ -48,6 +48,11 @@ public class MColor extends X_AD_Color if (AD_Color_ID == 0) setName("-/-"); } // MColor + + public MColor(Properties ctx, ResultSet rs, String trxName) + { + super (ctx, rs, trxName); + } /** * String Representation diff --git a/org.adempiere.base/src/org/compiere/model/MQualityTestResult.java b/org.adempiere.base/src/org/compiere/model/MQualityTestResult.java index 34364b0040..a4b3b73c47 100644 --- a/org.adempiere.base/src/org/compiere/model/MQualityTestResult.java +++ b/org.adempiere.base/src/org/compiere/model/MQualityTestResult.java @@ -1,5 +1,6 @@ package org.compiere.model; +import java.sql.ResultSet; import java.util.Properties; public class MQualityTestResult extends X_M_QualityTestResult { @@ -7,11 +8,16 @@ public class MQualityTestResult extends X_M_QualityTestResult { /** * */ - private static final long serialVersionUID = -4253026765149175778L; + private static final long serialVersionUID = -5529865718027582930L; public MQualityTestResult(Properties ctx, int M_QualityTestResult_ID, String trxName) { super(ctx, M_QualityTestResult_ID, trxName); } + public MQualityTestResult(Properties ctx, ResultSet rs, + String trxName) { + super (ctx, rs, trxName); + } + } diff --git a/org.adempiere.base/src/org/compiere/model/MReplication.java b/org.adempiere.base/src/org/compiere/model/MReplication.java index 5532d6af95..f2d2fca802 100644 --- a/org.adempiere.base/src/org/compiere/model/MReplication.java +++ b/org.adempiere.base/src/org/compiere/model/MReplication.java @@ -16,6 +16,7 @@ *****************************************************************************/ package org.compiere.model; +import java.sql.ResultSet; import java.sql.Timestamp; import java.util.Properties; @@ -30,7 +31,7 @@ public class MReplication extends X_AD_Replication /** * */ - private static final long serialVersionUID = -7363193371925559167L; + private static final long serialVersionUID = -562186299848949607L; /** * Load Constructor @@ -41,6 +42,11 @@ public class MReplication extends X_AD_Replication { super (ctx, AD_Replication_ID, trxName); } // MReplication + + public MReplication (Properties ctx, ResultSet rs, String trxName) + { + super (ctx, rs, trxName); + } /** * Public Access diff --git a/org.adempiere.base/src/org/compiere/model/MReplicationLog.java b/org.adempiere.base/src/org/compiere/model/MReplicationLog.java index fe760c3b7e..a8b6a00ad4 100644 --- a/org.adempiere.base/src/org/compiere/model/MReplicationLog.java +++ b/org.adempiere.base/src/org/compiere/model/MReplicationLog.java @@ -16,6 +16,7 @@ *****************************************************************************/ package org.compiere.model; +import java.sql.ResultSet; import java.util.Properties; /** @@ -30,7 +31,7 @@ public class MReplicationLog extends X_AD_Replication_Log /** * */ - private static final long serialVersionUID = -5188563816312329819L; + private static final long serialVersionUID = -8815834636981996509L; /** * Create new Log @@ -47,5 +48,10 @@ public class MReplicationLog extends X_AD_Replication_Log setIsReplicated(false); setP_Msg(P_Msg); } // MReplicationLog - + + public MReplicationLog(Properties ctx, ResultSet rs, String trxName) + { + super (ctx, rs, trxName); + } + } // MReplicationLog diff --git a/org.adempiere.base/src/org/compiere/model/MReplicationRun.java b/org.adempiere.base/src/org/compiere/model/MReplicationRun.java index 83636ff455..e07f203408 100644 --- a/org.adempiere.base/src/org/compiere/model/MReplicationRun.java +++ b/org.adempiere.base/src/org/compiere/model/MReplicationRun.java @@ -16,6 +16,7 @@ *****************************************************************************/ package org.compiere.model; +import java.sql.ResultSet; import java.sql.Timestamp; import java.util.Properties; @@ -30,7 +31,7 @@ public class MReplicationRun extends X_AD_Replication_Run /** * */ - private static final long serialVersionUID = 2619966943083677072L; + private static final long serialVersionUID = 7609847179225634980L; /** * Create new Run @@ -46,6 +47,11 @@ public class MReplicationRun extends X_AD_Replication_Run super.setIsReplicated (false); } // MReplicationRun + public MReplicationRun (Properties ctx, ResultSet rs, String trxName) + { + super (ctx, rs, trxName); + } + /** * Set Replication Flag * @param IsReplicated replicated diff --git a/org.adempiere.base/src/org/compiere/model/MReplicationStrategy.java b/org.adempiere.base/src/org/compiere/model/MReplicationStrategy.java index 94780d6e17..0be0afec5c 100644 --- a/org.adempiere.base/src/org/compiere/model/MReplicationStrategy.java +++ b/org.adempiere.base/src/org/compiere/model/MReplicationStrategy.java @@ -17,6 +17,7 @@ package org.compiere.model; +import java.sql.ResultSet; import java.util.List; import java.util.Properties; @@ -34,10 +35,10 @@ import org.compiere.util.CLogger; */ public class MReplicationStrategy extends X_AD_ReplicationStrategy { - /** - * - */ - private static final long serialVersionUID = -3017484140206284805L; + /** + * + */ + private static final long serialVersionUID = 7231926756021012730L; public static final int REPLICATION_TABLE =0; public static final int REPLICATION_DOCUMENT =1; @@ -56,7 +57,11 @@ public class MReplicationStrategy extends X_AD_ReplicationStrategy { public MReplicationStrategy(Properties ctx, int AD_ReplicationStrategy_ID, String trxName) { super(ctx, AD_ReplicationStrategy_ID, trxName); } - + + public MReplicationStrategy(Properties ctx, ResultSet rs, String trxName) { + super (ctx, rs, trxName); + } + /** * @return the list the X_AD_ReplicationTable */ diff --git a/org.adempiere.base/src/org/compiere/model/MSearchDefinition.java b/org.adempiere.base/src/org/compiere/model/MSearchDefinition.java index 11eb001765..45d0591068 100644 --- a/org.adempiere.base/src/org/compiere/model/MSearchDefinition.java +++ b/org.adempiere.base/src/org/compiere/model/MSearchDefinition.java @@ -47,7 +47,7 @@ public class MSearchDefinition extends X_AD_SearchDefinition { /** * */ - private static final long serialVersionUID = 2448668218372939766L; + private static final long serialVersionUID = -5366274782950561962L; /** Constant for the searchtype table */ public static final String SEARCHTYPE_TABLE = "T"; /** Constant for the searchtype query */ @@ -66,6 +66,10 @@ public class MSearchDefinition extends X_AD_SearchDefinition { public MSearchDefinition(Properties ctx, int AD_SearchDefinition_ID, String trxName) { super(ctx, AD_SearchDefinition_ID, trxName); } + + public MSearchDefinition(Properties ctx, ResultSet rs, String trxName) { + super (ctx, rs, trxName); + } /** * Returns all SearchDefinition objects with the given transaction code diff --git a/org.adempiere.base/src/org/compiere/print/MPrintColor.java b/org.adempiere.base/src/org/compiere/print/MPrintColor.java index e9b8df0e59..9d69c80124 100644 --- a/org.adempiere.base/src/org/compiere/print/MPrintColor.java +++ b/org.adempiere.base/src/org/compiere/print/MPrintColor.java @@ -18,6 +18,7 @@ package org.compiere.print; import java.awt.Color; import java.awt.SystemColor; +import java.sql.ResultSet; import java.util.Properties; import java.util.logging.Level; @@ -36,11 +37,10 @@ import org.compiere.util.Util; */ public class MPrintColor extends X_AD_PrintColor { - /** * */ - private static final long serialVersionUID = 8352503254165120016L; + private static final long serialVersionUID = -5611659311562283304L; /************************************************************************** * Create Color in Database and save @@ -138,6 +138,11 @@ public class MPrintColor extends X_AD_PrintColor if (AD_PrintColor_ID == 0) setIsDefault(false); } // MPrintColor + + public MPrintColor(Properties ctx, ResultSet rs, String trxName) + { + super (ctx, rs, trxName); + } /** Color cached */ private Color m_cacheColor = null; diff --git a/org.adempiere.base/src/org/compiere/print/MPrintFont.java b/org.adempiere.base/src/org/compiere/print/MPrintFont.java index 38d552699f..5b0d28dd54 100644 --- a/org.adempiere.base/src/org/compiere/print/MPrintFont.java +++ b/org.adempiere.base/src/org/compiere/print/MPrintFont.java @@ -40,7 +40,7 @@ public class MPrintFont extends X_AD_PrintFont /** * */ - private static final long serialVersionUID = -4721840631004326810L; + private static final long serialVersionUID = -2986160498367260541L; /** * Constructor diff --git a/org.adempiere.base/src/org/compiere/report/MReportColumnSet.java b/org.adempiere.base/src/org/compiere/report/MReportColumnSet.java index 1e88219f45..9a148fdb8d 100644 --- a/org.adempiere.base/src/org/compiere/report/MReportColumnSet.java +++ b/org.adempiere.base/src/org/compiere/report/MReportColumnSet.java @@ -37,7 +37,7 @@ public class MReportColumnSet extends X_PA_ReportColumnSet /** * */ - private static final long serialVersionUID = 8636368829160472883L; + private static final long serialVersionUID = -3496781398287709753L; /** * Constructor @@ -54,6 +54,11 @@ public class MReportColumnSet extends X_PA_ReportColumnSet else loadColumns(); } // MReportColumnSet + + public MReportColumnSet (Properties ctx, ResultSet rs, String trxName) + { + super (ctx, rs, trxName); + } /** Contained Columns */ private MReportColumn[] m_columns = null; diff --git a/org.adempiere.base/src/org/compiere/report/MReportLineSet.java b/org.adempiere.base/src/org/compiere/report/MReportLineSet.java index b72160c9a5..5f85ffb10a 100644 --- a/org.adempiere.base/src/org/compiere/report/MReportLineSet.java +++ b/org.adempiere.base/src/org/compiere/report/MReportLineSet.java @@ -37,7 +37,7 @@ public class MReportLineSet extends X_PA_ReportLineSet /** * */ - private static final long serialVersionUID = -2540937629148624046L; + private static final long serialVersionUID = 6882950634644885097L; /** * Constructor @@ -54,6 +54,11 @@ public class MReportLineSet extends X_PA_ReportLineSet else loadLines(); } // MReportLineSet + + public MReportLineSet (Properties ctx, ResultSet rs, String trxName) + { + super (ctx, rs, trxName); + } /** Contained Lines */ private MReportLine[] m_lines = null;