details:   https://code.openbravo.com/erp/devel/pi/rev/772761fc1df8
changeset: 29760:772761fc1df8
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Fri Jun 03 15:16:08 2016 +0200
summary:   fixed bug 33200: getId in DAL proxy loads object in memory

  Whenever getId method was invoked on a DAL proxy, the full object was 
initialized
  in memory from DB. This is not necessary as the id information is part of the
  proxy itself. This behavior could be workarounded by using DalUtil.getId 
method.

  Now it has been fixed so that proxy.getId() does not load the object from DB,
  because of this DalUtil.getId method is no longer needed, thus it has been
  deprecated.

  The fix consists in letting Hibernate know which is the getId method so it 
does
  not require to load it.

details:   https://code.openbravo.com/erp/devel/pi/rev/a43b1b2b9ac0
changeset: 29761:a43b1b2b9ac0
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Fri Jul 08 13:40:12 2016 +0200
summary:   related to bug 33200: getId in DAL proxy loads object in memory

  Do not use DalUtil.getId: fixed some special cases

details:   https://code.openbravo.com/erp/devel/pi/rev/9507e84c71af
changeset: 29762:9507e84c71af
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Fri Jul 08 13:40:39 2016 +0200
summary:   related to bug 33200: getId in DAL proxy loads object in memory

  Do not use DalUtil.getId: massive update with regexp

details:   https://code.openbravo.com/erp/devel/pi/rev/cdb3eed55554
changeset: 29763:cdb3eed55554
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Fri Jul 08 13:41:24 2016 +0200
summary:   related to bug 33200: getId in DAL proxy loads object in memory

  Do not use DalUtil.getId: fixed the rest of the cases the regexp couldn't
  find.

details:   https://code.openbravo.com/erp/devel/pi/rev/4fa7c1e45e4d
changeset: 29764:4fa7c1e45e4d
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Fri Jul 08 13:42:14 2016 +0200
summary:   related to bug 33200: getId in DAL proxy loads object in memory

  Do not use DalUtil.getId: removed unneded DalUtil imports no longer required

diffstat:

 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java
                                  |   3 +-
 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
                                  |   3 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ADAlertDatasourceService.java
                     |   9 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ComputeTranslatedNameActionHandler.java
           |   3 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ComputeWindowActionHandler.java
                   |   3 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java
                                  |   5 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java
                               |   3 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/PropertiesComponent.java
                          |   3 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachImplementationManager.java
       |   5 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachmentAH.java
                      |   3 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachmentConfigEventHandler.java
      |   7 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachmentUtils.java
                   |  11 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/CoreAttachImplementation.java
          |   7 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/event/FieldHandler.java
                           |   2 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/event/TreeTablesEventHandler.java
                 |   3 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java
       |  16 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/process/BaseProcessActionHandler.java
             |   3 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/ApplicationDictionaryCachedStructures.java
 |   5 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
           |   4 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java
                   |   3 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewParameterHandler.java
                |   5 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
                             |   3 +-
 
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewUtil.java
                            |   7 +-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java
                                            |   2 +-
 
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java
                             |   5 +-
 modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOBUtils.java 
                                                 |   3 +-
 
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/MyOpenbravoComponent.java
                                       |   2 +-
 
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
                                             |   5 +-
 
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListUtils.java
                                   |   3 +-
 
modules/org.openbravo.financial.paymentreport/src/org/openbravo/financial/paymentreport/erpCommon/ad_reports/PaymentReport.java
 |   5 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/BaseDataSourceService.java
                        |   5 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/ComboTableDatasourceService.java
                  |  11 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
                            |   4 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DefaultDataSourceService.java
                     |   2 +-
 
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/NoteDataSource.java
                               |   3 +-
 
modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
                                     |   2 +-
 
modules/org.openbravo.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
                                   |   2 +-
 
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorComponent.java
                    |   8 +-
 
modules/org.openbravo.utility.cleanup.log/src/org/openbravo/utility/cleanup/log/CleanEntity.java
                                |   7 +-
 
modules/org.openbravo.utility.cleanup.log/src/org/openbravo/utility/cleanup/log/LogCleanUpProcess.java
                          |   3 +-
 src-test/src/org/openbravo/test/dal/ComputedColumnsTest.java                   
                                                 |   7 +-
 src-test/src/org/openbravo/test/dal/DalPerformanceExampleTest.java             
                                                 |   2 +-
 
