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 8c2d34a95..45722f255 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 @@ -60,8 +60,9 @@ public class TypeOfWorkHoursDAO extends IntegrationEntityDAO c.add(Restrictions.eq("code", code)); TypeOfWorkHours found = (TypeOfWorkHours) c.uniqueResult(); - if (found==null) + if (found == null) { throw new InstanceNotFoundException(code, TypeOfWorkHours.class.getName()); + } return found; } 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 815b123af..cef34ea77 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 @@ -109,14 +109,16 @@ public class CostCategory extends IntegrationEntity { public void addHourCost(HourCost hourCost) { hourCosts.add(hourCost); - if(hourCost.getCategory()!=this) + if (hourCost.getCategory() != this) { hourCost.setCategory(this); + } } public void removeHourCost(HourCost hourCost) { hourCosts.remove(hourCost); - if(hourCost.getCategory()==this) + if (hourCost.getCategory() == this) { hourCost.setCategory(null); + } } public boolean canAddHourCost(HourCost hourCost) { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java index 9488a5a66..ddecc696b 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/HourCost.java @@ -126,10 +126,12 @@ public class HourCost extends IntegrationEntity { public void setCategory(CostCategory category) { CostCategory oldCategory = this.category; this.category = category; - if(oldCategory!=null) + if (oldCategory != null) { oldCategory.removeHourCost(this); - if(category!=null && !category.getHourCosts().contains(this)) + } + if (category != null && !category.getHourCosts().contains(this)) { category.addHourCost(this); + } } public boolean isActiveAtDate(LocalDate date) { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java index bac8203e5..ebcb87e52 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/entities/ResourcesCostCategoryAssignment.java @@ -132,10 +132,11 @@ public class ResourcesCostCategoryAssignment extends IntegrationEntity { public void setResource(Resource resource) { Resource oldResource = this.resource; this.resource = resource; - if(oldResource!=null) + if (oldResource != null) { oldResource.removeResourcesCostCategoryAssignment(this); - if(resource!=null && - !resource.getResourcesCostCategoryAssignments().contains(this)) { + } + if (resource != null + && !resource.getResourcesCostCategoryAssignments().contains(this)) { resource.addResourcesCostCategoryAssignment(this); } } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/daos/ExternalCompanyDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/daos/ExternalCompanyDAO.java index 951ee8637..260a4b246 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/daos/ExternalCompanyDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/externalcompanies/daos/ExternalCompanyDAO.java @@ -66,8 +66,9 @@ public class ExternalCompanyDAO extends GenericDAOHibernate implements List listOrderElements = getAllChildren(orderElement); listOrderElements.add(orderElement); for (T element : listOrderElements) { - if (existSameCriterionRequirement(element, newRequirement)) + if (existSameCriterionRequirement(element, newRequirement)) { return false; + } } return true; } @@ -125,8 +126,9 @@ public abstract class CriterionRequirementHandler implements return true; } for (HoursGroup hoursGroup : getHoursGroups(orderLine)) { - if (hoursGroup.existSameCriterionRequirement(newRequirement)) + if (hoursGroup.existSameCriterionRequirement(newRequirement)) { return true; + } } return false; } @@ -137,8 +139,9 @@ public abstract class CriterionRequirementHandler implements T orderElement, CriterionRequirement newRequirement) { Criterion criterion = newRequirement.getCriterion(); for (CriterionRequirement requirement : getCriterionRequirements(orderElement)) { - if (requirement.getCriterion().equals(criterion)) + if (requirement.getCriterion().equals(criterion)) { return true; + } } return false; } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java index 9be285747..74a8eda16 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java @@ -434,19 +434,23 @@ public class Order extends OrderLineGroup { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null || isNewObject()) + } + if (obj == null || isNewObject()) { return false; + } if (!(obj instanceof Order)) { return false; } Order other = (Order) obj; if (getId() == null) { - if (other.getId() != null) + if (other.getId() != null) { return false; - } else if (!getId().equals(other.getId())) + } + } else if (!getId().equals(other.getId())) { return false; + } return true; } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElement.java index eedcf3886..7266eb5bf 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElement.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/limiting/entities/LimitingResourceQueueElement.java @@ -221,10 +221,12 @@ public class LimitingResourceQueueElement extends BaseEntity { } public void remove(LimitingResourceQueueDependency d) { - if (dependenciesAsOrigin.contains(d)) + if (dependenciesAsOrigin.contains(d)) { dependenciesAsOrigin.remove(d); - if (dependenciesAsDestiny.contains(d)) + } + if (dependenciesAsDestiny.contains(d)) { dependenciesAsDestiny.remove(d); + } } public Set getDependenciesAsOrigin() { diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityFormItem.java b/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityFormItem.java index 7454cbf73..1f19b9b04 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityFormItem.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/QualityFormItem.java @@ -106,8 +106,9 @@ public class QualityFormItem implements INewObject { @SuppressWarnings("unused") @AssertTrue(message = "percentage should be greater than 0% and less than 100%") public boolean checkConstraintQualityFormItemPercentage() { - if (percentage == null) + if (percentage == null) { return true; + } return ((percentage.compareTo(new BigDecimal(100).setScale(2)) <= 0) && (percentage .compareTo(new BigDecimal(0).setScale(2)) > 0)); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/TaskQualityFormItem.java b/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/TaskQualityFormItem.java index abfe24275..b40a4495e 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/TaskQualityFormItem.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/qualityforms/entities/TaskQualityFormItem.java @@ -120,8 +120,9 @@ public class TaskQualityFormItem implements INewObject { @SuppressWarnings("unused") @AssertTrue(message = "percentage should be greater than 0% and less than 100%") public boolean checkConstraintQualityFormItemPercentage() { - if (percentage == null) + if (percentage == null) { return true; + } if ((percentage.compareTo(new BigDecimal(100).setScale(2)) <= 0) && (percentage.compareTo(new BigDecimal(0).setScale(2)) > 0)) { return true; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java index eab958b94..e4e509f7c 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java @@ -1006,8 +1006,9 @@ public abstract class Resource extends IntegrationEntity { public void addResourcesCostCategoryAssignment(ResourcesCostCategoryAssignment assignment) { resourcesCostCategoryAssignments.add(assignment); - if(assignment.getResource()!=this) + if (assignment.getResource() != this) { assignment.setResource(this); + } } public void addUnvalidatedResourcesCostCategoryAssignment( @@ -1019,8 +1020,9 @@ public abstract class Resource extends IntegrationEntity { public void removeResourcesCostCategoryAssignment(ResourcesCostCategoryAssignment assignment) { resourcesCostCategoryAssignments.remove(assignment); - if(assignment.getResource()==this) + if (assignment.getResource() == this) { assignment.setResource(null); + } } @AssertTrue(message="Some criterion satisfactions overlap in time") diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/scenarios/entities/Scenario.java b/navalplanner-business/src/main/java/org/navalplanner/business/scenarios/entities/Scenario.java index 55665f7b3..dbbe555df 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/scenarios/entities/Scenario.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/scenarios/entities/Scenario.java @@ -237,19 +237,23 @@ public class Scenario extends BaseEntity { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null || isNewObject()) + } + if (obj == null || isNewObject()) { return false; + } if (!(obj instanceof Scenario)) { return false; } Scenario other = (Scenario) obj; if (getId() == null) { - if (other.getId() != null) + if (other.getId() != null) { return false; - } else if (!getId().equals(other.getId())) + } + } else if (!getId().equals(other.getId())) { return false; + } return true; } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/valueobjects/DescriptionValue.java b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/valueobjects/DescriptionValue.java index ff87f61bc..a2eb90bb0 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/workreports/valueobjects/DescriptionValue.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/workreports/valueobjects/DescriptionValue.java @@ -82,8 +82,9 @@ public class DescriptionValue implements INewObject { } public void setValue(String value) { - if (value == null) + if (value == null) { value = ""; + } this.value = value; } } diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/OrderElementTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/OrderElementTest.java index 44aa9fe0f..582f2f140 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/OrderElementTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/OrderElementTest.java @@ -201,8 +201,9 @@ public class OrderElementTest { try { InvalidValue[] invalidValues = orderElementValidator.getInvalidValues(orderElement); - if (invalidValues.length > 0) + if (invalidValues.length > 0) { throw new ValidationException(invalidValues); + } } catch (ValidationException e) { fail("It not should throw an exception"); } @@ -216,8 +217,9 @@ public class OrderElementTest { try { InvalidValue[] invalidValues = orderElementValidator.getInvalidValues(orderElement); - if (invalidValues.length > 0) + if (invalidValues.length > 0) { throw new ValidationException(invalidValues); + } } catch (ValidationException e) { fail("It no should throw an exception"); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java index 8692ece88..6d8a7943c 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/CriterionRequirementWrapper.java @@ -105,7 +105,9 @@ public class CriterionRequirementWrapper implements INewObject { } public String getCriterionAndType() { - if(criterionWithItsType == null) return criterionAndType; + if (criterionWithItsType == null) { + return criterionAndType; + } return criterionWithItsType.getNameAndType(); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java index 09c8319c9..67fe6135a 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java @@ -364,8 +364,9 @@ public class OrderCRUDController extends GenericForwardComposer { private AssignedHoursToOrderElementController assignedHoursController; public void setupAssignedHoursToOrderElementController() throws Exception { - if (!confirmLastTab()) + if (!confirmLastTab()) { return; + } setCurrentTab(); if (assignedHoursController == null) { @@ -382,8 +383,9 @@ public class OrderCRUDController extends GenericForwardComposer { private ManageOrderElementAdvancesController manageOrderElementAdvancesController; public void setupManageOrderElementAdvancesController() throws Exception { - if (!confirmLastTab()) + if (!confirmLastTab()) { return; + } setCurrentTab(); Component orderElementAdvances = editWindow @@ -404,8 +406,9 @@ public class OrderCRUDController extends GenericForwardComposer { public void setupAssignedLabelsToOrderElementController() throws Exception { - if (!confirmLastTab()) + if (!confirmLastTab()) { return; + } setCurrentTab(); if (assignedLabelsController == null) { @@ -422,8 +425,9 @@ public class OrderCRUDController extends GenericForwardComposer { public void setupAssignedCriterionRequirementsToOrderElementController() throws Exception { - if (!confirmLastTab()) + if (!confirmLastTab()) { return; + } setCurrentTab(); if (assignedCriterionRequirementController == null) { @@ -444,8 +448,9 @@ public class OrderCRUDController extends GenericForwardComposer { public void setupAssignedMaterialsToOrderElementController() throws Exception { - if (!confirmLastTab()) + if (!confirmLastTab()) { return; + } setCurrentTab(); if (assignedMaterialsController == null) { @@ -462,8 +467,9 @@ public class OrderCRUDController extends GenericForwardComposer { private AssignedTaskQualityFormsToOrderElementController assignedTaskQualityFormController; public void setupAssignedTaskQualityFormsToOrderElementController() throws Exception { - if (!confirmLastTab()) + if (!confirmLastTab()) { return; + } setCurrentTab(); Component orderElementTaskQualityForms = editWindow @@ -482,8 +488,9 @@ public class OrderCRUDController extends GenericForwardComposer { private OrderAuthorizationController orderAuthorizationController; public void setupOrderAuthorizationController() { - if (!confirmLastTab()) + if (!confirmLastTab()) { return; + } setCurrentTab(); Component orderElementAuthorizations = editWindow @@ -1220,10 +1227,12 @@ public class OrderCRUDController extends GenericForwardComposer { } public void showOrderElementFilter() { - if (orderFilter != null) + if (orderFilter != null) { orderFilter.setVisible(false); - if (orderElementFilter != null) + } + if (orderElementFilter != null) { orderElementFilter.setVisible(true); + } } public void showCreateButtons(boolean showCreate) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java index a74d62552..512cd28ae 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/print/CutyPrint.java @@ -334,8 +334,9 @@ public class CutyPrint { } if (generatedCSS != null) { return generatedCSS.getAbsolutePath(); - } else + } else { return srFile; + } } private static String widthForTaskNamesColumnCSS( diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java index 3362e09f7..e457f4f08 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineCRUDController.java @@ -298,8 +298,9 @@ public class MachineCRUDController extends GenericForwardComposer { private String showInvalidValues(ValidationException e) { String result = ""; - for (InvalidValue each : e.getInvalidValues()) + for (InvalidValue each : e.getInvalidValues()) { result = result + each.getMessage(); + } return result; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineModel.java index ed200f60d..995d39041 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineModel.java @@ -208,8 +208,9 @@ public class MachineModel implements IMachineModel { @Transactional(readOnly = true) public List getConfigurationUnitsOfMachine() { ArrayList elements = new ArrayList(); - if ( machine != null ) + if (machine != null) { elements.addAll(machine.getConfigurationUnits()); + } return elements; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java index 3f38c326c..0003d8525 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java @@ -265,12 +265,14 @@ public class WorkReportCRUDController extends GenericForwardComposer implements private boolean showInvalidProperty() { if (getWorkReport() != null) { - if (!validateWorkReport()) + if (!validateWorkReport()) { return true; + } for (WorkReportLine workReportLine : getWorkReport() .getWorkReportLines()) { - if (!validateWorkReportLine(workReportLine)) + if (!validateWorkReportLine(workReportLine)) { return true; + } } } return false; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java index 0befedd75..09afed424 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportTypeModel.java @@ -320,10 +320,11 @@ public class WorkReportTypeModel implements IWorkReportTypeModel { } private PositionInWorkReportEnum getPosition(boolean sharedByLines) { - if (sharedByLines) + if (sharedByLines) { return PositionInWorkReportEnum.HEADING; - else + } else { return PositionInWorkReportEnum.LINE; + } } @Override