Author: jcouteau Date: 2009-08-03 14:09:58 +0000 (Mon, 03 Aug 2009) New Revision: 161 Modified: trunk/analyseplans/Calibration.java trunk/analyseplans/Max.java Log: Remove warnings Modified: trunk/analyseplans/Calibration.java =================================================================== --- trunk/analyseplans/Calibration.java 2009-07-20 13:38:52 UTC (rev 160) +++ trunk/analyseplans/Calibration.java 2009-08-03 14:09:58 UTC (rev 161) @@ -29,7 +29,7 @@ import fr.ifremer.isisfish.util.Doc; /** - * Calibration_bidon.java + * Calibration.java * * Created: 8 mars 2007 * @@ -43,7 +43,7 @@ /** to use log facility, just put in your code: log.info("..."); */ static private Log log = LogFactory.getLog(Calibration.class); - enum State { + protected enum State { STATE_INIT, STATE_0, STATE_1, STATE_2, STATE_3, STATE_4 }; @@ -77,6 +77,7 @@ public String[] necessaryResult = { ResultName.MATRIX_LANDING_PER_MET }; + @Override public String[] getNecessaryResult() { return this.necessaryResult; } @@ -86,6 +87,7 @@ * * @return L'aide ou la description du plan */ + @Override public String getDescription() throws Exception { return _("Simplexe"); } @@ -97,6 +99,7 @@ * @param simulation * La simulation pour lequel on utilise cette regle */ + @Override public void init(AnalysePlanContext context) throws Exception { if (param_nomfichier_debarquements == null || "".equals(param_nomfichier_debarquements)) { @@ -132,6 +135,7 @@ * @return true if we must do next simulation, false to stop plan * @throws Exception */ + @Override public boolean beforeSimulation(AnalysePlanContext context, SimulationStorage nextSimulation) throws Exception { boolean doNext = true; @@ -239,6 +243,7 @@ * @return true if we must do next simulation, false to stop plan * @throws Exception */ + @Override public boolean afterSimulation(AnalysePlanContext context, SimulationStorage lastSimulation) throws Exception { boolean doNext = true; @@ -354,6 +359,7 @@ * Permit to order experience, first is experience with smallest * criteria */ + @Override public int compareTo(Object arg0) { Experience other = (Experience) arg0; int result = Double.compare(this.criteria, other.criteria); Modified: trunk/analyseplans/Max.java =================================================================== --- trunk/analyseplans/Max.java 2009-07-20 13:38:52 UTC (rev 160) +++ trunk/analyseplans/Max.java 2009-08-03 14:09:58 UTC (rev 161) @@ -35,6 +35,7 @@ // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, }; + @Override public String[] getNecessaryResult() { return this.necessaryResult; } @@ -44,6 +45,7 @@ * * @return L'aide ou la description du plan */ + @Override public String getDescription() throws Exception { return _("Permit to specify maximum simulation numbers"); } @@ -54,6 +56,7 @@ * * @param context La simulation pour lequel on utilise cette regle */ + @Override public void init(AnalysePlanContext context) throws Exception { } @@ -68,6 +71,7 @@ * @return true if we must do next simulation, false to stop plan * @throws Exception */ + @Override public boolean beforeSimulation(AnalysePlanContext context, SimulationStorage nextSimulation) throws Exception { boolean result = context.getNumber() < param_max; @@ -83,6 +87,7 @@ * @return true if we must do next simulation, false to stop plan * @throws Exception */ + @Override public boolean afterSimulation(AnalysePlanContext context, SimulationStorage lastSimulation) throws Exception { return true;