RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Bug #789] Fixed problem with static strings and translations.

Browse source 
FEA: ItEr67S04BugFixing
This commit is contained in:
Manuel Rego Casasnovas 2011-01-04 22:32:12 +01:00
parent 758596909a
commit b89537e74f
12 changed files with 39 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java
View file

@ -81,8 +81,8 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
private Listbox listZoomLevels;
private static final String filterResources = _("by resources");
private static final String filterCriteria = _("by criteria");
private final String FILTER_RESOURCES = _("by resources");
private final String FILTER_CRITERIA = _("by criteria");
private String feedBackMessage;
private Boolean filterbyResources;
@ -125,12 +125,12 @@ public class ResourcesLoadPanel extends HtmlMacroComponent {
}
public ListModel getFilters() {
String[] filters = new String[] { filterResources, filterCriteria };
String[] filters = new String[] { FILTER_RESOURCES, FILTER_CRITERIA };
return new SimpleListModel(filters);
}
public void setFilter(String filterby) {
if (filterby.equals(filterResources)) {
if (filterby.equals(FILTER_RESOURCES)) {
this.filterbyResources = true;
this.feedBackMessage = _("showing resources");
} else {

8
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java
View file

@ -41,9 +41,11 @@ import org.navalplanner.business.resources.entities.ResourceEnum;
*/
public class CriterionRequirementWrapper implements INewObject {
public static final String DIRECT = _("Direct");
public final String DIRECT = _("Direct");
public static final String INDIRECT = _("Indirect");
public static String getIndirectTypeLabel() {
return _("Indirect");
}
private String type;
@ -145,7 +147,7 @@ public class CriterionRequirementWrapper implements INewObject {
if (criterionRequirement instanceof DirectCriterionRequirement) {
type = DIRECT;
} else if (criterionRequirement instanceof IndirectCriterionRequirement) {
type = INDIRECT;
type = getIndirectTypeLabel();
}
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementModel.java
View file

@ -269,7 +269,7 @@ public abstract class AssignedCriterionRequirementModel<T, M> implements
HoursGroupWrapper hoursGroupWrapper) {
if ((getModel() != null) && (getElement() != null)) {
CriterionRequirementWrapper exceptionWrapper = new CriterionRequirementWrapper(
CriterionRequirementWrapper.INDIRECT);
CriterionRequirementWrapper.getIndirectTypeLabel());
exceptionWrapper.setNewException(true);
hoursGroupWrapper.addExceptionRequirementWrappers(exceptionWrapper);
return exceptionWrapper;

6
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java
View file

@ -21,7 +21,7 @@ package org.navalplanner.web.planner.tabs;
import static org.navalplanner.web.I18nHelper._;
import static org.navalplanner.web.planner.tabs.MultipleTabsPlannerController.BREADCRUMBS_SEPARATOR;
import static org.navalplanner.web.planner.tabs.MultipleTabsPlannerController.PLANNIFICATION;
import static org.navalplanner.web.planner.tabs.MultipleTabsPlannerController.getSchedulingLabel;
import java.util.ArrayList;
import java.util.HashMap;
@ -191,7 +191,7 @@ public class AdvancedAllocationTabCreator {
}
}
private static final String ADVANCED_ALLOCATION_VIEW = _("Advanced Allocation");
private final String ADVANCED_ALLOCATION_VIEW = _("Advanced Allocation");
private final Mode mode;
private final IAdHocTransactionService adHocTransactionService;
private final IOrderDAO orderDAO;
@ -259,7 +259,7 @@ public class AdvancedAllocationTabCreator {
protected void afterShowAction() {
breadcrumbs.getChildren().clear();
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(PLANNIFICATION));
breadcrumbs.appendChild(new Label(getSchedulingLabel()));
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(_("Advanced Allocation")));
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));

8
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/LimitingResourcesTabCreator.java
View file

@ -21,7 +21,7 @@ package org.navalplanner.web.planner.tabs;
import static org.navalplanner.web.I18nHelper._;
import static org.navalplanner.web.planner.tabs.MultipleTabsPlannerController.BREADCRUMBS_SEPARATOR;
import static org.navalplanner.web.planner.tabs.MultipleTabsPlannerController.PLANNIFICATION;
import static org.navalplanner.web.planner.tabs.MultipleTabsPlannerController.getSchedulingLabel;
import java.util.HashMap;
import java.util.Map;
@ -42,7 +42,7 @@ import org.zkoss.zul.Label;
public class LimitingResourcesTabCreator {
/* Unnecesary */
private static String ORDER_LIMITING_RESOURCES_VIEW = _("Limiting resources (project)");
private String ORDER_LIMITING_RESOURCES_VIEW = _("Limiting resources (project)");
public static ITab create(Mode mode,
LimitingResourcesController LimitingResourcesController,
@ -107,7 +107,7 @@ public class LimitingResourcesTabCreator {
protected void afterShowAction() {
breadcrumbs.getChildren().clear();
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(PLANNIFICATION));
breadcrumbs.appendChild(new Label(getSchedulingLabel()));
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs
.appendChild(new Label(ORDER_LIMITING_RESOURCES_VIEW));
@ -143,7 +143,7 @@ public class LimitingResourcesTabCreator {
breadcrumbs.getChildren().clear();
}
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(PLANNIFICATION));
breadcrumbs.appendChild(new Label(getSchedulingLabel()));
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(
_("Limiting Resources Planning")));

8
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MonteCarloTabCreator.java
View file

@ -21,7 +21,7 @@ package org.navalplanner.web.planner.tabs;
import static org.navalplanner.web.I18nHelper._;
import static org.navalplanner.web.planner.tabs.MultipleTabsPlannerController.BREADCRUMBS_SEPARATOR;
import static org.navalplanner.web.planner.tabs.MultipleTabsPlannerController.PLANNIFICATION;
import static org.navalplanner.web.planner.tabs.MultipleTabsPlannerController.getSchedulingLabel;
import java.util.ArrayList;
import java.util.Date;
@ -44,8 +44,8 @@ import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.business.resources.daos.IResourceDAO;
import org.navalplanner.business.scenarios.IScenarioManager;
import org.navalplanner.business.scenarios.entities.Scenario;
import org.navalplanner.web.common.TemplateModel.DependencyWithVisibility;
import org.navalplanner.web.common.TemplateModelAdapter;
import org.navalplanner.web.common.TemplateModel.DependencyWithVisibility;
import org.navalplanner.web.montecarlo.MonteCarloController;
import org.navalplanner.web.planner.order.OrderPlanningController;
import org.navalplanner.web.planner.tabs.CreatedOnDemandTab.IComponentCreator;
@ -66,7 +66,7 @@ import org.zkoss.zul.Label;
*/
public class MonteCarloTabCreator {
private static String ORDER_LIMITING_RESOURCES_VIEW = _("MonteCarlo Method");
private String ORDER_LIMITING_RESOURCES_VIEW = _("MonteCarlo Method");
public static ITab create(Mode mode,
MonteCarloController monteCarloController,
@ -136,7 +136,7 @@ public class MonteCarloTabCreator {
breadcrumbs.getChildren().clear();
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(PLANNIFICATION));
breadcrumbs.appendChild(new Label(getSchedulingLabel()));
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs
.appendChild(new Label(ORDER_LIMITING_RESOURCES_VIEW));

6
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java
View file

@ -122,7 +122,11 @@ public class MultipleTabsPlannerController implements Composer,
}
}
public static final String PLANNIFICATION = _("Scheduling");
public final String PLANNIFICATION = _("Scheduling");
public static String getSchedulingLabel() {
return _("Scheduling");
};
public static final String BREADCRUMBS_SEPARATOR = "/common/img/migas_separacion.gif";

8
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/OrdersTabCreator.java
View file

@ -21,7 +21,7 @@ package org.navalplanner.web.planner.tabs;
import static org.navalplanner.web.I18nHelper._;
import static org.navalplanner.web.planner.tabs.MultipleTabsPlannerController.BREADCRUMBS_SEPARATOR;
import static org.navalplanner.web.planner.tabs.MultipleTabsPlannerController.PLANNIFICATION;
import static org.navalplanner.web.planner.tabs.MultipleTabsPlannerController.getSchedulingLabel;
import java.util.HashMap;
import java.util.Map;
@ -42,7 +42,7 @@ import org.zkoss.zul.Label;
*/
public class OrdersTabCreator {
private static final String PROJECT_DETAILS = _("Project Details");
private final String PROJECT_DETAILS = _("Project Details");
public static ITab create(Mode mode,
OrderCRUDController orderCRUDController, Component breadcrumbs,
@ -107,7 +107,7 @@ public class OrdersTabCreator {
breadcrumbs.getChildren().clear();
}
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(PLANNIFICATION));
breadcrumbs.appendChild(new Label(getSchedulingLabel()));
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(_("Projects")));
}
@ -132,7 +132,7 @@ public class OrdersTabCreator {
protected void afterShowAction() {
breadcrumbs.getChildren().clear();
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(PLANNIFICATION));
breadcrumbs.appendChild(new Label(getSchedulingLabel()));
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(PROJECT_DETAILS));
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));

