Author: bleny Date: 2014-09-02 15:04:51 +0200 (Tue, 02 Sep 2014) New Revision: 2230 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2230 Log: Retrait des clauses 'throws Exception' Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java 2014-09-02 09:38:14 UTC (rev 2229) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java 2014-09-02 13:04:51 UTC (rev 2230) @@ -104,34 +104,34 @@ // ship owner modelBuilder.newColumnForImportExport("ARMATEUR_CODE", new ValueGetterSetter<Boat, String>() { @Override - public String get(Boat boat) throws Exception { + public String get(Boat boat) { return boat.getShipOwner().getCode(); } @Override - public void set(Boat boat, String code) throws Exception { + public void set(Boat boat, String code) { boat.getShipOwner().setCode(code); } }); modelBuilder.newColumnForImportExport("ARMATEUR_NOM", new ValueGetterSetter<Boat, String>() { @Override - public String get(Boat boat) throws Exception { + public String get(Boat boat) { return boat.getShipOwner().getLastName(); } @Override - public void set(Boat boat, String lastName) throws Exception { + public void set(Boat boat, String lastName) { boat.getShipOwner().setLastName(lastName); } }); modelBuilder.newColumnForImportExport("ARMATEUR_PRENOM", new ValueGetterSetter<Boat, String>() { @Override - public String get(Boat boat) throws Exception { + public String get(Boat boat) { return boat.getShipOwner().getFirstName(); } @Override - public void set(Boat boat, String firstName) throws Exception { + public void set(Boat boat, String firstName) { boat.getShipOwner().setFirstName(firstName); } }); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java 2014-09-02 09:38:14 UTC (rev 2229) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java 2014-09-02 13:04:51 UTC (rev 2230) @@ -183,7 +183,7 @@ modelBuilder.newIgnoredColumn("NAVIRE_NOM"); modelBuilder.newColumnForExport("NAVIRE_NOM", new ValueGetter<Contact, String>() { @Override - public String get(Contact contact) throws Exception { + public String get(Contact contact) { return contact.getBoat().getName(); } }); @@ -204,7 +204,7 @@ modelBuilder.newColumnForExport("CONTACT_ETAT_MOTIF_NOM", new ValueGetter<Contact, String>() { @Override - public String get(Contact contact) throws Exception { + public String get(Contact contact) { String name = ""; if (contact.getContactStateMotif() != null) { name = contact.getContactStateMotif().getName(); @@ -245,7 +245,7 @@ "CONTACT_LIEU_TYPE", new ValueGetter<Contact, LocationType>() { @Override - public LocationType get(Contact contact) throws Exception { + public LocationType get(Contact contact) { LocationType locationType = null; if (contact.getTerrestrialLocation() != null) { locationType = contact.getTerrestrialLocation() @@ -263,7 +263,7 @@ modelBuilder.newIgnoredColumn("CONTACT_LIEU_DESCRIPTION"); modelBuilder.newColumnForExport("CONTACT_LIEU_DESCRIPTION", new ValueGetter<Contact, String>() { @Override - public String get(Contact contact) throws Exception { + public String get(Contact contact) { String description = ""; if (contact.getTerrestrialLocation() != null) { description = contact.getTerrestrialLocation() Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java 2014-09-02 09:38:14 UTC (rev 2229) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java 2014-09-02 13:04:51 UTC (rev 2230) @@ -79,7 +79,7 @@ } @Override - public Integer get(SampleRow sampleRow) throws Exception { + public Integer get(SampleRow sampleRow) { SampleMonth sampleMonth = sampleRow.getSampleMonth(month); Integer value = null; if (sampleMonth != null) { @@ -89,7 +89,7 @@ } @Override - public void set(SampleRow sampleRow, Integer expectedTidesValue) throws Exception { + public void set(SampleRow sampleRow, Integer expectedTidesValue) { SampleMonth sampleMonth = sampleRow.getSampleMonth(month); if (sampleMonth == null) { sampleMonth = new SampleMonthImpl(); Modified: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java 2014-09-02 09:38:14 UTC (rev 2229) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ObsMerSamplingPlanServiceTest.java 2014-09-02 13:04:51 UTC (rev 2230) @@ -157,7 +157,7 @@ } @Test - public void testRecomputeSampleRowEstimatedAndRealTides() throws Exception { + public void testRecomputeSampleRowEstimatedAndRealTides() { FakeWaoServiceContext serviceContext = newServiceContext(); Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java 2014-09-02 09:38:14 UTC (rev 2229) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java 2014-09-02 13:04:51 UTC (rev 2230) @@ -25,7 +25,6 @@ import fr.ifremer.wao.WaoEntityEnum; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.struts2.impl.StrutsObjectFactory; import org.nuiton.topia.persistence.TopiaEntity; import java.util.Map; @@ -37,7 +36,7 @@ private static final Log log = LogFactory.getLog(WaoStrutsObjectFactory.class); @Override - public Object buildBean(Class clazz, Map<String, Object> extraContext) throws Exception { + public Object buildBean(Class clazz, Map<String, Object> extraContext) throws IllegalAccessException, InstantiationException { Object instance; Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-09-02 09:38:14 UTC (rev 2229) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/EditContactAction.java 2014-09-02 13:04:51 UTC (rev 2230) @@ -333,14 +333,20 @@ } @Override - public String execute() throws Exception { + public String execute() { - service.save(updateContactCommand); + try { + service.save(updateContactCommand); + } catch (ContactNotUpdatableException e) { + throw new IllegalStateException("should never occur", e); + } session.addMessage(t("wao.ui.form.updateContactCommand.success")); session.setContactToHighlightId(updateContactCommand.getContact().getTopiaId()); + return SUCCESS; + } } \ No newline at end of file