From b636354971cb255ee1622374cd92346068b26179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 3 Nov 2009 20:38:03 +0100 Subject: [PATCH] ItEr33S08ValidacionEProbasFuncionaisItEr32S09: Converting one line if statements to block --- .../web/planner/DataForPlanner.java | 3 +- .../navalplanner/web/planner/ShareBean.java | 6 +- .../org/zkoss/ganttz/DependencyComponent.java | 9 +- .../java/org/zkoss/ganttz/DependencyList.java | 6 +- .../FunctionalityExposedForExtensions.java | 18 +- .../java/org/zkoss/ganttz/LeftTasksTree.java | 9 +- .../org/zkoss/ganttz/LeftTasksTreeRow.java | 4 +- .../main/java/org/zkoss/ganttz/Planner.java | 15 +- .../java/org/zkoss/ganttz/TabsRegistry.java | 3 +- .../java/org/zkoss/ganttz/TaskComponent.java | 9 +- .../zkoss/ganttz/TaskContainerComponent.java | 3 +- .../main/java/org/zkoss/ganttz/TaskList.java | 6 +- .../data/DefaultFundamentalProperties.java | 3 +- .../org/zkoss/ganttz/data/Dependency.java | 18 +- .../org/zkoss/ganttz/data/DependencyType.java | 3 +- .../zkoss/ganttz/data/GanttDiagramGraph.java | 12 +- .../main/java/org/zkoss/ganttz/data/Task.java | 9 +- .../org/zkoss/ganttz/data/TaskContainer.java | 9 +- .../ganttz/data/resourceload/LoadLevel.java | 3 +- .../ganttz/data/resourceload/LoadPeriod.java | 9 +- .../ContextRelativeToOtherComponent.java | 6 +- .../timetracker/OnColumnsRowRenderer.java | 6 +- .../zoom/DetailFiveTimeTrackerState.java | 3 +- .../zoom/DetailThreeTimeTrackerState.java | 6 +- .../ganttz/timetracker/zoom/ZoomLevel.java | 3 +- .../java/org/zkoss/ganttz/util/Interval.java | 12 +- .../org/zkoss/ganttz/util/MenuBuilder.java | 6 +- .../zkoss/ganttz/util/MutableTreeModel.java | 15 +- .../ganttz/util/OnZKDesktopRegistry.java | 3 +- .../ganttz/util/WeakReferencedListeners.java | 7 +- .../util/script/ScriptDependenciesSorter.java | 3 +- .../ganttz/util/script/ScriptDependency.java | 3 +- .../advance/entities/AdvanceType.java | 20 +- .../calendars/daos/BaseCalendarDAO.java | 6 +- .../partialtime/IntervalOfPartialDates.java | 6 +- .../common/partialtime/PartialDate.java | 12 +- .../hibernate/IntervalOfPartialDatesType.java | 9 +- .../hibernate/PartialDateType.java | 9 +- .../hibernate/TimeQuantityType.java | 9 +- .../orders/entities/OrderElement.java | 6 +- .../entities/OrderLineGroupManipulator.java | 3 +- .../entities/GenericDayAssignment.java | 3 +- .../entities/GenericResourceAllocation.java | 3 +- .../planner/entities/ResourceAllocation.java | 3 +- .../planner/entities/ResourcesPerDay.java | 3 +- .../entities/SpecificDayAssignment.java | 3 +- .../business/planner/entities/Task.java | 3 +- .../planner/entities/TaskElement.java | 6 +- .../business/planner/entities/TaskGroup.java | 12 +- .../hibernate/ResourcesPerDayType.java | 9 +- .../business/resources/daos/CriterionDAO.java | 17 +- .../entities/CriterionCompounder.java | 6 +- .../entities/CriterionSatisfaction.java | 8 +- .../resources/entities/CriterionType.java | 6 +- .../business/resources/entities/Interval.java | 6 +- .../business/resources/entities/Resource.java | 17 +- .../business/util/ListSorter.java | 9 +- .../entities/DayAssignmentMatchers.java | 3 +- .../advance/AdvanceTypeCRUDController.java | 9 +- .../web/advance/AdvanceTypeModel.java | 3 +- .../web/common/CustomMenuController.java | 6 +- .../web/common/components/finders/Finder.java | 6 +- .../common/converters/ConverterFactory.java | 3 +- .../entrypoints/RedirectorSynthetiser.java | 3 +- .../web/common/entrypoints/URLHandler.java | 22 +- .../entrypoints/URLHandlerRegistry.java | 3 +- .../AsignedHoursToOrderElementModel.java | 3 +- .../ManageOrderElementAdvancesController.java | 14 +- .../ManageOrderElementAdvancesModel.java | 39 +-- .../web/orders/OrderElementModel.java | 6 +- .../web/orders/OrderElementTreeModel.java | 3 +- .../navalplanner/web/orders/OrderModel.java | 6 +- .../ResourceAllocationsBeingEdited.java | 3 +- .../allocation/SpecificAllocationDTO.java | 6 +- .../web/planner/order/OrderPlanningModel.java | 3 +- .../planner/splitting/MergeTaskCommand.java | 3 +- .../web/planner/splitting/ShareBean.java | 6 +- .../CriterionAdminController_V2.java | 3 +- .../criterion/CriterionTreeModel.java | 3 +- .../resources/criterion/CriterionsModel.java | 9 +- .../criterion/CriterionsModel_V2.java | 9 +- .../AssignedMachineCriterionsModel.java | 28 +-- .../worker/AssignedCriterionsModel.java | 232 ++++++++++-------- .../worker/CriterionSatisfactionDTO.java | 63 +++-- .../worker/CriterionsController.java | 11 +- .../worker/CriterionsMachineController.java | 8 +- .../worker/WorkerCRUDController.java | 6 +- .../web/resources/CriterionModelTest.java | 3 +- 88 files changed, 592 insertions(+), 357 deletions(-) diff --git a/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java b/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java index 2d46f006f..af8893f65 100644 --- a/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java +++ b/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java @@ -163,8 +163,9 @@ public class DataForPlanner { @Override public List getChildren( ITaskFundamentalProperties object) { - if (object == container) + if (object == container) { return containerChildren; + } return new ArrayList(); } diff --git a/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/ShareBean.java b/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/ShareBean.java index f85459f21..cfa88b369 100644 --- a/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/ShareBean.java +++ b/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/planner/ShareBean.java @@ -70,8 +70,9 @@ public class ShareBean { } public void setName(String name) { - if (StringUtils.isEmpty(name)) + if (StringUtils.isEmpty(name)) { return; + } this.name = name; } @@ -80,8 +81,9 @@ public class ShareBean { } public void setHours(Integer share) { - if (share == null || share <= 0) + if (share == null || share <= 0) { return; + } this.hours = share; } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/DependencyComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/DependencyComponent.java index c34b6ed48..b3a4b3fdd 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/DependencyComponent.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/DependencyComponent.java @@ -47,12 +47,15 @@ public class DependencyComponent extends XulElement implements AfterCompose { public DependencyComponent(TaskComponent source, TaskComponent destination, DependencyType type) { this.type = type; - if (source == null) + if (source == null) { throw new IllegalArgumentException("source cannot be null"); - if (destination == null) + } + if (destination == null) { throw new IllegalArgumentException("destination cannot be null"); - if (type == null) + } + if (type == null) { throw new IllegalArgumentException("type must be not null"); + } this.source = source; this.destination = destination; } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java b/ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java index 3c92aca91..2a9ac0fa4 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/DependencyList.java @@ -77,8 +77,9 @@ public class DependencyList extends XulElement implements AfterCompose { @Override public void propertyChange(PropertyChangeEvent evt) { - if (!evt.getPropertyName().equals("visible")) + if (!evt.getPropertyName().equals("visible")) { return; + } if (dependencyMustBeVisible() != isDependencyNowVisible()) { toggleDependencyExistence(dependencyMustBeVisible()); } @@ -156,8 +157,9 @@ public class DependencyList extends XulElement implements AfterCompose { listener = new IZoomLevelChangedListener() { @Override public void zoomLevelChanged(ZoomLevel detailLevel) { - if (!isInPage()) + if (!isInPage()) { return; + } for (DependencyComponent dependencyComponent : getDependencyComponents()) { dependencyComponent.zoomChanged(); } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java index e334a2d4c..707a93b2f 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java @@ -61,10 +61,12 @@ public class FunctionalityExposedForExtensions implements IContext { @Override public Task findAssociatedBean(T domainObject) throws IllegalArgumentException { - if (domainObject == null) + if (domainObject == null) { throw new IllegalArgumentException("domainObject is null"); - if (!fromDomainToTask.containsKey(domainObject)) + } + if (!fromDomainToTask.containsKey(domainObject)) { throw new IllegalArgumentException("not found " + domainObject); + } return fromDomainToTask.get(domainObject); } @@ -85,8 +87,9 @@ public class FunctionalityExposedForExtensions implements IContext { fromTaskToParent.put(task, parent); } else if (insertionPositionForTop != null) { topLevel.add(insertionPositionForTop, task); - } else + } else { topLevel.add(task); + } } void remove(T domainObject) { @@ -104,10 +107,12 @@ public class FunctionalityExposedForExtensions implements IContext { @Override public T findAssociatedDomainObject(Task task) throws IllegalArgumentException { - if (task == null) + if (task == null) { throw new IllegalArgumentException("taskBean is null"); - if (!fromTaskToDomain.containsKey(task)) + } + if (!fromTaskToDomain.containsKey(task)) { throw new IllegalArgumentException(); + } return fromTaskToDomain.get(task); } @@ -283,8 +288,9 @@ public class FunctionalityExposedForExtensions implements IContext { } public void addDependency(Dependency dependency) { - if (!canAddDependency(dependency)) + if (!canAddDependency(dependency)) { return; + } diagramGraph.add(dependency); getDependencyList().addDependencyComponent( getTaskList().asDependencyComponent(dependency)); diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java b/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java index 3526bca70..042e634df 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java @@ -205,8 +205,9 @@ public class LeftTasksTree extends HtmlMacroComponent { } private int getPositionOfChild() { - if (positionOfChildCached != null) + if (positionOfChildCached != null) { return positionOfChildCached; + } int[] path = tasksTreeModel.getPath(parent, child); return positionOfChildCached = path[path.length - 1]; } @@ -251,8 +252,9 @@ public class LeftTasksTree extends HtmlMacroComponent { } public void isBeingRendered(final Task parent, final Treeitem item) { - if (!pendingToAddChildren.contains(parent)) + if (!pendingToAddChildren.contains(parent)) { return; + } markLoaded(item); fillModel(parent, 0, parent.getTasks(), false); pendingToAddChildren.remove(parent); @@ -270,8 +272,9 @@ public class LeftTasksTree extends HtmlMacroComponent { private Method setLoadedMethod = null; private Method getSetLoadedMethod() { - if (setLoadedMethod != null) + if (setLoadedMethod != null) { return setLoadedMethod; + } try { Method method = Treeitem.class.getDeclaredMethod("setLoaded", Boolean.TYPE); diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java b/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java index a62211a4a..9b3beb469 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java @@ -196,9 +196,9 @@ public class LeftTasksTreeRow extends GenericForwardComposer { } break; case RIGHT: - if (position < textBoxes.size() - 1) + if (position < textBoxes.size() - 1) { textBoxes.get(position + 1).focus(); - else { + } else { focusGoDown(0); } break; diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java index b405af26e..1720f1d04 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java @@ -75,8 +75,9 @@ public class Planner extends HtmlMacroComponent { } TaskList getTaskList() { - if (ganttPanel == null) + if (ganttPanel == null) { return null; + } List children = ganttPanel.getChildren(); return ComponentsFinder.findComponentsOfType(TaskList.class, children).get(0); } @@ -86,13 +87,15 @@ public class Planner extends HtmlMacroComponent { } public DependencyList getDependencyList() { - if (ganttPanel == null) + if (ganttPanel == null) { return null; + } List children = ganttPanel.getChildren(); List found = ComponentsFinder.findComponentsOfType(DependencyList.class, children); - if (found.isEmpty()) + if (found.isEmpty()) { return null; + } return found.get(0); } @@ -134,8 +137,9 @@ public class Planner extends HtmlMacroComponent { } public void setConfiguration(PlannerConfiguration configuration) { - if (configuration == null) + if (configuration == null) { return; + } this.diagramGraph = new GanttDiagramGraph(); FunctionalityExposedForExtensions context = new FunctionalityExposedForExtensions( this, configuration.getAdapter(), configuration.getNavigator(), @@ -200,8 +204,9 @@ public class Planner extends HtmlMacroComponent { private CommandContextualized contextualize(IContext context, ICommand command) { - if (command == null) + if (command == null) { return null; + } return CommandContextualized.create(command, context); } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java b/ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java index 79b4b9563..d67c8b130 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java @@ -78,8 +78,9 @@ public class TabsRegistry { private void hideAllExcept(ITab tab) { for (ITab t : tabs) { - if (t.equals(tab)) + if (t.equals(tab)) { continue; + } t.hide(); } } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java index a1b6ab03d..9b0cc5bba 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskComponent.java @@ -62,10 +62,11 @@ public class TaskComponent extends Div implements AfterCompose { private static int stripPx(String pixels) { Matcher matcher = pixelsSpecificationPattern.matcher(pixels); - if (!matcher.matches()) + if (!matcher.matches()) { throw new IllegalArgumentException("pixels " + pixels + " is not valid. It must be " + pixelsSpecificationPattern.pattern()); + } return Integer.valueOf(matcher.group(1)); } @@ -311,8 +312,9 @@ public class TaskComponent extends Div implements AfterCompose { @Override public void setParent(Component parent) { - if (parent != null && !(parent instanceof TaskList)) + if (parent != null && !(parent instanceof TaskList)) { throw new UiException("Unsupported parent for rows: " + parent); + } super.setParent(parent); } @@ -321,8 +323,9 @@ public class TaskComponent extends Div implements AfterCompose { } private void updateProperties() { - if (!isInPage()) + if (!isInPage()) { return; + } setLeft("0"); setLeft(getMapper().toPixels(this.task.getBeginDate()) + "px"); setWidth("0"); diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskContainerComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskContainerComponent.java index 3dc0ebdc2..8c7744346 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskContainerComponent.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskContainerComponent.java @@ -55,8 +55,9 @@ public class TaskContainerComponent extends TaskComponent implements public TaskContainerComponent(TaskContainer taskContainer, TaskList taskList) { super(taskContainer, taskList.getDisabilityConfiguration()); - if (!taskContainer.isContainer()) + if (!taskContainer.isContainer()) { throw new IllegalArgumentException(); + } this.expandListener = new IExpandListener() { @Override diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java index 9488c324d..f308036fd 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java @@ -148,8 +148,9 @@ public class TaskList extends XulElement implements AfterCompose { private TaskComponent getFirstTopTaskComponent() { List taskComponents = getTopLevelTaskComponents(); - if (taskComponents.isEmpty()) + if (taskComponents.isEmpty()) { return null; + } return taskComponents.get(0); } @@ -194,8 +195,9 @@ public class TaskList extends XulElement implements AfterCompose { private void addListenerForTaskComponentEditForm( final TaskComponent taskComponent) { - if (editTaskCommand == null) + if (editTaskCommand == null) { return; + } taskComponent.addEventListener("onDoubleClick", new EventListener() { @Override diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java index e40018978..e59c3625b 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java @@ -87,10 +87,11 @@ public class DefaultFundamentalProperties implements ITaskFundamentalProperties } public void setLengthMilliseconds(long lengthMilliseconds) { - if (lengthMilliseconds < 0) + if (lengthMilliseconds < 0) { throw new IllegalArgumentException( "a task must not have a negative length. Received value: " + lengthMilliseconds); + } this.lengthMilliseconds = lengthMilliseconds; } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/Dependency.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/Dependency.java index af8b5313d..85364227a 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/Dependency.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/Dependency.java @@ -77,12 +77,15 @@ public class Dependency { public Dependency(Task source, Task destination, DependencyType type, boolean visible) { - if (source == null) + if (source == null) { throw new IllegalArgumentException("source cannot be null"); - if (destination == null) + } + if (destination == null) { throw new IllegalArgumentException("destination cannot be null"); - if (type == null) + } + if (type == null) { throw new IllegalArgumentException("type cannot be null"); + } this.source = source; this.destination = destination; this.type = type; @@ -102,12 +105,15 @@ public class Dependency { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } Dependency other = (Dependency) obj; return new EqualsBuilder().append(this.destination, other.destination) .append(this.source, other.source) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/DependencyType.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/DependencyType.java index d30ac5a0d..3c2ca87c4 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/DependencyType.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/DependencyType.java @@ -79,8 +79,9 @@ public enum DependencyType { }; private static Date getBigger(Date date1, Date date2) { - if (date1.before(date2)) + if (date1.before(date2)) { return date2; + } return date1; } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java index 07864292c..c05b90dfc 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/GanttDiagramGraph.java @@ -67,16 +67,18 @@ public class GanttDiagramGraph { private final Map alreadyRegistered = new WeakHashMap(); private ParentShrinkingEnforcer(final TaskContainer container) { - if (container == null) + if (container == null) { throw new IllegalArgumentException("container cannot be null"); + } this.container = container; registerListeners(); } void registerListeners() { for (Task subtask : this.container.getTasks()) { - if (alreadyRegistered.containsKey(subtask)) + if (alreadyRegistered.containsKey(subtask)) { continue; + } subtask .addFundamentalPropertiesChangeListener(new PropertyChangeListener() { @@ -102,8 +104,9 @@ public class GanttDiagramGraph { private final Task task; private DependencyRulesEnforcer(Task task) { - if (task == null) + if (task == null) { throw new IllegalArgumentException("task cannot be null"); + } this.task = task; this.task .addFundamentalPropertiesChangeListener(new PropertyChangeListener() { @@ -121,8 +124,9 @@ public class GanttDiagramGraph { Date beginDate = task.getBeginDate(); Date newStart = Dependency .calculateStart(task, beginDate, incoming); - if (!beginDate.equals(newStart)) + if (!beginDate.equals(newStart)) { task.setBeginDate(newStart); + } Date endDate = task.getEndDate(); Date newEnd = Dependency.calculateEnd(task, endDate, incoming); if (!endDate.equals(newEnd)) { diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java index 086b84f22..c96458cfa 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java @@ -53,14 +53,17 @@ public abstract class Task implements ITaskFundamentalProperties { public Task(String name, Date beginDate, long lengthMilliseconds) { this(); - if (name == null) + if (name == null) { throw new IllegalArgumentException("name cannot be null"); - if (beginDate == null) + } + if (beginDate == null) { throw new IllegalArgumentException("beginDate cannot be null"); - if (lengthMilliseconds < 0) + } + if (lengthMilliseconds < 0) { throw new IllegalArgumentException( "length in milliseconds must be positive. Instead it is " + lengthMilliseconds); + } this.fundamentalProperties.setName(name); this.fundamentalProperties.setBeginDate(beginDate); this.fundamentalProperties.setLengthMilliseconds(lengthMilliseconds); diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/TaskContainer.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/TaskContainer.java index 8612fa656..29ccb7f65 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/TaskContainer.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/TaskContainer.java @@ -57,8 +57,9 @@ public class TaskContainer extends Task { private static T getSmallest(Collection elements, Comparator comparator) { List withoutNulls = removeNulls(elements); - if (withoutNulls.isEmpty()) + if (withoutNulls.isEmpty()) { throw new IllegalArgumentException("at least one required"); + } T result = null; for (T element : withoutNulls) { result = result == null ? element : (comparator.compare(result, @@ -111,8 +112,9 @@ public class TaskContainer extends Task { } public Date getSmallestBeginDateFromChildren() { - if (tasks.isEmpty()) + if (tasks.isEmpty()) { return getBeginDate(); + } return getSmallest(getStartDates()); } @@ -133,8 +135,9 @@ public class TaskContainer extends Task { } public Date getBiggestDateFromChildren() { - if (tasks.isEmpty()) + if (tasks.isEmpty()) { return getEndDate(); + } return getBiggest(getEndDates()); } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadLevel.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadLevel.java index 70aa4168d..35fdb21ab 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadLevel.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadLevel.java @@ -54,8 +54,9 @@ public class LoadLevel { protected abstract boolean contains(int percentage); public static Category categoryFor(int percentage) { for (Category category : values()) { - if (category.contains(percentage)) + if (category.contains(percentage)) { return category; + } } throw new IllegalArgumentException("couldn't handle " + percentage); } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadPeriod.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadPeriod.java index 0784dd709..535fd5c60 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadPeriod.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadPeriod.java @@ -86,8 +86,9 @@ public class LoadPeriod { + o2); } int comparison = compareLocalDates(o1.start, o2.start); - if (comparison != 0) + if (comparison != 0) { return comparison; + } return compareLocalDates(o1.end, o2.end); } }); @@ -95,10 +96,12 @@ public class LoadPeriod { } private static int compareLocalDates(LocalDate l1, LocalDate l2) { - if (l1.isBefore(l2)) + if (l1.isBefore(l2)) { return -1; - if (l1.isAfter(l2)) + } + if (l1.isAfter(l2)) { return 1; + } return 0; } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/extensions/ContextRelativeToOtherComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/extensions/ContextRelativeToOtherComponent.java index a05a9b02e..475ecb2e0 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/extensions/ContextRelativeToOtherComponent.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/extensions/ContextRelativeToOtherComponent.java @@ -43,10 +43,12 @@ public class ContextRelativeToOtherComponent implements IContext { private ContextRelativeToOtherComponent(Component component, IContext context) { - if (component == null) + if (component == null) { throw new IllegalArgumentException("component must be not null"); - if (context == null) + } + if (context == null) { throw new IllegalArgumentException("context must be not null"); + } this.component = component; this.context = context; } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/OnColumnsRowRenderer.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/OnColumnsRowRenderer.java index 46c4bce85..d49f5b253 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/OnColumnsRowRenderer.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/OnColumnsRowRenderer.java @@ -66,8 +66,9 @@ public class OnColumnsRowRenderer implements RowRenderer { if (isTypeForInterface(type, ICellForDetailItemRenderer.class)) { if (type instanceof ParameterizedType) { return (ParameterizedType) type; - } else + } else { informCannotBeInferred(renderer); + } } } throw new RuntimeException("shouldn't reach here. Uncovered case for " @@ -110,9 +111,10 @@ public class OnColumnsRowRenderer implements RowRenderer { @Override public void render(Row row, Object data) { - if (!type.isInstance(data)) + if (!type.isInstance(data)) { throw new IllegalArgumentException(data + " is not instance of " + type); + } for (C item : columns) { Component child = cellRenderer.cellFor(item, type.cast(data)); child.setParent(row); diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailFiveTimeTrackerState.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailFiveTimeTrackerState.java index 321a7bc3b..0bea2e784 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailFiveTimeTrackerState.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailFiveTimeTrackerState.java @@ -90,8 +90,9 @@ public class DetailFiveTimeTrackerState extends TimeTrackerStateUsingJodaTime { @Override protected LocalDate round(LocalDate date, boolean down) { int dayOfWeek = date.getDayOfWeek(); - if (dayOfWeek == 1) + if (dayOfWeek == 1) { return date; + } return down ? date.withDayOfWeek(1) : date.withDayOfWeek(1) .plusWeeks(1); } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailThreeTimeTrackerState.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailThreeTimeTrackerState.java index d37a5bebb..f64392259 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailThreeTimeTrackerState.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/DetailThreeTimeTrackerState.java @@ -70,10 +70,12 @@ public class DetailThreeTimeTrackerState extends TimeTrackerStateUsingJodaTime { @Override protected LocalDate round(LocalDate date, boolean down) { - if (date.getMonthOfYear() == 1 && date.getDayOfMonth() == 1) + if (date.getMonthOfYear() == 1 && date.getDayOfMonth() == 1) { return date; - if (date.getMonthOfYear() == 7 && date.getDayOfMonth() == 1) + } + if (date.getMonthOfYear() == 7 && date.getDayOfMonth() == 1) { return date; + } date = date.withDayOfMonth(1); if (date.getMonthOfYear() < 7) { return down ? date.withMonthOfYear(1) : date.withMonthOfYear(7); diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java index d3b9aca36..99ba2c13f 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/zoom/ZoomLevel.java @@ -34,8 +34,9 @@ public enum ZoomLevel { private final TimeTrackerState state; private ZoomLevel(TimeTrackerState state) { - if (state == null) + if (state == null) { throw new IllegalArgumentException("state cannot be null"); + } this.state = state; } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/Interval.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/Interval.java index 902149bf4..37dea1675 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/util/Interval.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/util/Interval.java @@ -37,12 +37,15 @@ public class Interval { private final long lengthBetween; public Interval(Date start, Date finish) { - if (start == null) + if (start == null) { throw new IllegalArgumentException("begin cannot be null"); - if (finish == null) + } + if (finish == null) { throw new IllegalArgumentException("end cannot be null"); - if (start.compareTo(finish) > 0) + } + if (start.compareTo(finish) > 0) { throw new IllegalArgumentException("start must be prior to end"); + } this.start = start; this.finish = finish; lengthBetween = this.finish.getTime() - this.start.getTime(); @@ -74,9 +77,10 @@ public class Interval { } public double getProportion(Date date) { - if (!isIncluded(date)) + if (!isIncluded(date)) { throw new IllegalArgumentException("date " + date + " must be between [" + start + "," + finish + "]"); + } return ((double) date.getTime() - start.getTime()) / lengthBetween; } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/MenuBuilder.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/MenuBuilder.java index b9c255649..5504cfdfc 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/util/MenuBuilder.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/util/MenuBuilder.java @@ -83,10 +83,12 @@ public class MenuBuilder { } public MenuBuilder item(String name, ItemAction itemAction) { - if (name == null) + if (name == null) { throw new IllegalArgumentException("name cannot be null"); - if (itemAction == null) + } + if (itemAction == null) { throw new IllegalArgumentException("itemAction cannot be null"); + } items.add(new Item(name, itemAction)); return this; } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/MutableTreeModel.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/MutableTreeModel.java index 6bae52448..a748c0365 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/util/MutableTreeModel.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/util/MutableTreeModel.java @@ -167,8 +167,9 @@ public class MutableTreeModel extends AbstractTreeModel { private MutableTreeModel(Class type, Node root) { super(root); - if (type == null) + if (type == null) { throw new IllegalArgumentException("type cannot be null"); + } nodesByDomainObject.put(unwrap(root), root); this.root = root; } @@ -177,8 +178,9 @@ public class MutableTreeModel extends AbstractTreeModel { public int[] getPath(Object parent, Object last) { Node parentNode = find(parent); Node lastNode = find(last); - if (parentNode == null || lastNode == null) + if (parentNode == null || lastNode == null) { return new int[0]; + } List path = lastNode.until(parentNode); return asIntArray(path); } @@ -221,8 +223,9 @@ public class MutableTreeModel extends AbstractTreeModel { } private void add(Node parent, Integer position, List> children) { - if (children.isEmpty()) + if (children.isEmpty()) { return; + } int indexFrom = position == null ? parent.children.size() : position; int indexTo = indexFrom + children.size() - 1; parent.addAll(position, children); @@ -254,9 +257,10 @@ public class MutableTreeModel extends AbstractTreeModel { public void remove(T node) { Node found = find(node); - if (found.isRoot()) + if (found.isRoot()) { throw new IllegalArgumentException(node + " is root. It can't be removed"); + } int positionInParent = found.remove(); nodesByDomainObject.remove(node); fireEvent(unwrap(found.parentNode), positionInParent, positionInParent, @@ -265,8 +269,9 @@ public class MutableTreeModel extends AbstractTreeModel { public T getParent(T node) { Node associatedNode = find(node); - if (associatedNode.equals(root)) + if (associatedNode.equals(root)) { throw new IllegalArgumentException(node + " is root"); + } return unwrap(associatedNode.getParent()); } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/OnZKDesktopRegistry.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/OnZKDesktopRegistry.java index 5e3248130..901e13d46 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/util/OnZKDesktopRegistry.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/util/OnZKDesktopRegistry.java @@ -58,9 +58,10 @@ public class OnZKDesktopRegistry { } public T retrieve() throws IllegalStateException { - if (!isRegistered()) + if (!isRegistered()) { throw new IllegalStateException("no " + klass.getSimpleName() + " registered"); + } return klass.cast(get()); } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/WeakReferencedListeners.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/WeakReferencedListeners.java index 9c359c546..7f73a5b78 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/util/WeakReferencedListeners.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/util/WeakReferencedListeners.java @@ -44,8 +44,9 @@ public class WeakReferencedListeners { } public synchronized void addListener(T listener) { - if (listener == null) + if (listener == null) { throw new IllegalArgumentException("listener cannot be null"); + } listeners.add(new WeakReference(listener)); } @@ -55,9 +56,9 @@ public class WeakReferencedListeners { ArrayList active = new ArrayList(); while (listIterator.hasNext()) { T listener = listIterator.next().get(); - if (listener == null) + if (listener == null) { listIterator.remove(); - else { + } else { active.add(listener); } } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/script/ScriptDependenciesSorter.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/script/ScriptDependenciesSorter.java index e3a3092ad..3690687f5 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/util/script/ScriptDependenciesSorter.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/util/script/ScriptDependenciesSorter.java @@ -37,10 +37,11 @@ public class ScriptDependenciesSorter implements IScriptsRegister { public static List extractFrom(Class classWithScripts) { ScriptsRequiredDeclaration annotation = classWithScripts .getAnnotation(ScriptsRequiredDeclaration.class); - if (annotation == null) + if (annotation == null) { throw new IllegalArgumentException(classWithScripts + " must be annotated with " + ScriptsRequiredDeclaration.class.getName()); + } List dependsOn = getDependencies(annotation); List result = new ArrayList(); for (Field field : getStringFields(getStaticFields(classWithScripts diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/script/ScriptDependency.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/script/ScriptDependency.java index e03f1ba2a..c7dfb810b 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/util/script/ScriptDependency.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/util/script/ScriptDependency.java @@ -68,8 +68,9 @@ public class ScriptDependency { @Override public boolean equals(Object other) { - if (this == other) + if (this == other) { return true; + } if (other instanceof ScriptDependency) { return url.equals(((ScriptDependency) other).url); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java b/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java index bf76f69fe..020964ff6 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/advance/entities/AdvanceType.java @@ -139,8 +139,9 @@ public class AdvanceType extends BaseEntity { } public String getType() { - if (isUpdatable()) + if (isUpdatable()) { return "De Usuario"; + } return "Predefinido"; } @@ -148,25 +149,24 @@ public class AdvanceType extends BaseEntity { } public boolean isPrecisionValid(BigDecimal precision) { - if ((this.defaultMaxValue == null) || (precision == null)) + if ((this.defaultMaxValue == null) || (precision == null)) { return true; - if (this.defaultMaxValue.compareTo(precision) < 0) - return false; - return true; + } + return this.defaultMaxValue.compareTo(precision) >= 0; } public boolean isDefaultMaxValueValid(BigDecimal defaultMaxValue) { - if ((this.unitPrecision == null) || (defaultMaxValue == null)) + if ((this.unitPrecision == null) || (defaultMaxValue == null)) { return true; - if (this.unitPrecision.compareTo(defaultMaxValue) > 0) - return false; - return true; + } + return this.unitPrecision.compareTo(defaultMaxValue) <= 0; } public static boolean equivalentInDB(AdvanceType type, AdvanceType otherType) { - if (type.getId() == null || otherType.getId() == null) + if (type.getId() == null || otherType.getId() == null) { return false; + } return type.getId().equals(otherType.getId()); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/daos/BaseCalendarDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/daos/BaseCalendarDAO.java index 5a51bbd9d..b897e4a95 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/calendars/daos/BaseCalendarDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/calendars/daos/BaseCalendarDAO.java @@ -95,10 +95,12 @@ public class BaseCalendarDAO extends GenericDAOHibernate @Override public boolean thereIsOtherWithSameName(BaseCalendar baseCalendar) { List withSameName = findByName(baseCalendar); - if (withSameName.isEmpty()) + if (withSameName.isEmpty()) { return false; - if (withSameName.size() > 1) + } + if (withSameName.size() > 1) { return true; + } return areDifferentInDB(withSameName.get(0), baseCalendar); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/IntervalOfPartialDates.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/IntervalOfPartialDates.java index 711fb06e1..58f2477c0 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/IntervalOfPartialDates.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/IntervalOfPartialDates.java @@ -30,9 +30,10 @@ public class IntervalOfPartialDates { private final PartialDate end; public IntervalOfPartialDates(PartialDate start, PartialDate end) { - if (!start.getGranularity().equals(end.getGranularity())) + if (!start.getGranularity().equals(end.getGranularity())) { throw new IllegalArgumentException( "the from and the to must have the same granularity"); + } if (!start.before(end)) { throw new IllegalArgumentException( "the start must be before the end"); @@ -55,8 +56,9 @@ public class IntervalOfPartialDates { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; + } if (obj instanceof IntervalOfPartialDates) { IntervalOfPartialDates other = (IntervalOfPartialDates) obj; return new EqualsBuilder().append(this.start, other.start).append( diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/PartialDate.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/PartialDate.java index 3e65cbe8e..ebf44655c 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/PartialDate.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/PartialDate.java @@ -282,10 +282,12 @@ public class PartialDate implements ReadablePartial { Iterator otherIterator = other.values.iterator(); while (iterator.hasNext()) { int diff = iterator.next() - otherIterator.next(); - if (diff > 0) + if (diff > 0) { return false; - if (diff < 0) + } + if (diff < 0) { return true; + } } return false; } @@ -295,9 +297,10 @@ public class PartialDate implements ReadablePartial { } public LocalDate tryToConvertToLocalDate() throws IllegalArgumentException { - if (!this.canBeConvertedToLocalDate()) + if (!this.canBeConvertedToLocalDate()) { throw new IllegalArgumentException("the partialDate " + this + " can't support be converted to local date"); + } return new LocalDate(this.normalizedInstant, ISOChronology .getInstance(DateTimeZone.getDefault())); } @@ -405,10 +408,11 @@ public class PartialDate implements ReadablePartial { } public Integer valueFor(Granularity granularity) { - if (this.granularity.isMoreCoarseGrainedThan(granularity)) + if (this.granularity.isMoreCoarseGrainedThan(granularity)) { throw new IllegalArgumentException(granularity + " is more specific than this instance granularity: " + this.granularity); + } return get(granularity.getMostSpecific()); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/hibernate/IntervalOfPartialDatesType.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/hibernate/IntervalOfPartialDatesType.java index 4602fb163..0ae5f1219 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/hibernate/IntervalOfPartialDatesType.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/hibernate/IntervalOfPartialDatesType.java @@ -68,10 +68,12 @@ public class IntervalOfPartialDatesType implements CompositeUserType { @Override public boolean equals(Object x, Object y) throws HibernateException { - if (x == y) + if (x == y) { return true; - if (x == null || y == null) + } + if (x == null || y == null) { return false; + } return x.equals(y); } @@ -114,8 +116,9 @@ public class IntervalOfPartialDatesType implements CompositeUserType { 0, 2), owner); PartialDate end = PARTIAL_DATE_TYPE.nullSafeGet(rs, subArray(names, 2, 2), owner); - if (start == null || end == null) + if (start == null || end == null) { return null; + } return new IntervalOfPartialDates(start, end); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/hibernate/PartialDateType.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/hibernate/PartialDateType.java index 376036995..1d004d69d 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/hibernate/PartialDateType.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/hibernate/PartialDateType.java @@ -82,10 +82,12 @@ public class PartialDateType implements UserType { @Override public boolean equals(Object x, Object y) throws HibernateException { - if (x == y) + if (x == y) { return true; - if (x == null || y == null) + } + if (x == null || y == null) { return false; + } return x.equals(y); } @@ -106,8 +108,9 @@ public class PartialDateType implements UserType { names[0]); String granularity = (String) Hibernate.STRING .nullSafeGet(rs, names[1]); - if (timestamp == null || granularity == null) + if (timestamp == null || granularity == null) { return null; + } return PartialDate.createFromDataForPersistence(timestamp, granularity); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/hibernate/TimeQuantityType.java b/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/hibernate/TimeQuantityType.java index f1dd4fa54..57e1a4636 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/hibernate/TimeQuantityType.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/common/partialtime/hibernate/TimeQuantityType.java @@ -48,8 +48,9 @@ public class TimeQuantityType implements UserType { JSONObject jsonObject = new JSONObject(); for (Granularity granularity : Granularity.values()) { Integer value = timeQuantity.valueFor(granularity); - if (value != 0) + if (value != 0) { jsonObject.put(granularity.name(), value); + } } return jsonObject.toString(); } @@ -86,10 +87,12 @@ public class TimeQuantityType implements UserType { @Override public boolean equals(Object x, Object y) throws HibernateException { - if (x == y) + if (x == y) { return true; - if (x == null || y == null) + } + if (x == null || y == null) { return false; + } return x.equals(y); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java index 949f76680..90f3e5846 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java @@ -164,10 +164,12 @@ public abstract class OrderElement extends BaseEntity { public boolean isFormatCodeValid(String code) { - if (code.contains("_")) + if (code.contains("_")) { return false; - if (code.equals("")) + } + if (code.equals("")) { return false; + } return true; } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroupManipulator.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroupManipulator.java index 5a8db2948..db4978ba6 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroupManipulator.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroupManipulator.java @@ -55,8 +55,9 @@ public class OrderLineGroupManipulator implements IOrderLineGroup { } private void setParentIfRequired(OrderElement orderElement) { - if (this.parent != null) + if (this.parent != null) { orderElement.setParent(this.parent); + } } @Override diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignment.java index bfc96c9e6..ca2268b96 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignment.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssignment.java @@ -74,9 +74,10 @@ public class GenericDayAssignment extends DayAssignment { protected void setGenericResourceAllocation( GenericResourceAllocation genericResourceAllocation) { - if (this.genericResourceAllocation != null) + if (this.genericResourceAllocation != null) { throw new IllegalStateException( "the allocation cannot be changed once it has been set"); + } this.genericResourceAllocation = genericResourceAllocation; } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java index 76dcf5903..339f8f7e8 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericResourceAllocation.java @@ -97,8 +97,9 @@ public class GenericResourceAllocation extends public List getOrderedAssignmentsFor(Resource resource) { List list = getOrderedAssignmentsFor().get( resource); - if (list == null) + if (list == null) { return Collections.emptyList(); + } return Collections.unmodifiableList(list); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java index 2b1143e40..6aa3a9345 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java @@ -144,9 +144,10 @@ public abstract class ResourceAllocation extends List allocations) { for (AllocationBeingModified allocationBeingModified : allocations) { if (allocationBeingModified - .getBeingModified().getTask() == null) + .getBeingModified().getTask() == null) { throw new IllegalArgumentException( "all allocations must have task"); + } } } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourcesPerDay.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourcesPerDay.java index 5e7427478..163f0ca2d 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourcesPerDay.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourcesPerDay.java @@ -64,8 +64,9 @@ public class ResourcesPerDay { @Override public boolean equals(Object obj) { - if (obj == this) + if (obj == this) { return true; + } if (obj instanceof ResourcesPerDay) { ResourcesPerDay other = (ResourcesPerDay) obj; return amount.equals(other.getAmount()); diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignment.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignment.java index 760fc9c79..e1d113902 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignment.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificDayAssignment.java @@ -75,9 +75,10 @@ public class SpecificDayAssignment extends DayAssignment { public void setSpecificResourceAllocation( SpecificResourceAllocation specificResourceAllocation) { - if (this.specificResourceAllocation != null) + if (this.specificResourceAllocation != null) { throw new IllegalStateException( "the allocation cannot be changed once it has been set"); + } this.specificResourceAllocation = specificResourceAllocation; } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java index ae6f39f5c..d4732ce41 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java @@ -177,9 +177,10 @@ public class Task extends TaskElement { public TaskGroup split(int... shares) { int totalSumOfHours = sum(shares); - if (totalSumOfHours != getWorkHours()) + if (totalSumOfHours != getWorkHours()) { throw new IllegalArgumentException( "the shares don't sum up the work hours"); + } TaskGroup result = TaskGroup.create(); result.copyPropertiesFrom(this); result.shareOfHours = this.shareOfHours; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java index 3515d9e36..fd431f960 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java @@ -62,8 +62,9 @@ public abstract class TaskElement extends BaseEntity { private BaseCalendar calendar; public Integer getWorkHours() { - if (shareOfHours != null) + if (shareOfHours != null) { return shareOfHours; + } return defaultWorkHours(); } @@ -116,9 +117,10 @@ public abstract class TaskElement extends BaseEntity { public void setOrderElement(OrderElement orderElement) throws IllegalArgumentException, IllegalStateException { Validate.notNull(orderElement, "orderElement must be not null"); - if (this.orderElement != null) + if (this.orderElement != null) { throw new IllegalStateException( "once a orderElement is set, it cannot be changed"); + } this.orderElement = orderElement; } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskGroup.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskGroup.java index 4e713d624..4db2e6c99 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskGroup.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskGroup.java @@ -90,8 +90,9 @@ public class TaskGroup extends TaskElement { for (TaskElement t : taskElements) { if (t instanceof TaskGroup) { TaskGroup group = (TaskGroup) t; - if (!group.canBeMerged()) + if (!group.canBeMerged()) { return false; + } } } return true; @@ -109,10 +110,12 @@ public class TaskGroup extends TaskElement { HoursGroup hoursGroup = null; for (TaskElement taskElement : taskElements) { HoursGroup current = getHoursGroupFor(taskElement); - if (current == null) + if (current == null) { return false; - if (hoursGroup == null) + } + if (hoursGroup == null) { hoursGroup = current; + } if (!current.equals(hoursGroup)) { return false; } @@ -133,9 +136,10 @@ public class TaskGroup extends TaskElement { } public Task merge() { - if (!canBeMerged()) + if (!canBeMerged()) { throw new IllegalStateException( "merge must not be called on a TaskGroup such canBeMerged returns false"); + } HoursGroup hoursGroup = inferHoursGroupFromChildren(); Task result = Task.createTask(hoursGroup); result.copyPropertiesFrom(this); diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/hibernate/ResourcesPerDayType.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/hibernate/ResourcesPerDayType.java index 709b0860d..a3fc632e3 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/hibernate/ResourcesPerDayType.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/hibernate/ResourcesPerDayType.java @@ -64,10 +64,12 @@ public class ResourcesPerDayType implements UserType { @Override public boolean equals(Object x, Object y) throws HibernateException { - if (x == y) + if (x == y) { return true; - if (x == null || y == null) + } + if (x == null || y == null) { return false; + } return x.equals(y); } @@ -86,8 +88,9 @@ public class ResourcesPerDayType implements UserType { throws HibernateException, SQLException { BigDecimal bigDecimal = (BigDecimal) Hibernate.BIG_DECIMAL.nullSafeGet( rs, names[0]); - if (bigDecimal == null) + if (bigDecimal == null) { return null; + } return ResourcesPerDay.amount(bigDecimal); } 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 d61bd00b9..bcd4b09ad 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 @@ -54,10 +54,12 @@ public class CriterionDAO extends GenericDAOHibernate @Transactional(propagation = Propagation.REQUIRES_NEW, readOnly = true) public boolean thereIsOtherWithSameNameAndType(Criterion criterion) { List withSameNameAndType = findByNameAndType(criterion); - if (withSameNameAndType.isEmpty()) + if (withSameNameAndType.isEmpty()) { return false; - if (withSameNameAndType.size() > 1) + } + if (withSameNameAndType.size() > 1) { return true; + } return areDifferentInDB(withSameNameAndType.get(0), criterion); } @@ -68,8 +70,9 @@ public class CriterionDAO extends GenericDAOHibernate @Override public List findByNameAndType(Criterion criterion) { - if (criterion.getType() == null) return new ArrayList(); - + if (criterion.getType() == null) { + return new ArrayList(); + } Criteria c = getSession().createCriteria(Criterion.class); c.add(Restrictions.eq("name", criterion.getName()).ignoreCase()) .createCriteria("type") @@ -81,9 +84,10 @@ public class CriterionDAO extends GenericDAOHibernate public Criterion findUniqueByNameAndType(Criterion criterion) throws InstanceNotFoundException { List list = findByNameAndType(criterion); - if (list.size() != 1) + if (list.size() != 1) { throw new InstanceNotFoundException(criterion, Criterion.class .getName()); + } return list.get(0); } @@ -98,8 +102,9 @@ public class CriterionDAO extends GenericDAOHibernate @Override public Criterion find(Criterion criterion) throws InstanceNotFoundException { - if (criterion.getId() != null) + if (criterion.getId() != null) { return super.find(criterion.getId()); + } Criterion result = findUniqueByNameAndType(criterion); return result; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionCompounder.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionCompounder.java index 806018739..5410b2f76 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionCompounder.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionCompounder.java @@ -128,8 +128,9 @@ public class CriterionCompounder { @Override public boolean isSatisfiedBy(Resource resource) { for (ICriterion criterion : criterions) { - if (!criterion.isSatisfiedBy(resource)) + if (!criterion.isSatisfiedBy(resource)) { return false; + } } return true; } @@ -137,8 +138,9 @@ public class CriterionCompounder { @Override public boolean isSatisfiedBy(Resource resource, Date start, Date end) { for (ICriterion criterion : criterions) { - if (!criterion.isSatisfiedBy(resource, start, end)) + if (!criterion.isSatisfiedBy(resource, start, end)) { return false; + } } return true; } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java index 42df5704d..c0023f9c5 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionSatisfaction.java @@ -167,7 +167,9 @@ public class CriterionSatisfaction extends BaseEntity { || getStartDate().equals(finish) || getStartDate().before(finish)); Validate.isTrue(finishDate == null || isNewObject() || getEndDate().equals(finish) || getEndDate().before(finish)); - if(finish !=null) finish = new Date(finish.getTime()); + if(finish !=null) { + finish = new Date(finish.getTime()); + } this.finishDate = finish; } @@ -176,7 +178,9 @@ public class CriterionSatisfaction extends BaseEntity { } public void setEndDate(Date date) { - if(date != null) finish(date); + if(date != null) { + finish(date); + } this.finishDate = date; } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java index e4b47738a..4046d99c4 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java @@ -218,11 +218,13 @@ public class CriterionType extends BaseEntity implements */ @Override public boolean equals(Object o) { - if (o instanceof CriterionType == false) + if (o instanceof CriterionType == false) { return false; + } - if (this == o) + if (this == o) { return true; + } CriterionType criterionType = (CriterionType) o; diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Interval.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Interval.java index 8ad32c822..dae19b04c 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Interval.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Interval.java @@ -43,10 +43,12 @@ public abstract class Interval { public static Interval range(Date start, Date end) { Validate.notNull(start, "start date must be not null"); - if (end == null) + if (end == null) { return from(start); - if (start.equals(end)) + } + if (start.equals(end)) { return point(start); + } return new Range(start, end); } 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 27828706a..08f36dd05 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 @@ -84,8 +84,9 @@ public abstract class Resource extends BaseEntity{ Set satisfactionActives = new HashSet(); for(CriterionSatisfaction satisfaction:criterionSatisfactions){ - if(!satisfaction.isIsDeleted()) + if(!satisfaction.isIsDeleted()) { satisfactionActives.add(satisfaction); + } } return satisfactionActives; } @@ -187,8 +188,9 @@ public abstract class Resource extends BaseEntity{ private boolean isAcceptedByAllPredicates( CriterionSatisfaction criterionSatisfaction) { for (IPredicate predicate : predicates) { - if (!predicate.accepts(criterionSatisfaction)) + if (!predicate.accepts(criterionSatisfaction)) { return false; + } } return true; } @@ -437,7 +439,9 @@ public abstract class Resource extends BaseEntity{ ( posteriorSameCriterion == null || !posteriorSameCriterion.overlapsWith(interval))); - if(!canAdd) return false; + if(!canAdd) { + return false; + } if (type.isAllowSimultaneousCriterionsPerResource()){ return true; } @@ -470,7 +474,9 @@ public abstract class Resource extends BaseEntity{ ( posteriorSameCriterion == null || !posteriorSameCriterion.overlapsWith(interval))); - if(!canAdd) return false; + if(!canAdd) { + return false; + } if (type.isAllowSimultaneousCriterionsPerResource()){ return true; } @@ -562,8 +568,9 @@ public abstract class Resource extends BaseEntity{ if (previous != null) { checkNotOverlaps(previous, current); } - if (next != null) + if (next != null) { checkNotOverlaps(current, next); + } } } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/util/ListSorter.java b/navalplanner-business/src/main/java/org/navalplanner/business/util/ListSorter.java index f1523862d..a29ead7f0 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/util/ListSorter.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/util/ListSorter.java @@ -88,8 +88,9 @@ public class ListSorter { */ public void modified(T element) throws NoSuchElementException { int index = indexOfElement(element); - if ((index == list.size())) + if ((index == list.size())) { throw new NoSuchElementException("not found: " + element); + } list.remove(index); insert(element); } @@ -104,8 +105,9 @@ public class ListSorter { private int indexOfElement(T element) { int index = 0; for (T t : list) { - if (t == element) + if (t == element) { break; + } index++; } return index; @@ -119,9 +121,10 @@ public class ListSorter { */ public void add(T element) { Validate.notNull(element); - if (exists(element)) + if (exists(element)) { throw new IllegalArgumentException(element + " already exists. Duplicateds not allowed"); + } insert(element); } diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/DayAssignmentMatchers.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/DayAssignmentMatchers.java index b064d4ad5..477ff34f9 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/DayAssignmentMatchers.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/DayAssignmentMatchers.java @@ -92,8 +92,9 @@ public class DayAssignmentMatchers { public boolean matches(Object value) { if (value instanceof List) { List assignments = (List) value; - if (assignments.size() != hours.length) + if (assignments.size() != hours.length) { return false; + } for (int i = 0; i < hours.length; i++) { if (hours[i] != assignments.get(i).getHours()) { return false; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java index 86e3b46fb..698942232 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeCRUDController.java @@ -105,9 +105,10 @@ public class AdvanceTypeCRUDController extends GenericForwardComposer { @Override public void validate(Component comp, Object value) throws WrongValueException { - if (((BigDecimal) value) == null) + if (((BigDecimal) value) == null) { throw new WrongValueException(comp, _("Value is not valid, the default max value must not be null")); + } if (!(advanceTypeModel.isPrecisionValid((BigDecimal) value))) { throw new WrongValueException( @@ -124,9 +125,10 @@ public class AdvanceTypeCRUDController extends GenericForwardComposer { @Override public void validate(Component comp, Object value) throws WrongValueException { - if (((BigDecimal) value) == null) + if (((BigDecimal) value) == null) { throw new WrongValueException(comp, _("Value is not valid, the Precision value must not be null ")); + } if (!(advanceTypeModel .isDefaultMaxValueValid((BigDecimal) value))) { throw new WrongValueException( @@ -143,9 +145,10 @@ public class AdvanceTypeCRUDController extends GenericForwardComposer { @Override public void validate(Component comp, Object value) throws WrongValueException { - if (((String) value).isEmpty()) + if (((String) value).isEmpty()) { throw new WrongValueException(comp, _("The name is not valid, the name must not be null ")); + } if (!(advanceTypeModel.distinctNames((String) value))) { throw new WrongValueException(comp, _("The name is not valid, Exist other advance type with a similar name. ")); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java index 1c6c994b4..00ada6636 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/advance/AdvanceTypeModel.java @@ -141,8 +141,9 @@ public class AdvanceTypeModel implements IAdvanceTypeModel { @Override @Transactional public boolean distinctNames(String name) { - if (name.isEmpty()) + if (name.isEmpty()) { return true; + } List listAdvanceType = advanceTypeDAO .list(AdvanceType.class); for (AdvanceType advanceType : listAdvanceType) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java index b4b2e2e7b..07f5f7586 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/CustomMenuController.java @@ -98,8 +98,9 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { public boolean contains(String requestPath) { for (CustomMenuItem item : thisAndChildren()) { - if (requestContains(requestPath, item.unencodedURL)) + if (requestContains(requestPath, item.unencodedURL)) { return true; + } } return false; } @@ -198,8 +199,9 @@ public class CustomMenuController extends Div implements IMenuItemsRegister { public List getCustomMenuSecondaryItems() { for (CustomMenuItem ci : this.firstLevel) { - if (ci.isActiveParent()) + if (ci.isActiveParent()) { return ci.getChildren(); + } } return Collections. emptyList(); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/Finder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/Finder.java index 66ae682cf..8c874a8e1 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/Finder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/Finder.java @@ -120,15 +120,17 @@ public abstract class Finder implements IFinder { */ public ListModel getSubModel(Object value, int nRows) { final String idx = value == null ? "" : objectToString(value); - if (nRows < 0) + if (nRows < 0) { nRows = 10; + } final LinkedList data = new LinkedList(); for (int i = 0; i < getSize(); i++) { if (idx.equals("") || entryMatchesText(_toString(getElementAt(i)), idx)) { data.add(getElementAt(i)); - if (--nRows <= 0) + if (--nRows <= 0) { break; // done + } } } return new SimpleListModelExt(data); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java index 90067c39c..8ff87ee51 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/converters/ConverterFactory.java @@ -50,8 +50,9 @@ public class ConverterFactory implements IConverterFactory { @Override public IConverter getConverterFor(Class klass) { - if (convertersByType.containsKey(klass)) + if (convertersByType.containsKey(klass)) { return (IConverter) convertersByType.get(klass); + } for (Class registeredKlass : convertersByType.keySet()) { if (registeredKlass.isAssignableFrom(klass)) { IConverter result = convertersByType.get(registeredKlass); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/RedirectorSynthetiser.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/RedirectorSynthetiser.java index fe22694b6..afe2f2ef7 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/RedirectorSynthetiser.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/RedirectorSynthetiser.java @@ -75,8 +75,9 @@ public class RedirectorSynthetiser implements BeanFactoryPostProcessor { } private URLHandler getHandler() { - if (urlHandler != null) + if (urlHandler != null) { return urlHandler; + } URLHandlerRegistry registry = (URLHandlerRegistry) BeanFactoryUtils .beanOfType(beanFactory, URLHandlerRegistry.class); urlHandler = registry.getRedirectorFor(pageInterface); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java index d347ca659..9c8ee177a 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandler.java @@ -20,6 +20,8 @@ package org.navalplanner.web.common.entrypoints; +import static org.navalplanner.web.I18nHelper._; + import java.lang.reflect.Method; import java.util.Arrays; import java.util.HashMap; @@ -41,8 +43,6 @@ import org.zkoss.zk.ui.event.BookmarkEvent; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; -import static org.navalplanner.web.I18nHelper._; - /** *
* @author Óscar González Fernández @@ -95,8 +95,9 @@ public class URLHandler { } public void doTransition(String methodName, Object... values) { - if (isFlagedInThisRequest()) + if (isFlagedInThisRequest()) { return; + } flagAlreadyExecutedInThisRequest(); if (!metadata.containsKey(methodName)) { LOG.error("Method " + methodName @@ -120,8 +121,9 @@ public class URLHandler { .getRequestPath(); if (requestPath.contains(page)) { doBookmark(fragment); - } else + } else { sendRedirect(fragment); + } } private boolean isFlagedInThisRequest() { @@ -138,8 +140,9 @@ public class URLHandler { } private String stripHash(String fragment) { - if (fragment.startsWith("#")) + if (fragment.startsWith("#")) { return fragment.substring(1); + } return fragment; } @@ -151,12 +154,14 @@ public class URLHandler { private String getFragment(String[] parameterNames, String[] stringRepresentations) { StringBuilder result = new StringBuilder(); - if (parameterNames.length > 0) + if (parameterNames.length > 0) { result.append("#"); + } for (int i = 0; i < parameterNames.length; i++) { result.append(parameterNames[i]); - if (stringRepresentations[i] != null) + if (stringRepresentations[i] != null) { result.append("=").append(stringRepresentations[i]); + } if (i < parameterNames.length - 1) { result.append(";"); } @@ -224,8 +229,9 @@ public class URLHandler { } private String insertSemicolonIfNeeded(String uri) { - if (!uri.startsWith(";")) + if (!uri.startsWith(";")) { return ";" + uri; + } return uri; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandlerRegistry.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandlerRegistry.java index 353805b32..33311236f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandlerRegistry.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/URLHandlerRegistry.java @@ -47,8 +47,9 @@ public class URLHandlerRegistry implements IURLHandlerRegistry { @SuppressWarnings("unchecked") public URLHandler getRedirectorFor(Class klassWithLinkableMetadata) { - if (cached.containsKey(klassWithLinkableMetadata)) + if (cached.containsKey(klassWithLinkableMetadata)) { return (URLHandler) cached.get(klassWithLinkableMetadata); + } URLHandler result = new URLHandler(converterFactory, executorRetriever, klassWithLinkableMetadata); cached.put(klassWithLinkableMetadata, result); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementModel.java index a9794a853..1290ab1e4 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementModel.java @@ -107,8 +107,9 @@ public class AsignedHoursToOrderElementModel implements if (orderElement == null) { return 0; } - if (orderElement.getChildren().isEmpty()) + if (orderElement.getChildren().isEmpty()) { return 0; + } int asignedDirectChildren = getTotalAsignedHours() - this.asignedDirectHours; return asignedDirectChildren; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java index 29229f843..cdbd2ee66 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesController.java @@ -271,8 +271,9 @@ public class ManageOrderElementAdvancesController extends if ((advance.getAdvanceType() != null) && (advance.getAdvanceType().getId().equals(advanceType - .getId()))) + .getId()))) { comboAdvanceTypes.setSelectedItem(comboItem); + } } } comboAdvanceTypes.addEventListener(Events.ON_SELECT, @@ -669,8 +670,9 @@ public class ManageOrderElementAdvancesController extends Listitem listItem = (Listitem) editAdvances.getChildren().get(i); AdvanceAssignment advance = (AdvanceAssignment) listItem .getValue(); - if (advance.getAdvanceType() == null) + if (advance.getAdvanceType() == null) { return false; + } DirectAdvanceAssignment directAdvanceAssignment; if (advance instanceof IndirectAdvanceAssignment) { @@ -679,8 +681,9 @@ public class ManageOrderElementAdvancesController extends } else { directAdvanceAssignment = (DirectAdvanceAssignment) advance; } - if (directAdvanceAssignment.getMaxValue() == null) + if (directAdvanceAssignment.getMaxValue() == null) { return false; + } } } return true; @@ -692,10 +695,9 @@ public class ManageOrderElementAdvancesController extends Listitem listItem = (Listitem) editAdvancesMeasurement.getChildren().get(i); AdvanceMeasurement advance = (AdvanceMeasurement) listItem .getValue(); - if (advance.getValue() == null) - return false; - if (advance.getDate() == null) + if (advance.getValue() == null || advance.getDate() == null) { return false; + } } } return true; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java index d659d8e6f..e63849e67 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java @@ -96,8 +96,7 @@ public class ManageOrderElementAdvancesModel implements @Override public String getInfoAdvanceAssignment(){ - if ((this.advanceAssignment == null) || - (this.orderElement == null)) { + if (this.advanceAssignment == null || this.orderElement == null) { return ""; } return getInfoAdvanceAssignment(this.advanceAssignment); @@ -119,8 +118,7 @@ public class ManageOrderElementAdvancesModel implements @Override @Transactional(readOnly = true) public List getAdvanceMeasurements() { - if ((this.advanceAssignment == null) || - (this.orderElement == null)) { + if (this.advanceAssignment == null || this.orderElement == null) { return new ArrayList(); } return new ArrayList(this.advanceAssignment @@ -275,8 +273,9 @@ public class ManageOrderElementAdvancesModel implements @Override public boolean isReadOnlyAdvanceMeasurements(){ - if (this.advanceAssignment == null) + if (this.advanceAssignment == null) { return true; + } return this.isIndirectAdvanceAssignment; } @@ -308,8 +307,9 @@ public class ManageOrderElementAdvancesModel implements DuplicateValueTrueReportGlobalAdvanceException{ updateRemoveAdvances(); for (AdvanceAssignment advanceAssignment : this.listAdvanceAssignments) { - if (advanceAssignment instanceof DirectAdvanceAssignment) + if (advanceAssignment instanceof DirectAdvanceAssignment) { validateBasicData((DirectAdvanceAssignment) advanceAssignment); + } } } @@ -334,9 +334,10 @@ public class ManageOrderElementAdvancesModel implements AdvanceAssignment advanceAssignment) { for (AdvanceAssignment advance : this.orderElement .getDirectAdvanceAssignments()) { - if ((advance.getVersion() != null) - && (advance.getId().equals(advanceAssignment.getId()))) + if (advance.getVersion() != null + && advance.getId().equals(advanceAssignment.getId())) { return advance; + } } return null; } @@ -362,7 +363,9 @@ public class ManageOrderElementAdvancesModel implements BigDecimal precision = this.advanceAssignment.getAdvanceType() .getUnitPrecision(); BigDecimal result[] = value.divideAndRemainder(precision); - if(result[1].compareTo(BigDecimal.ZERO) == 0) return true; + if(result[1].compareTo(BigDecimal.ZERO) == 0) { + return true; + } return false; } return true; @@ -370,26 +373,30 @@ public class ManageOrderElementAdvancesModel implements @Override public boolean greatThanMaxValue(BigDecimal value){ - if ((this.advanceAssignment == null) - || (this.advanceAssignment.getMaxValue() == null)) + if (this.advanceAssignment == null + || this.advanceAssignment.getMaxValue() == null) { return false; - if (value.compareTo(this.advanceAssignment.getMaxValue()) > 0) + } + if (value.compareTo(this.advanceAssignment.getMaxValue()) > 0) { return true; + } return false; } @Override public boolean isDistinctValidDate(Date value, AdvanceMeasurement newAdvanceMeasurement) { - if (this.advanceAssignment == null) + if (this.advanceAssignment == null) { return true; + } for (AdvanceMeasurement advanceMeasurement : advanceAssignment .getAdvanceMeasurements()) { LocalDate oldDate = advanceMeasurement.getDate(); - if ((oldDate != null) - && (!newAdvanceMeasurement.equals(advanceMeasurement)) - && (oldDate.compareTo(new LocalDate(value)) == 0)) + if (oldDate != null + && !newAdvanceMeasurement.equals(advanceMeasurement) + && oldDate.compareTo(new LocalDate(value)) == 0) { return false; + } } return true; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementModel.java index 69669b613..dcb265666 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementModel.java @@ -85,8 +85,9 @@ public class OrderElementModel implements IOrderElementModel { public List getCriterionTypes() { List result = new ArrayList(); - if (mapCriterionTypes.isEmpty()) + if (mapCriterionTypes.isEmpty()) { loadCriterionTypes(); + } result.addAll(mapCriterionTypes.values()); return result; @@ -95,8 +96,9 @@ public class OrderElementModel implements IOrderElementModel { @Override @Transactional(readOnly = true) public CriterionType getCriterionTypeByName(String name) { - if (mapCriterionTypes.isEmpty()) + if (mapCriterionTypes.isEmpty()) { loadCriterionTypes(); + } return mapCriterionTypes.get(name); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java index af727f3f0..f0329010f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java @@ -215,8 +215,9 @@ public class OrderElementTreeModel { } private boolean find(OrderElement child, List children) { - if (children.indexOf(child) >= 0) + if (children.indexOf(child) >= 0) { return true; + } for (OrderElement criterionDTO : children) { return find(child, getChildren(criterionDTO)); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java index 39d2194f9..2d5dabac4 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java @@ -219,8 +219,9 @@ public class OrderModel implements IOrderModel { public void save() throws ValidationException { reattachCriterions(); InvalidValue[] invalidValues = orderValidator.getInvalidValues(order); - if (invalidValues.length > 0) + if (invalidValues.length > 0) { throw new ValidationException(invalidValues); + } order.checkValid(); this.orderDAO.save(order); @@ -336,10 +337,11 @@ public class OrderModel implements IOrderModel { return convertToTaskGroup(group); } else { OrderLine line = (OrderLine) order; - if (line.getHoursGroups().isEmpty()) + if (line.getHoursGroups().isEmpty()) { throw new IllegalArgumentException(_( "The line must have at least one {0} associated", HoursGroup.class.getSimpleName())); + } return line.getHoursGroups().size() > 1 ? convertToTaskGroup(line) : convertToTask(line); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationsBeingEdited.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationsBeingEdited.java index ed82a5024..928985c4b 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationsBeingEdited.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationsBeingEdited.java @@ -280,9 +280,10 @@ public class ResourceAllocationsBeingEdited { } public FormBinder createFormBinder() { - if (formBinder != null) + if (formBinder != null) { throw new IllegalStateException( "there is already a binder associated with this object"); + } formBinder = new FormBinder(this); return formBinder; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/SpecificAllocationDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/SpecificAllocationDTO.java index 63c57db80..f937b6ddb 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/SpecificAllocationDTO.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/SpecificAllocationDTO.java @@ -47,10 +47,12 @@ public class SpecificAllocationDTO extends AllocationDTO { } private static boolean areEquals(Resource one, Resource other) { - if (one == other) + if (one == other) { return true; - if (one == null || other == null) + } + if (one == null || other == null) { return false; + } return one.equals(other); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java index 6e68b3591..1037f13f1 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java @@ -135,9 +135,10 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel { CalendarAllocationController calendarAllocationController, List> additional) { Order orderReloaded = reload(order); - if (!orderReloaded.isSomeTaskElementScheduled()) + if (!orderReloaded.isSomeTaskElementScheduled()) { throw new IllegalArgumentException(_( "The order {0} must be scheduled", orderReloaded)); + } PlannerConfiguration configuration = createConfiguration(orderReloaded); addAdditional(additional, configuration); ISaveCommand saveCommand = buildSaveCommand(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/MergeTaskCommand.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/MergeTaskCommand.java index f40a471c6..355dbe21a 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/MergeTaskCommand.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/MergeTaskCommand.java @@ -49,8 +49,9 @@ public class MergeTaskCommand implements IMergeTaskCommand { return; } TaskGroup old = (TaskGroup) task; - if (!old.canBeMerged()) + if (!old.canBeMerged()) { return; + } Task result = old.merge(); context.replace(old, result); planningState.removed(old); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/ShareBean.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/ShareBean.java index ed6bac281..b19b16f54 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/ShareBean.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/splitting/ShareBean.java @@ -70,8 +70,9 @@ public class ShareBean { } public void setName(String name) { - if (StringUtils.isEmpty(name)) + if (StringUtils.isEmpty(name)) { return; + } this.name = name; } @@ -80,8 +81,9 @@ public class ShareBean { } public void setHours(Integer share) { - if (share == null || share <= 0) + if (share == null || share <= 0) { return; + } this.hours = share; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java index 54f26171d..c2c7aa2f9 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java @@ -150,8 +150,9 @@ public class CriterionAdminController_V2 extends GenericForwardComposer { } public boolean allowRemove(CriterionType criterionType){ - if(criterionType.getCriterions().size() > 0) + if(criterionType.getCriterions().size() > 0) { return false; + } return true; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java index 6451ee553..d182bb80d 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeModel.java @@ -422,8 +422,9 @@ public class CriterionTreeModel implements ICriterionTreeModel{ } private boolean find(CriterionDTO child,List children){ - if(children.indexOf(child) >= 0) + if(children.indexOf(child) >= 0) { return true; + } for(CriterionDTO criterionDTO : children){ return find(child,getChildren(criterionDTO)); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java index ce1e4cc4b..5c587fb8d 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java @@ -110,8 +110,9 @@ public class CriterionsModel implements ICriterionsModel { @Transactional(readOnly = true) public ICriterionType getTypeFor(Criterion criterion) { for (ICriterionType criterionType : getTypes()) { - if (criterionType.contains(criterion)) + if (criterionType.contains(criterion)) { return criterionType; + } } throw new RuntimeException(_("{0} not found type for criterion ", criterion)); } @@ -121,8 +122,9 @@ public class CriterionsModel implements ICriterionsModel { public void saveCriterion() throws ValidationException { InvalidValue[] invalidValues = criterionValidator .getInvalidValues(criterion); - if (invalidValues.length > 0) + if (invalidValues.length > 0) { throw new ValidationException(invalidValues); + } try { save(criterion); } finally { @@ -163,8 +165,9 @@ public class CriterionsModel implements ICriterionsModel { @Transactional(readOnly = true) public List getResourcesSatisfyingCurrentCriterionOfType( Class klass) { - if (criterion == null) + if (criterion == null) { return new ArrayList(); + } return getResourcesSatisfying(klass, criterion); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java index 524eb70fc..fe0b756a0 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java @@ -151,8 +151,9 @@ public class CriterionsModel_V2 implements ICriterionsModel_V2 { @Transactional(readOnly = true) public ICriterionType getTypeFor(Criterion criterion) { for (ICriterionType criterionType : getTypes()) { - if (criterionType.contains(criterion)) + if (criterionType.contains(criterion)) { return criterionType; + } } throw new RuntimeException(_("{0} not found type for criterion ", criterion)); } @@ -162,8 +163,9 @@ public class CriterionsModel_V2 implements ICriterionsModel_V2 { public void saveCriterionType() throws ValidationException { InvalidValue[] invalidValues = criterionTypeValidator .getInvalidValues(criterionType); - if (invalidValues.length > 0) + if (invalidValues.length > 0) { throw new ValidationException(invalidValues); + } criterionTreeModel.saveCriterions(criterionType); criterionTypeDAO.save(criterionType); } @@ -184,8 +186,9 @@ public class CriterionsModel_V2 implements ICriterionsModel_V2 { @Transactional(readOnly = true) public List getResourcesSatisfyingCurrentCriterionOfType( Class klass) { - if (criterion == null) + if (criterion == null) { return new ArrayList(); + } return getResourcesSatisfying(klass, criterion); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java index e26d080ec..b125e7c91 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/AssignedMachineCriterionsModel.java @@ -269,37 +269,34 @@ public class AssignedMachineCriterionsModel implements IAssignedMachineCriterion private boolean sameCriterion(CriterionSatisfactionDTO otherSatisfaction, CriterionSatisfactionDTO satisfaction) { - if (otherSatisfaction.getCriterionWithItsType() == null) + if (otherSatisfaction.getCriterionWithItsType() == null){ return false; + } Criterion otherCriterion = otherSatisfaction.getCriterionWithItsType() .getCriterion(); - if (otherCriterion.getId().equals( - satisfaction.getCriterionWithItsType().getCriterion().getId())) - return true; - return false; + return otherCriterion.getId().equals( + satisfaction.getCriterionWithItsType().getCriterion().getId()); } private boolean sameCriterionType( CriterionSatisfactionDTO otherSatisfaction, CriterionSatisfactionDTO satisfaction) { - if (otherSatisfaction.getCriterionWithItsType() == null) + if (otherSatisfaction.getCriterionWithItsType() == null) { return false; + } ICriterionType criterionType = otherSatisfaction .getCriterionWithItsType().getType(); - if (criterionType.equals(satisfaction.getCriterionWithItsType() - .getType())) - return true; - return false; + return criterionType.equals(satisfaction.getCriterionWithItsType() + .getType()); } private boolean sameInterval(CriterionSatisfactionDTO otherSatisfaction, CriterionSatisfactionDTO satisfaction) { - if (otherSatisfaction.getStartDate() == null) + if (otherSatisfaction.getStartDate() == null) { return false; + } Interval otherInterval = otherSatisfaction.getInterval(); - if (satisfaction.overlapsWith(otherInterval)) - return true; - return false; + return satisfaction.overlapsWith(otherInterval); } public void save() throws ValidationException { @@ -307,8 +304,9 @@ public class AssignedMachineCriterionsModel implements IAssignedMachineCriterion for (CriterionSatisfactionDTO satisfactionDTO : this.criterionSatisfactionDTOs) { invalidValues = satisfactionValidator .getInvalidValues(satisfactionDTO); - if (invalidValues.length > 0) + if (invalidValues.length > 0) { throw new ValidationException(invalidValues); + } save(satisfactionDTO); } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java index 20d8ef602..6711d19c0 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/AssignedCriterionsModel.java @@ -34,7 +34,6 @@ import org.springframework.transaction.annotation.Transactional; import org.zkoss.zk.ui.WrongValueException; /** - * * @author Susana Montes Pedreira */ @@ -74,40 +73,40 @@ public class AssignedCriterionsModel implements IAssignedCriterionsModel { @Transactional(readOnly = true) public void prepareForEdit(Worker worker) { this.worker = worker; - if(worker != null){ + if (worker != null) { reattachmentWorker(); initDTOs(); } } - public void prepareForCreate(Worker worker){ + public void prepareForCreate(Worker worker) { this.worker = worker; this.criterionSatisfactionDTOs = new HashSet(); } - private void initDTOs(){ + private void initDTOs() { criterionSatisfactionDTOs = new HashSet(); - for(CriterionSatisfaction criterionSatisfaction : - worker.getCriterionSatisfactions()){ - if(!criterionSatisfaction.isIsDeleted()){ - CriterionSatisfactionDTO dto = - new CriterionSatisfactionDTO(criterionSatisfaction); - criterionSatisfactionDTOs.add(dto); - } + for (CriterionSatisfaction criterionSatisfaction : worker + .getCriterionSatisfactions()) { + if (!criterionSatisfaction.isIsDeleted()) { + CriterionSatisfactionDTO dto = new CriterionSatisfactionDTO( + criterionSatisfaction); + criterionSatisfactionDTOs.add(dto); + } } } @Override public Set getAllCriterionSatisfactions() { - if(worker == null){ + if (worker == null) { return new HashSet(); } return allSatisfactionsDTO(); } - @Override + @Override public Set getFilterCriterionSatisfactions() { - if(worker == null){ + if (worker == null) { return new HashSet(); } return filterSatisfactionsDTO(); @@ -115,7 +114,7 @@ public class AssignedCriterionsModel implements IAssignedCriterionsModel { @Override @Transactional(readOnly = true) - public void reattachmentWorker(){ + public void reattachmentWorker() { resourceDAO.reattach(worker); for (CriterionSatisfaction criterionSatisfaction : worker .getCriterionSatisfactions()) { @@ -128,26 +127,26 @@ public class AssignedCriterionsModel implements IAssignedCriterionsModel { } @Override - public void addCriterionSatisfaction(){ + public void addCriterionSatisfaction() { CriterionSatisfactionDTO criterionSatisfactionDTO = new CriterionSatisfactionDTO(); this.criterionSatisfactionDTOs.add(criterionSatisfactionDTO); } - private Set allSatisfactionsDTO(){ + private Set allSatisfactionsDTO() { Set satisfactions = new HashSet(); - for(CriterionSatisfactionDTO criterionSatisfactionDTO : criterionSatisfactionDTOs){ - if(!criterionSatisfactionDTO.isIsDeleted()){ + for (CriterionSatisfactionDTO criterionSatisfactionDTO : criterionSatisfactionDTOs) { + if (!criterionSatisfactionDTO.isIsDeleted()) { satisfactions.add(criterionSatisfactionDTO); } } return satisfactions; } - private Set filterSatisfactionsDTO(){ + private Set filterSatisfactionsDTO() { Set satisfactions = new HashSet(); - for(CriterionSatisfactionDTO criterionSatisfactionDTO : criterionSatisfactionDTOs){ - if((!criterionSatisfactionDTO.isIsDeleted())&& - (criterionSatisfactionDTO.isCurrent())){ + for (CriterionSatisfactionDTO criterionSatisfactionDTO : criterionSatisfactionDTOs) { + if ((!criterionSatisfactionDTO.isIsDeleted()) + && (criterionSatisfactionDTO.isCurrent())) { satisfactions.add(criterionSatisfactionDTO); } } @@ -155,10 +154,10 @@ public class AssignedCriterionsModel implements IAssignedCriterionsModel { } @Override - public void remove(CriterionSatisfactionDTO criterionSatisfactionDTO){ - if(criterionSatisfactionDTO.isNewObject()){ + public void remove(CriterionSatisfactionDTO criterionSatisfactionDTO) { + if (criterionSatisfactionDTO.isNewObject()) { criterionSatisfactionDTOs.remove(criterionSatisfactionDTO); - }else{ + } else { criterionSatisfactionDTO.setIsDeleted(true); } } @@ -168,10 +167,10 @@ public class AssignedCriterionsModel implements IAssignedCriterionsModel { public List getCriterionWithItsType() { criterionsWithItsTypes = new ArrayList(); List listTypes = getCriterionTypes(); - for(CriterionType criterionType : listTypes){ - if(criterionType.isEnabled()){ + for (CriterionType criterionType : listTypes) { + if (criterionType.isEnabled()) { Set listCriterion = getDirectCriterions(criterionType); - getCriterionWithItsType(criterionType,listCriterion ); + getCriterionWithItsType(criterionType, listCriterion); } } return criterionsWithItsTypes; @@ -182,22 +181,26 @@ public class AssignedCriterionsModel implements IAssignedCriterionsModel { .getCriterionTypesByResources(applicableResources); } - private void getCriterionWithItsType(CriterionType type, Set children){ - for(Criterion criterion : children){ - if(criterion.isActive()){ - //Create the criterion with its criterionType and its Hierarchy label - CriterionWithItsType criterionAndType = new CriterionWithItsType(type,criterion); - //Add to the list + private void getCriterionWithItsType(CriterionType type, + Set children) { + for (Criterion criterion : children) { + if (criterion.isActive()) { + // Create the criterion with its criterionType and its Hierarchy + // label + CriterionWithItsType criterionAndType = new CriterionWithItsType( + type, criterion); + // Add to the list criterionsWithItsTypes.add(criterionAndType); - getCriterionWithItsType(type,criterion.getChildren()); - } + getCriterionWithItsType(type, criterion.getChildren()); + } } } - private static Set getDirectCriterions(CriterionType criterionType){ + private static Set getDirectCriterions( + CriterionType criterionType) { Set criterions = new HashSet(); - for(Criterion criterion : criterionType.getCriterions()){ - if(criterion.getParent() == null){ + for (Criterion criterion : criterionType.getCriterions()) { + if (criterion.getParent() == null) { criterions.add(criterion); } } @@ -205,47 +208,51 @@ public class AssignedCriterionsModel implements IAssignedCriterionsModel { } @Override - public void setCriterionWithItsType(CriterionSatisfactionDTO criterionSatisfactionDTO, - CriterionWithItsType criterionAndType) throws WrongValueException{ - criterionSatisfactionDTO.setCriterionWithItsType(criterionAndType); + public void setCriterionWithItsType( + CriterionSatisfactionDTO criterionSatisfactionDTO, + CriterionWithItsType criterionAndType) throws WrongValueException { + criterionSatisfactionDTO.setCriterionWithItsType(criterionAndType); } @Override - public boolean checkSameCriterionAndSameInterval(CriterionSatisfactionDTO satisfaction){ + public boolean checkSameCriterionAndSameInterval( + CriterionSatisfactionDTO satisfaction) { return existSameCriterionAndInterval(satisfaction); } @Override public boolean checkNotAllowSimultaneousCriterionsPerResource( - CriterionSatisfactionDTO satisfaction){ - ICriterionType type = satisfaction.getCriterionWithItsType().getType(); + CriterionSatisfactionDTO satisfaction) { + ICriterionType type = satisfaction.getCriterionWithItsType() + .getType(); if (type.isAllowSimultaneousCriterionsPerResource()) { return false; } return existSameCriterionTypeAndInterval(satisfaction); } - - private boolean existSameCriterionTypeAndInterval(CriterionSatisfactionDTO satisfaction){ - for(CriterionSatisfactionDTO otherSatisfaction : criterionSatisfactionDTOs){ - if((!otherSatisfaction.equals(satisfaction))&& - (!otherSatisfaction.isIsDeleted())&& - (!satisfaction.isIsDeleted())&& - (sameCriterionType(otherSatisfaction,satisfaction)) && - (sameInterval(otherSatisfaction,satisfaction))) { + private boolean existSameCriterionTypeAndInterval( + CriterionSatisfactionDTO satisfaction) { + for (CriterionSatisfactionDTO otherSatisfaction : criterionSatisfactionDTOs) { + if ((!otherSatisfaction.equals(satisfaction)) + && (!otherSatisfaction.isIsDeleted()) + && (!satisfaction.isIsDeleted()) + && (sameCriterionType(otherSatisfaction, satisfaction)) + && (sameInterval(otherSatisfaction, satisfaction))) { return true; } } return false; } - private boolean existSameCriterionAndInterval(CriterionSatisfactionDTO satisfaction){ - for(CriterionSatisfactionDTO otherSatisfaction : criterionSatisfactionDTOs){ - if((!otherSatisfaction.equals(satisfaction))&& - (!otherSatisfaction.isIsDeleted())&& - (!satisfaction.isIsDeleted())&& - (sameCriterion(otherSatisfaction,satisfaction)) && - (sameInterval(otherSatisfaction,satisfaction))) { + private boolean existSameCriterionAndInterval( + CriterionSatisfactionDTO satisfaction) { + for (CriterionSatisfactionDTO otherSatisfaction : criterionSatisfactionDTOs) { + if ((!otherSatisfaction.equals(satisfaction)) + && (!otherSatisfaction.isIsDeleted()) + && (!satisfaction.isIsDeleted()) + && (sameCriterion(otherSatisfaction, satisfaction)) + && (sameInterval(otherSatisfaction, satisfaction))) { return true; } } @@ -253,83 +260,96 @@ public class AssignedCriterionsModel implements IAssignedCriterionsModel { } private boolean sameCriterion(CriterionSatisfactionDTO otherSatisfaction, - CriterionSatisfactionDTO satisfaction){ - if(otherSatisfaction.getCriterionWithItsType() == null) return false; - Criterion otherCriterion = otherSatisfaction.getCriterionWithItsType().getCriterion(); - if(otherCriterion.getId().equals(satisfaction.getCriterionWithItsType().getCriterion().getId())) + CriterionSatisfactionDTO satisfaction) { + if (otherSatisfaction.getCriterionWithItsType() == null) { + return false; + } + Criterion otherCriterion = otherSatisfaction.getCriterionWithItsType() + .getCriterion(); + if (otherCriterion.getId().equals( + satisfaction.getCriterionWithItsType().getCriterion().getId())) { return true; + } return false; } - private boolean sameCriterionType(CriterionSatisfactionDTO otherSatisfaction, - CriterionSatisfactionDTO satisfaction){ - if(otherSatisfaction.getCriterionWithItsType() == null) return false; - ICriterionType criterionType = otherSatisfaction.getCriterionWithItsType().getType(); - if(criterionType.equals(satisfaction.getCriterionWithItsType().getType())) - return true; - return false; + private boolean sameCriterionType( + CriterionSatisfactionDTO otherSatisfaction, + CriterionSatisfactionDTO satisfaction) { + if (otherSatisfaction.getCriterionWithItsType() == null) { + return false; + } + ICriterionType criterionType = otherSatisfaction + .getCriterionWithItsType().getType(); + return criterionType.equals(satisfaction.getCriterionWithItsType() + .getType()); } private boolean sameInterval(CriterionSatisfactionDTO otherSatisfaction, - CriterionSatisfactionDTO satisfaction){ - if(otherSatisfaction.getStartDate() == null) return false; + CriterionSatisfactionDTO satisfaction) { + if (otherSatisfaction.getStartDate() == null) { + return false; + } Interval otherInterval = otherSatisfaction.getInterval(); Interval interval = satisfaction.getInterval(); - if((satisfaction.overlapsWith(otherInterval))|| - (otherSatisfaction.overlapsWith(interval))) - return true; - return false; + return (satisfaction.overlapsWith(otherInterval)) + || (otherSatisfaction.overlapsWith(interval)); } @Override - public void validate() - throws ValidationException,IllegalStateException { + public void validate() throws ValidationException, IllegalStateException { validateDTOs(); } @Override - public void confirm() - throws ValidationException,IllegalStateException { + public void confirm() throws ValidationException, IllegalStateException { updateDTOs(); } - private void validateDTOs() throws ValidationException{ - Set listDTOs = - new HashSet(criterionSatisfactionDTOs); - for(CriterionSatisfactionDTO satisfactionDTO : listDTOs){ + private void validateDTOs() throws ValidationException { + Set listDTOs = new HashSet( + criterionSatisfactionDTOs); + for (CriterionSatisfactionDTO satisfactionDTO : listDTOs) { InvalidValue[] invalidValues; - invalidValues = satisfactionDTOValidator.getInvalidValues(satisfactionDTO); - if (invalidValues.length > 0){ + invalidValues = satisfactionDTOValidator + .getInvalidValues(satisfactionDTO); + if (invalidValues.length > 0) { throw new ValidationException(invalidValues); } - Criterion criterion = satisfactionDTO.getCriterionWithItsType().getCriterion(); - if(checkSameCriterionAndSameInterval(satisfactionDTO)){ - throw new IllegalStateException(_(" The "+criterion.getName()+ - " can not be assigned to this resource. Its interval overlap with other criterion")); + Criterion criterion = satisfactionDTO.getCriterionWithItsType() + .getCriterion(); + if (checkSameCriterionAndSameInterval(satisfactionDTO)) { + throw new IllegalStateException( + _(" The " + + criterion.getName() + + " can not be assigned to this resource. Its interval overlap with other criterion")); } - if(checkNotAllowSimultaneousCriterionsPerResource(satisfactionDTO)){ - throw new IllegalStateException(_(" The "+criterion.getName()+ - "is not valid, the criterionType overlap other criterionSatisfaction whith same criterionType")); + if (checkNotAllowSimultaneousCriterionsPerResource(satisfactionDTO)) { + throw new IllegalStateException( + _(" The " + + criterion.getName() + + "is not valid, the criterionType overlap other criterionSatisfaction whith same criterionType")); } } } - - private void updateDTOs()throws ValidationException,IllegalStateException { - //Create a new list of Criterion satisfaction + private void updateDTOs() throws ValidationException, IllegalStateException { + // Create a new list of Criterion satisfaction Set newList = new HashSet(); - for(CriterionSatisfactionDTO satisfactionDTO :criterionSatisfactionDTOs){ + for (CriterionSatisfactionDTO satisfactionDTO : criterionSatisfactionDTOs) { CriterionSatisfaction satisfaction; - if(satisfactionDTO.isNewObject()){ - Criterion criterion = satisfactionDTO.getCriterionWithItsType().getCriterion(); + if (satisfactionDTO.isNewObject()) { + Criterion criterion = satisfactionDTO.getCriterionWithItsType() + .getCriterion(); Interval interval = satisfactionDTO.getInterval(); - satisfaction = CriterionSatisfaction.create(criterion, worker, interval); + satisfaction = CriterionSatisfaction.create(criterion, worker, + interval); - }else{ + } else { satisfaction = satisfactionDTO.getCriterionSatisfaction(); - if(satisfactionDTO.isIsDeleted()){ - satisfaction.setIsDeleted(true); - }else{ + if (satisfactionDTO.isIsDeleted()) { + satisfaction.setIsDeleted(true); + } else { satisfaction.setStartDate(satisfactionDTO.getStartDate()); satisfaction.finish(satisfactionDTO.getEndDate()); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionSatisfactionDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionSatisfactionDTO.java index 6f87dc2c8..5d4075131 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionSatisfactionDTO.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionSatisfactionDTO.java @@ -68,8 +68,12 @@ public class CriterionSatisfactionDTO implements INewObject { } public String getState() { - if(startDate == null) return ""; - if( !isFinished() || isCurrent() ) return "Current"; + if (startDate == null) { + return ""; + } + if (!isFinished() || isCurrent()) { + return "Current"; + } return "Expired"; } @@ -112,8 +116,10 @@ public class CriterionSatisfactionDTO implements INewObject { public boolean isCurrent() { Date now = new Date(); - if(!isFinished()) return true; - return (now.compareTo(getEndDate()) <= 0); + if (!isFinished()) { + return true; + } + return now.compareTo(getEndDate()) <= 0; } public Interval getInterval() { @@ -146,41 +152,58 @@ public class CriterionSatisfactionDTO implements INewObject { } public boolean isLessToEndDate(Date startDate){ - if((getEndDate() == null) || - (startDate == null)) return true; - if(startDate.compareTo(getEndDate()) < 0) return true; + if (getEndDate() == null || startDate == null) { + return true; + } + if (startDate.compareTo(getEndDate()) < 0) { + return true; + } return false; } public boolean isPreviousStartDate(Date startDate){ - if(newObject) return true; - if((getStartDate() == null) || - (startDate == null)) return true; - if(startDate.compareTo(getCriterionSatisfaction().getStartDate()) <= 0) + if (newObject) { return true; + } + if (getStartDate() == null || startDate == null) { + return true; + } + if (startDate.compareTo(getCriterionSatisfaction().getStartDate()) <= 0) { + return true; + } return false; } public boolean isGreaterStartDate(Date endDate){ - if((getStartDate() == null) || - (endDate == null)) return true; - if(endDate.compareTo(getStartDate()) >= 0) return true; + if (getStartDate() == null || endDate == null) { + return true; + } + if (endDate.compareTo(getStartDate()) >= 0) { + return true; + } return false; } public boolean isPostEndDate(Date endDate){ - if(newObject) return true; - if((getEndDate() == null) || - (endDate == null)) return true; - if(getCriterionSatisfaction().getEndDate() == null) + if (newObject) { return true; - if(endDate.compareTo(getCriterionSatisfaction().getEndDate()) >= 0) + } + if (getEndDate() == null || endDate == null) { return true; + } + if (getCriterionSatisfaction().getEndDate() == null) { + return true; + } + if (endDate.compareTo(getCriterionSatisfaction().getEndDate()) >= 0) { + return true; + } return false; } 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/resources/worker/CriterionsController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java index aeee31c3c..f45ce7ec0 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsController.java @@ -57,8 +57,9 @@ public class CriterionsController extends GenericForwardComposer { @Override public void doAfterCompose(Component comp) throws Exception { super.doAfterCompose(comp); - if (messagesContainer == null) + if (messagesContainer == null) { throw new RuntimeException(_("MessagesContainer is needed")); + } messages = new MessagesForUser(messagesContainer); comp.setVariable("assignedCriterionsController", this, true); //comboboxFilter = (Combobox) comp.getFellow("comboboxfilter"); @@ -139,8 +140,12 @@ public class CriterionsController extends GenericForwardComposer { private void validateCriterionWithItsType(CriterionSatisfactionDTO satisfaction, Component comp) throws WrongValueException{ - if(satisfaction.getCriterionWithItsType() == null) return; - if(satisfaction.getStartDate() == null) return; + if(satisfaction.getCriterionWithItsType() == null) { + return; + } + if(satisfaction.getStartDate() == null) { + return; + } if(assignedCriterionsModel.checkSameCriterionAndSameInterval(satisfaction)){ throw new WrongValueException(comp, _("Criterion is not valid, the criterion overlap other criterionSatisfaction whith same criterion")); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java index 0c7773031..2b4e44710 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/CriterionsMachineController.java @@ -120,8 +120,12 @@ public class CriterionsMachineController extends GenericForwardComposer { private void validateCriterionWithItsType(CriterionSatisfactionDTO satisfaction, Component comp) throws WrongValueException{ - if(satisfaction.getCriterionWithItsType() == null) return; - if(satisfaction.getStartDate() == null) return; + if(satisfaction.getCriterionWithItsType() == null) { + return; + } + if(satisfaction.getStartDate() == null) { + return; + } if (assignedMachineCriterionsModel .checkSameCriterionAndSameInterval(satisfaction)) { throw new WrongValueException(comp, diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java index 0e7e062ab..30fb6013a 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java @@ -127,8 +127,9 @@ public class WorkerCRUDController extends GenericForwardComposer implements } public LocalizationsController getLocalizations() { - if (workerModel.isCreating()) + if (workerModel.isCreating()) { return localizationsForCreationController; + } return localizationsForEditionController; } @@ -225,8 +226,9 @@ public class WorkerCRUDController extends GenericForwardComposer implements localizationsForCreationController = createLocalizationsController( comp, "editWindow"); comp.setVariable("controller", this, true); - if (messagesContainer == null) + if (messagesContainer == null) { throw new RuntimeException(_("MessagesContainer is needed")); + } messages = new MessagesForUser(messagesContainer); this.addWorkRelationship = new WorkRelationshipsController( this.workerModel, this, messages); diff --git a/navalplanner-webapp/src/test/java/org/navalplanner/web/resources/CriterionModelTest.java b/navalplanner-webapp/src/test/java/org/navalplanner/web/resources/CriterionModelTest.java index dba6a5fb0..91f9858d1 100644 --- a/navalplanner-webapp/src/test/java/org/navalplanner/web/resources/CriterionModelTest.java +++ b/navalplanner-webapp/src/test/java/org/navalplanner/web/resources/CriterionModelTest.java @@ -139,8 +139,9 @@ public class CriterionModelTest { private CriterionType ensureExists(CriterionType transientType) { List found = criterionTypeDAO.findByName(transientType); - if (!found.isEmpty()) + if (!found.isEmpty()) { return found.get(0); + } criterionTypeDAO.save(transientType); return criterionTypeDAO.findByName(transientType).get(0); }