From 801ffc456e2cd721c06a3d50cb0129c8cde779ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Sat, 28 Apr 2012 13:08:28 +0200
Subject: [PATCH] Remove code attribute from OrderElementTemplate entity and
 from DB.

FEA: ItEr76S26RemoveExternalCodeFromTemplates
---
 .../templates/entities/OrderElementTemplate.java     |  9 ---------
 .../src/main/resources/db.changelog-1.3.xml          | 12 ++++++++++++
 .../src/main/resources/db.changelog.xml              |  1 +
 .../business/templates/entities/Templates.hbm.xml    |  1 -
 4 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 libreplan-business/src/main/resources/db.changelog-1.3.xml

diff --git a/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java b/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java
index c94d95535..cb1002bc6 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/templates/entities/OrderElementTemplate.java
@@ -354,14 +354,6 @@ public abstract class OrderElementTemplate extends BaseEntity implements
         this.deadlineAsDaysFromBeginning = days;
     }
 
-    public String getCode() {
-        return getInfoComponent().getCode();
-    }
-
-    public void setCode(String code) {
-        getInfoComponent().setCode(code);
-    }
-
     public String getDescription() {
         return getInfoComponent().getDescription();
     }
@@ -384,7 +376,6 @@ public abstract class OrderElementTemplate extends BaseEntity implements
     }
 
     protected void copyTo(OrderElementTemplate result) {
-        result.setCode(getCode());
         result.setName(getName());
         result.setDescription(getDescription());
         result.setDeadlineAsDaysFromBeginning(getDeadlineAsDaysFromBeginning());
diff --git a/libreplan-business/src/main/resources/db.changelog-1.3.xml b/libreplan-business/src/main/resources/db.changelog-1.3.xml
new file mode 100644
index 000000000..628b98a07
--- /dev/null
+++ b/libreplan-business/src/main/resources/db.changelog-1.3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+    http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd">
+
+    <changeSet id="remove-code-from-order_element_template" author="jaragunde">
+        <comment>Remove column code in order_element_template table</comment>
+        <dropColumn tableName="order_element_template" columnName="code" />
+    </changeSet>
+
+</databaseChangeLog>
diff --git a/libreplan-business/src/main/resources/db.changelog.xml b/libreplan-business/src/main/resources/db.changelog.xml
index 0ace5ccf8..5011d0a53 100644
--- a/libreplan-business/src/main/resources/db.changelog.xml
+++ b/libreplan-business/src/main/resources/db.changelog.xml
@@ -10,5 +10,6 @@
     <include file="src/main/resources/db.changelog-1.0.xml"/>
     <include file="src/main/resources/db.changelog-1.1.xml"/>
     <include file="src/main/resources/db.changelog-1.2.xml"/>
+    <include file="src/main/resources/db.changelog-1.3.xml"/>
 
 </databaseChangeLog>
diff --git a/libreplan-business/src/main/resources/org/libreplan/business/templates/entities/Templates.hbm.xml b/libreplan-business/src/main/resources/org/libreplan/business/templates/entities/Templates.hbm.xml
index 04ee58d8c..f64091ca5 100644
--- a/libreplan-business/src/main/resources/org/libreplan/business/templates/entities/Templates.hbm.xml
+++ b/libreplan-business/src/main/resources/org/libreplan/business/templates/entities/Templates.hbm.xml
@@ -12,7 +12,6 @@
         <component name="infoComponent" class="org.libreplan.business.orders.entities.InfoComponent">
             <property name="name" access="field" />
             <property name="description" access="field" type="text" />
-            <property name="code" access="field"/>
         </component>
         <property name="startAsDaysFromBeginning"
             column="start_as_days_from_beginning" />