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 5504cfdfc..614ebdcab 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/util/MenuBuilder.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/util/MenuBuilder.java
@@ -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;
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/requirements/entities/DirectCriterionRequirement.java b/navalplanner-business/src/main/java/org/navalplanner/business/requirements/entities/DirectCriterionRequirement.java
index 260636f04..192e822fb 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/requirements/entities/DirectCriterionRequirement.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/requirements/entities/DirectCriterionRequirement.java
@@ -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(){
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 08f36dd05..fadff016f 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
@@ -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);
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java
index 1fb44fa0f..03720a45e 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceEnum.java
@@ -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);
     }
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/MessagesForUser.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/MessagesForUser.java
index 0f324551f..72ac5181f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/MessagesForUser.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/MessagesForUser.java
@@ -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;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/I18n.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/I18n.java
index f80da6d6c..b5929f874 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/I18n.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/I18n.java
@@ -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() {
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
index c79d813e1..4d2500535 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/labels/LabelTypeCRUDController.java
@@ -57,7 +57,7 @@ import org.zkoss.zul.Window;
 public class LabelTypeCRUDController extends GenericForwardComposer {
 
     @Autowired
-    ILabelTypeModel labelTypeModel;
+    private ILabelTypeModel labelTypeModel;
 
     private Window listWindow;
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementController.java
index 90d51de6b..e727affe5 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AsignedHoursToOrderElementController.java
@@ -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
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementModel.java
index ba780b77c..948305152 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementModel.java
@@ -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() {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/LabelOrderElementPredicate.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/LabelOrderElementPredicate.java
index bfe856421..b3f7b41c1 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/LabelOrderElementPredicate.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/LabelOrderElementPredicate.java
@@ -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;
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 cdbd2ee66..98177764c 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
@@ -141,7 +141,7 @@ public class ManageOrderElementAdvancesController extends
         return false;
     }
 
-    IOrderElementModel orderElementModel;
+    private IOrderElementModel orderElementModel;
 
     public void openWindow(IOrderElementModel orderElementModel) {
         setOrderElementModel(orderElementModel);
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 6d6a3aa0f..5246b4ed4 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
@@ -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;
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 2d5dabac4..be7f13744 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
@@ -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() {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineModel.java
index 93b3853ad..1c7655d87 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/machine/MachineModel.java
@@ -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;
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/WorkerSearchController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/WorkerSearchController.java
index 8b8bccbcd..897de6592 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/WorkerSearchController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/WorkerSearchController.java
@@ -71,7 +71,7 @@ public class WorkerSearchController extends GenericForwardComposer {
 
     private Listbox listBoxWorkers;
 
-    CriterionRenderer criterionRenderer = new CriterionRenderer();
+    private CriterionRenderer criterionRenderer = new CriterionRenderer();
 
     public WorkerSearchController() {