Author: chatellier Date: 2010-01-08 14:55:19 +0000 (Fri, 08 Jan 2010) New Revision: 2895 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java Log: Manage Selectivity.equation factor name. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2010-01-08 13:53:22 UTC (rev 2894) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2010-01-08 14:55:19 UTC (rev 2895) @@ -25,7 +25,6 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; @@ -35,6 +34,7 @@ import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.entities.PopulationGroup; import fr.ifremer.isisfish.entities.PopulationSeasonInfo; +import fr.ifremer.isisfish.entities.Selectivity; import fr.ifremer.isisfish.entities.StrategyMonthInfo; import fr.ifremer.isisfish.mexico.MexicoHelper; import fr.ifremer.isisfish.types.RangeOfValues; @@ -197,7 +197,7 @@ exportFactorName = factorClass + "." + lastReadName + "." + propertyName; } else { - // test each entities + // example : EffortDescription.TfjMJyI2.BolincheProfil1gir.fishingOperation if (entity instanceof EffortDescription) { EffortDescription newEntity = (EffortDescription)entity; // FIXME newEntity.getSetOfVessels() is null ??? @@ -205,21 +205,31 @@ exportFactorName += RandomStringUtils.randomAlphanumeric(8); // getSetOfVessels().getName() exportFactorName += "." + newEntity.getPossibleMetiers() + "." + propertyName; } + // example : PopulationGroup.Population_new.0.reproductionRate else if (entity instanceof PopulationGroup) { PopulationGroup newEntity = (PopulationGroup)entity; exportFactorName = factorClass + "." + newEntity.getPopulation().getName(); exportFactorName += "." + newEntity.getId() + "." + propertyName; } + // example : PopulationSeasonInfo.Population_new.janvier.avril.lengthChangeMatrix else if (entity instanceof PopulationSeasonInfo) { PopulationSeasonInfo newEntity = (PopulationSeasonInfo)entity; exportFactorName = factorClass + "." + newEntity.getPopulation().getName() + "."; exportFactorName += newEntity.getFirstMonth() + "." + newEntity.getLastMonth() + "." + propertyName; } + // example : StrategyMonthInfo.Espagnols.janvier.minInactivityDays else if (entity instanceof StrategyMonthInfo) { StrategyMonthInfo newEntity = (StrategyMonthInfo)entity; exportFactorName = factorClass + "." + newEntity.getStrategy().getName() + "."; exportFactorName += newEntity.getMonth() + "." + propertyName; } + // example : Selectivity.Senne.Anchois_long + else if (entity instanceof Selectivity) { + // association class with no name attribute + Selectivity newEntity = (Selectivity)entity; + exportFactorName = factorClass + "." + newEntity.getGear().getName(); + exportFactorName += "." + newEntity.getPopulation().getName(); + } } return exportFactorName;