diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/Emitter.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/Emitter.java index ffbda8aff..b671502f2 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/util/Emitter.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/util/Emitter.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; /** - * + * * @author Óscar González Fernández */ public class Emitter { diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/daos/SubcontractedTaskDataDAO.java b/libreplan-business/src/main/java/org/libreplan/business/planner/daos/SubcontractedTaskDataDAO.java index 61b53651c..8699a5574 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/daos/SubcontractedTaskDataDAO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/daos/SubcontractedTaskDataDAO.java @@ -110,7 +110,7 @@ public class SubcontractedTaskDataDAO extends .createCriteria("taskSource","ts") .createCriteria("schedulingData","data") .add(Restrictions.eq("data.orderElement",orderElement)); - + TaskElement taskElement = (TaskElement) c.uniqueResult(); return (taskElement != null && taskElement.isSubcontracted()) ? ((Task) taskElement) .getSubcontractedTaskData() : null; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorComunication.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorComunication.java index 36d971093..d2fd52eb2 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorComunication.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorComunication.java @@ -112,7 +112,7 @@ public class SubcontractorComunication extends BaseEntity { public List getSubcontratorComunicationValues() { return subcontratorComunicationValues; } - + public SubcontractorComunicationValue getLastSubcontratorComunicationValues(){ if (subcontratorComunicationValues.isEmpty()){ return null; diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorComunicationValue.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorComunicationValue.java index 0a10247ff..66322cde6 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorComunicationValue.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractorComunicationValue.java @@ -30,7 +30,7 @@ import org.libreplan.business.INewObject; /** * Entity to represent each {@SubcontractorComunicationValue}. - * + * * @author Susana Montes Pedreira */ public class SubcontractorComunicationValue implements INewObject { diff --git a/libreplan-business/src/main/resources/db.changelog-1.2.xml b/libreplan-business/src/main/resources/db.changelog-1.2.xml index 99ea424a4..fcc2ccc2f 100644 --- a/libreplan-business/src/main/resources/db.changelog-1.2.xml +++ b/libreplan-business/src/main/resources/db.changelog-1.2.xml @@ -44,5 +44,5 @@ - + \ No newline at end of file diff --git a/libreplan-business/src/test/java/org/libreplan/business/test/planner/daos/SubcontractorComunicationDAOTest.java b/libreplan-business/src/test/java/org/libreplan/business/test/planner/daos/SubcontractorComunicationDAOTest.java index 5f95c4372..875a5fac4 100644 --- a/libreplan-business/src/test/java/org/libreplan/business/test/planner/daos/SubcontractorComunicationDAOTest.java +++ b/libreplan-business/src/test/java/org/libreplan/business/test/planner/daos/SubcontractorComunicationDAOTest.java @@ -156,12 +156,12 @@ public class SubcontractorComunicationDAOTest { order.setCode("code-" + UUID.randomUUID()); order.useSchedulingDataFor(orderVersion); order.add(orderLine); - + //add a basic calendar BaseCalendar basicCalendar = BaseCalendarTest.createBasicCalendar(); calendarDAO.save(basicCalendar); order.setCalendar(basicCalendar); - + try { orderDAO.save(order); sessionFactory.getCurrentSession().flush(); @@ -201,7 +201,7 @@ public class SubcontractorComunicationDAOTest { taskElementDAO.flush(); sessionFactory.getCurrentSession().evict(task); sessionFactory.getCurrentSession().evict(subcontractedTaskData); - + subcontractedTaskDataDAO.save(subcontractedTaskData); return subcontractedTaskData; } diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java index 226f29cb6..1eda280f7 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderModel.java @@ -455,7 +455,7 @@ public class OrderModel extends IntegrationEntityModel implements IOrderModel { this.planningState.getSaveCommand().save(beforeSaveActions, null); } } - + private void reattachCalendar() { if (planningState.getOrder().getCalendar() == null) { return; diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java index 22b2a5db2..7183b14db 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SaveCommandBuilder.java @@ -103,11 +103,11 @@ import org.zkoss.zul.Messagebox; /** * Builds a command that saves the changes in the taskElements. It can be * considered the final step in the conversation
- * + * * In the save operation it is also kept the consistency of the * LimitingResourceQueueDependencies with the Dependecies between the task of * the planning gantt. - * + * * @author Óscar González Fernández * @author Javier Moran Rua */ @@ -125,7 +125,7 @@ public class SaveCommandBuilder { "/planner/index.zul;company_scheduling", ISaveCommand.class, result); } - + public static void dontPoseAsTransientAndChildrenObjects( Collection> resourceAllocations) { for (ResourceAllocation each : resourceAllocations) { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java index c321f783a..2a247d995 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadModel.java @@ -142,7 +142,7 @@ public class ResourceLoadModel implements IResourceLoadModel { allocationsFinder.lazilyGetResourcesIncluded(), allocationsFinder.lazilyGetAssignmentsShown()); } - + @Override @Transactional(readOnly = true) @@ -643,7 +643,7 @@ public class ResourceLoadModel implements IResourceLoadModel { } return result; } - + private LoadTimeLine buildTimeLine(Collection criterions, Task task, Resource resource, String type, List allocationsSortedByStartDate, @@ -1044,7 +1044,7 @@ class PeriodBuilderFactory { this.initDateFilter = initDateFilter; this.endDateFilter = endDateFilter; } - + public List build(LoadPeriodGeneratorFactory factory, List> sortedByStartDate){ if (initDateFilter == null && endDateFilter == null) { return PeriodsBuilder.build(factory, sortedByStartDate); @@ -1056,7 +1056,7 @@ class PeriodBuilderFactory { private Date asDate(LocalDate date) { return ResourceLoadModel.asDate(date); } - + } class PeriodsBuilder { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadParameters.java b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadParameters.java index 37c9d36e3..e19cffc6a 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadParameters.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/resourceload/ResourceLoadParameters.java @@ -104,7 +104,7 @@ public class ResourceLoadParameters { criteriaToShowList.clear(); criteriaToShowList.addAll(criteriaList); } - + public Paginator getEntities(Class type, Callable> allEntities, IReattacher reattacher) { Validate.isTrue( @@ -119,7 +119,7 @@ public class ResourceLoadParameters { allEntities, reattacher); } } - + private List listOfType(Class klass, Collection objects) { List result = new ArrayList(); for (Object each : objects) { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationModel.java index c0423d6a2..326e10308 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/CustomerComunicationModel.java @@ -39,7 +39,7 @@ public class CustomerComunicationModel implements ICustomerComunicationModel{ @Autowired private ICustomerComunicationDAO customerComunicationDAO; - + private FilterComunicationEnum currentFilter = FilterComunicationEnum.NOT_REVIEWED; @Override diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationCRUDController.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationCRUDController.java index 0cf449f11..80e1e57a5 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationCRUDController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationCRUDController.java @@ -60,7 +60,7 @@ import org.zkoss.zul.SimpleListModel; /** * Controller for CRUD actions over a {@link SubcontractorComunication} - * + * * @author Susana Montes Pedreira */ @SuppressWarnings("serial") @@ -183,11 +183,11 @@ public class SubcontractorComunicationCRUDController extends GenericForwardCompo private void appendLabel(Row row, String label) { row.appendChild(new Label(label)); } - + private void appendLabelWitTooltip(final Row row,final SubcontractorComunication subcontractorComunication) { String lastValue = getLastValue(subcontractorComunication); final Label compLabel = new Label(lastValue); - + compLabel.setTooltip(pp); compLabel.addEventListener(Events.ON_MOUSE_OVER, new EventListener() { diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationModel.java index ff62a0f60..292acc650 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/subcontract/SubcontractorComunicationModel.java @@ -45,7 +45,7 @@ public class SubcontractorComunicationModel implements ISubcontractorComunicatio @Autowired private ISubcontractorComunicationDAO subcontractorComunicationDAO; - + @Autowired IOrderDAO orderDAO; diff --git a/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/ReportAdvancesServiceREST.java b/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/ReportAdvancesServiceREST.java index 7def9bab2..461660675 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/ReportAdvancesServiceREST.java +++ b/libreplan-webapp/src/main/java/org/libreplan/ws/subcontract/impl/ReportAdvancesServiceREST.java @@ -87,10 +87,10 @@ public class ReportAdvancesServiceREST implements IReportAdvancesService { private IOrderElementDAO orderElementDAO; @Autowired - private ISubcontractedTaskDataDAO subcontractedTaskDataDAO; + private ISubcontractedTaskDataDAO subcontractedTaskDataDAO; @Autowired - private ISubcontractorComunicationDAO subcontractorComunicationDAO; + private ISubcontractorComunicationDAO subcontractorComunicationDAO; @Autowired private IOrderDAO orderDAO; @@ -215,7 +215,7 @@ public class ReportAdvancesServiceREST implements IReportAdvancesService { createSubcontractorComunication( orderElement, orderElementWithAdvanceMeasurementsDTO.advanceMeasurements); - + } catch (ValidationException e) { instanceConstraintViolationsDTO = ConstraintViolationConverter diff --git a/libreplan-webapp/src/main/webapp/subcontract/subcontractorComunications.zul b/libreplan-webapp/src/main/webapp/subcontract/subcontractorComunications.zul index ea5aaa381..e2b599a6c 100644 --- a/libreplan-webapp/src/main/webapp/subcontract/subcontractorComunications.zul +++ b/libreplan-webapp/src/main/webapp/subcontract/subcontractorComunications.zul @@ -60,7 +60,7 @@ - + diff --git a/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/subcontract/ReportAdvancesServiceTest.java b/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/subcontract/ReportAdvancesServiceTest.java index 1838d8bdc..178424cd1 100644 --- a/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/subcontract/ReportAdvancesServiceTest.java +++ b/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/subcontract/ReportAdvancesServiceTest.java @@ -242,7 +242,7 @@ public class ReportAdvancesServiceTest { OrderElementWithAdvanceMeasurementsListDTO orderElementWithAdvanceMeasurementsListDTO = givenOrderElementWithAdvanceMeasurementsListDTO( orderElementCode, values); - SubcontractorComunication subcontractorComunication = SubcontractorComunication.create(); + SubcontractorComunication subcontractorComunication = SubcontractorComunication.create(); reportAdvancesService .updateAdvances(orderElementWithAdvanceMeasurementsListDTO); @@ -270,7 +270,7 @@ public class ReportAdvancesServiceTest { int currentComunications = subcontractorComunicationDAO.getAll().size(); assertThat((previousComunications+1), equalTo(currentComunications)); - } + } @Test public void validAdvancesReportWithSeveralDates() { @@ -418,7 +418,7 @@ public class ReportAdvancesServiceTest { Arrays.asList(associatedHoursGroup)); orderLine.getCurrentSchedulingData().requestedCreationOf(taskSource); - + TaskSourceSynchronization mustAdd = TaskSource.mustAdd(taskSource); mustAdd.apply(TaskSource.persistTaskSources(taskSourceDAO)); @@ -436,10 +436,10 @@ public class ReportAdvancesServiceTest { taskElementDAO.save(task); task.dontPoseAsTransientObjectAnymore(); taskElementDAO.flush(); - + sessionFactory.getCurrentSession().evict(task); sessionFactory.getCurrentSession().evict(subcontractedTaskData); - + subcontractedTaskDataDAO.save(subcontractedTaskData); return subcontractedTaskData; }