src-test/src/org/openbravo/test/datasource/TestAllowUnpagedDatasourcePreference.java
                                            |  10 +-
 src-test/src/org/openbravo/test/role/inheritance/AccessPropagation.java        
                                                 |   5 +-
 
src-test/src/org/openbravo/test/role/inheritance/AccessPropagationNotInherited.java
                                             |   5 +-
 src-test/src/org/openbravo/test/role/inheritance/DeletedAccessPropagation.java 
                                                 |   9 +-
 src-test/src/org/openbravo/test/role/inheritance/HorizontalInheritance.java    
                                                 |   9 +-
 src-test/src/org/openbravo/test/role/inheritance/RecalculatePermissions.java   
                                                 |  11 +-
 
src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceRestrictions.java
                                               |  41 ++++----
 src-test/src/org/openbravo/test/role/inheritance/RoleInheritanceTestUtils.java 
                                                 |  25 ++--
 src-test/src/org/openbravo/test/role/inheritance/VerticalInheritance.java      
                                                 |   7 +-
 src/org/openbravo/costing/AverageCostAdjustment.java                           
                                                 |   3 +-
 src/org/openbravo/costing/CostingAlgorithm.java                                
                                                 |   6 +-
 src/org/openbravo/costing/CostingAlgorithmAdjustmentImp.java                   
                                                 |   3 +-
 src/org/openbravo/costing/CostingMigrationProcess.java                         
                                                 |  15 +-
 src/org/openbravo/costing/CostingRuleProcess.java                              
                                                 |   5 +-
 src/org/openbravo/costing/CostingUtils.java                                    
                                                 |   7 +-
 src/org/openbravo/costing/InventoryAmountUpdateProcess.java                    
                                                 |   5 +-
 src/org/openbravo/costing/ManualCostAdjustmentProcessHandler.java              
                                                 |   3 +-
 src/org/openbravo/dal/core/DalUtil.java                                        
                                                 |  10 +-
 src/org/openbravo/dal/core/OBContext.java                                      
                                                 |   4 +-
 src/org/openbravo/dal/core/OBDynamicPropertyHandler.java                       
                                                 |  40 ++++++-
 src/org/openbravo/dal/core/OBInterceptor.java                                  
                                                 |   2 +-
 src/org/openbravo/dal/security/EntityAccessChecker.java                        
                                                 |  13 +-
 src/org/openbravo/dal/security/OrganizationStructureProvider.java              
                                                 |   5 +-
 src/org/openbravo/dal/security/SecurityChecker.java                            
                                                 |  11 +-
 src/org/openbravo/dal/xml/EntityExcelXMLConverter.java                         
                                                 |   2 +-
 src/org/openbravo/dal/xml/EntityXMLConverter.java                              
                                                 |  14 +-
 src/org/openbravo/dal/xml/PrimitiveReferenceHandler.java                       
                                                 |   3 +-
 src/org/openbravo/erpCommon/ad_actionButton/ActionButtonUtility.java           
                                                 |   3 +-
 src/org/openbravo/erpCommon/ad_actionButton/MRPManufacturingPlanProcess.java   
                                                 |  27 ++--
 src/org/openbravo/erpCommon/ad_callouts/SE_Payment_FinAccount.java             
                                                 |   5 +-
 src/org/openbravo/erpCommon/ad_callouts/SL_Reservation.java                    
                                                 |   3 +-
 src/org/openbravo/erpCommon/ad_forms/AcctServer.java                           
                                                 |   7 +-
 src/org/openbravo/erpCommon/ad_process/MRPPurchaseCreateReservations.java      
                                                 |   7 +-
 
