Author: tchemit Date: 2013-02-05 15:46:18 +0100 (Tue, 05 Feb 2013) New Revision: 336 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/336 Log: rename cruiseCode to surveyCode Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-02-05 14:44:38 UTC (rev 335) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-02-05 14:46:18 UTC (rev 336) @@ -122,7 +122,7 @@ // registerMultiJXPathDecorator(Caracteristic.class, CARACTERISTIC_WITH_UNIT, "${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s (${unit}$s)", SEPARATOR, " - "); registerTuttiDecorator(CaracteristicQualitativeValue.class, "${name}$s", SEPARATOR, " - "); registerTuttiDecorator(Species.class, "${refTaxCode}$s#${name}$s", SEPARATOR, " - "); -// registerMultiJXPathDecorator(Species.class, SPECIES_BY_CRUISE_CODE, "${cruiseCode}$s#${refTaxCode}$s#${name}$s", SEPARATOR, " - "); +// registerMultiJXPathDecorator(Species.class, SPECIES_BY_CRUISE_CODE, "${surveyCode}$s#${refTaxCode}$s#${name}$s", SEPARATOR, " - "); registerTuttiDecorator(Species.class, SPECIES_BY_REF_TAX_CODE, "${refTaxCode}$s", SEPARATOR, " - "); registerTuttiDecorator(Species.class, SPECIES_BY_GENUS, "${name}$s", SEPARATOR, " - "); registerTuttiDecorator(SpeciesProtocol.class, "${speciesId}", SEPARATOR, " - "); @@ -178,7 +178,7 @@ n_("tutti.property.user"); n_("tutti.property.strata"); n_("tutti.property.refTaxCode"); - n_("tutti.property.cruiseCode"); + n_("tutti.property.surveyCode"); n_("tutti.property.species"); n_("tutti.property.genusSpecies"); n_("tutti.property.sortedUnsortedCategory"); @@ -193,14 +193,14 @@ private static final long serialVersionUID = 1L; public SpeciesDecorator() throws IllegalArgumentException, NullPointerException { - super(Species.class, "${cruiseCode}$s#${refTaxCode}$s#${name}$s", DecoratorService.SEPARATOR, " - "); + super(Species.class, "${surveyCode}$s#${refTaxCode}$s#${name}$s", DecoratorService.SEPARATOR, " - "); } @Override protected Object onNullValue(Species bean, String token) { Object result = null; - if ("cruiseCode".equals(token)) { - result = _("tutti.propety.no.species.cruiseCode"); + if ("surveyCode".equals(token)) { + result = _("tutti.propety.no.species.surveyCode"); } return result; } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-02-05 14:44:38 UTC (rev 335) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-02-05 14:46:18 UTC (rev 336) @@ -42,7 +42,7 @@ public static final String PROPERTY_ID = "id"; - public static final String PROPERTY_CRUISE_CODE = "cruiseCode"; + public static final String PROPERTY_CRUISE_CODE = "surveyCode"; public static final String PROPERTY_SPECIES = "species"; @@ -185,10 +185,10 @@ } public String getCruiseCode() { - return delegate.getCruiseCode(); + return delegate.getSurveyCode(); } public void setCruiseCode(String cruiseCode) { - delegate.setCruiseCode(cruiseCode); + delegate.setSurveyCode(cruiseCode); } } \ No newline at end of file Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-02-05 14:44:38 UTC (rev 335) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-02-05 14:46:18 UTC (rev 336) @@ -82,7 +82,7 @@ "species: \n" + "- !SpeciesProtocol\n" + " calcifySampleEnabled: true\n" + - " cruiseCode: cruiseCode1\n" + + " surveyCode: cruiseCode1\n" + " lengthStepPmfmId: 1394\n" + " maturityEnabled: true\n" + " sexEnabled: true\n" + @@ -116,7 +116,7 @@ "5;;parameterName5;matrixName5;fractionName5;methodName5;"; public static final String PROTOCOL_SPECIES_FILE_CONTENT = - "id;cruiseCode;lengthStep;lengthStepParameterName;lengthStepMatrixName;lengthStepFractionName;lengthStepMethodName;sizeEnabled;sexEnabled;maturityEnabled;ageEnabled;weightEnabled;countIfNoFrequencyEnabled;calcifySampleEnabled\n" + + "id;surveyCode;lengthStep;lengthStepParameterName;lengthStepMatrixName;lengthStepFractionName;lengthStepMethodName;sizeEnabled;sexEnabled;maturityEnabled;ageEnabled;weightEnabled;countIfNoFrequencyEnabled;calcifySampleEnabled\n" + "1;cruiseCode1;2;parameterName2;matrixName2;fractionName2;methodName2;Y;Y;Y;Y;Y;Y;Y;\n" + "2;;;;;;;N;Y;N;Y;Y;Y;Y;"; @@ -155,7 +155,7 @@ protocol.setSpecies(Lists.<SpeciesProtocol>newArrayList()); SpeciesProtocol sp1 = new SpeciesProtocol(); sp1.setSpeciesId("11242"); - sp1.setCruiseCode("cruiseCode1"); + sp1.setSurveyCode("cruiseCode1"); sp1.setLengthStepPmfmId("1394"); sp1.setCalcifySampleEnabled(true); sp1.setMaturityEnabled(true); @@ -206,7 +206,7 @@ SpeciesProtocol sp1 = protocol.getSpecies().get(0); Assert.assertNotNull(sp1); Assert.assertEquals("11242", sp1.getSpeciesId()); - Assert.assertEquals("cruiseCode1", sp1.getCruiseCode()); + Assert.assertEquals("cruiseCode1", sp1.getSurveyCode()); Assert.assertEquals("1394", sp1.getLengthStepPmfmId()); Assert.assertFalse(sp1.isAgeEnabled()); Assert.assertTrue(sp1.isCalcifySampleEnabled()); @@ -322,7 +322,7 @@ SpeciesProtocol sp1 = protocol.getSpecies().get(0); Assert.assertNotNull(sp1); Assert.assertEquals("1", sp1.getSpeciesId()); - Assert.assertEquals("cruiseCode1", sp1.getCruiseCode()); + Assert.assertEquals("cruiseCode1", sp1.getSurveyCode()); Assert.assertEquals("2", sp1.getLengthStepPmfmId()); Assert.assertTrue(sp1.isAgeEnabled()); Assert.assertTrue(sp1.isCalcifySampleEnabled()); @@ -335,7 +335,7 @@ SpeciesProtocol sp2 = protocol.getSpecies().get(1); Assert.assertNotNull(sp2); Assert.assertEquals("2", sp2.getSpeciesId()); - Assert.assertNull(sp2.getCruiseCode()); + Assert.assertNull(sp2.getSurveyCode()); Assert.assertNull(sp2.getLengthStepPmfmId()); Assert.assertTrue(sp2.isAgeEnabled()); Assert.assertTrue(sp2.isCalcifySampleEnabled()); @@ -360,7 +360,7 @@ SpeciesProtocol sp1 = new SpeciesProtocol(); sp1.setSpeciesId("1"); - sp1.setCruiseCode("cruiseCode1"); + sp1.setSurveyCode("cruiseCode1"); sp1.setAgeEnabled(true); sp1.setSizeEnabled(true); sp1.setMaturityEnabled(true); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java 2013-02-05 14:44:38 UTC (rev 335) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java 2013-02-05 14:46:18 UTC (rev 336) @@ -39,7 +39,7 @@ private static final long serialVersionUID = 1L; - public static final String PROPERTY_CRUISE_CODE = "cruiseCode"; + public static final String PROPERTY_CRUISE_CODE = "surveyCode"; public static final String PROPERTY_SPECIES = "species"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2013-02-05 14:44:38 UTC (rev 335) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2013-02-05 14:46:18 UTC (rev 336) @@ -44,8 +44,8 @@ public static final ColumnIdentifier<EditProtocolSpeciesRowModel> CRUISE_CODE_ID = ColumnIdentifier.newId( EditProtocolSpeciesRowModel.PROPERTY_CRUISE_CODE, - n_("tutti.table.protocol.species.header.cruiseCode"), - n_("tutti.table.protocol.species.header.cruiseCode.tip")); + n_("tutti.table.protocol.species.header.surveyCode"), + n_("tutti.table.protocol.species.header.surveyCode.tip")); public static final ColumnIdentifier<EditProtocolSpeciesRowModel> SIZE_ENABLED = ColumnIdentifier.newId(