svn commit: r1760668 - /ofbiz/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java

Author: jleroux
Date: Wed Sep 14 10:18:23 2016
New Revision: 1760668

URL: http://svn.apache.org/viewvc?rev=1760668&view=rev
Log:
Fixes: The entity description labels are considered not used by the Label Manager
OFBIZ-8154

FieldDescription. is used in 2 places UtilHelpText.java (widget) WebToolsServices.java
HumanResServices. seems unused and should be removed
.portalPageName. is doubtful to be double checked
ProductShipmentUomAbbreviation_ used in PackOrder.ftl and WeightPackage.ftl
ProductStoreGroup.productStoreGroupName.NA not sure
TemporalExpression_ used in many place: ServiceDemoData.xml, ExpressionUiHelper.java, TempExprMaint.ftl and TemporalExpressions.java

Modified:
    ofbiz/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java

Modified: ofbiz/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java?rev=1760668&r1=1760667&r2=1760668&view=diff
==============================================================================
--- ofbiz/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java (original)
+++ ofbiz/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java Wed Sep 14 10:18:23 2016
@@ -135,8 +135,14 @@ public class LabelManagerFactory {
                                     || labelKey.contains(".partyRelationshipName.")
                                     || labelKey.contains(".geoName.")
                                     || labelKey.contains(".categoryName.")
+                                    || labelKey.contains("FieldDescription.")
+                                    || labelKey.contains("ProductShipmentUomAbbreviation_")
+                                    || labelKey.contains("TemporalExpression_")
                                     )) {
-                        continue; // OFBIZ-8154
+                        continue; // OFBIZ-8154 WIP
+                                    // TODO HumanResServices. labels seems unused and should be removed
+                                    // TODO .portalPageName. is doubtful to be double checked
+                                    // TODO ProductStoreGroup.productStoreGroupName.NA not sure
                     }
                     String labelComment = "";
                     for (Node valueNode : UtilXml.childNodeList(propertyElem.getFirstChild())) {