details: https://code.openbravo.com/erp/devel/pi/rev/aea5c08b7cf2
changeset: 35358:aea5c08b7cf2
user: Carlos Aristu <carlos.aristu <at> openbravo.com>
date: Thu Jan 24 10:25:44 2019 +0100
summary: related to issue 40009: minor code cleanup
- Use diamond operator
- Rename field "parameters" to prevent any misunderstanding/clash with field
"PARAMETERS"
- Use a StringBuilder instead of String concatenation
- Renamed "_parameter" to follow standard name guidelines
- Remove commented-out code
- Remove condition that was always being evaluated to false
- Iterate over the "entrySet" instead of the "keySet"
- Add comment to explain the ignored exception
- Replaced if-then-else statement by a single return statement
diffstat:
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
| 66 +++------
1 files changed, 26 insertions(+), 40 deletions(-)
diffs (171 lines):
diff -r 01860dfaa385 -r aea5c08b7cf2
modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
---
a/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
Thu Jan 24 10:05:04 2019 +0100
+++
b/modules/org.openbravo.client.myob/src/org/openbravo/client/myob/WidgetProvider.java
Thu Jan 24 10:25:44 2019 +0100
@@ -25,6 +25,7 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import org.apache.logging.log4j.LogManager;
@@ -106,7 +107,7 @@
private static final String MENU_ITEMS = "menuItems";
private static final Long WIDGET_HEADER_HEIGHT = 35L;
- private Map<String, Object> parameters = new HashMap<String, Object>();
+ private Map<String, Object> widgetParameters = new HashMap<>();
// note this is only set if the widgetprovider is created through the
MyOBUtils class
private JSONObject widgetClassDefinition;
@@ -141,11 +142,11 @@
aboutFieldDefinitions.put(MODULEJPACKAGE,
widgetClass.getModule().getJavaPackage());
aboutFieldDefinitions.put(MODULETYPE, widgetClass.getModule().getType());
- String moduleDBPrefixList = "";
+ StringBuilder moduleDBPrefixList = new StringBuilder();
for (ModuleDBPrefix moduleDBPrefix :
widgetClass.getModule().getModuleDBPrefixList()) {
- moduleDBPrefixList += moduleDBPrefix.getName() + " ";
+ moduleDBPrefixList.append(moduleDBPrefix.getName() + " ");
}
- aboutFieldDefinitions.put(MODULEDBPREFIX, moduleDBPrefixList);
+ aboutFieldDefinitions.put(MODULEDBPREFIX, moduleDBPrefixList.toString());
aboutFieldDefinitions.put(MODULELICENSETYPE,
widgetClass.getModule().getLicenseType());
aboutFieldDefinitions.put(MODULEUPDATEINFO,
widgetClass.getModule().getUpdateInformation() == null ? ""
@@ -168,7 +169,7 @@
widgetClass.getAuthorUrl() == null ? "" :
widgetClass.getAuthorUrl());
final JSONObject defaultParameters = new JSONObject();
- final List<JSONObject> fieldDefinitions = new ArrayList<JSONObject>();
+ final List<JSONObject> fieldDefinitions = new ArrayList<>();
for (Parameter parameter :
widgetClass.getOBUIAPPParameterEMObkmoWidgetClassIDList()) {
// fixed parameters are not part of the fielddefinitions
if (parameter.isFixed()) {
@@ -248,23 +249,23 @@
jsonObject.put(HEIGHT, widgetClassDefinition.get(HEIGHT));
jsonObject.put(PRIORITY, widgetInstance.getRelativePriority());
- final JSONObject widgetParameters = new JSONObject();
+ final JSONObject widgetParams = new JSONObject();
for (ParameterValue parameterValue : widgetInstance
.getOBUIAPPParameterValueEMObkmoWidgetInstanceIDList()) {
- widgetParameters.put(parameterValue.getParameter().getDBColumnName(),
+ widgetParams.put(parameterValue.getParameter().getDBColumnName(),
ParameterUtils.getParameterValue(parameterValue));
}
// Include fixed parameters in the definition.
for (Parameter parameter : widgetInstance.getWidgetClass()
.getOBUIAPPParameterEMObkmoWidgetClassIDList()) {
- if (!widgetParameters.has(parameter.getDBColumnName()) &&
parameter.isFixed()) {
- widgetParameters.put(parameter.getDBColumnName(),
+ if (!widgetParams.has(parameter.getDBColumnName()) &&
parameter.isFixed()) {
+ widgetParams.put(parameter.getDBColumnName(),
ParameterUtils.getParameterFixedValue(getStringParameters(getParameters()),
parameter));
}
}
- jsonObject.put(PARAMETERS, widgetParameters);
+ jsonObject.put(PARAMETERS, widgetParams);
}
public String getClientSideWidgetClassName() {
@@ -291,20 +292,20 @@
}
public Map<String, Object> getParameters() {
- return parameters;
+ return widgetParameters;
}
public void setParameters(Map<String, Object> parameters) {
- this.parameters = parameters;
+ this.widgetParameters = parameters;
}
- private Map<String, String> getStringParameters(Map<String, Object>
_parameters) {
- Map<String, String> stringParameters = new HashMap<String, String>();
- final Iterator<String> keys = _parameters.keySet().iterator();
+ private Map<String, String> getStringParameters(Map<String, Object> params) {
+ Map<String, String> stringParameters = new HashMap<>();
+ final Iterator<String> keys = params.keySet().iterator();
while (keys.hasNext()) {
final String keyName = keys.next();
- if (_parameters.get(keyName) instanceof String) {
- stringParameters.put(keyName, (String) _parameters.get(keyName));
+ if (params.get(keyName) instanceof String) {
+ stringParameters.put(keyName, (String) params.get(keyName));
}
}
return stringParameters;
@@ -349,20 +350,8 @@
.getADReferencedTableList()
.get(0);
final Entity entity =
ModelProvider.getInstance().getEntity(refTable.getTable().getName());
+ final String orderBy;
- Property displayProperty = null;
- // for now always display the identifier
- // if (false && refTable.getDisplayedColumn() != null) {
- // final String displayColId = refTable.getDisplayedColumn().getId();
- // for (Property prop : entity.getProperties()) {
- // if (prop.getColumnId().equals(displayColId)) {
- // displayProperty = prop;
- // break;
- // }
- // }
- // }
-
- final String orderBy;
if (refTable.getHqlorderbyclause() != null) {
orderBy = refTable.getHqlorderbyclause();
} else {
@@ -380,13 +369,12 @@
: "") + " order by " + orderBy;
final OBQuery<BaseOBObject> obQuery = OBDal.getInstance()
.createQuery(entity.getName(), whereOrderByClause);
- final List<JSONObject> values = new ArrayList<JSONObject>();
+ final List<JSONObject> values = new ArrayList<>();
for (BaseOBObject bob : obQuery.list()) {
final JSONObject dataJSONObject = new JSONObject();
dataJSONObject.put(JsonConstants.ID, bob.getId());
- dataJSONObject.put(JsonConstants.IDENTIFIER,
- (displayProperty != null ? bob.getValue(displayProperty.getName())
- : bob.getIdentifier()));
+ // for now always display the identifier
+ dataJSONObject.put(JsonConstants.IDENTIFIER, bob.getIdentifier());
values.add(dataJSONObject);
}
return values;
@@ -399,8 +387,8 @@
final Map<String, String> valueMap = createValueMap(
(Set<String>) enumDomainType.getEnumerateValues(),
enumUIDefinition.getReference().getId());
final JSONObject valueMapJSONObject = new JSONObject();
- for (String key : valueMap.keySet()) {
- valueMapJSONObject.put(key, valueMap.get(key));
+ for (Entry<String, String> entry : valueMap.entrySet()) {
+ valueMapJSONObject.put(entry.getKey(), entry.getValue());
}
return valueMapJSONObject;
}
@@ -449,6 +437,7 @@
try {
widgetClassId = widgetClassDefinition.getString(WIDGETCLASSID);
} catch (JSONException ignore) {
+ // should not happen if the WidgetProvider instance is initialized
properly
}
return widgetClassId;
}
@@ -458,10 +447,7 @@
}
private boolean getBooleanValueFromString(String value) {
- if ("true".equals(value) || "Y".equals(value) || "'Y'".equals(value)) {
- return true;
- }
- return false;
+ return "true".equals(value) || "Y".equals(value) || "'Y'".equals(value);
}
/**
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
