From 300e002add7528450e36cd576601d489ebf3679b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Wed, 27 Oct 2010 18:02:31 +0200 Subject: [PATCH] Remove unused private methods and fields FEA: ItEr62S05BugFixing --- .../data/resourceload/LoadTimeLine.java | 11 ---- .../resourceload/ResourceLoadLeftPane.java | 9 --- .../ganttz/resourceload/ResourceLoadList.java | 3 - .../business/orders/entities/Order.java | 3 - .../business/planner/daos/TaskElementDAO.java | 14 ----- ...dAdvanceAssignmentsToOrderElementTest.java | 4 -- .../test/planner/entities/TaskTest.java | 5 -- .../test/resources/daos/MachineDAOTest.java | 11 ---- .../calendars/BaseCalendarCRUDController.java | 9 --- .../BaseCalendarEditionController.java | 6 -- .../components/finders/FilterEnumNone.java | 7 --- ...sourceAllocationMultipleFiltersFinder.java | 4 -- .../LimitingDependencyList.java | 61 ------------------- .../LimitingResourcesController.java | 6 -- .../LimitingResourcesLeftPane.java | 22 ------- .../LimitingResourcesPanel.java | 13 ---- .../limitingresources/QueueTaskGenerator.java | 6 -- .../orders/OrderElementTreeController.java | 2 - .../navalplanner/web/orders/OrderModel.java | 4 -- .../AdvanceAssignmentPlanningModel.java | 6 -- .../ResourceAllocationController.java | 6 -- .../planner/order/SubcontractController.java | 3 - .../web/planner/tabs/OrdersTabCreator.java | 3 - .../taskedition/TaskPropertiesController.java | 4 -- .../QualityFormCRUDController.java | 5 -- .../reports/OrderCostsPerResourceModel.java | 8 --- .../TimeLineRequiredMaterialController.java | 5 -- .../TimeLineRequiredMaterialModel.java | 2 - .../web/resourceload/LoadPeriodGenerator.java | 25 -------- .../machine/MachineCRUDController.java | 3 - .../web/resources/machine/MachineModel.java | 9 --- .../resources/search/ResourcePredicate.java | 2 - .../scenarios/TransferOrdersController.java | 3 - .../advances/AdvancesAssignmentComponent.java | 3 +- .../workreports/WorkReportCRUDController.java | 15 ----- .../workreports/WorkReportLinePredicate.java | 7 --- .../web/workreports/WorkReportTypeModel.java | 4 -- .../web/orders/OrderModelTest.java | 5 -- .../ws/labels/api/CalendarServiceTest.java | 4 -- .../ws/materials/MaterialServiceTest.java | 4 -- .../ReportAdvancesServiceTest.java | 4 -- .../ws/workreports/WorkReportServiceTest.java | 4 -- 42 files changed, 1 insertion(+), 333 deletions(-) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadTimeLine.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadTimeLine.java index ce66a69bf..97e9f26d8 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadTimeLine.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/resourceload/LoadTimeLine.java @@ -155,17 +155,6 @@ public class LoadTimeLine { return one.compareTo(other) < 0 ? one : other; } - private static void allChildrenAreNotEmpty(List lines) { - for (LoadTimeLine l : lines) { - if (l.isEmpty()) { - throw new IllegalArgumentException(l + " is empty"); - } - if (l.hasChildren()) { - allChildrenAreNotEmpty(l.getChildren()); - } - } - } - public boolean hasChildren() { return (!children.isEmpty()); } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java index 70dca159d..d008677b1 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java @@ -228,15 +228,6 @@ MutableTreeModel modelForTree, return result; } - private static void limitValue(Div parent, Label label, int maxLength) { - String originalValue = label.getValue(); - if (originalValue == null || originalValue.length() <= maxLength) { - return; - } - label.setValue(originalValue.substring(0, maxLength - 3) + "..."); - label.setTooltip(createPopup(parent, originalValue)); - } - private static Popup createPopup(Div parent, String originalValue) { Popup result = new Popup(); result.appendChild(new Label(originalValue)); diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadList.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadList.java index 97a3c5cbd..3bce5259e 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadList.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadList.java @@ -49,11 +49,8 @@ public class ResourceLoadList extends HtmlMacroComponent implements private Map fromTimeLineToComponent = new HashMap(); - private final MutableTreeModel timelinesTree; - public ResourceLoadList(TimeTracker timeTracker, MutableTreeModel timelinesTree) { - this.timelinesTree = timelinesTree; zoomListener = adjustTimeTrackerSizeListener(); timeTracker.addZoomListener(zoomListener); LoadTimeLine current = timelinesTree.getRoot(); diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java index 6f80d7d6d..9be285747 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java @@ -101,8 +101,6 @@ public class Order extends OrderLineGroup { public static class CurrentVersionInfo { - private final Scenario scenario; - private final OrderVersion orderVersion; private final boolean modifyingTheOwnerScenario; @@ -115,7 +113,6 @@ public class Order extends OrderLineGroup { private CurrentVersionInfo(Scenario scenario, OrderVersion orderVersion) { Validate.notNull(scenario); Validate.notNull(orderVersion); - this.scenario = scenario; this.orderVersion = orderVersion; this.modifyingTheOwnerScenario = orderVersion.isOwnedBy(scenario); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/TaskElementDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/TaskElementDAO.java index 886a3988f..f92b18bee 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/TaskElementDAO.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/TaskElementDAO.java @@ -27,9 +27,7 @@ import org.hibernate.Criteria; import org.hibernate.criterion.Restrictions; import org.joda.time.LocalDate; import org.navalplanner.business.common.daos.GenericDAOHibernate; -import org.navalplanner.business.planner.entities.GenericDayAssignment; import org.navalplanner.business.planner.entities.ResourceAllocation; -import org.navalplanner.business.planner.entities.SpecificDayAssignment; import org.navalplanner.business.planner.entities.TaskElement; import org.navalplanner.business.planner.entities.TaskGroup; import org.springframework.beans.factory.config.BeanDefinition; @@ -46,18 +44,6 @@ import org.springframework.transaction.annotation.Transactional; public class TaskElementDAO extends GenericDAOHibernate implements ITaskElementDAO { - @SuppressWarnings("unchecked") - private List findOrphanedGenericDayAssignments() { - return getSession().createCriteria(GenericDayAssignment.class).add( - Restrictions.isNull("genericResourceAllocation")).list(); - } - - @SuppressWarnings("unchecked") - private List findOrphanedSpecificDayAssignments() { - return getSession().createCriteria(SpecificDayAssignment.class).add( - Restrictions.isNull("specificResourceAllocation")).list(); - } - @SuppressWarnings("unchecked") @Override public List findChildrenOf(TaskGroup each) { diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssignmentsToOrderElementTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssignmentsToOrderElementTest.java index 2c0ac1328..65bc8bed5 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssignmentsToOrderElementTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssignmentsToOrderElementTest.java @@ -50,7 +50,6 @@ import org.navalplanner.business.advance.exceptions.DuplicateValueTrueReportGlob import org.navalplanner.business.common.daos.IConfigurationDAO; import org.navalplanner.business.common.exceptions.InstanceNotFoundException; import org.navalplanner.business.orders.daos.IOrderDAO; -import org.navalplanner.business.orders.daos.IOrderElementDAO; import org.navalplanner.business.orders.entities.HoursGroup; import org.navalplanner.business.orders.entities.Order; import org.navalplanner.business.orders.entities.OrderElement; @@ -90,9 +89,6 @@ public class AddAdvanceAssignmentsToOrderElementTest { @Autowired private SessionFactory sessionFactory; - @Autowired - private IOrderElementDAO orderElementDao; - @Autowired private IOrderDAO orderDao; diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/TaskTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/TaskTest.java index 55ad27db7..550eb7e83 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/TaskTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/TaskTest.java @@ -42,13 +42,11 @@ import org.navalplanner.business.orders.entities.Order; import org.navalplanner.business.orders.entities.OrderLine; import org.navalplanner.business.orders.entities.SchedulingDataForVersion; import org.navalplanner.business.orders.entities.TaskSource; -import org.navalplanner.business.planner.daos.ITaskElementDAO; import org.navalplanner.business.planner.entities.SpecificResourceAllocation; import org.navalplanner.business.planner.entities.Task; import org.navalplanner.business.planner.entities.TaskElement; import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement; import org.navalplanner.business.scenarios.entities.OrderVersion; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; @@ -62,9 +60,6 @@ import org.springframework.transaction.annotation.Transactional; @Transactional public class TaskTest { - @Autowired - private ITaskElementDAO taskElementDAO; - private static final OrderVersion mockedOrderVersion = mockOrderVersion(); public static final OrderVersion mockOrderVersion() { diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/daos/MachineDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/daos/MachineDAOTest.java index 5e57dbb45..2fa7cd866 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/daos/MachineDAOTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/resources/daos/MachineDAOTest.java @@ -31,7 +31,6 @@ import static org.navalplanner.business.test.BusinessGlobalNames.BUSINESS_SPRING import java.math.BigDecimal; import java.util.List; -import org.hibernate.SessionFactory; import org.junit.Test; import org.junit.runner.RunWith; import org.navalplanner.business.common.IAdHocTransactionService; @@ -43,7 +42,6 @@ import org.navalplanner.business.resources.daos.IWorkerDAO; import org.navalplanner.business.resources.entities.Criterion; import org.navalplanner.business.resources.entities.Machine; import org.navalplanner.business.resources.entities.MachineWorkersConfigurationUnit; -import org.navalplanner.business.resources.entities.Worker; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.NotTransactional; import org.springframework.test.context.ContextConfiguration; @@ -71,9 +69,6 @@ public class MachineDAOTest { @Autowired IWorkerDAO workerDAO; - @Autowired - private SessionFactory sessionFactory; - private Machine createValidMachine() { Machine machine = Machine.create(); machine.setCode("code"); @@ -82,12 +77,6 @@ public class MachineDAOTest { return machine; } - private Worker createValidWorker() { - Worker worker = Worker.create(); - worker.setFirstName("FirstName"); - return worker; - } - @Test public void testInSpringContainer() { assertNotNull(machineDAO); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java index d18c3ec6e..1c3136dc2 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java @@ -266,15 +266,6 @@ public class BaseCalendarCRUDController extends GenericForwardComposer { return visibility; } - private void reloadCurrentWindow() { - if (baseCalendarModel.isEditing()) { - Util.reloadBindings(editWindow); - } else { - Util.reloadBindings(createWindow); - } - highlightDaysOnCalendar(); - } - private void reloadDayInformation() { if (baseCalendarModel.isEditing()) { Util.reloadBindings(editWindow.getFellow("dayInformation")); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java index 80385b1f5..37e9e346f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java @@ -289,12 +289,6 @@ public abstract class BaseCalendarEditionController extends return baseCalendarModel.isDerived(); } - private boolean isPast(Date date) { - LocalDate localDate = new LocalDate(date); - LocalDate currentLocalDate = new LocalDate(); - return localDate.compareTo(currentLocalDate) <= 0; - } - public List getHoursPerDay() { return Arrays.asList(Days.values()); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/FilterEnumNone.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/FilterEnumNone.java index d850d142b..e92cbdc1c 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/FilterEnumNone.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/FilterEnumNone.java @@ -29,13 +29,6 @@ public enum FilterEnumNone implements IFilterEnum { None("..."); - /** - * Forces to mark the string as needing translation - */ - private static String _(String string) { - return string; - } - private String description; private FilterEnumNone(String description) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationMultipleFiltersFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationMultipleFiltersFinder.java index ada1726a7..38e0300b7 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationMultipleFiltersFinder.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceAllocationMultipleFiltersFinder.java @@ -234,10 +234,6 @@ public class ResourceAllocationMultipleFiltersFinder extends return mode.equals(ResourceAllocationFilterEnum.Resource); } - private boolean isModeCriterion() { - return mode.equals(ResourceAllocationFilterEnum.Criterion); - } - private boolean isModeNone() { return mode.equals(FilterEnumNone.None); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingDependencyList.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingDependencyList.java index 99bd3f1b1..b0b4f2a9f 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingDependencyList.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingDependencyList.java @@ -20,8 +20,6 @@ package org.navalplanner.web.limitingresources; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.List; @@ -30,15 +28,11 @@ import org.apache.commons.logging.LogFactory; import org.zkoss.ganttz.DependencyList; import org.zkoss.ganttz.TaskComponent; import org.zkoss.ganttz.data.Dependency; -import org.zkoss.ganttz.data.DependencyType; -import org.zkoss.ganttz.data.Task; import org.zkoss.ganttz.timetracker.TimeTracker; import org.zkoss.ganttz.timetracker.TimeTrackerComponent; import org.zkoss.ganttz.timetracker.zoom.IZoomLevelChangedListener; import org.zkoss.ganttz.timetracker.zoom.ZoomLevel; import org.zkoss.ganttz.util.ComponentsFinder; -import org.zkoss.ganttz.util.MenuBuilder.ItemAction; -import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.ext.AfterCompose; import org.zkoss.zul.impl.XulElement; @@ -47,61 +41,6 @@ import org.zkoss.zul.impl.XulElement; */ public class LimitingDependencyList extends XulElement implements AfterCompose { - private final class ChangeTypeAction implements - ItemAction { - private final DependencyType type; - - private ChangeTypeAction(DependencyType type) { - this.type = type; - } - - @Override - public void onEvent(final LimitingDependencyComponent choosen, - Event event) { - // context.changeType(choosen.getDependency(), type); - } - } - - private final class DependencyVisibilityToggler implements - PropertyChangeListener { - private final Task source; - private final Task destination; - private final LimitingDependencyComponent dependencyComponent; - - private DependencyVisibilityToggler(Task source, Task destination, - LimitingDependencyComponent dependencyComponent) { - this.source = source; - this.destination = destination; - this.dependencyComponent = dependencyComponent; - } - - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (!evt.getPropertyName().equals("visible")) { - return; - } - if (dependencyMustBeVisible() != isDependencyNowVisible()) { - toggleDependencyExistence(dependencyMustBeVisible()); - } - } - - void toggleDependencyExistence(boolean visible) { - if (visible) { - appendChild(dependencyComponent); - } else { - removeChild(dependencyComponent); - } - } - - boolean isDependencyNowVisible() { - return dependencyComponent.getParent() != null; - } - - boolean dependencyMustBeVisible() { - return source.isVisible() && destination.isVisible(); - } - } - private static final Log LOG = LogFactory.getLog(DependencyList.class); private transient IZoomLevelChangedListener listener; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java index b597012bb..da26e11b6 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesController.java @@ -49,7 +49,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; -import org.zkoss.ganttz.resourceload.IFilterChangedListener; import org.zkoss.ganttz.timetracker.TimeTracker; import org.zkoss.ganttz.timetracker.zoom.SeveralModificators; import org.zkoss.ganttz.timetracker.zoom.ZoomLevel; @@ -84,8 +83,6 @@ public class LimitingResourcesController extends GenericForwardComposer { private List commands = new ArrayList(); - private Order filterBy; - private org.zkoss.zk.ui.Component parent; private LimitingResourcesPanel limitingResourcesPanel; @@ -103,8 +100,6 @@ public class LimitingResourcesController extends GenericForwardComposer { private final LimitingResourceQueueElementsRenderer limitingResourceQueueElementsRenderer = new LimitingResourceQueueElementsRenderer(); - private transient IFilterChangedListener filterChangedListener; - public LimitingResourcesController() { } @@ -301,7 +296,6 @@ public class LimitingResourcesController extends GenericForwardComposer { } public void filterBy(Order order) { - this.filterBy = order; } public void saveQueues() { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesLeftPane.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesLeftPane.java index 5bc9462aa..dc7d284fd 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesLeftPane.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesLeftPane.java @@ -26,7 +26,6 @@ import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.HtmlMacroComponent; import org.zkoss.zul.Div; import org.zkoss.zul.Label; -import org.zkoss.zul.Popup; import org.zkoss.zul.Treecell; import org.zkoss.zul.Treeitem; import org.zkoss.zul.TreeitemRenderer; @@ -36,16 +35,13 @@ import org.zkoss.zul.api.Tree; public class LimitingResourcesLeftPane extends HtmlMacroComponent { private MutableTreeModel modelForTree; - private final QueueListComponent limitingResourcesList; public LimitingResourcesLeftPane( MutableTreeModel treeModel, QueueListComponent resourceLoadList) { - this.limitingResourcesList = resourceLoadList; this.modelForTree = treeModel; } - @Override public void afterCompose() { super.afterCompose(); @@ -82,16 +78,6 @@ public class LimitingResourcesLeftPane extends HtmlMacroComponent { }; } - private LimitingResourceQueue getLineByTreeitem(Treeitem child) { - LimitingResourceQueue line = null; - try { - line = (LimitingResourceQueue) child.getValue(); - } catch (Exception e) { - return null; - } - return line; - } - private Tree getContainerTree() { return (Tree) getFellow("loadsTree"); } @@ -116,12 +102,4 @@ public class LimitingResourcesLeftPane extends HtmlMacroComponent { result.appendChild(label); return result; } - - - private static Popup createPopup(Div parent, String originalValue) { - Popup result = new Popup(); - result.appendChild(new Label(originalValue)); - parent.appendChild(result); - return result; - } } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java index 854abcf5e..ca645a7bb 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java @@ -44,8 +44,6 @@ import org.zkoss.ganttz.timetracker.zoom.ZoomLevel; import org.zkoss.ganttz.util.ComponentsFinder; import org.zkoss.ganttz.util.Interval; import org.zkoss.ganttz.util.MutableTreeModel; -import org.zkoss.ganttz.util.OnZKDesktopRegistry; -import org.zkoss.ganttz.util.script.IScriptsRegister; import org.zkoss.zk.au.out.AuInvoke; import org.zkoss.zk.ui.Component; import org.zkoss.zk.ui.HtmlMacroComponent; @@ -155,7 +153,6 @@ public class LimitingResourcesPanel extends HtmlMacroComponent { treeModel); leftPane = new LimitingResourcesLeftPane(treeModel, queueListComponent); - registerNeededScripts(); } public void appendQueueElementToQueue(LimitingResourceQueueElement element) { @@ -236,16 +233,6 @@ public class LimitingResourcesPanel extends HtmlMacroComponent { return toolbar; } - private void registerNeededScripts() { - // getScriptsRegister().register( - // ScriptsRequiredByLimitingResourcesPanel.class); - } - - private IScriptsRegister getScriptsRegister() { - return OnZKDesktopRegistry.getLocatorFor(IScriptsRegister.class) - .retrieve(); - } - private TimeTrackerComponent timeTrackerForLimitingResourcesPanel( TimeTracker timeTracker) { return new TimeTrackerComponent(timeTracker) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueTaskGenerator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueTaskGenerator.java index bd3d7e07c..efe0e976e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueTaskGenerator.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueTaskGenerator.java @@ -32,7 +32,6 @@ import org.apache.commons.lang.Validate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.joda.time.LocalDate; -import org.navalplanner.business.planner.entities.GenericResourceAllocation; import org.navalplanner.business.planner.entities.ResourceAllocation; import org.navalplanner.business.planner.entities.SpecificDayAssignment; import org.navalplanner.business.resources.daos.IResourceDAO; @@ -298,11 +297,6 @@ class QueueTaskGeneratorOnCriterion extends QueueTaskGenerator { return result; } - private List genericAllocationsOnInterval() { - return ResourceAllocation.getOfType(GenericResourceAllocation.class, - getAllocationsOnInterval()); - } - @Override protected int getAssignedHoursFor(ResourceAllocation resourceAllocation) { return resourceAllocation.getAssignedHours(start, end); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java index d62c13ead..3078be481 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java @@ -87,8 +87,6 @@ public class OrderElementTreeController extends TreeController { private Vbox orderElementFilter; - private Hbox orderFilter; - private BandboxMultipleSearch bdFiltersOrderElement; private Datebox filterStartDateOrderElement; 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 745cd336a..a598af143 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 @@ -51,7 +51,6 @@ import org.navalplanner.business.externalcompanies.daos.IExternalCompanyDAO; import org.navalplanner.business.externalcompanies.entities.ExternalCompany; import org.navalplanner.business.labels.daos.ILabelDAO; import org.navalplanner.business.labels.entities.Label; -import org.navalplanner.business.orders.daos.IHoursGroupDAO; import org.navalplanner.business.orders.daos.IOrderDAO; import org.navalplanner.business.orders.daos.IOrderElementDAO; import org.navalplanner.business.orders.entities.HoursGroup; @@ -175,9 +174,6 @@ public class OrderModel implements IOrderModel { @Autowired private IOrderVersionDAO orderVersionDAO; - @Autowired - private IHoursGroupDAO hoursGroupDAO; - @Override @Transactional(readOnly = true) public List