From 4f2cfbb2431512b58f0e0b31dd66d9983da25976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Wed, 2 Dec 2009 20:58:25 +0100
Subject: [PATCH]  ItEr35S15CUAdministracionCategoriaCosteItEr34S15:
 style/indentation revision

---
 .../business/costcategories/daos/HourCostDAO.java      |  2 +-
 .../costcategories/daos/TypeOfWorkHoursDAO.java        |  2 +-
 .../business/costcategories/entities/CostCategory.java | 10 ++++++----
 .../costcategories/entities/TypeOfWorkHours.java       |  2 +-
 .../costcategories/TypeOfWorkHoursCRUDController.java  |  2 +-
 .../web/costcategories/TypeOfWorkHoursModel.java       |  2 --
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/HourCostDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/HourCostDAO.java
index 007a7dd51..6e9ce84f3 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/HourCostDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/HourCostDAO.java
@@ -33,7 +33,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 @Scope(BeanDefinition.SCOPE_SINGLETON)
 public class HourCostDAO extends GenericDAOHibernate<HourCost, Long> implements
-		IHourCostDAO {
+        IHourCostDAO {
 
     @Override
     public void remove(Long id) throws InstanceNotFoundException {
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/TypeOfWorkHoursDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/TypeOfWorkHoursDAO.java
index 5cddb80ea..5fae4cc0e 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/TypeOfWorkHoursDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/TypeOfWorkHoursDAO.java
@@ -42,7 +42,7 @@ public class TypeOfWorkHoursDAO extends GenericDAOHibernate<TypeOfWorkHours, Lon
 
     @Override
     public TypeOfWorkHours findUniqueByCode(TypeOfWorkHours typeOfWorkHours)
-                throws InstanceNotFoundException {
+            throws InstanceNotFoundException {
 
         Validate.notNull(typeOfWorkHours);
         return findUniqueByCode(typeOfWorkHours.getCode());
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java
index 1d69fc25c..40e7d38de 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/CostCategory.java
@@ -33,10 +33,10 @@ import org.navalplanner.business.common.BaseEntity;
  */
 public class CostCategory extends BaseEntity {
 
-	@NotEmpty
+    @NotEmpty
     private String name;
 
-	private Set<HourCost> hourCosts = new HashSet<HourCost>();
+    private Set<HourCost> hourCosts = new HashSet<HourCost>();
 
     // Default constructor, needed by Hibernate
     protected CostCategory() {
@@ -80,8 +80,10 @@ public class CostCategory extends BaseEntity {
         LocalDate initDate = hourCost.getInitDate();
         LocalDate endDate = hourCost.getEndDate();
         for(HourCost listElement:hourCosts) {
-            if((listElement.getEndDate().compareTo(initDate)>=0 && listElement.getEndDate().compareTo(endDate)<=0) ||
-               (listElement.getInitDate().compareTo(initDate)>=0 && listElement.getInitDate().compareTo(endDate)<=0))
+            if((listElement.getEndDate().compareTo(initDate)>=0 &&
+                    listElement.getEndDate().compareTo(endDate)<=0) ||
+                    (listElement.getInitDate().compareTo(initDate)>=0 &&
+                        listElement.getInitDate().compareTo(endDate)<=0))
                 overlap = true;
         }
         return !overlap;
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/TypeOfWorkHours.java b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/TypeOfWorkHours.java
index 69dbe6a9d..3f0585bb0 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/TypeOfWorkHours.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/TypeOfWorkHours.java
@@ -42,7 +42,7 @@ public class TypeOfWorkHours extends BaseEntity {
 
     private BigDecimal defaultPrice;
 
-	boolean enabled = true;
+    boolean enabled = true;
 
     // Default constructor, needed by Hibernate
     protected TypeOfWorkHours() {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java
index da5ec12b5..a342959ff 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursCRUDController.java
@@ -24,7 +24,6 @@ import static org.navalplanner.web.I18nHelper._;
 
 import java.util.List;
 
-import org.hibernate.validator.InvalidValue;
 import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.costcategories.entities.TypeOfWorkHours;
 import org.navalplanner.web.common.IMessagesForUser;
@@ -44,6 +43,7 @@ import org.zkoss.zul.api.Window;
  *
  * @author Jacobo Aragunde Perez <jaragunde@igalia.com>
  */
+@SuppressWarnings("serial")
 public class TypeOfWorkHoursCRUDController extends GenericForwardComposer implements
         ITypeOfWorkHoursCRUDController {
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursModel.java
index bf692f5d3..32423decd 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/TypeOfWorkHoursModel.java
@@ -22,8 +22,6 @@ package org.navalplanner.web.costcategories;
 
 import java.util.List;
 
-import org.apache.commons.lang.Validate;
-import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
 import org.navalplanner.business.common.exceptions.ValidationException;
 import org.navalplanner.business.costcategories.daos.ITypeOfWorkHoursDAO;
 import org.navalplanner.business.costcategories.entities.TypeOfWorkHours;