From 5e2f50d08244f7f97985aa3292058a989d3bf5ff Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Fri, 26 Aug 2011 09:10:49 +0200
Subject: [PATCH] Add function isSigmoid in IAssignmentFunctionConfiguration

FEA: ItEr75S23FixAllocationModel
---
 .../AdvancedAllocationController.java         | 21 ++++++++++++++-----
 .../IAssignmentFunctionConfiguration.java     |  2 ++
 .../StrechesFunctionConfiguration.java        |  5 +++++
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
index 625295a37..821e583a3 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
@@ -1302,7 +1302,7 @@ class Row {
 
                     // Cannot apply function if task contains consolidated day assignments
                     final ResourceAllocation<?> resourceAllocation = getAllocation();
-                    if (isSigmoid(function.getName())
+                    if (function.isSigmoid()
                             && !resourceAllocation
                                     .getConsolidatedAssignments().isEmpty()) {
                         showCannotApplySigmoidFunction();
@@ -1331,10 +1331,6 @@ class Row {
             this.previousListitem = previousListitem;
         }
 
-        private boolean isSigmoid(String value) {
-            return AssignmentFunctionName.SIGMOID.toString().equals(value);
-        }
-
         private void showCannotApplySigmoidFunction() {
             try {
                 Messagebox
@@ -1401,6 +1397,11 @@ class Row {
             fireCellChanged();
         }
 
+        @Override
+        public boolean isSigmoid() {
+            return false;
+        }
+
     };
 
     private IAssignmentFunctionConfiguration manualFunction = new IAssignmentFunctionConfiguration() {
@@ -1430,6 +1431,11 @@ class Row {
             resourceAllocation.setAssignmentFunction(ManualFunction.create());
         }
 
+        @Override
+        public boolean isSigmoid() {
+            return false;
+        }
+
     };
 
     private abstract class CommonStrechesConfiguration extends
@@ -1533,6 +1539,11 @@ class Row {
             fireCellChanged();
         }
 
+        @Override
+        public boolean isSigmoid() {
+            return true;
+        }
+
     };
 
     private IAssignmentFunctionConfiguration[] functions = {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IAssignmentFunctionConfiguration.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IAssignmentFunctionConfiguration.java
index 1d3420f81..c97d3ea31 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IAssignmentFunctionConfiguration.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/IAssignmentFunctionConfiguration.java
@@ -34,4 +34,6 @@ public interface IAssignmentFunctionConfiguration {
 
     public void goToConfigure();
 
+    public boolean isSigmoid();
+
 }
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StrechesFunctionConfiguration.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StrechesFunctionConfiguration.java
index b50dada59..c5dc1b64e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StrechesFunctionConfiguration.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/streches/StrechesFunctionConfiguration.java
@@ -97,4 +97,9 @@ public abstract class StrechesFunctionConfiguration implements
         resourceAllocation.setAssignmentFunction(StretchesFunction.create());
     }
 
+    @Override
+    public boolean isSigmoid() {
+        return false;
+    }
+
 }