ItEr33S08ValidacionEProbasFuncionaisItEr32S09: Removing private methods never called
This commit is contained in:
parent
77844bfd02
commit
14ccb170eb
7 changed files with 4 additions and 76 deletions
|
|
@ -41,7 +41,6 @@ import org.navalplanner.business.common.BaseEntity;
|
|||
import org.navalplanner.business.labels.entities.Label;
|
||||
import org.navalplanner.business.planner.entities.TaskElement;
|
||||
import org.navalplanner.business.requirements.entities.CriterionRequirement;
|
||||
import org.navalplanner.business.requirements.entities.DirectCriterionRequirement;
|
||||
import org.navalplanner.business.requirements.entities.IndirectCriterionRequirement;
|
||||
|
||||
public abstract class OrderElement extends BaseEntity {
|
||||
|
|
@ -333,10 +332,6 @@ public abstract class OrderElement extends BaseEntity {
|
|||
return result;
|
||||
}
|
||||
|
||||
private void setCriterionRequirements(Set<CriterionRequirement> criterionRequirements) {
|
||||
this.criterionRequirements = criterionRequirements;
|
||||
}
|
||||
|
||||
public Set<CriterionRequirement> getCriterionRequirements() {
|
||||
return Collections.unmodifiableSet(criterionRequirements);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -341,19 +341,6 @@ public class ManageOrderElementAdvancesModel implements
|
|||
return null;
|
||||
}
|
||||
|
||||
private boolean yetExistAdvanceMeasurement(
|
||||
DirectAdvanceAssignment advanceAssignment,
|
||||
AdvanceMeasurement advanceMeasurement){
|
||||
for (AdvanceMeasurement advance : advanceAssignment
|
||||
.getAdvanceMeasurements()) {
|
||||
if ((advance.getVersion() != null)
|
||||
&& (advance.getId() == advanceMeasurement.getId())) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Transactional(readOnly = true)
|
||||
private void addAdvanceAssignment(
|
||||
DirectAdvanceAssignment newAdvanceAssignment)
|
||||
|
|
@ -368,12 +355,6 @@ public class ManageOrderElementAdvancesModel implements
|
|||
}
|
||||
}
|
||||
|
||||
private void removeAdvanceMeasurement(AdvanceMeasurement advanceMeasurement){
|
||||
DirectAdvanceAssignment advanceAssignment = (DirectAdvanceAssignment) advanceMeasurement
|
||||
.getAdvanceAssignment();
|
||||
advanceAssignment.getAdvanceMeasurements().remove(advanceMeasurement);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPrecisionValid(BigDecimal value){
|
||||
if ((this.advanceAssignment != null)
|
||||
|
|
|
|||
|
|
@ -223,24 +223,6 @@ public class OrderElementTreeModel {
|
|||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if parent is an ancestor of child
|
||||
*
|
||||
* @param parent
|
||||
* @param child
|
||||
* @return
|
||||
*/
|
||||
private boolean isAncestor(OrderElement parent, OrderElement child) {
|
||||
OrderElement orderElement = child.getParent();
|
||||
while (orderElement != null) {
|
||||
if (orderElement.equals(parent)) {
|
||||
return true;
|
||||
}
|
||||
orderElement = orderElement.getParent();
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public void up(OrderElement node) {
|
||||
IOrderLineGroup orderLineGroup = asOrderLineGroup(tree.getParent(node));
|
||||
orderLineGroup.up(node);
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@ import org.navalplanner.business.labels.entities.Label;
|
|||
import org.navalplanner.business.orders.daos.IOrderElementDAO;
|
||||
import org.navalplanner.business.orders.entities.Order;
|
||||
import org.navalplanner.business.orders.entities.OrderElement;
|
||||
import org.navalplanner.business.planner.daos.IDayAssignmentDAO;
|
||||
import org.navalplanner.business.planner.daos.ITaskElementDAO;
|
||||
import org.navalplanner.business.planner.entities.Dependency;
|
||||
import org.navalplanner.business.planner.entities.TaskElement;
|
||||
|
|
@ -73,9 +72,6 @@ public class TaskElementAdapter implements ITaskElementAdapter {
|
|||
@Autowired
|
||||
private ITaskElementDAO taskDAO;
|
||||
|
||||
@Autowired
|
||||
private IDayAssignmentDAO dayAssignmentDAO;
|
||||
|
||||
private List<IOnMoveListener> listeners = new ArrayList<IOnMoveListener>();
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -25,17 +25,18 @@
|
|||
|
||||
package org.navalplanner.web.resources.criterion;
|
||||
|
||||
import static org.navalplanner.web.I18nHelper._;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import static org.navalplanner.web.I18nHelper._;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import org.hibernate.validator.InvalidValue;
|
||||
import org.navalplanner.business.common.exceptions.ValidationException;
|
||||
import java.util.Set;
|
||||
import org.navalplanner.business.resources.entities.Criterion;
|
||||
import org.navalplanner.business.resources.entities.CriterionType;
|
||||
import org.navalplanner.web.common.Util;
|
||||
import org.zkoss.ganttz.util.MutableTreeModel;
|
||||
import org.zkoss.zul.TreeModel;
|
||||
|
||||
|
|
@ -252,13 +253,6 @@ public class CriterionTreeModel implements ICriterionTreeModel{
|
|||
}
|
||||
}
|
||||
|
||||
private CriterionDTO toNode(CriterionDTO container) {
|
||||
if (container == criterionRootDTO) {
|
||||
return tree.getRoot();
|
||||
}
|
||||
return (CriterionDTO) container;
|
||||
}
|
||||
|
||||
private CriterionDTO asCriterion(CriterionDTO node) {
|
||||
if (tree.isRoot(node)) {
|
||||
return criterionRootDTO;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,6 @@ import org.navalplanner.web.common.Level;
|
|||
import org.navalplanner.web.common.MessagesForUser;
|
||||
import org.navalplanner.web.common.OnlyOneVisible;
|
||||
import org.navalplanner.web.common.Util;
|
||||
import org.navalplanner.web.common.entrypoints.IURLHandlerRegistry;
|
||||
import org.navalplanner.web.resources.worker.CriterionsController;
|
||||
import org.navalplanner.web.resources.worker.CriterionsMachineController;
|
||||
import org.zkoss.zk.ui.Component;
|
||||
|
|
@ -61,8 +60,6 @@ public class MachineCRUDController extends GenericForwardComposer {
|
|||
|
||||
private IMachineModel machineModel;
|
||||
|
||||
private IURLHandlerRegistry URLHandlerRegistry;
|
||||
|
||||
private OnlyOneVisible visibility;
|
||||
|
||||
private IMessagesForUser messagesForUser;
|
||||
|
|
@ -335,11 +332,4 @@ public class MachineCRUDController extends GenericForwardComposer {
|
|||
return baseCalendarEditionController;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unused")
|
||||
private CriterionsController getCriterionsController() {
|
||||
return (CriterionsController) editWindow.getFellow(
|
||||
"criterionsContainer").getAttribute(
|
||||
"assignedCriterionsController");
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -150,16 +150,6 @@ public class WorkerSearchController extends GenericForwardComposer {
|
|||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Refresh listBoxWorkers with new {@link Worker} results
|
||||
*
|
||||
* @param workers
|
||||
* array of {@link Worker}
|
||||
*/
|
||||
private void refreshListBoxWorkers(Worker[] workers) {
|
||||
listBoxWorkers.setModel(new SimpleListModel(workers));
|
||||
}
|
||||
|
||||
private void refreshListBoxWorkers(List<Worker> workers) {
|
||||
listBoxWorkers.setModel(new SimpleListModel(workers));
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue