From 62bc4ba6562abe478e878d7db6c4a7fa4f862899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Wed, 10 Mar 2010 12:39:42 +0100 Subject: [PATCH] ItEr50S13AdaptacionServiciosRESTItEr49S18: Added the field generateCodeForLabel to the Configuration interface. --- .../web/common/ConfigurationController.java | 8 ++++++++ .../web/common/ConfigurationModel.java | 15 +++++++++++++++ .../web/common/IConfigurationModel.java | 3 +++ .../src/main/webapp/common/configuration.zul | 4 ++++ 4 files changed, 30 insertions(+) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java index 8336ada50..9faf26c85 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java @@ -139,6 +139,14 @@ public class ConfigurationController extends GenericForwardComposer { configurationModel.setGenerateCodeForCriterion(generateCodeForCriterion); } + public Boolean getGenerateCodeForLabel() { + return configurationModel.getGenerateCodeForLabel(); + } + + public void setGenerateCodeForLabel(Boolean generateCodeForLabel) { + configurationModel.setGenerateCodeForLabel(generateCodeForLabel); + } + public List getOrderSequences() { return configurationModel.getOrderSequences(); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java index b6fc45aab..2a50f672f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationModel.java @@ -221,6 +221,21 @@ public class ConfigurationModel implements IConfigurationModel { } } + @Override + public Boolean getGenerateCodeForLabel() { + if (configuration == null) { + return null; + } + return configuration.getGenerateCodeForLabel(); + } + + @Override + public void setGenerateCodeForLabel(Boolean generateCodeForLabel) { + if (configuration != null) { + configuration.setGenerateCodeForLabel(generateCodeForLabel); + } + } + @Override public List getOrderSequences() { return Collections.unmodifiableList(orderSequences); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java index d7676e357..a749430ab 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/IConfigurationModel.java @@ -54,6 +54,9 @@ public interface IConfigurationModel { Boolean getGenerateCodeForCriterion(); void setGenerateCodeForCriterion(Boolean generateCodeForCriterion); + Boolean getGenerateCodeForLabel(); + void setGenerateCodeForLabel(Boolean generateCodeForLabel); + List getOrderSequences(); void addOrderSequence(); void removeOrderSequence(OrderSequence orderSequence) diff --git a/navalplanner-webapp/src/main/webapp/common/configuration.zul b/navalplanner-webapp/src/main/webapp/common/configuration.zul index 922bfa1d3..105e2349e 100644 --- a/navalplanner-webapp/src/main/webapp/common/configuration.zul +++ b/navalplanner-webapp/src/main/webapp/common/configuration.zul @@ -65,6 +65,10 @@