6
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/PlanningTabCreator.java
View file

@ -21,7 +21,7 @@ package org.navalplanner.web.planner.tabs;
import static org.navalplanner.web.I18nHelper._;
import static org.navalplanner.web.planner.tabs.MultipleTabsPlannerController.BREADCRUMBS_SEPARATOR;
import static org.navalplanner.web.planner.tabs.MultipleTabsPlannerController.PLANNIFICATION;
import static org.navalplanner.web.planner.tabs.MultipleTabsPlannerController.getSchedulingLabel;
import java.util.ArrayList;
import java.util.HashMap;
@ -263,7 +263,7 @@ public class PlanningTabCreator {
companyPlanningController.setConfigurationForPlanner();
breadcrumbs.getChildren().clear();
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(PLANNIFICATION));
breadcrumbs.appendChild(new Label(getSchedulingLabel()));
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(_("Projects Planning")));
}
@ -304,7 +304,7 @@ public class PlanningTabCreator {
breadcrumbs.getChildren().clear();
}
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(PLANNIFICATION));
breadcrumbs.appendChild(new Label(getSchedulingLabel()));
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(_("Project Scheduling")));
if (mode.isOf(ModeType.ORDER)) {

6
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/ResourcesLoadTabCreator.java
View file

@ -21,7 +21,7 @@ package org.navalplanner.web.planner.tabs;
import static org.navalplanner.web.I18nHelper._;
import static org.navalplanner.web.planner.tabs.MultipleTabsPlannerController.BREADCRUMBS_SEPARATOR;
import static org.navalplanner.web.planner.tabs.MultipleTabsPlannerController.PLANNIFICATION;
import static org.navalplanner.web.planner.tabs.MultipleTabsPlannerController.getSchedulingLabel;
import java.util.HashMap;
import java.util.Map;
@ -108,7 +108,7 @@ public class ResourcesLoadTabCreator {
protected void afterShowAction() {
breadcrumbs.getChildren().clear();
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(PLANNIFICATION));
breadcrumbs.appendChild(new Label(getSchedulingLabel()));
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(_("Resources Load")));
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
@ -149,7 +149,7 @@ public class ResourcesLoadTabCreator {
breadcrumbs.getChildren().clear();
}
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(PLANNIFICATION));
breadcrumbs.appendChild(new Label(getSchedulingLabel()));
breadcrumbs.appendChild(new Image(BREADCRUMBS_SEPARATOR));
breadcrumbs.appendChild(new Label(_("Resource Usage")));
}

