Author: chatellier Date: 2011-04-18 13:40:19 +0000 (Mon, 18 Apr 2011) New Revision: 3257 Log: Remove deprecated stuff Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2011-04-18 08:58:21 UTC (rev 3256) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2011-04-18 13:40:19 UTC (rev 3257) @@ -76,7 +76,7 @@ List oldMonths = null; if (result != null) { - oldMonths = result.getSemantics(0); + oldMonths = result.getSemantic(0); } List<Month> months = getMonths(); @@ -813,7 +813,7 @@ // l'equation doit mettre les resultats dans la matrice result e.evaluate("N", N, "pop", pop, "month", month, "prepro", coeff .getValue(month), "zoneRepro", zoneRepro, "groups", N - .getSemantics(0), "zones", N.getSemantics(1), "result", + .getSemantic(0), "zones", N.getSemantic(1), "result", result); } } catch (Exception eee) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2011-04-18 08:58:21 UTC (rev 3256) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2011-04-18 13:40:19 UTC (rev 3257) @@ -75,7 +75,7 @@ // se le metier n'y ait pas on renvera 0; MatrixND mat = super.getProportionMetier(); if (mat != null) { - int indice = mat.getSemantics(0).indexOf(metier); + int indice = mat.getSemantic(0).indexOf(metier); if (indice >= 0) { result = mat.getValue(indice); } @@ -120,7 +120,7 @@ _("isisfish.strategyMonthInfo.proportion"), new List[] { metiers }, new String[] { _("isisfish.strategyMonthInfo.metier") }); - } else if (!result.getSemantics(0).equals(metiers)) { + } else if (!result.getSemantic(0).equals(metiers)) { MatrixND tmp = MatrixFactory.getInstance().create( _("isisfish.strategyMonthInfo.proportion"), new List[] { metiers },