src/org/openbravo/erpCommon/ad_process/assets/AssetLinearDepreciationMethodProcess.java
                                         |   5 +-
 src/org/openbravo/erpCommon/businessUtility/Preferences.java                   
                                                 |  48 ++++-----
 src/org/openbravo/erpCommon/obps/ActivationKey.java                            
                                                 |   3 +-
 src/org/openbravo/erpCommon/utility/OBMessageUtils.java                        
                                                 |   7 +-
 src/org/openbravo/erpCommon/utility/ReferencedLink.java                        
                                                 |   7 +-
 src/org/openbravo/erpReports/RptC_Bpartner.java                                
                                                 |   3 +-
 src/org/openbravo/financial/FinancialUtils.java                                
                                                 |   4 +-
 src/org/openbravo/materialmgmt/InventoryCountProcess.java                      
                                                 |   5 +-
 src/org/openbravo/materialmgmt/ManageVariantsDS.java                           
                                                 |   3 +-
 src/org/openbravo/materialmgmt/ProductCharacteristicsDS.java                   
                                                 |   3 +-
 src/org/openbravo/materialmgmt/ReservationUtils.java                           
                                                 |  14 +-
 src/org/openbravo/role/inheritance/InheritedAccessEnabledEventHandler.java     
                                                 |   3 +-
 src/org/openbravo/role/inheritance/RoleInheritanceEventHandler.java            
                                                 |  15 +-
 src/org/openbravo/role/inheritance/RoleInheritanceManager.java                 
                                                 |  26 ++--
 src/org/openbravo/role/inheritance/RoleInheritanceWarningFICExtension.java     
                                                 |   5 +-
 src/org/openbravo/role/inheritance/access/AccessTypeInjector.java              
                                                 |  13 +-
 src/org/openbravo/role/inheritance/access/FieldAccessInjector.java             
                                                 |   7 +-
 src/org/openbravo/role/inheritance/access/PreferenceAccessInjector.java        
                                                 |  33 +++---
 src/org/openbravo/role/inheritance/access/TabAccessInjector.java               
                                                 |   9 +-
 src/org/openbravo/role/inheritance/access/WindowAccessInjector.java            
                                                 |   3 +-
 src/org/openbravo/service/db/DataImportService.java                            
                                                 |   3 +-
 src/org/openbravo/service/importprocess/ImportEntryProcessor.java              
                                                 |   9 +-
 src/org/openbravo/service/system/SystemService.java                            
                                                 |   3 +-
 src/org/openbravo/service/web/UserContextCache.java                            
                                                 |   3 +-
 99 files changed, 340 insertions(+), 416 deletions(-)

diffs (truncated from 3110 to 300 lines):

diff -r 6b0cb6931b7b -r 4fa7c1e45e4d 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java
    Mon Jul 11 08:33:18 2016 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/TransactionsDao.java
    Fri Jul 08 13:42:14 2016 +0200
@@ -33,7 +33,6 @@
 import org.openbravo.base.provider.OBProvider;
 import org.openbravo.base.secureApp.VariablesSecureApp;
 import org.openbravo.base.session.OBPropertiesProvider;
