Author: chatellier Date: 2009-07-15 07:31:35 +0000 (Wed, 15 Jul 2009) New Revision: 2479 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java Log: Replace matrix name and dimension names by translated stings Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2009-07-13 09:28:52 UTC (rev 2478) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2009-07-15 07:31:35 UTC (rev 2479) @@ -507,10 +507,10 @@ if (mat == null) { log.debug("Capturability is null, create new matrix"); mat = MatrixFactory.getInstance().create( - n_("isisfish.population.capturability"), + _("isisfish.population.capturability"), sems, - new String[] { n_("isisfish.population.group"), - n_("isisfish.population.season") }); + new String[] { _("isisfish.population.group"), + _("isisfish.population.season") }); // we don't call setCapturability because is better to create a valid // matrix when capturability is null instead check validity and // create new one and paste the old @@ -518,10 +518,10 @@ log.debug("Capturability has changed, create new matrix and copy old: " + mat.getSemantics() + " " + sems); MatrixND newmat = MatrixFactory.getInstance().create( - n_("isisfish.population.capturability"), + _("isisfish.population.capturability"), sems, - new String[] { n_("isisfish.population.group"), - n_("isisfish.population.season") }); + new String[] { _("isisfish.population.group"), + _("isisfish.population.season") }); boolean allNull = true; for (List l : mat.getSemantics()) { @@ -559,17 +559,17 @@ mat = MatrixFactory.getInstance().create( n_("isisfish.population.mappingZoneReproZoneRecru"), sems, - new String[] { n_("isisfish.population.reproduction"), - n_("isisfish.population.recruitment") }); + new String[] { _("isisfish.population.reproduction"), + _("isisfish.population.recruitment") }); // we don't call setMappingZoneReproZoneRecru because is better to create a valid // matrix when MappingZoneReproZoneRecru is null instead check validity and // create new one and paste the old } else if (!Arrays.equals(mat.getSemantics(), sems)) { MatrixND newmat = MatrixFactory.getInstance().create( - n_("isisfish.population.mappingZoneReproZoneRecru"), + _("isisfish.population.mappingZoneReproZoneRecru"), sems, - new String[] { n_("isisfish.population.reproduction"), - n_("isisfish.population.recruitment") }); + new String[] { _("isisfish.population.reproduction"), + _("isisfish.population.recruitment") }); newmat.paste(mat); mat = newmat; } @@ -588,7 +588,7 @@ int maxY = N.getDim(1); MatrixND result = MatrixFactory.getInstance().create( - n_("isisfish.population.matrixAbundance1D"), + _("isisfish.population.matrixAbundance1D"), new int[] { 1, maxX * maxY }); for (int x = 0; x < maxX; x++) { @@ -612,10 +612,10 @@ int nbZone = zones.size(); MatrixND result = MatrixFactory.getInstance().create( - n_("isisfish.population.matrixAbundance"), + _("isisfish.population.matrixAbundance"), new List[] { groups, zones }, - new String[] { n_("isisfish.population.groups"), - n_("isisfish.population.zones") }); + new String[] { _("isisfish.population.groups"), + _("isisfish.population.zones") }); try { int c = 0;