You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/09/13 13:05:48 UTC
svn commit: r1760537 -
/ofbiz/trunk/framework/webtools/src/main/java/org/apache/ofbiz/webtools/labelmanager/LabelManagerFactory.java
Author: jleroux
Date: Tue Sep 13 13:05:47 2016
New Revision: 1760537
URL: http://svn.apache.org/viewvc?rev=1760537&view=rev
Log:
Fixes: The entity description labels are considered not used by the Label Manager
OFBIZ-8154
Completes a TODO and removes useless tests on label keys replaced by bypass on entire ExampleEntityLabels and ProductPromoUiLabels files, still a WIP
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=1760537&r1=1760536&r2=1760537&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 Tue Sep 13 13:05:47 2016
@@ -114,6 +114,11 @@ public class LabelManagerFactory {
if (UtilValidate.isNotEmpty(fileName) && !fileName.equals(fileInfo.getFileName())) {
continue;
}
+ if ("ExampleEntityLabels.xml".equals(fileInfo.getFileName())
+ || "ProductPromoUiLabels.xml".equals(fileInfo.getFileName())
+ ) {
+ continue;
+ }
if (Debug.infoOn()) {
Debug.logInfo("Current file : " + fileInfo.getFileName(), module);
}
@@ -130,9 +135,6 @@ public class LabelManagerFactory {
|| labelKey.contains(".partyRelationshipName.")
|| labelKey.contains(".geoName.")
|| labelKey.contains(".categoryName.")
- || labelKey.contains(".ProductPromoCondition..")
- || labelKey.contains(".ProductPromoOperatorEquality..")
- || labelKey.contains(".Example.") // TODO check all is used here
)) {
continue; // OFBIZ-8154
}