-import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
@@ -152,7 +151,7 @@
         .getSession()
         .createQuery(
             "select max(f.lineNo) as maxLineno from FIN_Finacc_Transaction as 
f where account.id=?");
-    query.setString(0, (String) DalUtil.getId(financialAccount));
+    query.setString(0, financialAccount.getId());
     for (Object obj : query.list()) {
       if (obj != null) {
         return (Long) obj;
diff -r 6b0cb6931b7b -r 4fa7c1e45e4d 
modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
--- 
a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
    Mon Jul 11 08:33:18 2016 +0200
+++ 
b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/utility/FIN_Utility.java
    Fri Jul 08 13:42:14 2016 +0200
@@ -48,7 +48,6 @@
 import org.openbravo.base.session.OBPropertiesProvider;
 import org.openbravo.base.structure.BaseOBObject;
 import org.openbravo.client.kernel.reference.UIDefinitionController;
-import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.security.OrganizationStructureProvider;
 import org.openbravo.dal.service.OBCriteria;
@@ -1085,7 +1084,7 @@
       invoiceDocNo = invoice.getDocumentNo();
 
       final String paymentDescription = OBDal.getInstance()
-          .get(OrganizationInformation.class, (DalUtil.getId(organization)))
+          .get(OrganizationInformation.class, (organization.getId()))
           .getAPRMPaymentDescription();
       // In case of a purchase invoice and the Supplier Reference is selected 
use
       // Reference
diff -r 6b0cb6931b7b -r 4fa7c1e45e4d 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ADAlertDatasourceService.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ADAlertDatasourceService.java
       Mon Jul 11 08:33:18 2016 +0200
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ADAlertDatasourceService.java
       Fri Jul 08 13:42:14 2016 +0200
@@ -32,7 +32,6 @@
 import org.openbravo.base.model.Entity;
 import org.openbravo.base.model.ModelProvider;
 import org.openbravo.client.kernel.RequestContext;
-import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBQuery;
@@ -111,8 +110,8 @@
 
       OBQuery<AlertRule> alertRulesQuery = 
OBDal.getInstance().createQuery(AlertRule.class,
           whereClause.toString());
-      alertRulesQuery.setNamedParameter("user", 
DalUtil.getId(OBContext.getOBContext().getUser()));
-      alertRulesQuery.setNamedParameter("role", 
DalUtil.getId(OBContext.getOBContext().getRole()));
+      alertRulesQuery.setNamedParameter("user", 
OBContext.getOBContext().getUser().getId());
+      alertRulesQuery.setNamedParameter("role", 
OBContext.getOBContext().getRole().getId());
 
       return getAlertIdsFromAlertRules(alertRulesQuery.list());
     } finally {
@@ -127,7 +126,7 @@
       // case it returns data after applying the filter clause.
       if (alertRule.getFilterClause() == null) {
         for (Alert alert : alertRule.getADAlertList()) {
-          alertIds.add((String) DalUtil.getId(alert));
+          alertIds.add(alert.getId());
         }
       }
 
@@ -153,7 +152,7 @@
           log.debug("Alert " + alertRule.getName() + " (" + alertRule.getId() 
+ ") - SQL:'" + sql
               + "' - Rows: " + alertsWithFilterClause.size());
           for (Alert alert : alertsWithFilterClause) {
-            alertIds.add((String) DalUtil.getId(alert));
+            alertIds.add(alert.getId());
           }
         } catch (SQLGrammarException e) {
           log.error("An error has ocurred when trying to process the alerts: " 
+ e.getMessage(), e);
diff -r 6b0cb6931b7b -r 4fa7c1e45e4d 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ComputeTranslatedNameActionHandler.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ComputeTranslatedNameActionHandler.java
     Mon Jul 11 08:33:18 2016 +0200
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ComputeTranslatedNameActionHandler.java
     Fri Jul 08 13:42:14 2016 +0200
@@ -26,7 +26,6 @@
 import org.openbravo.base.exception.OBException;
 import org.openbravo.client.kernel.BaseActionHandler;
 import org.openbravo.client.kernel.StaticResourceComponent;
-import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 
@@ -53,7 +52,7 @@
 
       String title = process.getName();
       for (org.openbravo.model.ad.ui.ProcessTrl processtrl : 
process.getADProcessTrlList()) {
-        final String trlLanguageId = (String) 
DalUtil.getId(processtrl.getLanguage());
+        final String trlLanguageId = processtrl.getLanguage().getId();
         if (trlLanguageId.equals(userLanguageId)) {
           title = processtrl.getName();
         }
diff -r 6b0cb6931b7b -r 4fa7c1e45e4d 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ComputeWindowActionHandler.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ComputeWindowActionHandler.java
     Mon Jul 11 08:33:18 2016 +0200
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ComputeWindowActionHandler.java
     Fri Jul 08 13:42:14 2016 +0200
@@ -29,7 +29,6 @@
 import org.openbravo.base.model.ModelProvider;
 import org.openbravo.client.kernel.BaseActionHandler;
 import org.openbravo.client.kernel.StaticResourceComponent;
-import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBQuery;
@@ -76,7 +75,7 @@
       final String userLanguageId = 
OBContext.getOBContext().getLanguage().getId();
       String tabTitle = null;
       for (WindowTrl windowTrl : tab.getWindow().getADWindowTrlList()) {
-        final String trlLanguageId = (String) 
DalUtil.getId(windowTrl.getLanguage());
+        final String trlLanguageId = windowTrl.getLanguage().getId();
         if (trlLanguageId.equals(userLanguageId)) {
           tabTitle = windowTrl.getName();
         }
diff -r 6b0cb6931b7b -r 4fa7c1e45e4d 
modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java
    Mon Jul 11 08:33:18 2016 +0200
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java
    Fri Jul 08 13:42:14 2016 +0200
@@ -32,7 +32,6 @@
 import org.hibernate.Query;
 import org.hibernate.criterion.Restrictions;
 import org.openbravo.base.session.SessionFactoryController;
-import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
@@ -517,7 +516,7 @@
     public void setMenu(Menu menu, String userLanguageId) {
       this.menu = menu;
       for (MenuTrl menuTrl : menu.getADMenuTrlList()) {
-        final String trlLanguageId = (String) 
DalUtil.getId(menuTrl.getLanguage());
+        final String trlLanguageId = menuTrl.getLanguage().getId();
         if (trlLanguageId.equals(userLanguageId)) {
           setLabel(menuTrl.getName());
         }
@@ -543,7 +542,7 @@
       if (isProcess()) {
         // done via isModelProcess(String) as is called from different request 
and getProcess() is
         // not initialized
-        String processId = (String) DalUtil.getId(getMenu().getProcess());
+        String processId = getMenu().getProcess().getId();
         return Utility.isModalProcess(processId);
       }
       return true;
diff -r 6b0cb6931b7b -r 4fa7c1e45e4d 
modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java
 Mon Jul 11 08:33:18 2016 +0200
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java
 Fri Jul 08 13:42:14 2016 +0200
@@ -48,7 +48,6 @@
 import org.openbravo.base.util.Check;
 import org.openbravo.client.kernel.reference.UIDefinition;
 import org.openbravo.client.kernel.reference.UIDefinitionController;
-import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.data.Sqlc;
@@ -108,7 +107,7 @@
   }
 
   public static DomainType getParameterDomainType(Parameter parameter) {
-    String referenceId = (String) DalUtil.getId(parameter.getReference());
+    String referenceId = parameter.getReference().getId();
     return 
ModelProvider.getInstance().getReference(referenceId).getDomainType();
   }
 
diff -r 6b0cb6931b7b -r 4fa7c1e45e4d 
modules/org.openbravo.client.application/src/org/openbravo/client/application/PropertiesComponent.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/PropertiesComponent.java
    Mon Jul 11 08:33:18 2016 +0200
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/PropertiesComponent.java
    Fri Jul 08 13:42:14 2016 +0200
@@ -27,7 +27,6 @@
 import org.codehaus.jettison.json.JSONObject;
 import org.openbravo.client.kernel.BaseTemplateComponent;
 import org.openbravo.client.kernel.Template;
-import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.erpCommon.businessUtility.Preferences;
@@ -86,7 +85,7 @@
       }
 
       if (preference.getWindow() != null) {
-        localProperty.setId(localProperty.getId() + "_" + 
DalUtil.getId(preference.getWindow()));
+        localProperty.setId(localProperty.getId() + "_" + 
preference.getWindow().getId());
       }
 
       // prevent duplicates
diff -r 6b0cb6931b7b -r 4fa7c1e45e4d 
modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachImplementationManager.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachImplementationManager.java
 Mon Jul 11 08:33:18 2016 +0200
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachImplementationManager.java
 Fri Jul 08 13:42:14 2016 +0200
@@ -51,7 +51,6 @@
 import org.openbravo.client.application.ParameterValue;
 import 
org.openbravo.client.application.window.ApplicationDictionaryCachedStructures;
 import org.openbravo.client.kernel.ComponentProvider;
-import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.security.SecurityChecker;
 import org.openbravo.dal.service.OBCriteria;
@@ -284,7 +283,7 @@
     try {
       OBContext.setAdminMode(true);
       Tab tab = OBDal.getInstance().get(Tab.class, tabId);
-      String tableId = (String) DalUtil.getId(tab.getTable());
+      String tableId = tab.getTable().getId();
       final ZipOutputStream dest = new ZipOutputStream(os);
       HashMap<String, Integer> writtenFiles = new HashMap<String, Integer>();
       OBCriteria<Attachment> attachmentFiles = 
OBDao.getFilteredCriteria(Attachment.class,
@@ -512,7 +511,7 @@
         metadataValues.put(strMetadataId, null);
         OBDal.getInstance().remove(metadataStoredValue);
       } else {
-        String strReferenceId = (String) 
DalUtil.getId(parameter.getReference());
+        String strReferenceId = parameter.getReference().getId();
         if (REFERENCE_LIST.equals(strReferenceId)) {
           strValue = (String) value;
           Reference reference = parameter.getReferenceSearchKey();
diff -r 6b0cb6931b7b -r 4fa7c1e45e4d 
modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachmentAH.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachmentAH.java
        Mon Jul 11 08:33:18 2016 +0200
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachmentAH.java
        Fri Jul 08 13:42:14 2016 +0200
@@ -34,7 +34,6 @@
 import org.openbravo.client.application.Parameter;
 import 
org.openbravo.client.application.window.ApplicationDictionaryCachedStructures;
 import org.openbravo.client.kernel.BaseActionHandler;
-import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
@@ -157,7 +156,7 @@
   private void doDelete(Map<String, Object> parameters, Tab tab, String 
recordIds)
       throws OBException {
     String attachmentId = (String) parameters.get("attachId");
-    String tableId = (String) DalUtil.getId(tab.getTable());
+    String tableId = tab.getTable().getId();
 
     OBCriteria<Attachment> attachmentFiles = 
OBDao.getFilteredCriteria(Attachment.class,
         Restrictions.eq("table.id", tableId), Restrictions.in("record", 
recordIds.split(",")));
diff -r 6b0cb6931b7b -r 4fa7c1e45e4d 
modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachmentConfigEventHandler.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachmentConfigEventHandler.java
        Mon Jul 11 08:33:18 2016 +0200
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachmentConfigEventHandler.java
        Fri Jul 08 13:42:14 2016 +0200
@@ -29,7 +29,6 @@
 import org.openbravo.client.kernel.event.EntityPersistenceEvent;
 import org.openbravo.client.kernel.event.EntityPersistenceEventObserver;
 import org.openbravo.client.kernel.event.EntityUpdateEvent;
-import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.service.OBDal;
 import org.openbravo.dal.service.OBQuery;
 import org.openbravo.erpCommon.utility.OBMessageUtils;
@@ -67,7 +66,7 @@
     final AttachmentConfig newAttConfig = (AttachmentConfig) 
event.getTargetInstance();
 
     isAnyActivated(event);
-    String clientId = (String) DalUtil.getId(newAttConfig.getClient());
+    String clientId = newAttConfig.getClient().getId();
     if ((Boolean) event.getCurrentState(propActive)) {
       AttachmentUtils.setAttachmentConfig(clientId, event.getId());
     } else if ((Boolean) event.getPreviousState(propActive)) {
@@ -87,7 +86,7 @@
     final AttachmentConfig newAttConfig = (AttachmentConfig) 
event.getTargetInstance();
 
     isAnyActivated(event);
-    String clientId = (String) DalUtil.getId(newAttConfig.getClient());
+    String clientId = newAttConfig.getClient().getId();
     if ((Boolean) event.getCurrentState(propActive)) {
       AttachmentUtils.setAttachmentConfig(clientId, newAttConfig.getId());
     }
@@ -102,7 +101,7 @@
     }
 
     final AttachmentConfig deletedAttachmentConfig = (AttachmentConfig) 
event.getTargetInstance();
-    String clientId = (String) 
DalUtil.getId(deletedAttachmentConfig.getClient());
+    String clientId = deletedAttachmentConfig.getClient().getId();
     if (deletedAttachmentConfig.isActive()) {
       // The active config of the client is deleted. Update AttachmentUtils 
with an empty config
       AttachmentUtils.setAttachmentConfig(clientId, null);
diff -r 6b0cb6931b7b -r 4fa7c1e45e4d 
modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachmentUtils.java
--- 
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachmentUtils.java
     Mon Jul 11 08:33:18 2016 +0200
+++ 
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/attachment/AttachmentUtils.java
     Fri Jul 08 13:42:14 2016 +0200
@@ -39,7 +39,6 @@
 import org.openbravo.client.application.ParameterUtils;
 import org.openbravo.client.application.ParameterValue;
 import 
org.openbravo.client.application.window.ApplicationDictionaryCachedStructures;
-import org.openbravo.dal.core.DalUtil;
 import org.openbravo.dal.core.OBContext;
 import org.openbravo.dal.service.OBCriteria;
 import org.openbravo.dal.service.OBDal;
@@ -73,7 +72,7 @@
    */
   public static AttachmentConfig getAttachmentConfig() {
     Client client = OBContext.getOBContext().getCurrentClient();
-    return getAttachmentConfig((String) DalUtil.getId(client));
+    return getAttachmentConfig(client.getId());
   }
 
   /**
@@ -166,7 +165,7 @@
    * @return List of JSONOject with attachments information values
    */
   public static List<JSONObject> getTabAttachmentsForRows(Tab tab, String[] 
recordIds) {

------------------------------------------------------------------------------
Attend Shape: An AT&T Tech Expo July 15-16. Meet us at AT&T Park in San
Francisco, CA to explore cutting-edge tech and listen to tech luminaries
present their vision of the future. This family event has something for
everyone, including kids. Get more information and register today.
http://sdm.link/attshape
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits

Reply via email to