ItEr33S08ValidacionEProbasFuncionaisItEr32S09: Reducing visibility of instance variables where possible
This commit is contained in:
parent
b636354971
commit
7cf93093f7
15 changed files with 39 additions and 42 deletions
|
|
@ -54,9 +54,9 @@ public class MenuBuilder<T extends XulElement> {
|
|||
}
|
||||
|
||||
private class Item {
|
||||
final String name;
|
||||
private final String name;
|
||||
|
||||
final ItemAction<T> action;
|
||||
private final ItemAction<T> action;
|
||||
|
||||
Item(String name, ItemAction<T> action) {
|
||||
this.name = name;
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ package org.navalplanner.business.requirements.entities;
|
|||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import org.navalplanner.business.orders.entities.HoursGroup;
|
||||
import org.navalplanner.business.orders.entities.OrderElement;
|
||||
import org.navalplanner.business.resources.entities.Criterion;
|
||||
|
|
@ -33,7 +34,7 @@ import org.navalplanner.business.resources.entities.Criterion;
|
|||
public class DirectCriterionRequirement extends CriterionRequirement{
|
||||
|
||||
|
||||
Set<IndirectCriterionRequirement> children =
|
||||
private Set<IndirectCriterionRequirement> children =
|
||||
new HashSet<IndirectCriterionRequirement>();
|
||||
|
||||
public static DirectCriterionRequirement create(){
|
||||
|
|
|
|||
|
|
@ -287,11 +287,11 @@ public abstract class Resource extends BaseEntity{
|
|||
this.resource = resource;
|
||||
}
|
||||
|
||||
final Resource resource;
|
||||
private final Resource resource;
|
||||
|
||||
final CriterionWithItsType type;
|
||||
private final CriterionWithItsType type;
|
||||
|
||||
final Interval interval;
|
||||
private final Interval interval;
|
||||
|
||||
CriterionSatisfaction addSatisfaction() {
|
||||
return resource.addSatisfaction(type, interval);
|
||||
|
|
|
|||
|
|
@ -32,14 +32,14 @@ public enum ResourceEnum {
|
|||
WORKER(Worker.class),
|
||||
MACHINE(Machine.class);
|
||||
|
||||
Class clase;
|
||||
private Class<?> klass;
|
||||
|
||||
private ResourceEnum(Class clase) {
|
||||
this.clase = clase;
|
||||
private ResourceEnum(Class<?> clase) {
|
||||
this.klass = clase;
|
||||
}
|
||||
|
||||
public Class asClass() {
|
||||
return clase;
|
||||
public Class<?> asClass() {
|
||||
return klass;
|
||||
}
|
||||
|
||||
public static ResourceEnum getDefault() {
|
||||
|
|
@ -47,10 +47,10 @@ public enum ResourceEnum {
|
|||
}
|
||||
|
||||
public String toString() {
|
||||
return clase.getSimpleName().toUpperCase();
|
||||
return klass.getSimpleName().toUpperCase();
|
||||
}
|
||||
|
||||
public boolean isAssignableFrom(Class clase) {
|
||||
public boolean isAssignableFrom(Class<?> clase) {
|
||||
return asClass().isAssignableFrom(clase);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,8 +50,8 @@ public class MessagesForUser extends GenericForwardComposer implements
|
|||
// seconds
|
||||
|
||||
private class ComponentHolderTimestamped {
|
||||
final Component component;
|
||||
final long timestamp;
|
||||
private final Component component;
|
||||
private final long timestamp;
|
||||
|
||||
ComponentHolderTimestamped(Component component) {
|
||||
this.component = component;
|
||||
|
|
|
|||
|
|
@ -33,15 +33,15 @@ import org.zkoss.zul.Label;
|
|||
@SuppressWarnings("serial")
|
||||
public class I18n extends HtmlMacroComponent {
|
||||
|
||||
public String value;
|
||||
private String value;
|
||||
|
||||
public String arg0;
|
||||
private String arg0;
|
||||
|
||||
public String arg1;
|
||||
private String arg1;
|
||||
|
||||
public String arg2;
|
||||
private String arg2;
|
||||
|
||||
public String arg3;
|
||||
private String arg3;
|
||||
|
||||
public I18n() {
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ import org.zkoss.zul.Window;
|
|||
public class LabelTypeCRUDController extends GenericForwardComposer {
|
||||
|
||||
@Autowired
|
||||
ILabelTypeModel labelTypeModel;
|
||||
private ILabelTypeModel labelTypeModel;
|
||||
|
||||
private Window listWindow;
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ import org.zkoss.zul.Progressmeter;
|
|||
public class AsignedHoursToOrderElementController extends
|
||||
GenericForwardComposer {
|
||||
|
||||
IAsignedHoursToOrderElementModel asignedHoursToOrderElementModel;
|
||||
private IAsignedHoursToOrderElementModel asignedHoursToOrderElementModel;
|
||||
|
||||
@Override
|
||||
public void doAfterCompose(Component comp) throws Exception {
|
||||
|
|
@ -67,7 +67,7 @@ public class AsignedHoursToOrderElementController extends
|
|||
return asignedHoursToOrderElementModel.getProgressWork();
|
||||
}
|
||||
|
||||
IOrderElementModel orderElementModel;
|
||||
private IOrderElementModel orderElementModel;
|
||||
|
||||
public void openWindow(IOrderElementModel orderElementModel) {
|
||||
setOrderElementModel(orderElementModel);
|
||||
|
|
@ -83,9 +83,9 @@ public class AsignedHoursToOrderElementController extends
|
|||
return orderElementModel.getOrderElement();
|
||||
}
|
||||
|
||||
Progressmeter hoursProgressBar;
|
||||
private Progressmeter hoursProgressBar;
|
||||
|
||||
Progressmeter exceedHoursProgressBar;
|
||||
private Progressmeter exceedHoursProgressBar;
|
||||
|
||||
/**
|
||||
* This method shows the percentage of the imputed hours with respect to the
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ import java.util.List;
|
|||
import java.util.Set;
|
||||
|
||||
import org.navalplanner.business.labels.daos.ILabelDAO;
|
||||
import org.navalplanner.business.labels.daos.ILabelTypeDAO;
|
||||
import org.navalplanner.business.labels.entities.Label;
|
||||
import org.navalplanner.business.labels.entities.LabelType;
|
||||
import org.navalplanner.business.orders.daos.IOrderElementDAO;
|
||||
|
|
@ -47,17 +46,14 @@ public class AssignedLabelsToOrderElementModel implements
|
|||
IAssignedLabelsToOrderElementModel {
|
||||
|
||||
@Autowired
|
||||
IOrderElementDAO orderDAO;
|
||||
private IOrderElementDAO orderDAO;
|
||||
|
||||
@Autowired
|
||||
ILabelTypeDAO labelTypeDAO;
|
||||
private ILabelDAO labelDAO;
|
||||
|
||||
@Autowired
|
||||
ILabelDAO labelDAO;
|
||||
private OrderElement orderElement;
|
||||
|
||||
OrderElement orderElement;
|
||||
|
||||
IOrderModel orderModel;
|
||||
private IOrderModel orderModel;
|
||||
|
||||
@Override
|
||||
public OrderElement getOrderElement() {
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ import org.navalplanner.business.orders.entities.OrderElement;
|
|||
*/
|
||||
public class LabelOrderElementPredicate implements IPredicate {
|
||||
|
||||
Label label;
|
||||
private Label label;
|
||||
|
||||
public LabelOrderElementPredicate(Label label) {
|
||||
this.label = label;
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ public class ManageOrderElementAdvancesController extends
|
|||
return false;
|
||||
}
|
||||
|
||||
IOrderElementModel orderElementModel;
|
||||
private IOrderElementModel orderElementModel;
|
||||
|
||||
public void openWindow(IOrderElementModel orderElementModel) {
|
||||
setOrderElementModel(orderElementModel);
|
||||
|
|
|
|||
|
|
@ -692,7 +692,7 @@ public class OrderElementTreeController extends GenericForwardComposer {
|
|||
return !isItemSelected();
|
||||
}
|
||||
|
||||
Button btnNew, btnDown, btnUp, btnUnindent, btnIndent, btnDelete;
|
||||
private Button btnNew, btnDown, btnUp, btnUnindent, btnIndent, btnDelete;
|
||||
|
||||
private void resetControlButtons() {
|
||||
final boolean disabled = tree.getSelectedItem() == null;
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|||
public class OrderModel implements IOrderModel {
|
||||
|
||||
@Autowired
|
||||
ICriterionTypeDAO criterionTypeDAO;
|
||||
private ICriterionTypeDAO criterionTypeDAO;
|
||||
|
||||
private static final Map<CriterionType, List<Criterion>> mapCriterions = new HashMap<CriterionType, List<Criterion>>();
|
||||
|
||||
|
|
@ -103,7 +103,7 @@ public class OrderModel implements IOrderModel {
|
|||
@Autowired
|
||||
private IOrderElementDAO orderElementDAO;
|
||||
|
||||
Set<Label> cacheLabels = new HashSet<Label>();
|
||||
private Set<Label> cacheLabels = new HashSet<Label>();
|
||||
|
||||
@Override
|
||||
public List<Label> getLabels() {
|
||||
|
|
|
|||
|
|
@ -52,13 +52,13 @@ import org.springframework.transaction.annotation.Transactional;
|
|||
public class MachineModel implements IMachineModel {
|
||||
|
||||
@Autowired
|
||||
IResourceDAO resourceDAO;
|
||||
private IResourceDAO resourceDAO;
|
||||
|
||||
@Autowired
|
||||
IMachineDAO machineDAO;
|
||||
private IMachineDAO machineDAO;
|
||||
|
||||
@Autowired
|
||||
IBaseCalendarDAO baseCalendarDAO;
|
||||
private IBaseCalendarDAO baseCalendarDAO;
|
||||
|
||||
private Machine machine;
|
||||
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ public class WorkerSearchController extends GenericForwardComposer {
|
|||
|
||||
private Listbox listBoxWorkers;
|
||||
|
||||
CriterionRenderer criterionRenderer = new CriterionRenderer();
|
||||
private CriterionRenderer criterionRenderer = new CriterionRenderer();
|
||||
|
||||
public WorkerSearchController() {
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue