From e746e27906e86d641d24ae7dee3656526677a3e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 3 Nov 2009 22:59:57 +0100 Subject: [PATCH] ItEr33S08ValidacionEProbasFuncionaisItEr32S09: Prevent instantiation of utility classes --- .../src/main/java/org/navalplanner/web/I18nHelper.java | 3 +++ .../main/java/org/zkoss/ganttz/ScriptsRequiredByPlanner.java | 3 +++ ganttzk/src/main/java/org/zkoss/ganttz/ScrollSyncScript.java | 3 +++ ganttzk/src/main/java/org/zkoss/ganttz/YUIMin.java | 3 +++ .../resourceload/ScriptsRequiredByResourceLoadPanel.java | 3 +++ .../src/main/java/org/zkoss/ganttz/util/ComponentsFinder.java | 3 +++ ganttzk/src/main/java/org/zkoss/ganttz/util/GanttUtils.java | 3 +++ .../src/main/java/org/navalplanner/web/I18nHelper.java | 3 +++ .../src/main/java/org/navalplanner/web/WebappGlobalNames.java | 3 +++ .../java/org/navalplanner/web/common/ComponentsReplacer.java | 3 +++ .../web/common/ConcurrentModificationDetector.java | 3 +++ .../java/org/navalplanner/web/common/InvalidInputsChecker.java | 3 +++ .../src/main/java/org/navalplanner/web/common/Util.java | 3 +++ .../navalplanner/web/common/entrypoints/MatrixParameters.java | 3 +++ .../allocation/ScriptsRequiredByAdvancedAllocation.java | 3 +++ 15 files changed, 45 insertions(+) diff --git a/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/I18nHelper.java b/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/I18nHelper.java index ec808eb6e..746e78cb4 100644 --- a/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/I18nHelper.java +++ b/ganttzk-demo-webapp/src/main/java/org/navalplanner/web/I18nHelper.java @@ -30,6 +30,9 @@ import org.zkoss.util.Locales; public class I18nHelper { + private I18nHelper() { + } + private static HashMap localesCache = new HashMap(); public static I18n getI18n() { diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/ScriptsRequiredByPlanner.java b/ganttzk/src/main/java/org/zkoss/ganttz/ScriptsRequiredByPlanner.java index 13650d4bd..4988d3d16 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/ScriptsRequiredByPlanner.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/ScriptsRequiredByPlanner.java @@ -25,6 +25,9 @@ import org.zkoss.ganttz.util.script.ScriptsRequiredDeclaration; @ScriptsRequiredDeclaration(dependsOn = { YUIMin.class, ScrollSyncScript.class }) public class ScriptsRequiredByPlanner { + private ScriptsRequiredByPlanner() { + } + public static final String SELECTOR = "/zkau/web/js/yui/2.7.0/selector/selector-min.js"; public static final String YAHOO_DOM_EVENT = "/zkau/web/js/yui/2.7.0/yahoo-dom-event/yahoo-dom-event.js"; public static final String DRAGDROPMIN = "/zkau/web/js/yui/2.7.0/dragdrop/dragdrop-min.js"; diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/ScrollSyncScript.java b/ganttzk/src/main/java/org/zkoss/ganttz/ScrollSyncScript.java index ee097b1fc..f50e7f2fc 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/ScrollSyncScript.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/ScrollSyncScript.java @@ -25,6 +25,9 @@ import org.zkoss.ganttz.util.script.ScriptsRequiredDeclaration; @ScriptsRequiredDeclaration(dependsOn = YUIMin.class) public class ScrollSyncScript { + private ScrollSyncScript() { + } + public static final String SCROLL_SYNC = "/zkau/web/js/ganttz/scrollSync.js"; public static final String YAHOO_DOM_EVENT = "/zkau/web/js/yui/2.7.0/yahoo-dom-event/yahoo-dom-event.js"; diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/YUIMin.java b/ganttzk/src/main/java/org/zkoss/ganttz/YUIMin.java index 1b35fcfa6..7a4f93d99 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/YUIMin.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/YUIMin.java @@ -25,6 +25,9 @@ import org.zkoss.ganttz.util.script.ScriptsRequiredDeclaration; @ScriptsRequiredDeclaration public class YUIMin { + private YUIMin() { + } + public static final String YUI_MIN = "/zkau/web/js/yui/2.7.0/yahoo/yahoo-min.js"; } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ScriptsRequiredByResourceLoadPanel.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ScriptsRequiredByResourceLoadPanel.java index 2f678cfed..fe9299fdf 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ScriptsRequiredByResourceLoadPanel.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ScriptsRequiredByResourceLoadPanel.java @@ -27,6 +27,9 @@ import org.zkoss.ganttz.util.script.ScriptsRequiredDeclaration; @ScriptsRequiredDeclaration(dependsOn = { YUIMin.class, ScrollSyncScript.class }) public class ScriptsRequiredByResourceLoadPanel { + private ScriptsRequiredByResourceLoadPanel() { + } + public static final String SELECTOR = "/zkau/web/js/yui/2.7.0/selector/selector-min.js"; public static final String YAHOO_DOM_EVENT = "/zkau/web/js/yui/2.7.0/yahoo-dom-event/yahoo-dom-event.js"; diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/ComponentsFinder.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/ComponentsFinder.java index 9d2020844..0372b7423 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/util/ComponentsFinder.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/util/ComponentsFinder.java @@ -29,6 +29,9 @@ import java.util.List; */ public class ComponentsFinder { + private ComponentsFinder() { + } + public static List findComponentsOfType(Class type, List children) { ArrayList result = new ArrayList(); diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/GanttUtils.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/GanttUtils.java index 9e2e7843a..2877a0102 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/util/GanttUtils.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/util/GanttUtils.java @@ -27,6 +27,9 @@ package org.zkoss.ganttz.util; */ public class GanttUtils { + private GanttUtils() { + } + public static int getIntFromStylePosition(String position) throws Exception { String[] tokens = position.split("px"); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/I18nHelper.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/I18nHelper.java index ae8463f0d..b101113c3 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/I18nHelper.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/I18nHelper.java @@ -30,6 +30,9 @@ import org.zkoss.util.Locales; public class I18nHelper { + private I18nHelper() { + } + private static HashMap localesCache = new HashMap(); public static I18n getI18n() { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/WebappGlobalNames.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/WebappGlobalNames.java index af860564f..0491d44da 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/WebappGlobalNames.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/WebappGlobalNames.java @@ -27,6 +27,9 @@ package org.navalplanner.web; */ public class WebappGlobalNames { + private WebappGlobalNames() { + } + public final static String WEBAPP_SPRING_CONFIG_FILE = "classpath:/navalplanner-webapp-spring-config.xml"; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ComponentsReplacer.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ComponentsReplacer.java index 2e3ca8617..6da08fb52 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ComponentsReplacer.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ComponentsReplacer.java @@ -28,6 +28,9 @@ import org.zkoss.zk.ui.Executions; public class ComponentsReplacer { + private ComponentsReplacer() { + } + private static class ChildrenSnapshot implements IChildrenSnapshot { private final List children; private final Component parent; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConcurrentModificationDetector.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConcurrentModificationDetector.java index 3a9bbb832..551d4bd55 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConcurrentModificationDetector.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/ConcurrentModificationDetector.java @@ -25,6 +25,9 @@ import org.springframework.dao.OptimisticLockingFailureException; public class ConcurrentModificationDetector { + private ConcurrentModificationDetector() { + } + public static T addAutomaticHandlingOfConcurrentModification(Class interfaceClass, T model, final String backURL) { IExceptionHandler handler = createHandler(backURL); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/InvalidInputsChecker.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/InvalidInputsChecker.java index 4de635180..9d4dc1fab 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/InvalidInputsChecker.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/InvalidInputsChecker.java @@ -31,6 +31,9 @@ import org.zkoss.zul.impl.api.InputElement; */ public class InvalidInputsChecker { + private InvalidInputsChecker() { + } + public static boolean thereAreInvalidInputsOn(Component component) { if (isInvalid(component)) { return true; diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java index 963eb6ad6..0bde568e8 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/Util.java @@ -46,6 +46,9 @@ import org.zkoss.zul.Textbox; */ public class Util { + private Util() { + } + public static void reloadBindings(Component... toReload) { for (Component reload : toReload) { DataBinder binder = Util.getBinder(reload); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/MatrixParameters.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/MatrixParameters.java index ad47f832a..f11913a33 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/MatrixParameters.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/entrypoints/MatrixParameters.java @@ -34,6 +34,9 @@ import javax.servlet.http.HttpServletRequest; */ public class MatrixParameters { + private MatrixParameters() { + } + private static Pattern matrixParamPattern = Pattern .compile(";([^/=;]+)=?([^/;]+)?"); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ScriptsRequiredByAdvancedAllocation.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ScriptsRequiredByAdvancedAllocation.java index c26b17f33..e2496310c 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ScriptsRequiredByAdvancedAllocation.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ScriptsRequiredByAdvancedAllocation.java @@ -28,6 +28,9 @@ import org.zkoss.ganttz.util.script.ScriptsRequiredDeclaration; @ScriptsRequiredDeclaration public class ScriptsRequiredByAdvancedAllocation { + private ScriptsRequiredByAdvancedAllocation() { + } + public static final String ADVANDED_ALLOCATION = "/js/advanceAllocations.js"; }