r1753 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: aspect datastore/update equation map simulator simulator/launcher types ui/input ui/result ui/simulator util vcs
Author: chatellier Date: 2009-01-23 09:22:36 +0000 (Fri, 23 Jan 2009) New Revision: 1753 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationPrice.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SelectivityEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/TargetSpeciesTargetFactorEquation.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Coordinate.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMap.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultDataMap.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Motif.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Scale.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlan.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanContext.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/RuleMonitor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/package.html isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Date.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBean.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphComboRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphEvent.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphListener.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphMatrixNDDataset.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateListRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoPanelable.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendPanel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixInfoTableModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/Docable.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/package.html Log: Fix javadoc Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -120,7 +120,7 @@ * dans les traces * * @param jp - * @return + * @return ? * @throws Throwable */ protected Object realCall(final JoinPoint jp) throws Throwable { @@ -137,7 +137,7 @@ * toString, pour que 2 soit bien egal a 2. * * @param jp - * @return + * @return ? */ protected Object computeKey(JoinPoint jp) { Method method = ((MethodSignature)jp.getSignature()).getMethod(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -294,7 +294,6 @@ * Converti un fichier XML version 2 en un zip importable en v3 * * @param xml - * @return * @throws Exception */ public void importXML(File xml) throws Exception { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -48,7 +48,7 @@ * @param context * @param age l'age du groupe en mois * @param group le groupe dont on souhaite avoir la longueur en fonction de l'age - * @return + * @return equation result */ @Args({"context", "age", "group"}) public double compute(SimulationContext context, double age, PopulationGroup group) throws Exception; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -54,7 +54,7 @@ * @param zone la zone du groupe pour lequel on souhaite la mortalité natrurelle * seulement utilisé pour la mortalité naturelle du group des naissances, * sinon null - * @return + * @return eqaution result */ @Args({"context", "pop", "group", "zone"}) public double compute(SimulationContext context, Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationPrice.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationPrice.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/PopulationPrice.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -47,7 +47,7 @@ * * @param context * @param group le groupe dont on souhaite le poids moyen - * @return + * @return equation result */ @Args({"context", "group"}) public double compute(SimulationContext context, PopulationGroup group) throws Exception; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SelectivityEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SelectivityEquation.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SelectivityEquation.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -51,7 +51,7 @@ * @param pop La population pour lequel on souhaite la selectivite de l'engin * @param group le group pour lequel on souhaite la selectivite de l'engin * @param metier le metier pour lequel on souhaite la selectivite de l'engin - * @return + * @return eqaution result */ @Args({"context", "pop", "group", "metier"}) public double compute(SimulationContext context, Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -38,7 +38,7 @@ * @param context * @param metier le metier pour lequel on demande le calcul * @param gear l'engin utilise par le metier - * @return + * @return equation result */ @Args({"context", "metier", "gear"}) public double compute(SimulationContext context, Metier metier, Gear gear) throws Exception; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -39,7 +39,7 @@ * @param context * @param month le mois courant de simulation * @param info l'objet associe a la strategie pour le mois courant - * @return + * @return equation result */ @Args({"context", "month", "info"}) public double compute(SimulationContext context, Month month, StrategyMonthInfo info) throws Exception; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/TargetSpeciesTargetFactorEquation.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/TargetSpeciesTargetFactorEquation.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/equation/TargetSpeciesTargetFactorEquation.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -52,7 +52,7 @@ * @param species l'espece pour lequel on recherche le facteur de ciblage * @param infoMetier * @param primaryCatch - * @return + * @return equation result */ @Args({"context", "group", "species", "infoMetier", "primaryCatch"}) public double compute(SimulationContext context, Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Coordinate.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Coordinate.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Coordinate.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -1,17 +1,16 @@ package fr.ifremer.isisfish.map; /** -* Coordinate.java -* -* -* Created: Mon Apr 22 16:49:52 2002 -* -* @author <a href="mailto:seb.regnier at free.fr"></a> -* @version -*/ - + * Coordinate. + * + * Created: Mon Apr 22 16:49:52 2002 + * + * @author <a href="mailto:seb.regnier at free.fr"></a> + * @version $Revision$ + */ public class Coordinate extends java.awt.geom.Point2D.Float implements java.io.Serializable { - /** */ + + /** serialVersionUID */ private static final long serialVersionUID = 1L; public Coordinate() { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMap.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMap.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMap.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -3,7 +3,7 @@ import java.io.Serializable; /** - * DataMap.java + * DataMap. * * A DataMap is some data we have to put on the map. * To do this, we use a motif that tells the layer how to render the data. @@ -11,9 +11,8 @@ * Created: Mon Apr 22 16:45:38 2002 * * @author <a href="mailto:seb.regnier at free.fr"></a> - * @version + * @version $Revision$ */ - public interface DataMap extends Serializable{ /** Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -7,18 +7,16 @@ import java.util.List; /** - * DataMapInfo.java + * DataMapInfo. * - * * Created: Mon Apr 22 16:47:31 2002 * * @author <a href="mailto:seb.regnier at free.fr"></a> - * @version + * @version $Revision$ */ - public class DataMapInfo implements Serializable { - /** */ + /** serialVersionUID */ private static final long serialVersionUID = -8530276186766231164L; protected List<String> labels = new ArrayList<String>(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultDataMap.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultDataMap.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultDataMap.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -7,12 +7,12 @@ * A default DataMap implementation. Created: Mon Apr 22 16:39:08 2002 * * @author <a href="mailto:seb.regnier at free.fr"></a> - * @version + * @version $Revision$ */ public class DefaultDataMap implements DataMap { - /** */ + /** serialVersionUID */ private static final long serialVersionUID = 3277576798583867731L; protected double value; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -8,12 +8,12 @@ * Created: Mon Apr 22 16:52:17 2002 * * @author <a href="mailto:seb.regnier at free.fr"></a> - * @version + * @version $Revision$ */ public class DefaultScale implements Scale { - /** */ + /** serialVersionUID */ private static final long serialVersionUID = -3348731042237607596L; public double min; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -335,9 +335,8 @@ } /** - * init the mServer property value. - * @return MapServer - */ + * init the mServer property value. + */ protected void initMap() { try { float centerLat = (maxLatitude + minLatitude) / 2f; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Motif.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Motif.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Motif.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -17,12 +17,12 @@ * Created: Mon Apr 22 16:31:39 2002 * * @author <a href="mailto:seb.regnier at free.fr"></a> - * @version + * @version $Revision$ */ public class Motif implements Serializable { - /** */ + /** serialVersionUID */ private static final long serialVersionUID = -2814583859271654759L; public static final Color defaultLineColor = new Color(0, true); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -296,9 +296,7 @@ * return new String[1] { SelectMouseMode.modeID }; * </pre> * <code> - * @see NavMouseMode#modeID * @see SelectMouseMode#modeID - * @see NullMouseMode#modeID */ public String[] getMouseModeServiceList() { return new String[] { SelectMouseMode.modeID }; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Scale.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Scale.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/Scale.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -3,16 +3,15 @@ import java.io.Serializable; /** -* Scale.java -* This interface allows the user to define a graduation between 0.0 and 1.0 -* whose movement are proportionnal to a bounded value. -* -* Created: Mon Apr 22 16:36:05 2002 -* -* @author <a href="mailto:seb.regnier at free.fr"></a> -* @version -*/ - + * Scale. + * This interface allows the user to define a graduation between 0.0 and 1.0 + * whose movement are proportionnal to a bounded value. + * + * Created: Mon Apr 22 16:36:05 2002 + * + * @author <a href="mailto:seb.regnier at free.fr"></a> + * @version $Revision$ + */ public interface Scale extends Serializable{ /** Get the corresponding value between 0.0 and 1.0 */ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -23,18 +23,16 @@ import fr.ifremer.isisfish.entities.FisheryRegion; /** -* ZoneDelimiterLayer.java -* -* -* Created: Wed Apr 17 15:59:09 2002 -* -* @author <a href="mailto:seb.regnier at free.fr"></a> -* @version -*/ + * ZoneDelimiterLayer. + * + * Created: Wed Apr 17 15:59:09 2002 + * + * @author <a href="mailto:seb.regnier at free.fr"></a> + * @version $Revision$ + */ +public class ZoneDelimiterLayer extends Layer implements TopiaTransactionListener { //ZoneDelimiterLayer -public class ZoneDelimiterLayer extends Layer implements TopiaTransactionListener { //TopiaEntityListener { - - /** */ + /** serialVersionUID */ private static final long serialVersionUID = 1127201121371123690L; /** to use log facility, just put in your code: log.info(\"...\"); */ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlan.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlan.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlan.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -48,7 +48,7 @@ /** * return plan description - * @return + * @return plan description * @throws Exception */ public String getDescription() throws Exception; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanContext.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanContext.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanContext.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -98,9 +98,6 @@ return this.values.get(key); } - /** - * @param values The values to set. - */ public void setValue(String key, Object value) { this.values.put(key, value); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/RuleMonitor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/RuleMonitor.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/RuleMonitor.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -48,16 +48,10 @@ protected MultiKeyMap evalutionCondition = new MultiKeyMap(); - /** - * @return Returns the lastEvalutionCondition. - */ public boolean getEvalutionCondition(Date date, Rule rule, Metier metier) { return (Boolean)this.evalutionCondition.get(date, rule, metier); } - - /** - * @param lastEvalutionCondition The lastEvalutionCondition to set. - */ + public void setEvaluationCondition(Date date, Rule rule, Metier metier, boolean evalutionCondition) { this.evalutionCondition.put(date, rule, metier, evalutionCondition); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -208,7 +208,7 @@ } /** - * @param topiaContext The topiaContext to set. + * @param simulation The simulation storage to set. */ public void setSimulationStorage(SimulationStorage simulation) { this.simulation = simulation; @@ -310,7 +310,7 @@ } /** - * @param string + * @param message message */ public void message(String message) { log.info(message); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -266,7 +266,7 @@ /** * Convert current object in hashtable representation, and clear hashtable * that contains last modified field - * @return + * @return object hashtable representation */ public Hashtable<String, Object> getUpdateHashtable() { Hashtable<String, Object> result = new Hashtable<String, Object>(update); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServer.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServer.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -83,7 +83,7 @@ * @param user le login a utiliser pour pouvoir faire une simulation * @param password le mot de passe * @return si la methode est <b>simulate</b> retourne un objet - * {@link fr.ifremer.db.Simulation} Simulation sous forme XML. Si la + * {@link SimulationStorage} Simulation sous forme XML. Si la * methode est <b>checkPoint</b> retourne le nombre de mois simule. */ public Object execute(String method, Vector params, String user, @@ -148,7 +148,7 @@ * synchronized two SimulationControl (local and remote) * * @param params - * @return + * @return ? * @throws Exception */ synchronized protected Object checkPoint(Vector params) throws Exception { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -169,7 +169,7 @@ /** * Change la valeur de la variable pause, si pause est alors vrai * notifie tous les threads en attente - * @param autoLaunch The autoLaunch to set. + * @param pause pause value to set */ public void setPause(boolean pause) { boolean oldValue = this.pause; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -56,7 +56,6 @@ import java.util.TreeSet; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import java.util.concurrent.PriorityBlockingQueue; import org.apache.commons.lang.mutable.MutableInt; import org.apache.commons.lang.time.DurationFormatUtils; import org.apache.commons.logging.Log; @@ -78,10 +77,10 @@ * Il existe une instance unique pour toute l'application * <p> * Lors de l'instanciation de la classe, l'ensemble des - * {@link SimulationLauncher} disponible est recherche dans la configuration + * {@link SimulatorLauncher} disponible est recherche dans la configuration * et un executor est cree pour chaque. * <p> - * Si un {@link SimulationLauncher} genere trop d'erreur (RemoteException) + * Si un {@link SimulatorLauncher} genere trop d'erreur (RemoteException) * Il est alors suspendu pour ne plus etre utilise pour les simulations. * * @author poussin @@ -104,7 +103,7 @@ /** * Retourne l'instance du SimulationService a utiliser - * @return + * @return l'instance a utiliser */ static public SimulationService getService() { return instance; @@ -377,7 +376,7 @@ * que le launcher de l'executor ne fonctionne plus (il se met en pause * tout seul) * - * @param item l'item a resoumettre + * @param job l'item a resoumettre */ protected void resubmit(SimulationJob job) { submit(job); @@ -484,9 +483,9 @@ /** * Indique s'il y a encore des simulations dans le plan. Par defaut pour * Eviter les plans sans fin, le nombre de plan genere par simulation - * est limite a {@link MAX_PLAN_SIMULATION} + * est limite a {@link SimulationService.MAX_PLAN_SIMULATION} * - * @return + * @return <tt>true</tt> if has next */ public boolean hasNext() { try { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/package.html =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/package.html 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/package.html 2009-01-23 09:22:36 UTC (rev 1753) @@ -1,4 +1,6 @@ -<h1>Launcher</h1> +<html> + <body> + <h1>Launcher</h1> <h2>To do</h2> <li> voir pourquoi l'interface de visu des simulations en cours ne se @@ -116,3 +118,5 @@ SimulationService} ce {@link SimulatorLauncher} n'est plus pris en compte et n'importe quel {@link SimulatorLauncher} peut faire cette simulation. </p> +</body> +</html> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Date.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Date.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Date.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -163,7 +163,7 @@ /** * @param date2 - * @return + * @return month array */ public Month[] getMonthBetweenDate(Date date2) { if(date2.getDate() - getDate() <0) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/types/Month.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -184,7 +184,9 @@ } /** - * @return + * Get number of days. + * + * @return number of day */ public int getNumbersOfDays() { int result = NUMBERS_OF_DAYS[getMonthNumber()]; @@ -197,7 +199,7 @@ * * @param first * @param last - * @return + * @return month list */ static public List<Month> getMonths(Month first, Month last) { List<Month> result = new ArrayList<Month>(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -144,8 +144,6 @@ * <p/> * Refresh all ui component where name match "input<entity type without * package >.*" - * - * @return if ok return null else OutView error */ public void topiaRemove() { if (log.isTraceEnabled()) { @@ -253,8 +251,6 @@ /** * Cancel all modification on entity (rollback), and force reload it and * refresh all ui component that name match 'type'Tab - * - * @return the roolbacked entity */ public void topiaCancel() { try { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBean.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBean.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBean.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -18,17 +18,18 @@ import com.jrefinery.chart.ui.ChartPropertyEditPanel; /** - * GraphBean.java + * GraphBean. * - * * Created: Mon Apr 29 17:48:40 2002 * * @author <a href="mailto:seb.regnier at free.fr"></a> - * @version + * @version $Revision$ */ - public class GraphBean extends GraphBeanUI implements GraphBeanUICallback,GraphListener { + /** serialVersionUID */ + private static final long serialVersionUID = -4474836708965453250L; + protected GraphBeanModel model; protected ChartPropertyEditPanel graphPalette; protected ChartPanel chartPanel; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanModel.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphBeanModel.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -15,15 +15,13 @@ import com.jrefinery.data.CategoryDataset; /** -* GraphBeanModel.java -* -* -* Created: Fri May 17 13:29:47 2002 -* -* @author <a href="mailto:seb.regnier at free.fr"></a> -* @version -*/ - + * GraphBeanModel. + * + * Created: Fri May 17 13:29:47 2002 + * + * @author <a href="mailto:seb.regnier at free.fr"></a> + * @version $Revision$ + */ public class GraphBeanModel { // protected VerticalCategoryPlot verticalCategoryPlot; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphComboRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphComboRenderer.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphComboRenderer.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -17,17 +17,18 @@ import com.jrefinery.chart.VerticalBarRenderer3D; /** - * GraphComboRenderer.java + * GraphComboRenderer. * - * * Created: Thu Sep 12 19:55:10 2002 * * @author <a href="mailto:seb.regnier at free.fr"></a> - * @version + * @version $Revision$ */ - public class GraphComboRenderer extends DefaultListCellRenderer { + /** serialVersionUID */ + private static final long serialVersionUID = 5439698068065934760L; + public GraphComboRenderer (){ super(); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphEvent.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphEvent.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphEvent.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -5,16 +5,17 @@ /** * GraphEvent.java * - * * Created: Tue May 21 16:42:58 2002 * * @author <a href="mailto:seb.regnier at free.fr"></a> - * @version + * @version $Revision$ */ +public class GraphEvent extends EventObject { + /** serialVersionUID */ + private static final long serialVersionUID = 4189617216481564748L; -public class GraphEvent extends EventObject { - public GraphEvent (GraphBeanModel gbm){ - super((Object)gbm); + public GraphEvent(GraphBeanModel gbm) { + super((Object) gbm); } - + }// GraphEvent Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphListener.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphListener.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphListener.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -3,15 +3,13 @@ import java.util.EventListener; /** - * GraphListener.java + * GraphListener. * - * * Created: Tue May 21 16:36:39 2002 * * @author <a href="mailto:seb.regnier at free.fr"></a> - * @version + * @version $Revision$ */ - public interface GraphListener extends EventListener { public void graphChanged(GraphEvent e); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphMatrixNDDataset.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphMatrixNDDataset.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/GraphMatrixNDDataset.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -11,15 +11,13 @@ import com.jrefinery.data.CategoryDataset; /** -* GraphMatrixNDDataset.java -* -* -* Created: Fri May 17 16:26:19 2002 -* -* @author <a href="mailto:seb.regnier at free.fr"></a> -* @version -*/ - + * GraphMatrixNDDataset. + * + * Created: Fri May 17 16:26:19 2002 + * + * @author <a href="mailto:seb.regnier at free.fr"></a> + * @version $Revision$ + */ public class GraphMatrixNDDataset extends AbstractSeriesDataset implements CategoryDataset {//,XYDataset { /** The series names. */ @@ -55,7 +53,7 @@ * * @param seriesNames The series names. * @param categories The categories. - * @param data The matrice. + * @param mat The matrice. */ public GraphMatrixNDDataset(List seriesNames, List categories, MatrixND mat) { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateListRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateListRenderer.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoItemDateListRenderer.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -8,16 +8,18 @@ import fr.ifremer.isisfish.types.Date; /** - * InfoItemDateListRenderer.java + * InfoItemDateListRenderer. * - * * Created: Thu Sep 12 20:16:20 2002 * * @author <a href="mailto:seb.regnier at free.fr"></a> - * @version + * @version $Revision$ */ +public class InfoItemDateListRenderer extends DefaultListCellRenderer { + + /** serialVersionUID */ + private static final long serialVersionUID = -3340579108147857972L; -public class InfoItemDateListRenderer extends DefaultListCellRenderer { public InfoItemDateListRenderer (){ super(); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoPanelable.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoPanelable.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/InfoPanelable.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -3,15 +3,13 @@ import javax.swing.*; /** - * InfoPanelable.java + * InfoPanelable. * - * * Created: Mon Jun 3 18:58:09 2002 * * @author <a href="mailto:seb.regnier at free.fr"></a> - * @version + * @version $Revision$ */ - public interface InfoPanelable { public JLabel getLabel(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendModel.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendModel.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -20,15 +20,13 @@ /** - * LegendModel.java + * LegendModel. * - * * Created: Tue Oct 8 11:31:57 2002 * * @author <a href="mailto:seb.regnier at free.fr"></a> - * @version + * @version $Revision$ */ - public class LegendModel { protected double min; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendPanel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendPanel.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/LegendPanel.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -31,17 +31,18 @@ import javax.swing.JPanel; /** - * LegendPanel.java + * LegendPanel. * - * * Created: Tue Oct 8 10:56:14 2002 * * @author <a href="mailto:seb.regnier at free.fr"></a> - * @version + * @version $Revision$ */ - public class LegendPanel extends JPanel { + /** serialVersionUID */ + private static final long serialVersionUID = -6803899655178581165L; + private final static int DEFAULT_WIDTH = 110; private final static int DEFAULT_HEIGHT = 50; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixInfoTableModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixInfoTableModel.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/MatrixInfoTableModel.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -6,17 +6,18 @@ import javax.swing.table.AbstractTableModel; /** -* MatrixInfoTableModel.java -* -* -* Created: Fri May 31 18:31:20 2002 -* -* @author <a href="mailto:seb.regnier at free.fr"></a> -* @version -*/ - + * MatrixInfoTableModel. + * + * Created: Fri May 31 18:31:20 2002 + * + * @author <a href="mailto:seb.regnier at free.fr"></a> + * @version $Revision$ + */ public class MatrixInfoTableModel extends AbstractTableModel { + /** serialVersionUID */ + private static final long serialVersionUID = 2632133167225155487L; + protected MatrixND matrix; public MatrixInfoTableModel (MatrixND mat){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -99,21 +99,21 @@ // setSelectedSimulation((Simulation)getSimulation().getSelectedItem()); } - /** + /* * Get the value of selectedSimulation. * @return value of selectedSimulation. - */ - // public Simulation getSelectedSimulation() { - //return selectedSimulation; - //} + * + public Simulation getSelectedSimulation() { + return selectedSimulation; + }*/ - /** + /* * Set the value of selectedSimulation. * @param v Value to assign to selectedSimulation. - */ - //public void setSelectedSimulation(Simulation v) { - //this.selectedSimulation = v; - //} + * + public void setSelectedSimulation(Simulation v) { + this.selectedSimulation = v; + }*/ public void on_supprimerSimulationButton_clicked(){ String name = (String)getSimulation().getSelectedItem(); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanel.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResumePanel.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -2,16 +2,16 @@ /** -* ResumePanel.java -* -* -* -* @author <a href="mailto:seb.regnier at free.fr"></a> -* @version + * ResumePanel. + * + * @author <a href="mailto:seb.regnier at free.fr"></a> + * @version $Revision$ */ - public class ResumePanel extends ResumePanelUI { + /** serialVersionUID */ + private static final long serialVersionUID = 5424709605082901110L; + protected String resume; // protected Vector vmatInfo; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -241,7 +241,6 @@ * Change region in simulation launcher * * @param simulName name of simulation to load - * @return <code>null</code> if ok, an OutputView otherwise with error */ public void loadOldSimulation(String simulName) { log.debug("call loadOldSimulation: " + simulName); Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -81,10 +81,11 @@ private static Method compileMethodWithPrintStream; /** - * Recherche tous les fichiers qui un source plus recent que la version compilé + * Recherche tous les fichiers qui un source plus recent que la version compilé. + * * @param srcDir * @param destDir - * @return + * @return File list */ static public List<File> searchSrcToCompile(File srcDir, File destDir) { List<File> result = new ArrayList<File>(); @@ -278,7 +279,7 @@ * @param category * @param name * @param javaInterface - * @return + * @return doc */ static public String extractDoc(String category, String name, Class javaInterface) { String content = ""; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/Docable.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/Docable.java 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/util/Docable.java 2009-01-23 09:22:36 UTC (rev 1753) @@ -4,8 +4,8 @@ * This is the contract to be realize by any class wich wanted to have a @Doc support. * * @author chemit - * @see @Doc - * @see @DocHelper + * @see Doc + * @see DocHelper */ public interface Docable { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/package.html =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/package.html 2009-01-22 21:08:00 UTC (rev 1752) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/vcs/package.html 2009-01-23 09:22:36 UTC (rev 1753) @@ -1,4 +1,5 @@ -Try to keep this classes agnostic about IsisFish specific objects. This permit +<html> + <body>Try to keep this classes agnostic about IsisFish specific objects. This permit library creation in near futur. <h1>Politique d'utilisation du VCS pour les datas</h1> @@ -35,3 +36,5 @@ <li>En lecture (trunk, tag, branch) car reseau indisponible</li> </ul> </p> +</body> +</html> \ No newline at end of file
participants (1)
-
chatellier＠users.labs.libre-entreprise.org