5
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerInAMonthController.java
View file

@ -22,7 +22,6 @@ package org.navalplanner.web.reports;
import static org.navalplanner.web.I18nHelper._;
import java.util.HashMap;
import java.util.Map;
import net.sf.jasperreports.engine.JRDataSource;
@ -39,7 +38,7 @@ public class HoursWorkedPerWorkerInAMonthController extends NavalplannerReportCo
private static final String REPORT_NAME = "hoursWorkedPerWorkerInAMonthReport";
private static final String months[] = { _("January"), _("February"),
private final String MONTHS[] = { _("January"), _("February"),
_("March"), _("April"), _("May"), _("June"), _("July"),
_("August"), _("September"), _("October"), _("November"),
_("December") };
@ -103,7 +102,7 @@ public class HoursWorkedPerWorkerInAMonthController extends NavalplannerReportCo
private String monthAsLiteral(String monthNumber) {
Integer number = Integer.parseInt(monthNumber);
return months[number-1];
return MONTHS[number-1];
}
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportModel.java
View file

@ -548,7 +548,7 @@ public class WorkReportModel extends IntegrationEntityModel implements
/**
* Set the selected default work report type to filter the work reports
*/
public static final String SHOW_ALL_TYPES = _("Show all");
public final String SHOW_ALL_TYPES = _("Show all");
private final WorkReportType defaultType = WorkReportType.create(
SHOW_ALL_TYPES, "");