From 8370d66ebbcc08ca855ffdd8e20352891978e5dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Mon, 6 Jun 2011 17:46:26 +0200 Subject: [PATCH] Avoid where possible to mark a method as throws Exception FEA: ItEr74S04BugFixing --- .../zkoss/ganttz/CommandContextualized.java | 2 +- .../FunctionalityExposedForExtensions.java | 2 +- .../java/org/zkoss/ganttz/LeftTasksTree.java | 2 +- .../org/zkoss/ganttz/LeftTasksTreeRow.java | 10 ++--- .../main/java/org/zkoss/ganttz/Planner.java | 6 +-- .../java/org/zkoss/ganttz/TabsRegistry.java | 2 +- .../main/java/org/zkoss/ganttz/TaskList.java | 4 +- .../resourceload/ResourceLoadComponent.java | 4 +- .../resourceload/ResourceLoadLeftPane.java | 6 +-- .../resourceload/ResourcesLoadPanel.java | 6 +-- .../TimeTrackedTableWithLeftPane.java | 2 +- .../zkoss/ganttz/timetracker/TimeTracker.java | 2 +- .../org/zkoss/ganttz/util/GanttUtils.java | 5 ++- .../ganttz/util/LongOperationFeedback.java | 2 +- .../org/zkoss/ganttz/util/MenuBuilder.java | 4 +- .../PredefinedDatabaseSnapshots.java | 31 +++++++-------- .../business/common/EntitySequenceTest.java | 15 +++---- .../dbunit/DBUnitTestExecutionListener.java | 6 ++- ...dAdvanceAssignmentsToOrderElementTest.java | 36 ++++++++++++----- .../test/orders/entities/OrderTest.java | 4 +- .../bootstrap/CriterionsBootstrapTest.java | 2 +- .../test/resources/daos/CriterionDAOTest.java | 2 +- .../daos/CriterionSatisfactionDAOTest.java | 2 +- .../resources/daos/CriterionTypeDAOTest.java | 2 +- .../entities/CriterionSatisfactionTest.java | 2 +- .../resources/entities/CriterionTest.java | 16 ++++---- .../test/resources/entities/IntervalTest.java | 18 ++++----- .../test/resources/entities/ResourceTest.java | 12 +++--- .../advance/AdvanceTypeCRUDController.java | 8 ++-- .../calendars/BaseCalendarCRUDController.java | 10 ++--- .../BaseCalendarEditionController.java | 22 +++++------ .../web/common/ConfigurationController.java | 12 +++--- .../web/common/EnumsListitemRenderer.java | 2 +- .../web/common/MessagesForUser.java | 2 +- .../web/common/OnTabSelection.java | 2 +- .../org/navalplanner/web/common/Util.java | 18 ++++----- .../navalplanner/web/common/ViewSwitcher.java | 2 +- .../web/common/components/Autocomplete.java | 2 +- .../components/EffortDurationPicker.java | 2 +- .../components/NewDataSortableGrid.java | 2 +- .../bandboxsearch/BandboxMultipleSearch.java | 8 ++-- .../bandboxsearch/BandboxSearch.java | 10 ++--- .../components/finders/BandboxFinder.java | 2 +- .../finders/BaseCalendarBandboxFinder.java | 2 +- .../finders/CriterionBandboxFinder.java | 2 +- .../finders/ExternalCompanyBandboxFinder.java | 2 +- .../web/common/components/finders/Finder.java | 2 +- .../finders/LabelBandboxFinder.java | 2 +- .../finders/MultipleFiltersFinder.java | 2 +- .../finders/OrderBandboxFinder.java | 2 +- .../finders/OrderElementBandboxFinder.java | 2 +- .../finders/QualityFormBandboxFinder.java | 2 +- .../finders/ScenarioBandboxFinder.java | 2 +- .../components/finders/TemplateFinder.java | 2 +- .../entrypoints/EntryPointsHandler.java | 2 +- .../CostCategoryCRUDController.java | 10 ++--- ...urcesCostCategoryAssignmentController.java | 8 ++-- .../web/labels/LabelTypeCRUDController.java | 4 +- .../LimitingResourcesController.java | 10 ++--- .../LimitingResourcesLeftPane.java | 2 +- .../LimitingResourcesPanel.java | 2 +- .../ManualAllocationController.java | 8 ++-- .../web/limitingresources/QueueTask.java | 2 +- .../web/materials/MaterialsController.java | 18 ++++----- .../web/materials/UnitTypeController.java | 14 +++---- .../web/montecarlo/MonteCarloController.java | 6 +-- ...kQualityFormsToOrderElementController.java | 8 ++-- .../web/orders/DynamicDatebox.java | 8 ++-- .../ManageOrderElementAdvancesController.java | 20 +++++----- .../web/orders/OrderCRUDController.java | 39 +++++++++---------- .../web/orders/OrderElementController.java | 14 +++---- .../orders/OrderElementTreeController.java | 4 +- .../web/orders/ProjectDetailsController.java | 6 +-- .../assigntemplates/TemplateFinderPopup.java | 4 +- ...ssignedCriterionRequirementController.java | 2 +- .../AssignedMaterialsController.java | 8 ++-- .../AdvancedAllocationController.java | 11 +++--- .../allocation/AllocationConfiguration.java | 2 +- .../web/planner/allocation/FormBinder.java | 20 +++++----- .../ResourceAllocationController.java | 6 +-- .../streches/StretchesFunctionController.java | 4 +- .../company/CompanyPlanningController.java | 4 +- .../planner/company/CompanyPlanningModel.java | 6 +-- .../LimitingResourceAllocationController.java | 4 +- .../order/OrderPlanningController.java | 4 +- .../web/planner/order/OrderPlanningModel.java | 4 +- .../web/planner/reassign/ReassignCommand.java | 6 +-- .../planner/reassign/ReassignController.java | 2 +- .../tabs/MultipleTabsPlannerController.java | 6 +-- .../taskedition/EditTaskController.java | 1 - .../taskedition/TaskPropertiesController.java | 4 +- .../HoursWorkedPerWorkerController.java | 4 +- .../TimeLineRequiredMaterialController.java | 2 +- .../resourceload/ResourceLoadController.java | 8 ++-- .../criterion/CriterionTreeController.java | 18 ++++----- .../machine/MachineCRUDController.java | 14 +++---- .../NewAllocationSelectorController.java | 10 ++--- .../worker/LocalizationsController.java | 4 +- .../worker/WorkerCRUDController.java | 19 +++++---- .../web/scenarios/ScenarioCRUDController.java | 10 ++--- .../scenarios/TransferOrdersController.java | 12 +++--- .../subcontract/ReportAdvancesController.java | 6 +-- .../SubcontractedTasksController.java | 6 +-- .../templates/OrderTemplatesController.java | 2 +- .../templates/TemplatesTreeController.java | 2 +- .../advances/AdvancesAssignmentComponent.java | 2 +- .../navalplanner/web/tree/TreeController.java | 25 ++++++------ .../users/OrderAuthorizationController.java | 4 +- .../workreports/WorkReportCRUDController.java | 36 ++++++++--------- .../WorkReportTypeCRUDController.java | 24 ++++++------ .../web/orders/OrderModelTest.java | 12 +++--- .../web/resources/CriterionModelTest.java | 6 +-- 112 files changed, 423 insertions(+), 419 deletions(-) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/CommandContextualized.java b/ganttzk/src/main/java/org/zkoss/ganttz/CommandContextualized.java index 9ac208be6..bad415f5d 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/CommandContextualized.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/CommandContextualized.java @@ -65,7 +65,7 @@ class CommandContextualized { result.addEventListener(Events.ON_CLICK, new EventListener() { @Override - public void onEvent(Event event) throws Exception { + public void onEvent(Event event) { doAction(); } }); diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java index a49dc354e..9649c7fc6 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/FunctionalityExposedForExtensions.java @@ -511,7 +511,7 @@ public class FunctionalityExposedForExtensions implements IContext { Button printButton = (Button) printProperties.getFellow("printButton"); printButton.addEventListener(Events.ON_CLICK, new EventListener() { @Override - public void onEvent(Event event) throws Exception { + public void onEvent(Event event) { printProperties.detach(); configuration.print(buildParameters(printProperties),planner); } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java b/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java index 4226cec71..b45b6cce1 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java @@ -107,7 +107,7 @@ public class LeftTasksTree extends HtmlMacroComponent { Treeitem item) { item.addEventListener("onOpen", new EventListener() { @Override - public void onEvent(Event event) throws Exception { + public void onEvent(Event event) { OpenEvent openEvent = (OpenEvent) event; taskBean.setExpanded(openEvent.isOpen()); } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java b/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java index 67957c5ad..8a051b0c4 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTreeRow.java @@ -316,7 +316,7 @@ public class LeftTasksTreeRow extends GenericForwardComposer { textBox.addEventListener("onCtrlKey", new EventListener() { @Override - public void onEvent(Event event) throws Exception { + public void onEvent(Event event) { userWantsToMove(textBox, (KeyEvent) event); } }); @@ -326,7 +326,7 @@ public class LeftTasksTreeRow extends GenericForwardComposer { component.addEventListener("onChange", new EventListener() { @Override - public void onEvent(Event event) throws Exception { + public void onEvent(Event event) { updateBean(component); } }); @@ -336,7 +336,7 @@ public class LeftTasksTreeRow extends GenericForwardComposer { textBox.addEventListener("onOK", new EventListener() { @Override - public void onEvent(Event event) throws Exception { + public void onEvent(Event event) { userWantsDateBox(textBox); } }); @@ -346,7 +346,7 @@ public class LeftTasksTreeRow extends GenericForwardComposer { datebox.addEventListener("onOK", new EventListener() { @Override - public void onEvent(Event event) throws Exception { + public void onEvent(Event event) { datebox.setOpen(true); } }); @@ -375,7 +375,7 @@ public class LeftTasksTreeRow extends GenericForwardComposer { datebox.addEventListener("onBlur", new EventListener() { @Override - public void onEvent(Event event) throws Exception { + public void onEvent(Event event) { dateBoxHasLostFocus(datebox); } }); diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java index 865987c53..1d5c77db5 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/Planner.java @@ -286,7 +286,7 @@ public class Planner extends HtmlMacroComponent { } @Override - public void doAction() throws Exception { + public void doAction() { ganttPanel.zoomIncrease(); } }); @@ -303,7 +303,7 @@ public class Planner extends HtmlMacroComponent { } @Override - public void doAction() throws Exception { + public void doAction() { ganttPanel.zoomDecrease(); } }); @@ -497,7 +497,7 @@ public class Planner extends HtmlMacroComponent { westContainer.addEventListener(Events.ON_SIZE, new EventListener() { @Override - public void onEvent(Event event) throws Exception { + public void onEvent(Event event) { Clients.evalJavaScript("zkTaskContainer.legendResize();"); } diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java b/ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java index 3376b37a2..d20e915bf 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java @@ -117,7 +117,7 @@ public class TabsRegistry { new EventListener() { @Override - public void onEvent(Event event) throws Exception { + public void onEvent(Event event) { if (_("Limiting resources").equals(t.getName())) { Executions.sendRedirect("/planner/index.zul;limiting_resources"); } else { diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java b/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java index 5ed7d2789..b87b71bbd 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TaskList.java @@ -180,7 +180,7 @@ public class TaskList extends XulElement implements AfterCompose { taskComponent.addEventListener("onDoubleClick", new EventListener() { @Override - public void onEvent(Event event) throws Exception { + public void onEvent(Event event) { doubleClickCommand.doAction(taskComponent); } }); @@ -190,7 +190,7 @@ public class TaskList extends XulElement implements AfterCompose { taskComponent.addEventListener("onRightClick", new EventListener() { @Override - public void onEvent(Event event) throws Exception { + public void onEvent(Event event) { try { getContextMenuFor(taskComponent).open(taskComponent); } catch (Exception e) { diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java index a5238c1e6..eb245f3e6 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadComponent.java @@ -97,7 +97,7 @@ public class ResourceLoadComponent extends XulElement { private void addDoubleClickAction(final Div div, final LoadTimeLine loadLine) { div.addEventListener("onDoubleClick", new EventListener() { @Override - public void onEvent(Event event) throws Exception { + public void onEvent(Event event) { schedule(loadLine); } }); @@ -107,7 +107,7 @@ public class ResourceLoadComponent extends XulElement { final LoadTimeLine loadLine) { div.addEventListener("onRightClick", new EventListener() { @Override - public void onEvent(Event event) throws Exception { + public void onEvent(Event event) { try { getContextMenuFor(divs, div, loadLine).open(div); } catch (Exception e) { diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java index 06f0a9adb..c5ac9a755 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java @@ -74,7 +74,7 @@ MutableTreeModel modelForTree, return new TreeitemRenderer() { @Override public void render(Treeitem item, Object data) - throws Exception { + { LoadTimeLine line = (LoadTimeLine) data; item.setOpen(false); item.setValue(line); @@ -111,7 +111,7 @@ MutableTreeModel modelForTree, buttonPlan.setTooltiptext(_("See scheduling")); buttonPlan.addEventListener("onClick", new EventListener() { @Override - public void onEvent(Event event) throws Exception { + public void onEvent(Event event) { schedule(taskLine); } }); @@ -134,7 +134,7 @@ MutableTreeModel modelForTree, final LoadTimeLine line) { item.addEventListener("onOpen", new EventListener() { @Override - public void onEvent(Event event) throws Exception { + public void onEvent(Event event) { OpenEvent openEvent = (OpenEvent) event; if (openEvent.isOpen()) { List closed = calculatedClosedItems(item); diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java index 5ce272920..b75592e7d 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourcesLoadPanel.java @@ -158,7 +158,7 @@ public class ResourcesLoadPanel extends HtmlMacroComponent { new ILongOperation() { @Override - public void doAction() throws Exception { + public void doAction() { applyFilter(); } @@ -252,7 +252,7 @@ public class ResourcesLoadPanel extends HtmlMacroComponent { Button result = new Button(); result.addEventListener(Events.ON_CLICK, new EventListener() { @Override - public void onEvent(Event event) throws Exception { + public void onEvent(Event event) { c.doAction(); } }); @@ -506,7 +506,7 @@ public class ResourcesLoadPanel extends HtmlMacroComponent { new ILongOperation() { @Override - public void doAction() throws Exception { + public void doAction() { if(paginationType == PaginationType.INTERNAL_PAGINATION) { //if the pagination is internal, we are in charge of repainting the graph treeModel = createModelForTree(); diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackedTableWithLeftPane.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackedTableWithLeftPane.java index 55f2350ff..ea2300f01 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackedTableWithLeftPane.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTrackedTableWithLeftPane.java @@ -111,7 +111,7 @@ public class TimeTrackedTableWithLeftPane { return new Callable>() { @Override - public List call() throws Exception { + public List call() { return loadPairOfListsFromCallable().getSecond(); } }; diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java index a48b1f47c..c05dd0568 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/timetracker/TimeTracker.java @@ -234,7 +234,7 @@ public class TimeTracker { new ILongOperation() { @Override - public void doAction() throws Exception { + public void doAction() { invalidatingChangeHappened(); } 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 5f820ebbb..68de3b609 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/util/GanttUtils.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/util/GanttUtils.java @@ -31,12 +31,13 @@ public class GanttUtils { private GanttUtils() { } - public static int getIntFromStylePosition(String position) throws Exception { + public static int getIntFromStylePosition(String position) { String[] tokens = position.split("px"); if (tokens.length != 1) { - throw new Exception("Bad formatting for input parameter"); + throw new IllegalArgumentException( + "Bad formatting for input parameter"); } return Integer.parseInt(tokens[0]); diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/util/LongOperationFeedback.java b/ganttzk/src/main/java/org/zkoss/ganttz/util/LongOperationFeedback.java index a44473129..89c558964 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/util/LongOperationFeedback.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/util/LongOperationFeedback.java @@ -95,7 +95,7 @@ public class LongOperationFeedback { component.addEventListener(eventName, new EventListener() { @Override - public void onEvent(Event event) throws Exception { + public void onEvent(Event event) { try { runnable.run(); } finally { 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 f1c7d63c5..2dc4606ee 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/util/MenuBuilder.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/util/MenuBuilder.java @@ -116,7 +116,7 @@ public class MenuBuilder { result.addEventListener("onOpen", new EventListener() { @Override - public void onEvent(Event event) throws Exception { + public void onEvent(Event event) { OpenEvent openEvent = (OpenEvent) event; referenced = (T) openEvent.getReference(); } @@ -126,7 +126,7 @@ public class MenuBuilder { Menuitem menuItem = item.createMenuItem(); menuItem.addEventListener("onClick", new EventListener() { @Override - public void onEvent(Event event) throws Exception { + public void onEvent(Event event) { ItemAction action = item.action; action.onEvent(referenced, event); } diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/hibernate/notification/PredefinedDatabaseSnapshots.java b/navalplanner-business/src/main/java/org/navalplanner/business/hibernate/notification/PredefinedDatabaseSnapshots.java index 32df66270..5c14ab4e0 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/hibernate/notification/PredefinedDatabaseSnapshots.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/hibernate/notification/PredefinedDatabaseSnapshots.java @@ -243,8 +243,7 @@ public class PredefinedDatabaseSnapshots { private Callable>> calculateCriterionsMap() { return new Callable>>() { @Override - public SortedMap> call() - throws Exception { + public SortedMap> call() { SortedMap> result = new TreeMap>( getComparatorByName()); for (CriterionType criterionType : criterionTypeDAO @@ -278,7 +277,7 @@ public class PredefinedDatabaseSnapshots { private Callable>> calculateLabelsMap() { return new Callable>>() { @Override - public Map> call() throws Exception { + public Map> call() { Map> result = new HashMap>(); for (LabelType labelType : labelTypeDAO.getAll()) { List