[Bug #890] Fixed marking to generate the entries in keys.pot.

FEA : ItEr71S04BugFixing

navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/BaseCalendarBandboxFinder.java

@@ -43,7 +43,14 @@ public class BaseCalendarBandboxFinder extends BandboxFinder implements IBandbox
     @Autowired
     private IBaseCalendarDAO baseCalendarDAO;
 
-    private final String headers[] = { "Name" };
+    private final String headers[] = { _("Name") };
+
+    /**
+     * Forces to mark the string as needing translation
+     */
+    private static String _(String string) {
+        return string;
+    }
 
     @Override
     @Transactional(readOnly = true)

navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionBandboxFinder.java

@@ -41,7 +41,14 @@ public class CriterionBandboxFinder extends BandboxFinder implements IBandboxFin
     @Autowired
     private ICriterionDAO criterionDAO;
 
-    private final String headers[] = { "Type", "Criterion Name" };
+    private final String headers[] = { _("Type"), _("Criterion Name") };
+
+    /**
+     * Forces to mark the string as needing translation
+     */
+    private static String _(String string) {
+        return string;
+    }
 
     @Override
     @Transactional(readOnly = true)

navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/CriterionMultipleFiltersFinder.java

@@ -41,6 +41,13 @@ public class CriterionMultipleFiltersFinder extends MultipleFiltersFinder {
         }
     };
 
+    /**
+     * Forces to mark the string as needing translation
+     */
+    private static String _(String string) {
+        return string;
+    }
+
     @Override
     public List<FilterPair> getFirstTenFilters() {
         getListMatching().clear();

navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ExternalCompanyBandboxFinder.java

@@ -48,7 +48,14 @@ public class ExternalCompanyBandboxFinder extends BandboxFinder implements
     @Autowired
     private IExternalCompanyDAO externalCompanyDAO;
 
-    private final String headers[] = { "ID", "Name" };
+    private final String headers[] = { _("ID"), _("Name") };
+
+    /**
+     * Forces to mark the string as needing translation
+     */
+    private static String _(String string) {
+        return string;
+    }
 
     @Override
     @Transactional(readOnly = true)

navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/LabelBandboxFinder.java

@@ -49,7 +49,14 @@ public class LabelBandboxFinder extends BandboxFinder implements IBandboxFinder
     @Autowired
     private ILabelDAO labelDAO;
 
-    private final String headers[] = { "Type", "Name" };
+    private final String headers[] = { _("Type"), _("Name") };
+
+    /**
+     * Forces to mark the string as needing translation
+     */
+    private static String _(String string) {
+        return string;
+    }
 
     @Override
     @Transactional(readOnly = true)

navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderBandboxFinder.java

@@ -41,7 +41,14 @@ public class OrderBandboxFinder extends BandboxFinder implements IBandboxFinder
     @Autowired
     private IOrderDAO orderDAO;
 
-    private final String headers[] = { "Project", "Project code" };
+    private final String headers[] = { _("Project"), _("Project code") };
+
+    /**
+     * Forces to mark the string as needing translation
+     */
+    private static String _(String string) {
+        return string;
+    }
 
     @Override
     @Transactional(readOnly = true)

navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementBandboxFinder.java

@@ -48,8 +48,15 @@ public class OrderElementBandboxFinder extends BandboxFinder implements IBandbox
     @Autowired
     private IOrderDAO orderDAO;
 
-    private final String headers[] = { "Project", "Project code", "Task",
-            "Task code" };
+    private final String headers[] = { _("Project"), _("Project code"),
+            _("Task"), _("Task code") };
+
+    /**
+     * Forces to mark the string as needing translation
+     */
+    private static String _(String string) {
+        return string;
+    }
 
     @Override
     @Transactional(readOnly = true)

navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementFilterEnum.java

@@ -33,7 +33,7 @@ import org.navalplanner.business.orders.entities.OrderElement;
  */
 public enum OrderElementFilterEnum implements IFilterEnum {
 
-    Criterion("Criterion"), Label("Label");
+    Criterion(_("Criterion")), Label(_("Label"));
 
     /**
      * Forces to mark the string as needing translation

navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderFilterEnum.java

@@ -27,8 +27,9 @@ package org.navalplanner.web.common.components.finders;
 
 public enum OrderFilterEnum implements IFilterEnum {
 
-    Criterion("Criterion"), Label("Label"), ExternalCompany("Customer"), State(
-            "State"), Code("Code"), CustomerReference("Customer Reference");
+    Criterion(_("Criterion")), Label(_("Label")), ExternalCompany(_("Customer")), State(
+            _("State")), Code(_("Code")), CustomerReference(
+            _("Customer Reference"));
     /**
      * Forces to mark the string as needing translation
      */

navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/QualityFormBandboxFinder.java

@@ -48,7 +48,14 @@ public class QualityFormBandboxFinder extends BandboxFinder implements
     @Autowired
     private IQualityFormDAO qualityFormDAO;
 
-    private final String headers[] = { "Name", "Type" };
+    private final String headers[] = { _("Name"), _("Type") };
+
+    /**
+     * Forces to mark the string as needing translation
+     */
+    private static String _(String string) {
+        return string;
+    }
 
     @Override
     @Transactional(readOnly = true)

navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationFilterEnum.java

@@ -26,7 +26,7 @@ package org.navalplanner.web.common.components.finders;
 
 public enum ResourceAllocationFilterEnum implements IFilterEnum {
 
-    Criterion("Criterion"), Resource("Resource");
+    Criterion(_("Criterion")), Resource(_("Resource"));
 
     /**
      * Forces to mark the string as needing translation

navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFilterEnum.java

@@ -26,7 +26,7 @@ package org.navalplanner.web.common.components.finders;
 
 public enum ResourceFilterEnum implements IFilterEnum {
 
-    Criterion("Criterion"), CostCategory("Cost category");
+    Criterion(_("Criterion")), CostCategory(_("Cost category"));
 
     /**
      * Forces to mark the string as needing translation

navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ScenarioBandboxFinder.java

@@ -43,7 +43,14 @@ public class ScenarioBandboxFinder extends BandboxFinder implements IBandboxFind
     @Autowired
     private IScenarioDAO scenarioDAO;
 
-    private final String headers[] = { "Name" };
+    private final String headers[] = { _("Name") };
+
+    /**
+     * Forces to mark the string as needing translation
+     */
+    private static String _(String string) {
+        return string;
+    }
 
     @Override
     @Transactional(readOnly = true)

navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/WorkerMultipleFiltersFinder.java

@@ -41,6 +41,13 @@ public class WorkerMultipleFiltersFinder extends MultipleFiltersFinder {
         }
     };
 
+    /**
+     * Forces to mark the string as needing translation
+     */
+    private static String _(String string) {
+        return string;
+    }
+
     @Override
     public List<FilterPair> getFirstTenFilters() {
         getListMatching().clear();