Author: tchemit Date: 2013-02-05 17:56:47 +0100 (Tue, 05 Feb 2013) New Revision: 338 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/338 Log: fixes #1817: [PROTOCOLE] - Import / Export du protocole Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicType.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java trunk/tutti-service/src/test/resources/log4j.properties 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 trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-02-05 15:02:50 UTC (rev 337) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceDevImpl.java 2013-02-05 16:56:47 UTC (rev 338) @@ -258,7 +258,7 @@ if (protocol != null && !protocol.isSpeciesEmpty()) { Map<String, Species> map = TuttiEntities.splitById(result); for (SpeciesProtocol speciesProtocol : protocol.getSpecies()) { - map.get(speciesProtocol.getSpeciesId()).setSurveyCode(speciesProtocol.getSurveyCode()); + map.get(speciesProtocol.getSpeciesId()).setSurveyCode(speciesProtocol.getSpeciesSurveyCode()); } } return result; Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-05 15:02:50 UTC (rev 337) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-05 16:56:47 UTC (rev 338) @@ -210,7 +210,7 @@ if (protocol != null && !protocol.isSpeciesEmpty()) { Map<String, Species> map = TuttiEntities.splitById(result); for (SpeciesProtocol speciesProtocol : protocol.getSpecies()) { - map.get(speciesProtocol.getSpeciesId()).setSurveyCode(speciesProtocol.getSurveyCode()); + map.get(speciesProtocol.getSpeciesId()).setSurveyCode(speciesProtocol.getSpeciesSurveyCode()); } } return result; Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ) Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java 2013-02-05 15:02:50 UTC (rev 337) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocolsTest.java 2013-02-05 16:56:47 UTC (rev 338) @@ -73,7 +73,7 @@ " maturityEnabled: true\n" + " sexEnabled: true\n" + " speciesId: 11242\n" + - " surveyCode: BAR\n" + + " speciesSurveyCode: BAR\n" + " weightEnabled: true\n" + "- !SpeciesProtocol\n" + " id: 2\n" + @@ -85,7 +85,7 @@ " sexEnabled: true\n" + " sizeEnabled: true\n" + " speciesId: 3835\n" + - " surveyCode: CHIN\n" + + " speciesSurveyCode: CHIN\n" + " weightEnabled: true"; @@ -146,7 +146,7 @@ Assert.assertNotNull(sp1); Assert.assertEquals("1", sp1.getId()); Assert.assertEquals("11242", sp1.getSpeciesId()); - Assert.assertEquals("BAR", sp1.getSurveyCode()); + Assert.assertEquals("BAR", sp1.getSpeciesSurveyCode()); Assert.assertEquals("1394", sp1.getLengthStepPmfmId()); Assert.assertFalse(sp1.isAgeEnabled()); Assert.assertTrue(sp1.isCalcifySampleEnabled()); @@ -160,7 +160,7 @@ Assert.assertNotNull(sp2); Assert.assertEquals("2", sp2.getId()); Assert.assertEquals("3835", sp2.getSpeciesId()); - Assert.assertEquals("CHIN", sp2.getSurveyCode()); + Assert.assertEquals("CHIN", sp2.getSpeciesSurveyCode()); Assert.assertEquals("323", sp2.getLengthStepPmfmId()); Assert.assertTrue(sp2.isAgeEnabled()); Assert.assertTrue(sp2.isCalcifySampleEnabled()); @@ -185,7 +185,7 @@ SpeciesProtocol sp1 = new SpeciesProtocol(); sp1.setId("1"); sp1.setSpeciesId("11242"); - sp1.setSurveyCode("BAR"); + sp1.setSpeciesSurveyCode("BAR"); sp1.setLengthStepPmfmId("1394"); sp1.setCalcifySampleEnabled(true); sp1.setMaturityEnabled(true); @@ -196,7 +196,7 @@ SpeciesProtocol sp2 = new SpeciesProtocol(); sp2.setId("2"); sp2.setSpeciesId("3835"); - sp2.setSurveyCode("CHIN"); + sp2.setSpeciesSurveyCode("CHIN"); sp2.setLengthStepPmfmId("323"); sp2.setAgeEnabled(true); sp2.setCalcifySampleEnabled(true); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-02-05 15:02:50 UTC (rev 337) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-02-05 16:56:47 UTC (rev 338) @@ -60,7 +60,6 @@ } } - public static class StringParserFormatter extends Common.NullableParserFormatter<String> { public StringParserFormatter(String defaultValue, boolean nullAllowed) { Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRow.java 2013-02-05 15:02:50 UTC (rev 337) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRow.java 2013-02-05 16:56:47 UTC (rev 338) @@ -38,58 +38,58 @@ private static final long serialVersionUID = 1L; - public static final String PROPERTY_ID = "id"; + public static final String PROPERTY_PMFM_ID = "pmfmId"; - public static final String PROPERTY_TYPE = "type"; + public static final String PROPERTY_PMFM_TYPE = "pmfmType"; - public static final String PROPERTY_PARAMETER = "parameter"; + public static final String PROPERTY_PMFM_PARAMETER_NAME = "pmfmParameterName"; - public static final String PROPERTY_MATRIX = "matrix"; + public static final String PROPERTY_PMFM_MATRIX_NAME = "pmfmMatrixName"; - public static final String PROPERTY_FRACTION = "fraction"; + public static final String PROPERTY_PMFM_FRACTION_NAME = "pmfmFractionName"; - public static final String PROPERTY_METHOD = "method"; + public static final String PROPERTY_PMFM_METHOD_NAME = "pmfmMethodName"; - public static final String PROPERTY_CARACTERISTIC = "caracteristic"; + public static final String PROPERTY_PMFM = "pmfm"; - protected CaracteristicType type; + protected CaracteristicType pmfmType; - protected Caracteristic caracteristic; + protected Caracteristic pmfm; - public Caracteristic getCaracteristic() { - return caracteristic; + public Caracteristic getPmfm() { + return pmfm; } - public void setCaracteristic(Caracteristic caracteristic) { - this.caracteristic = caracteristic; + public void setPmfm(Caracteristic pmfm) { + this.pmfm = pmfm; } - public CaracteristicType getType() { - return type; + public CaracteristicType getPmfmType() { + return pmfmType; } - public void setType(CaracteristicType type) { - this.type = type; + public void setPmfmType(CaracteristicType pmfmType) { + this.pmfmType = pmfmType; } - public String getId() { - return getCaracteristic().getId(); + public String getPmfmId() { + return getPmfm().getId(); } - public String getParameter() { - return getCaracteristic().getParameterName(); + public String getPmfmParameterName() { + return getPmfm().getParameterName(); } - public String getMatrix() { - return getCaracteristic().getMatrixName(); + public String getPmfmMatrixName() { + return getPmfm().getMatrixName(); } - public String getMethod() { - return getCaracteristic().getMethodName(); + public String getPmfmMethodName() { + return getPmfm().getMethodName(); } - public String getFraction() { - return getCaracteristic().getFractionName(); + public String getPmfmFractionName() { + return getPmfm().getFractionName(); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java 2013-02-05 15:02:50 UTC (rev 337) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java 2013-02-05 16:56:47 UTC (rev 338) @@ -44,29 +44,29 @@ // import definition - newForeignKeyColumn(CaracteristicRow.PROPERTY_ID, - CaracteristicRow.PROPERTY_CARACTERISTIC, + newForeignKeyColumn(CaracteristicRow.PROPERTY_PMFM_ID, + CaracteristicRow.PROPERTY_PMFM, Caracteristic.class, Caracteristic.PROPERTY_ID, caracteristicMap); - newMandatoryColumn(CaracteristicRow.PROPERTY_TYPE, - CaracteristicRow.PROPERTY_TYPE, + newMandatoryColumn(CaracteristicRow.PROPERTY_PMFM_TYPE, + CaracteristicRow.PROPERTY_PMFM_TYPE, Common.newEnumByNameParserFormatter(CaracteristicType.class)); - newIgnoredColumn(CaracteristicRow.PROPERTY_PARAMETER); - newIgnoredColumn(CaracteristicRow.PROPERTY_MATRIX); - newIgnoredColumn(CaracteristicRow.PROPERTY_FRACTION); - newIgnoredColumn(CaracteristicRow.PROPERTY_METHOD); + newIgnoredColumn(CaracteristicRow.PROPERTY_PMFM_PARAMETER_NAME); + newIgnoredColumn(CaracteristicRow.PROPERTY_PMFM_MATRIX_NAME); + newIgnoredColumn(CaracteristicRow.PROPERTY_PMFM_FRACTION_NAME); + newIgnoredColumn(CaracteristicRow.PROPERTY_PMFM_METHOD_NAME); // export definition - newColumnForExport(CaracteristicRow.PROPERTY_ID); - newColumnForExport(CaracteristicRow.PROPERTY_TYPE, Common.newEnumByNameParserFormatter(CaracteristicType.class)); - newColumnForExport(CaracteristicRow.PROPERTY_PARAMETER); - newColumnForExport(CaracteristicRow.PROPERTY_MATRIX); - newColumnForExport(CaracteristicRow.PROPERTY_FRACTION); - newColumnForExport(CaracteristicRow.PROPERTY_METHOD); + newColumnForExport(CaracteristicRow.PROPERTY_PMFM_ID); + newColumnForExport(CaracteristicRow.PROPERTY_PMFM_TYPE, Common.newEnumByNameParserFormatter(CaracteristicType.class)); + newColumnForExport(CaracteristicRow.PROPERTY_PMFM_PARAMETER_NAME); + newColumnForExport(CaracteristicRow.PROPERTY_PMFM_MATRIX_NAME); + newColumnForExport(CaracteristicRow.PROPERTY_PMFM_FRACTION_NAME); + newColumnForExport(CaracteristicRow.PROPERTY_PMFM_METHOD_NAME); } @Override Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicType.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicType.java 2013-02-05 15:02:50 UTC (rev 337) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicType.java 2013-02-05 16:56:47 UTC (rev 338) @@ -32,7 +32,7 @@ */ public enum CaracteristicType { - LENGTH_CLASS, + LENGTH_STEP, ENVIRONMENT, HYDROLOGY, GEAR 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 15:02:50 UTC (rev 337) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-02-05 16:56:47 UTC (rev 338) @@ -40,12 +40,16 @@ private static final long serialVersionUID = 1L; - public static final String PROPERTY_ID = "id"; + public static final String PROPERTY_SPECIES = "species"; - public static final String PROPERTY_SURVEY_CODE = "surveyCode"; + public static final String PROPERTY_SPECIES_ID = "speciesId"; - public static final String PROPERTY_SPECIES = "species"; + public static final String PROPERTY_SPECIES_REF_TAX_CODE = "speciesRefTaxCode"; + public static final String PROPERTY_SPECIES_NAME = "speciesName"; + + public static final String PROPERTY_SPECIES_SURVEY_CODE = "speciesSurveyCode"; + public static final String PROPERTY_SIZE_ENABLED = "sizeEnabled"; public static final String PROPERTY_SEX_ENABLED = "sexEnabled"; @@ -54,15 +58,15 @@ public static final String PROPERTY_AGE_ENABLED = "ageEnabled"; - public static final String PROPERTY_LENGTH_STEP = "lengthStep"; + public static final String PROPERTY_LENGTH_STEP_PMFM = "lengthStepPmfm"; - public static final String PROPERTY_LENGTH_STEP_PARAMETER_NAME = "lengthStepParameterName"; + public static final String PROPERTY_LENGTH_STEP_PMFM_PARAMETER_NAME = "lengthStepPmfmParameterName"; - public static final String PROPERTY_LENGTH_STEP_MATRIX_NAME = "lengthStepMatrixName"; + public static final String PROPERTY_LENGTH_STEP_PMFM_MATRIX_NAME = "lengthStepPmfmMatrixName"; - public static final String PROPERTY_LENGTH_STEP_FRACTION_NAME = "lengthStepFractionName"; + public static final String PROPERTY_LENGTH_STEP_PMFM_FRACTION_NAME = "lengthStepPmfmFractionName"; - public static final String PROPERTY_LENGTH_STEP_METHOD_NAME = "lengthStepMethodName"; + public static final String PROPERTY_LENGTH_STEP_PMFM_METHOD_NAME = "lengthStepPmfmMethodName"; public static final String PROPERTY_LENGTH_STEP_PMFM_ID = "lengthStepPmfmId"; @@ -76,7 +80,7 @@ protected Species species; - protected Caracteristic lengthStep; + protected Caracteristic lengthStepPmfm; public SpeciesRow() { delegate = new SpeciesProtocol(); @@ -86,44 +90,60 @@ return species; } - public Caracteristic getLengthStep() { - return lengthStep; + public String getSpeciesId() { + return species == null ? null : delegate.getSpeciesId(); } - public void setLengthStep(Caracteristic lengthStep) { - this.lengthStep = lengthStep; - delegate.setLengthStepPmfmId(lengthStep == null ? null : lengthStep.getId()); + public String getSpeciesName() { + return species == null ? null : species.getName(); } - public String getLengthStepPmfmId() { - return delegate.getLengthStepPmfmId(); + public String getSpeciesRefTaxCode() { + return species.getRefTaxCode(); } - public String getLengthStepParameterName() { - return lengthStep == null ? null : lengthStep.getParameterName(); + public void setSpecies(Species species) { + this.species = species; + delegate.setSpeciesId(species == null ? null : species.getId()); } - public String getLengthStepMethodName() { - return lengthStep == null ? null : lengthStep.getMethodName(); + public String getSpeciesSurveyCode() { + return delegate.getSpeciesSurveyCode(); } - public String getLengthStepMatrixName() { - return lengthStep == null ? null : lengthStep.getMatrixName(); + public void setSpeciesSurveyCode(String speciesSuurveyCode) { + delegate.setSpeciesSurveyCode(speciesSuurveyCode); } - public String getLengthStepFractionName() { - return lengthStep == null ? null : lengthStep.getFractionName(); + public Caracteristic getLengthStepPmfm() { + return lengthStepPmfm; } - public void setSpecies(Species species) { - this.species = species; - delegate.setSpeciesId(species == null ? null : species.getId()); + public void setLengthStepPmfm(Caracteristic lengthStepPmfm) { + this.lengthStepPmfm = lengthStepPmfm; + delegate.setLengthStepPmfmId(lengthStepPmfm == null ? null : lengthStepPmfm.getId()); } - public String getId() { - return delegate.getSpeciesId(); + public String getLengthStepPmfmId() { + return delegate.getLengthStepPmfmId(); } + public String getLengthStepPmfmParameterName() { + return lengthStepPmfm == null ? null : lengthStepPmfm.getParameterName(); + } + + public String getLengthStepPmfmMethodName() { + return lengthStepPmfm == null ? null : lengthStepPmfm.getMethodName(); + } + + public String getLengthStepPmfmMatrixName() { + return lengthStepPmfm == null ? null : lengthStepPmfm.getMatrixName(); + } + + public String getLengthStepPmfmFractionName() { + return lengthStepPmfm == null ? null : lengthStepPmfm.getFractionName(); + } + public boolean isSizeEnabled() { return delegate.isSizeEnabled(); } @@ -179,16 +199,4 @@ public void setCalcifySampleEnabled(boolean calcifySampleEnabled) { delegate.setCalcifySampleEnabled(calcifySampleEnabled); } - - public String getSpeciesId() { - return delegate.getSpeciesId(); - } - - public String getSurveyCode() { - return delegate.getSurveyCode(); - } - - public void setSurveyCode(String surveyCode) { - delegate.setSurveyCode(surveyCode); - } } \ No newline at end of file Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-02-05 15:02:50 UTC (rev 337) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-02-05 16:56:47 UTC (rev 338) @@ -46,24 +46,26 @@ // import definition - newForeignKeyColumn(SpeciesRow.PROPERTY_ID, + newForeignKeyColumn(SpeciesRow.PROPERTY_SPECIES_ID, SpeciesRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_ID, speciesMap); - newForeignKeyColumn(SpeciesRow.PROPERTY_LENGTH_STEP, - SpeciesRow.PROPERTY_LENGTH_STEP, + newForeignKeyColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_ID, + SpeciesRow.PROPERTY_LENGTH_STEP_PMFM, Caracteristic.class, Caracteristic.PROPERTY_ID, caracteristicMap); - newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PARAMETER_NAME); - newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_MATRIX_NAME); - newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_FRACTION_NAME); - newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_METHOD_NAME); + newIgnoredColumn(SpeciesRow.PROPERTY_SPECIES_REF_TAX_CODE); + newIgnoredColumn(SpeciesRow.PROPERTY_SPECIES_NAME); + newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_PARAMETER_NAME); + newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_MATRIX_NAME); + newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_FRACTION_NAME); + newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_METHOD_NAME); - newMandatoryColumn(SpeciesRow.PROPERTY_SURVEY_CODE, new TuttiCsvUtil.StringParserFormatter(null,true)); + newMandatoryColumn(SpeciesRow.PROPERTY_SPECIES_SURVEY_CODE, new TuttiCsvUtil.StringParserFormatter(null, true)); newMandatoryColumn(SpeciesRow.PROPERTY_SIZE_ENABLED, Common.PRIMITIVE_BOOLEAN); newMandatoryColumn(SpeciesRow.PROPERTY_SEX_ENABLED, Common.PRIMITIVE_BOOLEAN); newMandatoryColumn(SpeciesRow.PROPERTY_MATURITY_ENABLED, Common.PRIMITIVE_BOOLEAN); @@ -74,13 +76,15 @@ // export definition - newColumnForExport(SpeciesRow.PROPERTY_ID); - newColumnForExport(SpeciesRow.PROPERTY_SURVEY_CODE); - newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP, SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_ID); - newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_PARAMETER_NAME); - newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_MATRIX_NAME); - newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_FRACTION_NAME); - newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_METHOD_NAME); + newColumnForExport(SpeciesRow.PROPERTY_SPECIES_ID); + newColumnForExport(SpeciesRow.PROPERTY_SPECIES_REF_TAX_CODE); + newColumnForExport(SpeciesRow.PROPERTY_SPECIES_NAME); + newColumnForExport(SpeciesRow.PROPERTY_SPECIES_SURVEY_CODE); + newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_ID); + newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_PARAMETER_NAME); + newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_MATRIX_NAME); + newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_FRACTION_NAME); + newColumnForExport(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_METHOD_NAME); newColumnForExport(SpeciesRow.PROPERTY_SIZE_ENABLED, Common.PRIMITIVE_BOOLEAN); newColumnForExport(SpeciesRow.PROPERTY_SEX_ENABLED, Common.PRIMITIVE_BOOLEAN); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportService.java 2013-02-05 15:02:50 UTC (rev 337) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportService.java 2013-02-05 16:56:47 UTC (rev 338) @@ -99,8 +99,8 @@ for (CaracteristicRow bean : importer) { - CaracteristicType caracteristicType = bean.getType(); - Caracteristic caracteristic = bean.getCaracteristic(); + CaracteristicType caracteristicType = bean.getPmfmType(); + Caracteristic caracteristic = bean.getPmfm(); String id = caracteristic.getId(); ids.put(caracteristicType, id); } @@ -118,7 +118,7 @@ protocol.setLengthClassesPmfmId( mergeIds(protocol.getLengthClassesPmfmId(), - ids.get(CaracteristicType.LENGTH_CLASS))); + ids.get(CaracteristicType.LENGTH_STEP))); protocol.setEnvironmentPmfmId( mergeIds(protocol.getEnvironmentPmfmId(), @@ -175,7 +175,7 @@ List<CaracteristicRow> rows = Lists.newArrayList(); if (!protocol.isLengthClassesPmfmIdEmpty()) { - function.setType(CaracteristicType.LENGTH_CLASS); + function.setType(CaracteristicType.LENGTH_STEP); rows.addAll(Lists.transform(protocol.getLengthClassesPmfmId(), function)); } @@ -344,8 +344,8 @@ Caracteristic caracteristic = caracteristicMap.get(input); Preconditions.checkNotNull(caracteristic, "Could not find a caracteristic with id: " + input); CaracteristicRow result = new CaracteristicRow(); - result.setCaracteristic(caracteristic); - result.setType(type); + result.setPmfm(caracteristic); + result.setPmfmType(type); return result; } @@ -379,7 +379,7 @@ String pmfmId = input.getLengthStepPmfmId(); if (pmfmId != null) { Caracteristic caracteristic = caracteristicMap.get(pmfmId); - result.setLengthStep(caracteristic); + result.setLengthStepPmfm(caracteristic); } result.setSpecies(species); return result; 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 15:02:50 UTC (rev 337) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-02-05 16:56:47 UTC (rev 338) @@ -86,7 +86,7 @@ " maturityEnabled: true\n" + " sexEnabled: true\n" + " speciesId: 11242\n" + - " surveyCode: cruiseCode1\n" + + " speciesSurveyCode: cruiseCode1\n" + " weightEnabled: true\n" + "- !SpeciesProtocol\n" + " ageEnabled: true\n" + @@ -100,15 +100,15 @@ " weightEnabled: true"; public static final String PROTOCOL_CARACTERISTIC_FILE_CONTENT = - "id;type;parameter;matrix;fraction;method\n" + - "1;LENGTH_CLASS;parameterName1;matrixName1;fractionName1;methodName1;\n" + + "pmfmId;pmfmType;pmfmParameterName;pmfmMatrixName;pmfmFractionName;pmfmMethodName\n" + + "1;LENGTH_STEP;parameterName1;matrixName1;fractionName1;methodName1;\n" + "2;ENVIRONMENT;parameterName2;matrixName2;fractionName2;methodName2;\n" + "3;GEAR;parameterName3;matrixName3;fractionName3;methodName3;\n" + "4;HYDROLOGY;parameterName4;matrixName4;fractionName4;methodName4;\n" + "5;HYDROLOGY;parameterName5;matrixName5;fractionName5;methodName5;"; public static final String ALL_CARACTERISTIC_FILE_CONTENT = - "id;type;parameter;matrix;fraction;method\n" + + "pmfmId;pmfmType;pmfmParameterName;pmfmMatrixName;pmfmFractionName;pmfmMethodName\n" + "1;;parameterName1;matrixName1;fractionName1;methodName1;\n" + "2;;parameterName2;matrixName2;fractionName2;methodName2;\n" + "3;;parameterName3;matrixName3;fractionName3;methodName3;\n" + @@ -116,9 +116,9 @@ "5;;parameterName5;matrixName5;fractionName5;methodName5;"; public static final String PROTOCOL_SPECIES_FILE_CONTENT = - "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;"; + "speciesId;speciesRefTaxCode;speciesName;speciesSurveyCode;lengthStepPmfmId;lengthStepPmfmParameterName;lengthStepPmfmMatrixName;lengthStepPmfmFractionName;lengthStepPmfmMethodName;sizeEnabled;sexEnabled;maturityEnabled;ageEnabled;weightEnabled;countIfNoFrequencyEnabled;calcifySampleEnabled\n" + + "1;speciesRefTaxCode1;speciesName1;cruiseCode1;2;parameterName2;matrixName2;fractionName2;methodName2;Y;Y;Y;Y;Y;Y;Y;\n" + + "2;speciesRefTaxCode2;speciesName2;;;;;;;N;Y;N;Y;Y;Y;Y;"; @Before public void setUp() throws Exception { @@ -155,7 +155,7 @@ protocol.setSpecies(Lists.<SpeciesProtocol>newArrayList()); SpeciesProtocol sp1 = new SpeciesProtocol(); sp1.setSpeciesId("11242"); - sp1.setSurveyCode("cruiseCode1"); + sp1.setSpeciesSurveyCode("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.getSurveyCode()); + Assert.assertEquals("cruiseCode1", sp1.getSpeciesSurveyCode()); 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.getSurveyCode()); + Assert.assertEquals("cruiseCode1", sp1.getSpeciesSurveyCode()); 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.getSurveyCode()); + Assert.assertNull(sp2.getSpeciesSurveyCode()); Assert.assertNull(sp2.getLengthStepPmfmId()); Assert.assertTrue(sp2.isAgeEnabled()); Assert.assertTrue(sp2.isCalcifySampleEnabled()); @@ -360,7 +360,7 @@ SpeciesProtocol sp1 = new SpeciesProtocol(); sp1.setSpeciesId("1"); - sp1.setSurveyCode("cruiseCode1"); + sp1.setSpeciesSurveyCode("cruiseCode1"); sp1.setAgeEnabled(true); sp1.setSizeEnabled(true); sp1.setMaturityEnabled(true); @@ -444,6 +444,8 @@ for (int i = 1; i < 3; i++) { Species c = new Species(); c.setId("" + i); + c.setName("speciesName" + i); + c.setRefTaxCode("speciesRefTaxCode" + i); result.put(i + "", c); } return result; Modified: trunk/tutti-service/src/test/resources/log4j.properties =================================================================== --- trunk/tutti-service/src/test/resources/log4j.properties 2013-02-05 15:02:50 UTC (rev 337) +++ trunk/tutti-service/src/test/resources/log4j.properties 2013-02-05 16:56:47 UTC (rev 338) @@ -23,7 +23,7 @@ ### log4j.rootCategory=WARN, A1 -log4j.logger.no.api=DEBUG +#log4j.logger.no.api=DEBUG log4j.appender.A1=org.apache.log4j.ConsoleAppender log4j.appender.A1.layout=org.apache.log4j.PatternLayout log4j.appender.A1.layout.ConversionPattern=%d %-4r [%t] %-5p %c %x - %m%n 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 15:02:50 UTC (rev 337) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java 2013-02-05 16:56:47 UTC (rev 338) @@ -39,7 +39,7 @@ private static final long serialVersionUID = 1L; - public static final String PROPERTY_CRUISE_CODE = "surveyCode"; + public static final String PROPERTY_SPECIES_SURVEY_CODE = "speciesSurveyCode"; public static final String PROPERTY_SPECIES = "species"; @@ -61,7 +61,7 @@ protected Species species; - protected String cruiseCode; + protected String speciesSurveyCode; protected boolean sizeEnabled; @@ -105,14 +105,14 @@ firePropertyChange(PROPERTY_SPECIES, oldValue, species); } - public String getCruiseCode() { - return cruiseCode; + public String getSpeciesSurveyCode() { + return speciesSurveyCode; } - public void setCruiseCode(String cruiseCode) { - Object oldValue = getCruiseCode(); - this.cruiseCode = cruiseCode; - firePropertyChange(PROPERTY_CRUISE_CODE, oldValue, cruiseCode); + public void setSpeciesSurveyCode(String speciesSurveyCode) { + Object oldValue = getSpeciesSurveyCode(); + this.speciesSurveyCode = speciesSurveyCode; + firePropertyChange(PROPERTY_SPECIES_SURVEY_CODE, oldValue, speciesSurveyCode); } public boolean isSizeEnabled() { 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 15:02:50 UTC (rev 337) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2013-02-05 16:56:47 UTC (rev 338) @@ -42,10 +42,10 @@ n_("tutti.table.protocol.species.header.speciesId"), n_("tutti.table.protocol.species.header.speciesId.tip")); - public static final ColumnIdentifier<EditProtocolSpeciesRowModel> CRUISE_CODE_ID = ColumnIdentifier.newId( - EditProtocolSpeciesRowModel.PROPERTY_CRUISE_CODE, - n_("tutti.table.protocol.species.header.surveyCode"), - n_("tutti.table.protocol.species.header.surveyCode.tip")); + public static final ColumnIdentifier<EditProtocolSpeciesRowModel> SURVEY_CODE_ID = ColumnIdentifier.newId( + EditProtocolSpeciesRowModel.PROPERTY_SPECIES_SURVEY_CODE, + n_("tutti.table.protocol.species.header.speciesSurveyCode"), + n_("tutti.table.protocol.species.header.speciesSurveyCode.tip")); public static final ColumnIdentifier<EditProtocolSpeciesRowModel> SIZE_ENABLED = ColumnIdentifier.newId( Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-02-05 15:02:50 UTC (rev 337) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java 2013-02-05 16:56:47 UTC (rev 338) @@ -258,7 +258,7 @@ addColumnToModel(columnModel, null, null, - EditProtocolSpeciesTableModel.CRUISE_CODE_ID); + EditProtocolSpeciesTableModel.SURVEY_CODE_ID); addLengthClassesColumnToModel(columnModel, model.getLengthClassesPmfmId()); Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-05 15:02:50 UTC (rev 337) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-05 16:56:47 UTC (rev 338) @@ -329,8 +329,6 @@ tutti.table.protocol.species.header.calcifySample.tip=Prélèvement de pièces calcifiées tutti.table.protocol.species.header.countIfNoFrequency=Dénombrement tutti.table.protocol.species.header.countIfNoFrequency.tip=Dénombrement -tutti.table.protocol.species.header.cruiseCode=Code -tutti.table.protocol.species.header.cruiseCode.tip=Code campagne (non synchronisable) tutti.table.protocol.species.header.lengthStep=Classe de Taille tutti.table.protocol.species.header.lengthStep.tip=Comment mesurer les classes de taille (si vide alors pas de mesure) tutti.table.protocol.species.header.maturity=Maturité @@ -341,8 +339,8 @@ tutti.table.protocol.species.header.size.tip=Catégorisation sur la catégorie de tri ? tutti.table.protocol.species.header.speciesId=Espèce tutti.table.protocol.species.header.speciesId.tip=Espèce (code permanent - nom scientifique) -tutti.table.protocol.species.header.surveyCode= -tutti.table.protocol.species.header.surveyCode.tip= +tutti.table.protocol.species.header.speciesSurveyCode=Code +tutti.table.protocol.species.header.speciesSurveyCode.tip=Code campagne (non synchronisable) tutti.table.protocol.species.header.weight=Pesée tutti.table.protocol.species.header.weight.tip=Pesée tutti.table.species.batch.header.ageCategory=Age