midsuit
/
core-jgi
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-5542 [DisplayType] - Cache issue (#1718) 

Minor refactoring to use MTable.MAX_OFFICIAL_ID
This commit is contained in:
Carlos Ruiz 2023-03-11 13:46:45 +01:00 committed by GitHub
parent fb98b75ce9
commit ef06b837d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
org.adempiere.base/src/org/compiere/util/DisplayType.java
View File

@ -78,6 +78,7 @@ import org.adempiere.base.Service;
import org.compiere.db.AdempiereDatabase; import org.compiere.db.AdempiereDatabase;
import org.compiere.db.Database; import org.compiere.db.Database;
import org.compiere.model.MLanguage; import org.compiere.model.MLanguage;
import org.compiere.model.MTable;
/** /**
* System Display Types. * System Display Types.
@ -232,7 +233,7 @@ public final class DisplayType
return true; return true;
//not custom type, don't have to check factory //not custom type, don't have to check factory
if (displayType < 1000000) if (displayType <= MTable.MAX_OFFICIAL_ID)
return false; return false;
IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType); IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType);
@ -271,7 +272,7 @@ public final class DisplayType
return true; return true;
//not custom type, don't have to check factory //not custom type, don't have to check factory
if (displayType < 1000000) if (displayType <= MTable.MAX_OFFICIAL_ID)
return false; return false;
IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType); IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType);
@ -314,7 +315,7 @@ public final class DisplayType
return 4; return 4;
//not custom type, don't have to check factory //not custom type, don't have to check factory
if (displayType < 1000000) if (displayType <= MTable.MAX_OFFICIAL_ID)
return 0; return 0;
IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType); IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType);
@ -365,7 +366,7 @@ public final class DisplayType
return true; return true;
//not custom type, don't have to check factory //not custom type, don't have to check factory
if (displayType < 1000000) if (displayType <= MTable.MAX_OFFICIAL_ID)
return false; return false;
IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType); IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType);
@ -406,7 +407,7 @@ public final class DisplayType
return true; return true;
//not custom type, don't have to check factory //not custom type, don't have to check factory
if (displayType < 1000000) if (displayType <= MTable.MAX_OFFICIAL_ID)
return false; return false;
IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType); IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType);
@ -447,7 +448,7 @@ public final class DisplayType
return true; return true;
//not custom type, don't have to check factory //not custom type, don't have to check factory
if (displayType < 1000000) if (displayType <= MTable.MAX_OFFICIAL_ID)
return false; return false;
IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType); IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType);
@ -491,7 +492,7 @@ public final class DisplayType
return true; return true;
//not custom type, don't have to check factory //not custom type, don't have to check factory
if (displayType < 1000000) if (displayType <= MTable.MAX_OFFICIAL_ID)
return false; return false;
IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType); IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType);
@ -530,7 +531,7 @@ public final class DisplayType
return true; return true;
//not custom type, don't have to check factory //not custom type, don't have to check factory
if (displayType < 1000000) if (displayType <= MTable.MAX_OFFICIAL_ID)
return false; return false;
IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType); IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType);
@ -643,7 +644,7 @@ public final class DisplayType
format.setMinimumFractionDigits(1); format.setMinimumFractionDigits(1);
//not custom type, don't have to check factory //not custom type, don't have to check factory
if (displayType < 1000000) if (displayType <= MTable.MAX_OFFICIAL_ID)
return format; return format;
IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType); IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType);
@ -780,7 +781,7 @@ public final class DisplayType
format = myLanguage.getDateTimeFormat(); format = myLanguage.getDateTimeFormat();
return setTimeZone(format); return setTimeZone(format);
} }
else if (displayType >= 1000000) { //custom display type else if (displayType > MTable.MAX_OFFICIAL_ID) { //custom display type
IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType); IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType);
if (cache != null) { if (cache != null) {
IDisplayTypeFactory service = cache.getService(); IDisplayTypeFactory service = cache.getService();
@ -873,7 +874,7 @@ public final class DisplayType
return String.class; return String.class;
else if (isLOB(displayType)) // CLOB is String else if (isLOB(displayType)) // CLOB is String
return byte[].class; return byte[].class;
else if (displayType >= 1000000) // custom display type else if (displayType > MTable.MAX_OFFICIAL_ID) // custom display type
{ {
IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType); IServiceReferenceHolder<IDisplayTypeFactory> cache = s_displayTypeFactoryCache.get(displayType);
if (cache != null) { if (cache != null) {