From b0b60433cf083f78e3944d4771dd96c7dd7d9795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Fri, 7 Aug 2009 18:09:31 +0200 Subject: [PATCH] ItEr20S04ArquitecturaServidorItEr19S04: Organizing all imports so warnings are removed. --- .../business/advance/daos/AdvanceMeasurementDAO.java | 2 +- .../business/advance/daos/IAdvanceAssigmentDAO.java | 4 +--- .../business/advance/daos/IAdvanceMeasurementDAO.java | 2 +- .../business/resources/bootstrap/CriterionsBootstrap.java | 2 +- .../business/resources/bootstrap/ICriterionsBootstrap.java | 3 --- .../navalplanner/business/resources/daos/CriterionDAO.java | 3 +-- .../business/resources/daos/CriterionTypeDAO.java | 1 + .../navalplanner/business/resources/daos/ICriterionDAO.java | 1 + .../business/resources/daos/ICriterionTypeDAO.java | 1 + .../business/resources/entities/ResourceEnum.java | 1 - .../business/resources/services/CriterionTypeServiceImpl.java | 1 + .../business/resources/services/ICriterionTypeService.java | 1 + .../business/workreports/daos/IWorkReportLineDAO.java | 1 + .../src/main/java/org/zkoss/ganttz/DependencyList.java | 2 +- .../src/main/java/org/zkoss/ganttz/TaskList.java | 2 +- .../src/main/java/org/zkoss/ganttz/TimeTracker.java | 2 +- .../org/zkoss/ganttz/extensions/ContextWithPlannerTask.java | 2 +- .../web/orders/IAsignedHoursToOrderElementModel.java | 1 + 18 files changed, 16 insertions(+), 16 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/AdvanceMeasurementDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/AdvanceMeasurementDAO.java index b0ba177ad..d958cef21 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/AdvanceMeasurementDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/AdvanceMeasurementDAO.java @@ -1,7 +1,7 @@ package org.navalplanner.business.advance.daos; -import org.navalplanner.business.common.daos.GenericDAOHibernate; import org.navalplanner.business.advance.entities.AdvanceMeasurement; +import org.navalplanner.business.common.daos.GenericDAOHibernate; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Repository; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/IAdvanceAssigmentDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/IAdvanceAssigmentDAO.java index 1f9465d50..d4a801d9a 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/IAdvanceAssigmentDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/IAdvanceAssigmentDAO.java @@ -1,9 +1,7 @@ package org.navalplanner.business.advance.daos; -import java.util.List; -import org.navalplanner.business.common.daos.IGenericDAO; -import org.navalplanner.business.orders.entities.OrderElement; import org.navalplanner.business.advance.entities.AdvanceAssigment; +import org.navalplanner.business.common.daos.IGenericDAO; /** * Contract for {@link AdvanceAssigmentDao} diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/IAdvanceMeasurementDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/IAdvanceMeasurementDAO.java index 6911e6602..39a36d697 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/IAdvanceMeasurementDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/advance/daos/IAdvanceMeasurementDAO.java @@ -1,7 +1,7 @@ package org.navalplanner.business.advance.daos; -import org.navalplanner.business.common.daos.IGenericDAO; import org.navalplanner.business.advance.entities.AdvanceMeasurement; +import org.navalplanner.business.common.daos.IGenericDAO; /** * Contract for {@link AdvanceMeasurementDao} diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/bootstrap/CriterionsBootstrap.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/bootstrap/CriterionsBootstrap.java index af311b8bb..e10e8106e 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/bootstrap/CriterionsBootstrap.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/bootstrap/CriterionsBootstrap.java @@ -5,12 +5,12 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.navalplanner.business.common.exceptions.ValidationException; import org.navalplanner.business.resources.entities.Criterion; import org.navalplanner.business.resources.entities.CriterionType; -import org.navalplanner.business.resources.entities.ICriterionType; import org.navalplanner.business.resources.services.ICriterionService; import org.navalplanner.business.resources.services.ICriterionTypeService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/bootstrap/ICriterionsBootstrap.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/bootstrap/ICriterionsBootstrap.java index ccfa450bc..f25ef86a8 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/bootstrap/ICriterionsBootstrap.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/bootstrap/ICriterionsBootstrap.java @@ -1,9 +1,6 @@ package org.navalplanner.business.resources.bootstrap; -import java.util.List; - import org.navalplanner.business.IDataBootstrap; -import org.navalplanner.business.resources.entities.ICriterionType; /** * Contract for {@link CriterionsBootstrap}.
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/CriterionDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/CriterionDAO.java index ea08ac3e5..3d6f733fe 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/CriterionDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/CriterionDAO.java @@ -2,11 +2,10 @@ package org.navalplanner.business.resources.daos; import java.util.ArrayList; import java.util.List; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Criteria; -import org.hibernate.Hibernate; -import org.hibernate.criterion.Property; import org.hibernate.criterion.Restrictions; import org.navalplanner.business.common.daos.GenericDAOHibernate; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/CriterionTypeDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/CriterionTypeDAO.java index 11ef5f7fd..0b347d477 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/CriterionTypeDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/CriterionTypeDAO.java @@ -1,6 +1,7 @@ package org.navalplanner.business.resources.daos; import java.util.List; + import org.apache.commons.lang.Validate; import org.hibernate.Criteria; import org.hibernate.criterion.Restrictions; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ICriterionDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ICriterionDAO.java index d069a7016..efebf11d5 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ICriterionDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ICriterionDAO.java @@ -1,6 +1,7 @@ package org.navalplanner.business.resources.daos; import java.util.List; + import org.navalplanner.business.common.daos.IGenericDAO; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; import org.navalplanner.business.resources.entities.Criterion; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ICriterionTypeDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ICriterionTypeDAO.java index 13dc92340..7a5f2bb64 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ICriterionTypeDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ICriterionTypeDAO.java @@ -1,6 +1,7 @@ package org.navalplanner.business.resources.daos; import java.util.List; + import org.navalplanner.business.common.daos.IGenericDAO; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; import org.navalplanner.business.resources.entities.CriterionType; 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 7deed5f27..54050323e 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 @@ -5,7 +5,6 @@ package org.navalplanner.business.resources.entities; -import java.util.List; /** * diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/services/CriterionTypeServiceImpl.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/services/CriterionTypeServiceImpl.java index 31b46e6a6..26442fad7 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/services/CriterionTypeServiceImpl.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/services/CriterionTypeServiceImpl.java @@ -2,6 +2,7 @@ package org.navalplanner.business.resources.services; import java.util.List; + import org.hibernate.validator.InvalidValue; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; import org.navalplanner.business.common.exceptions.ValidationException; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/services/ICriterionTypeService.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/services/ICriterionTypeService.java index 06cb5bb04..7e1321d79 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/services/ICriterionTypeService.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/services/ICriterionTypeService.java @@ -2,6 +2,7 @@ package org.navalplanner.business.resources.services; import java.util.List; + import org.navalplanner.business.common.exceptions.InstanceNotFoundException; import org.navalplanner.business.common.exceptions.ValidationException; import org.navalplanner.business.resources.entities.CriterionType; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/IWorkReportLineDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/IWorkReportLineDAO.java index c549dce18..128ee426b 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/IWorkReportLineDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/daos/IWorkReportLineDAO.java @@ -1,6 +1,7 @@ package org.navalplanner.business.workreports.daos; import java.util.List; + import org.navalplanner.business.common.daos.IGenericDAO; import org.navalplanner.business.orders.entities.OrderElement; import org.navalplanner.business.workreports.entities.WorkReportLine; diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/DependencyList.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/DependencyList.java index f1d3a689e..6f74802fc 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/DependencyList.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/DependencyList.java @@ -17,8 +17,8 @@ import org.zkoss.ganttz.util.MenuBuilder; import org.zkoss.ganttz.util.WeakReferencedListeners; import org.zkoss.ganttz.util.MenuBuilder.ItemAction; import org.zkoss.ganttz.util.WeakReferencedListeners.IListenerNotification; -import org.zkoss.ganttz.util.zoom.ZoomLevel; import org.zkoss.ganttz.util.zoom.IZoomLevelChangedListener; +import org.zkoss.ganttz.util.zoom.ZoomLevel; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.ext.AfterCompose; import org.zkoss.zul.Menupopup; diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskList.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskList.java index 0efaa41f6..4b3642f3d 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskList.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TaskList.java @@ -19,8 +19,8 @@ import org.zkoss.ganttz.data.Position; import org.zkoss.ganttz.data.Task; import org.zkoss.ganttz.util.MenuBuilder; import org.zkoss.ganttz.util.MenuBuilder.ItemAction; -import org.zkoss.ganttz.util.zoom.ZoomLevel; import org.zkoss.ganttz.util.zoom.IZoomLevelChangedListener; +import org.zkoss.ganttz.util.zoom.ZoomLevel; import org.zkoss.zk.au.out.AuInvoke; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.event.Event; diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TimeTracker.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TimeTracker.java index 5d2f0d4ba..3b39f1b91 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TimeTracker.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TimeTracker.java @@ -12,9 +12,9 @@ import java.util.List; import java.util.ListIterator; import org.zkoss.ganttz.util.Interval; +import org.zkoss.ganttz.util.zoom.IZoomLevelChangedListener; import org.zkoss.ganttz.util.zoom.TimeTrackerState; import org.zkoss.ganttz.util.zoom.ZoomLevel; -import org.zkoss.ganttz.util.zoom.IZoomLevelChangedListener; import org.zkoss.ganttz.util.zoom.TimeTrackerState.DetailItem; import org.zkoss.zk.au.out.AuInvoke; import org.zkoss.zk.ui.HtmlMacroComponent; diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/extensions/ContextWithPlannerTask.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/extensions/ContextWithPlannerTask.java index cb277363d..50cd333d2 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/extensions/ContextWithPlannerTask.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/extensions/ContextWithPlannerTask.java @@ -1,8 +1,8 @@ package org.zkoss.ganttz.extensions; import org.zkoss.ganttz.adapters.PlannerConfiguration; -import org.zkoss.ganttz.data.Task; import org.zkoss.ganttz.data.Position; +import org.zkoss.ganttz.data.Task; import org.zkoss.zk.ui.Component; /** diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAsignedHoursToOrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAsignedHoursToOrderElementModel.java index 3bd051461..9ecc10159 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAsignedHoursToOrderElementModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAsignedHoursToOrderElementModel.java @@ -1,6 +1,7 @@ package org.navalplanner.web.orders; import java.util.List; + import org.navalplanner.business.orders.entities.OrderElement; import org.navalplanner.business.workreports.entities.WorkReportLine;