r2434 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/simulator/launcher resources/i18n - Isis-fish-commits

25 Jun 2009

Author: chatellier
Date: 2009-06-25 13:37:36 +0000 (Thu, 25 Jun 2009)
New Revision: 2434

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.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/SimulationServiceListener.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java
   isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
   isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
Log:
Various fix (i18n, javadoc...)

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java
===================================================================

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java	2009-06-25 13:28:08 UTC (rev 2433)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java	2009-06-25 13:37:36 UTC (rev 2434)
@@ -69,7 +69,7 @@
     protected SimulatorLauncher launcher;
     /** Set it to true to restart simulation checking without restarting reel simulation */
     protected boolean onlyCheckControl;
-
+    
     public SimulationJob(SimulationService simulationService,
             SimulationItem item, int priority) {
         this(simulationService, null, item, priority);
@@ -159,7 +159,7 @@
      * L'ordre depend :
      *  - de la priorite
      *  - si le nom fini par un chiffre :
-     *    - du nom avant le chiffre (TODO :) )
+     *    - du nom avant le chiffre
      *    - du chiffre
      *  - sinon du nom
      */

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-06-25 13:28:08 UTC (rev 2433)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java	2009-06-25 13:37:36 UTC (rev 2434)
@@ -827,6 +827,7 @@
                     doNext = false;
                 }
             }
+            
             // une sim vient de se finir, on incremente le compteur
             done++;
             if (!hasNext() && (done + 1 == planContext.getNumber())) {

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceListener.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceListener.java	2009-06-25 13:28:08 UTC (rev 2433)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceListener.java	2009-06-25 13:37:36 UTC (rev 2434)
@@ -35,7 +35,7 @@
      * Notify start of simulation.
      * 
      * @param simService le simulation service qui a lance la simulation
-     * @param job job that responsable to simulation
+     * @param job job that responsible to simulation
      */
     public void simulationStart(SimulationService simService, SimulationJob job);
 
@@ -43,7 +43,7 @@
      * Notify end of simulation.
      * 
      * @param simService le simulation service qui a arrete la simulation
-     * @param job job that responsable to simulation
+     * @param job job that responsible to simulation
      */
     public void simulationStop(SimulationService simService, SimulationJob job);
 

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java	2009-06-25 13:28:08 UTC (rev 2433)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java	2009-06-25 13:37:36 UTC (rev 2434)
@@ -230,9 +230,9 @@
         case 2:
             if (job.getLauncher() == null) {
                 if (param.getUseAnalysePlan()) {
-                    result = _("Master plan");
+                    result = _("isisfish.queue.masterplan");
                 } else {
-                    result = _("not started");
+                    result = _("isisfish.queue.notstarted");
                 }
             } else {
                 result = job.getLauncher().toString();

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java	2009-06-25 13:28:08 UTC (rev 2433)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java	2009-06-25 13:37:36 UTC (rev 2434)
@@ -26,7 +26,7 @@
 
 /**
  * Interface devant etre implantée par les classes souhaitants etre utilisees
- * comme plugin de simulation (InProcess, CapArmor, SubProcess, ...) 
+ * comme plugin de simulation (InProcess, SubProcess, CapArmor, ...) 
  * 
  * @author poussin
  * @version $Revision: 1.0 $

Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
===================================================================
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties	2009-06-25 13:28:08 UTC (rev 2433)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties	2009-06-25 13:37:36 UTC (rev 2434)
@@ -41,7 +41,6 @@
 Launcher\ %s\ will\ be\ stopped\ because\ there\ are\ too\ many\ error\ (%s)=
 Local\ repository\ don't\ exist=
 Local\ repository\ exists\ but\ it's\ not\ valide\ for\ current\ vcs\:\ %s=
-Master\ plan=
 Normal\ stop\ thread,\ this\ is\ not\ an\ error=
 Not\ start\ simulation\ %s\ because\ user\ ask\ stop=
 Paste\ current\ selection\ (Ctrl-v)=
@@ -65,7 +64,6 @@
 Use\ branches,\ switch\ not\ needed=
 User\ restart\ simulation\ %s=
 User\ stop\ simulation\ %s=
-cant\ start\ nimbus=
 could\ not\ close\ reader\ %1$s=could not close reader %1$s
 could\ not\ create\ simulation\ filter\ model\ for\ reason\ %1$s=could not create simulation filter model for reason %1$s
 could\ not\ filter\ on\ simulations=could not filter on simulations
@@ -783,6 +781,8 @@
 isisfish.queue.clearDone=Clear done jobs
 isisfish.queue.id=Id
 isisfish.queue.launcher=Simulation launcher
+isisfish.queue.masterplan=Master plan
+isisfish.queue.notstarted=Not started
 isisfish.queue.plan=Plan
 isisfish.queue.progression=Progression
 isisfish.queue.restartSimulation=Restart
@@ -1102,6 +1102,5 @@
 isisfish.zone.cells=Zone cells
 isisfish.zone.comments=Comments
 isisfish.zone.name=Name
-not\ started=
 region\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite=
 simulate\ %s\ with\ file\ %s=

Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
===================================================================
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties	2009-06-25 13:28:08 UTC (rev 2433)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties	2009-06-25 13:37:36 UTC (rev 2434)
@@ -41,7 +41,6 @@
 Launcher\ %s\ will\ be\ stopped\ because\ there\ are\ too\ many\ error\ (%s)=
 Local\ repository\ don't\ exist=
 Local\ repository\ exists\ but\ it's\ not\ valide\ for\ current\ vcs\:\ %s=
-Master\ plan=
 Normal\ stop\ thread,\ this\ is\ not\ an\ error=
 Not\ start\ simulation\ %s\ because\ user\ ask\ stop=
 Paste\ current\ selection\ (Ctrl-v)=
@@ -65,7 +64,6 @@
 Use\ branches,\ switch\ not\ needed=
 User\ restart\ simulation\ %s=
 User\ stop\ simulation\ %s=
-cant\ start\ nimbus=
 could\ not\ close\ reader\ %1$s=could not close reader %1$s
 could\ not\ create\ simulation\ filter\ model\ for\ reason\ %1$s=could not create simulation filter model for reason %1$s
 could\ not\ filter\ on\ simulations=could not filter on simulations
@@ -783,6 +781,8 @@
 isisfish.queue.clearDone=Retirer les simulations termin\u00E9es
 isisfish.queue.id=Identifiant
 isisfish.queue.launcher=Lanceur de simulation
+isisfish.queue.masterplan=Plan de simulation
+isisfish.queue.notstarted=Non d\u00E9marr\u00E9
 isisfish.queue.plan=Plan
 isisfish.queue.progression=Progression
 isisfish.queue.restartSimulation=Red\u00E9marrer
@@ -1102,6 +1102,5 @@
 isisfish.zone.cells=cellules de la Zone
 isisfish.zone.comments=Commentaires
 isisfish.zone.name=Nom
-not\ started=
 region\ already\ exists\ %s\ use\ 'force'\ argument\ to\ force\ overwrite=
 simulate\ %s\ with\ file\ %s=

    

r2434 - in isis-fish/trunk/src/main: java/fr/ifremer/isisfish/simulator/launcher resources/i18n

chatellier＠users.labs.libre-entreprise.org

tags

participants (1)