Author: bleny Date: 2011-03-10 11:06:23 +0000 (Thu, 10 Mar 2011) New Revision: 1057 Log: fix minor issues Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2011-03-09 14:24:18 UTC (rev 1056) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2011-03-10 11:06:23 UTC (rev 1057) @@ -399,15 +399,17 @@ @Override public String getProfessionDescriptionWithoutDCF5() { String code = ""; - if (!StringUtils.isEmpty(getProfession().getMeshSize())) { - code += " " + getProfession().getMeshSize(); + if (getProfession() != null) { + if (!StringUtils.isEmpty(getProfession().getMeshSize())) { + code += " " + getProfession().getMeshSize(); + } + if (!StringUtils.isEmpty(getProfession().getSize())) { + code += " " + getProfession().getSize(); + } + if (!StringUtils.isEmpty(getProfession().getOther())) { + code += " " + getProfession().getOther(); + } } - if (!StringUtils.isEmpty(getProfession().getSize())) { - code += " " + getProfession().getSize(); - } - if (!StringUtils.isEmpty(getProfession().getOther())) { - code += " " + getProfession().getOther(); - } return code; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-09 14:24:18 UTC (rev 1056) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2011-03-10 11:06:23 UTC (rev 1057) @@ -147,10 +147,6 @@ context.closeTransaction(transaction); } -// public ServiceSamplingImpl() { -// prepareBinderForProfession(); -// } - /** given a collection of DCFCode (mixing some taken from DB and some * other insciated), return the same collection but assure that all elements * are now in the database. Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java 2011-03-09 14:24:18 UTC (rev 1056) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/pages/ObsDebSamplingPlan.java 2011-03-10 11:06:23 UTC (rev 1057) @@ -7,6 +7,7 @@ import fr.ifremer.wao.bean.SamplingFilterImpl; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.service.ServiceSampling; +import fr.ifremer.wao.ui.data.RequiresAuthentication; import fr.ifremer.wao.ui.data.SampleRowDataSource; import fr.ifremer.wao.ui.services.SampleRowModelFactory; import org.apache.tapestry5.ComponentResources; @@ -17,6 +18,7 @@ import org.apache.tapestry5.ioc.annotations.Inject; import org.apache.tapestry5.services.BeanModelSource; + at RequiresAuthentication(allowedPrograms = {ObsProgram.OBSDEB}) public class ObsDebSamplingPlan { /********* Tapestry stuffs **********/