diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/LimitingResourceQueue.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/LimitingResourceQueue.java index 4441aa58d..e5e8c86d4 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/LimitingResourceQueue.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/LimitingResourceQueue.java @@ -33,6 +33,7 @@ import java.util.SortedSet; import java.util.TreeSet; import org.navalplanner.business.common.BaseEntity; +import org.navalplanner.business.orders.entities.OrderElement; import org.navalplanner.business.planner.limiting.entities.DateAndHour; import org.navalplanner.business.planner.limiting.entities.Gap; import org.navalplanner.business.planner.limiting.entities.Gap.GapOnQueue; @@ -160,25 +161,6 @@ public class LimitingResourceQueue extends BaseEntity { invalidCachedGaps(); } - /** - * limitingResourceQueueElements is a SortedSet of - * {@link LimitingResourceQueueElement} ordered by startDate - * - * When an element if shifted visually in a list of queue elements, it might - * be necessary to rearrange the SortedSet so the new element occupies its - * real position. Instead of rearranging the SortedSet again, the element is - * removed from the set and inserted again. Insert operation guarantees that - * an element is inserted at the right position - * - */ - public void reloadLimitingResourceQueueElement( - LimitingResourceQueueElement element) { - if (limitingResourceQueueElements.contains(element)) { - limitingResourceQueueElements.remove(element); - limitingResourceQueueElements.add(element); - } - } - public String toString() { return getResource() != null ? getResource().getName() : ""; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java index c87977c0c..f0f09ee69 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourceQueueModel.java @@ -488,18 +488,12 @@ public class LimitingResourceQueueModel implements ILimitingResourceQueueModel { applyAllocation(each); LimitingResourceQueueElement element = each.getElement(); - reloadElementInQueue(element); result.add(element); } return result; } - private void reloadElementInQueue(LimitingResourceQueueElement element) { - final LimitingResourceQueue queue = element.getLimitingResourceQueue(); - queue.reloadLimitingResourceQueueElement(element); - } - private List getAllocationsToBeDone( DirectedGraph potentiallyAffectedByInsertion, LimitingResourceQueueElement elementInserted,