details: https://code.openbravo.com/erp/devel/pi/rev/269bf16d019e
changeset: 32621:269bf16d019e
user: Carlos Aristu <carlos.aristu <at> openbravo.com>
date: Tue Sep 05 18:37:33 2017 +0200
summary: related to issue 36762: minor code clean-up
- Use org.slf4j.Logger to log
- Added an error log message
- Remove unneeded comments
- Use diamond operator
- Updated copyright year
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java
| 21 ++++-----
1 files changed, 10 insertions(+), 11 deletions(-)
diffs (92 lines):
diff -r 4fa54a2fb83d -r 269bf16d019e
modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java
Tue Sep 05 13:09:40 2017 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/personalization/PersonalizationHandler.java
Tue Sep 05 18:37:33 2017 +0200
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2011 Openbravo SLU
+ * All portions are Copyright (C) 2011-2017 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -28,7 +28,6 @@
import javax.enterprise.context.RequestScoped;
-import org.apache.log4j.Logger;
import org.codehaus.jettison.json.JSONArray;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
@@ -48,6 +47,8 @@
import org.openbravo.model.ad.ui.Tab;
import org.openbravo.model.ad.ui.Window;
import org.openbravo.model.common.enterprise.Organization;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Handles personalization settings, stores them and retrieves them, taking
into account priority
@@ -55,7 +56,7 @@
*/
@RequestScoped
public class PersonalizationHandler {
- private static final Logger log =
Logger.getLogger(PersonalizationHandler.class);
+ private static final Logger log =
LoggerFactory.getLogger(PersonalizationHandler.class);
/**
* Returns all the personalization settings in an object keyed by tabid. The
current client, org,
@@ -193,13 +194,13 @@
result.put("clients", clientObject);
}
- final Map<String, String> orgs = new HashMap<String, String>();
+ final Map<String, String> orgs = new HashMap<>();
for (RoleOrganization currentRoleOrg : adminOrgs) {
orgs.put(currentRoleOrg.getOrganization().getId(),
currentRoleOrg.getOrganization()
.getName());
}
- final Map<String, String> roles = new HashMap<String, String>();
+ final Map<String, String> roles = new HashMap<>();
for (UserRoles currentUserRole : adminRoles) {
roles.put(currentUserRole.getRole().getId(),
currentUserRole.getRole().getName());
}
@@ -337,7 +338,6 @@
}
return selectedUIPersonalization;
} catch (Exception e) {
- // TODO: add param values to message
throw new OBException(e);
} finally {
OBContext.restorePreviousMode();
@@ -475,7 +475,7 @@
OBDal.getInstance().save(uiPersonalization);
return uiPersonalization;
} catch (Exception e) {
- // TODO: add param values to message
+ log.error("Error when storing personalization settings for tab with ID =
{}", tabId);
throw new OBException(e);
} finally {
OBContext.restorePreviousMode();
@@ -485,7 +485,7 @@
private static List<UIPersonalization> getPersonalizations(String clientId,
String orgId,
String userId, String roleId, String tabId, String windowId, boolean
exactMatch) {
- List<Object> parameters = new ArrayList<Object>();
+ List<Object> parameters = new ArrayList<>();
StringBuilder hql = new StringBuilder();
hql.append(" as p ");
hql.append(" where ");
@@ -565,9 +565,8 @@
// Remove from list organization that are not visible
final Organization org = OBDal.getInstance().get(Organization.class,
orgId);
List<String> parentTree = OBContext.getOBContext()
- .getOrganizationStructureProvider(org.getClient().getId())
- .getParentList(orgId, true);
- List<UIPersonalization> auxPersonalizations = new
ArrayList<UIPersonalization>();
+
.getOrganizationStructureProvider(org.getClient().getId()).getParentList(orgId,
true);
+ List<UIPersonalization> auxPersonalizations = new ArrayList<>();
for (UIPersonalization pers : personalizations) {
if (pers.getVisibleAtOrganization() == null
|| parentTree.contains(pers.getVisibleAtOrganization().getId())) {
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
