From e6799f46f6d07175f643437d6c2a79720c445dcd Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Mon, 19 Oct 2009 09:37:06 +0200
Subject: [PATCH] ItEr30S06CUAltaMaquina: Added MACHINE criterion type; now is
 possible to edit resource type in Criterion Type form

---
 .../business/resources/entities/CriterionType.java        | 8 ++++++++
 .../business/resources/entities/ResourceEnum.java         | 8 +++++++-
 .../src/main/webapp/resources/criterions/_edition-V2.zul  | 8 ++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java
index 17b8e1e62..12e08545b 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java
@@ -170,6 +170,14 @@ public class CriterionType extends BaseEntity implements
         this.resource = resource;
     }
 
+    public String getResource() {
+        return resource.toString();
+    }
+
+    public void setResource(String resource) {
+        this.resource = ResourceEnum.valueOf(resource);
+    }
+
     @Override
     public Criterion createCriterion(String name) {
         return Criterion.withNameAndType(name, this);
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java
index 870bd863a..1fb44fa0f 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java
@@ -21,6 +21,7 @@
 package org.navalplanner.business.resources.entities;
 
 
+
 /**
  *
  * @author Diego Pino Garcia<dpino@igalia.com>
@@ -28,7 +29,8 @@ package org.navalplanner.business.resources.entities;
 public enum ResourceEnum {
 
     RESOURCE(Resource.class),
-    WORKER(Worker.class);
+    WORKER(Worker.class),
+    MACHINE(Machine.class);
 
     Class clase;
 
@@ -44,6 +46,10 @@ public enum ResourceEnum {
         return RESOURCE;
     }
 
+    public String toString() {
+        return clase.getSimpleName().toUpperCase();
+    }
+
     public boolean isAssignableFrom(Class clase) {
         return asClass().isAssignableFrom(clase);
     }
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul
index 41a67ad63..54687628b 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/_edition-V2.zul
@@ -36,6 +36,14 @@
                             <label value="${i18n:_('Name')}" />
                             <textbox width="390px" value="@{controller.criterionType.name}"/>
                         </row>
+                        <row>
+                            <label value="${i18n:_('Type')}" />
+                            <listbox id="lbResource" mold="select" selectedItem="@{controller.criterionType.resource}">
+                                <listitem label="${i18n:_('Generic')}" value="RESOURCE" />
+                                <listitem label="${i18n:_('Worker')}" value="WORKER" />
+                                <listitem label="${i18n:_('Machine')}" value="MACHINE" />
+                            </listbox>
+                        </row>
                         <row>
                             <label value="${i18n:_('Multiple values per resource')}"/>
                             <checkbox checked="@{controller.criterionType.allowSimultaneousCriterionsPerResource}"/>