diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java b/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java
index 3dec00f6e..4226cec71 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java
@@ -120,7 +120,8 @@ public class LeftTasksTree extends HtmlMacroComponent {
         return task.isLeaf() || task.isExpanded();
     }
 
-    private final class DetailsForBeans {
+    private static final class DetailsForBeans {
+
         private Map<Task, LeftTasksTreeRow> map = new HashMap<Task, LeftTasksTreeRow>();
 
         private Set<Task> focusRequested = new HashSet<Task>();
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java
index 9a1df4f99..e3a403a63 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskEditFormComposer.java
@@ -93,7 +93,7 @@ public class TaskEditFormComposer extends GenericForwardComposer {
      *
      * @author Manuel Rego Casasnovas <mrego@igalia.com>
      */
-    public class TaskDTO {
+    public static class TaskDTO {
         public String name;
         public Date beginDate;
         public Date endDate;
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/util/deepcopy/DeepCopy.java b/navalplanner-business/src/main/java/org/navalplanner/business/util/deepcopy/DeepCopy.java
index 2a3d2f649..8b5ea752a 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/util/deepcopy/DeepCopy.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/util/deepcopy/DeepCopy.java
@@ -33,10 +33,10 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.SortedSet;
 import java.util.TreeSet;
-import java.util.Map.Entry;
 
 import org.apache.commons.lang.Validate;
 import org.hibernate.proxy.HibernateProxy;
@@ -279,7 +279,8 @@ public class DeepCopy {
 
     private Map<ByIdentity, Object> alreadyCopiedObjects = new HashMap<ByIdentity, Object>();
 
-    private class ByIdentity {
+    private static class ByIdentity {
+
         private final Object wrapped;
 
         ByIdentity(Object wrapped) {
@@ -303,7 +304,6 @@ public class DeepCopy {
             }
             return false;
         }
-
     }
 
     private ByIdentity byIdentity(Object value) {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
index 84cd0812a..8c6bc5ce5 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConfigurationController.java
@@ -444,7 +444,7 @@ public class ConfigurationController extends GenericForwardComposer {
         return progressTypeRenderer;
     }
 
-    private class ProgressTypeRenderer implements ListitemRenderer {
+    private static class ProgressTypeRenderer implements ListitemRenderer {
 
         @Override
         public void render(Listitem item, Object data) throws Exception {
@@ -702,11 +702,11 @@ public class ConfigurationController extends GenericForwardComposer {
         }
     }
 
-    public class EntitySequenceComparator implements Comparator {
+    public static class EntitySequenceComparator implements
+            Comparator<EntitySequence> {
+
         @Override
-        public int compare(Object o1, Object o2) {
-            EntitySequence seq1 = (EntitySequence) o1;
-            EntitySequence seq2 = (EntitySequence) o2;
+        public int compare(EntitySequence seq1, EntitySequence seq2) {
             return seq1.getEntityName().compareTo(seq2.getEntityName());
         }
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/RedirectorSynthetiser.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/RedirectorSynthetiser.java
index 5cc5d115b..4819d19e1 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/RedirectorSynthetiser.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/RedirectorSynthetiser.java
@@ -21,6 +21,8 @@
 
 package org.navalplanner.web.common.entrypoints;
 
+import static org.navalplanner.web.I18nHelper._;
+
 import java.io.IOException;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
@@ -42,8 +44,6 @@ import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
 import org.springframework.core.type.classreading.MetadataReader;
 import org.springframework.util.ClassUtils;
 
-import static org.navalplanner.web.I18nHelper._;
-
 /**
  * Creates implemnetations of controllers that sends http redirects to the
  * proper page <br />
@@ -53,7 +53,9 @@ public class RedirectorSynthetiser implements BeanFactoryPostProcessor {
     private static final Log LOG = LogFactory
             .getLog(RedirectorSynthetiser.class);
 
-    private final class SynthetizedImplementation implements InvocationHandler {
+    private static final class SynthetizedImplementation implements
+            InvocationHandler {
+
         private final ConfigurableListableBeanFactory beanFactory;
 
         private final Class<?> pageInterface;
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 2072ddee6..c1ac4c228 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
@@ -260,7 +260,8 @@ public class LimitingResourcesController extends GenericForwardComposer {
      * @author Diego Pino Garcia <dpino@igalia.com>
      *
      */
-    public class LimitingResourceQueueElementDTO implements Comparable<LimitingResourceQueueElementDTO> {
+    public static class LimitingResourceQueueElementDTO implements
+            Comparable<LimitingResourceQueueElementDTO> {
 
         private final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM/yyyy");
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java
index 17bce75ec..01193a621 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/ManualAllocationController.java
@@ -473,7 +473,7 @@ public class ManualAllocationController extends GenericForwardComposer {
         return candidateGapRenderer;
     }
 
-    private class CandidateGapRenderer implements ListitemRenderer {
+    private static class CandidateGapRenderer implements ListitemRenderer {
 
         @Override
         public void render(Listitem item, Object data) throws Exception {
@@ -529,7 +529,7 @@ public class ManualAllocationController extends GenericForwardComposer {
         self.setVariable("status", Integer.valueOf(status), true);
     }
 
-    private class QueueRenderer implements ListitemRenderer {
+    private static class QueueRenderer implements ListitemRenderer {
 
         @Override
         public void render(Listitem item, Object data) throws Exception {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java
index b8bed494f..fbee9bd45 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java
@@ -535,7 +535,7 @@ public class MaterialsController extends
      * RowRenderer for a @{UnitType} element
      * @author Susana Montes Pedreira <smontes@wirelessgalicia.com>
      */
-    public class UnitTypeListRenderer implements ListitemRenderer {
+    public static class UnitTypeListRenderer implements ListitemRenderer {
         @Override
         public void render(Listitem listItem, Object data) throws Exception {
             final UnitType unitType = (UnitType) data;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java
index d0e9fef25..5c2d2b83f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloController.java
@@ -303,7 +303,7 @@ public class MonteCarloController extends GenericForwardComposer {
         }
     }
 
-    private class CriticalPathTasksRender implements RowRenderer {
+    private static class CriticalPathTasksRender implements RowRenderer {
 
         @Override
         public void render(Row row, Object data) throws Exception {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloModel.java
index 1acf6a577..e1d5732d7 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/montecarlo/MonteCarloModel.java
@@ -449,7 +449,7 @@ public class MonteCarloModel implements IMonteCarloModel {
         return StringUtils.join(result, ",");
     }
 
-    private class MonteCarloCalculation {
+    private static class MonteCarloCalculation {
 
         private Map<MonteCarloTask, Set<EstimationRange>> estimationRangesForTasks = new HashMap<MonteCarloTask, Set<EstimationRange>>();
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java
index 6697d59f0..492b2e584 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/ManageOrderElementAdvancesModel.java
@@ -849,7 +849,7 @@ public class ManageOrderElementAdvancesModel implements
      *      pressed, restores the original state of the advance assignments
      *
      */
-    private class CancelOperation {
+    private static class CancelOperation {
 
         private Set<AdvanceMeasurement> addedMeasurements = new HashSet<AdvanceMeasurement>();
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
index 7dbef99d0..4cf290df3 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
@@ -114,8 +114,9 @@ public class OrderCRUDController extends GenericForwardComposer {
 
     private static final String DEFAULT_TAB = "tabOrderElements";
 
-    private final class LabelCreatorForInvalidValues implements
+    private static final class LabelCreatorForInvalidValues implements
             IMessagesForUser.ICustomLabelCreator {
+
         @Override
         public Component createLabelFor(
                 InvalidValue invalidValue) {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java
index 776228aaa..0b9d3d169 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningController.java
@@ -172,7 +172,7 @@ public class CompanyPlanningController implements Composer {
         cbProgressTypes.setVisible(true);
     }
 
-    private class ProgressTypeRenderer implements ComboitemRenderer {
+    private static class ProgressTypeRenderer implements ComboitemRenderer {
 
         @Override
         public void render(Comboitem item, Object data) throws Exception {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
index 5f19a0851..fbd2ed861 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java
@@ -67,8 +67,8 @@ import org.navalplanner.web.planner.ITaskElementAdapter;
 import org.navalplanner.web.planner.chart.Chart;
 import org.navalplanner.web.planner.chart.ChartFiller;
 import org.navalplanner.web.planner.chart.EarnedValueChartFiller;
-import org.navalplanner.web.planner.chart.IChartFiller;
 import org.navalplanner.web.planner.chart.EarnedValueChartFiller.EarnedValueType;
+import org.navalplanner.web.planner.chart.IChartFiller;
 import org.navalplanner.web.planner.order.BankHolidaysMarker;
 import org.navalplanner.web.planner.order.OrderPlanningModel;
 import org.navalplanner.web.planner.tabs.MultipleTabsPlannerController;
@@ -169,8 +169,9 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel {
         this.tabs = entryPoints;
     }
 
-    private final class TaskElementNavigator implements
+    private static final class TaskElementNavigator implements
             IStructureNavigator<TaskElement> {
+
         @Override
         public List<TaskElement> getChildren(TaskElement object) {
             return null;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
index d0c3fb147..5f5f8ce7e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
@@ -284,7 +284,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
 
     private OverAllProgressContent overallProgressContent;
 
-    private final class ReturningNewAssignments implements
+    private static final class ReturningNewAssignments implements
             IAssignmentsOnResourceCalculator {
 
         private Set<DayAssignment> previousAssignmentsSet;
@@ -307,8 +307,9 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
 
     }
 
-    private final class TaskElementNavigator implements
+    private static final class TaskElementNavigator implements
             IStructureNavigator<TaskElement> {
+
         @Override
         public List<TaskElement> getChildren(TaskElement object) {
             return object.getChildren();
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java
index d709609f3..7abb70f6f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/SchedulingProgressPerOrderController.java
@@ -26,7 +26,6 @@ import static org.navalplanner.web.I18nHelper._;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -216,7 +215,7 @@ public class SchedulingProgressPerOrderController extends NavalplannerReportCont
         super.showReport(jasperreport);
     }
 
-    public class AdvanceTypeDTO {
+    public static class AdvanceTypeDTO {
 
         private String name;
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java
index b12a972f5..d48a07513 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialController.java
@@ -27,7 +27,6 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -253,7 +252,7 @@ public class TimeLineRequiredMaterialController extends
         return new MaterialCategoryRenderer();
     }
 
-    private class MaterialCategoryRenderer implements TreeitemRenderer {
+    private static class MaterialCategoryRenderer implements TreeitemRenderer {
 
         /**
          * Copied verbatim from org.zkoss.zul.Tree;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java
index 77b5a995e..a0b77e084 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingArrangementsPerOrderController.java
@@ -147,7 +147,8 @@ public class WorkingArrangementsPerOrderController extends NavalplannerReportCon
         return result;
     }
 
-    private class TaskStatusEnumComparator implements Comparator<TaskStatusEnum> {
+    private static class TaskStatusEnumComparator implements
+            Comparator<TaskStatusEnum> {
 
         @Override
         public int compare(TaskStatusEnum arg0, TaskStatusEnum arg1) {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/NewAllocationSelectorController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/NewAllocationSelectorController.java
index adb24641c..6b72966c3 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/NewAllocationSelectorController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/NewAllocationSelectorController.java
@@ -370,7 +370,7 @@ public class NewAllocationSelectorController extends
      *         Encapsulates {@link SimpleTreeNode}
      *
      */
-    private class CriterionTreeNode extends SimpleTreeNode {
+    private static class CriterionTreeNode extends SimpleTreeNode {
 
         public CriterionTreeNode(Object data, List<CriterionTreeNode> children) {
             super(data, children);
@@ -471,7 +471,7 @@ public class NewAllocationSelectorController extends
      *
      *         Render for listBoxResources
      */
-    private class ResourceListRenderer implements ListitemRenderer {
+    private static class ResourceListRenderer implements ListitemRenderer {
 
         @Override
         public void render(Listitem item, Object data) throws Exception {
@@ -511,7 +511,7 @@ public class NewAllocationSelectorController extends
      *         Finally, I tried this solution and it works
      *
      */
-    private class CriterionRenderer implements TreeitemRenderer {
+    private static class CriterionRenderer implements TreeitemRenderer {
 
         /**
          * Copied verbatim from org.zkoss.zul.Tree;