[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/calcul FudaaCalculOp.java,1.5,1.6

[<de...@us...>]

Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/calcul
In directory sc8-pr-cvs1:/tmp/cvs-serv25368/commun/calcul

Modified Files:
	FudaaCalculOp.java 
Log Message:
Modification du prepro tr.
Ajout tail follow
Modifation ebli/graphe/courbe


Index: FudaaCalculOp.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/calcul/FudaaCalculOp.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FudaaCalculOp.java	25 Nov 2003 10:13:31 -0000	1.5
--- FudaaCalculOp.java	11 Dec 2003 12:50:53 -0000	1.6
***************
*** 10,31 ****
  import java.io.File;
  import java.io.PrintStream;
! import javax.swing.event.ChangeEvent;
! import com.memoire.bu.BuCommonImplementation;
! import com.memoire.bu.BuMainPanel;
! import com.memoire.bu.BuProgressBar;
! import com.memoire.bu.BuResource;
! import com.memoire.bu.BuTask;
  import com.memoire.bu.BuTaskOperation;
  import org.fudaa.dodico.calcul.CalculExec;
- import org.fudaa.dodico.calcul.CalculLauncher;
  import org.fudaa.dodico.calcul.CalculLauncherAbstract;
- import org.fudaa.dodico.calcul.CalculLauncherExe;
  import org.fudaa.dodico.commun.DodicoLib;
- import org.fudaa.dodico.commun.DodicoUI;
- import org.fudaa.dodico.commun.ProgressionBuAdapter;
  import org.fudaa.dodico.commun.ProgressionInterface;
  import org.fudaa.dodico.objet.CExecListener;
! import org.fudaa.fudaa.commun.FudaaCommonImplementation;
! import org.fudaa.fudaa.commun.FudaaLib;
  import org.fudaa.fudaa.commun.FudaaUI;
  import org.fudaa.fudaa.ressource.FudaaResource;
--- 10,24 ----
  import java.io.File;
  import java.io.PrintStream;
! import java.util.Timer;
! import java.util.TimerTask;
! 
  import com.memoire.bu.BuTaskOperation;
+ 
  import org.fudaa.dodico.calcul.CalculExec;
  import org.fudaa.dodico.calcul.CalculLauncherAbstract;
  import org.fudaa.dodico.commun.DodicoLib;
  import org.fudaa.dodico.commun.ProgressionInterface;
  import org.fudaa.dodico.objet.CExecListener;
! 
  import org.fudaa.fudaa.commun.FudaaUI;
  import org.fudaa.fudaa.ressource.FudaaResource;
***************
*** 38,42 ****
    implements CExecListener {
    FudaaUI impl_;
!   CalculExec exe_;
    boolean isFinished_;
    boolean stop_;
--- 31,35 ----
    implements CExecListener {
    FudaaUI impl_;
!   protected CalculExec exe_;
    boolean isFinished_;
    boolean stop_;
***************
*** 86,100 ****
      exe_.setUI(impl_);
      exe_.setProgression(_progress);
!     exe_.launch(f, manageArgs(), this);
!     setEtat("Fin du calcul", 90);
!     impl_.message(
!       FudaaResource.getS("Calcul"),
!       FudaaResource.getS("Le calcul est terminé"));
!     initEtat();
      isFinished_= true;
    }
!   public String[] manageArgs() {
!     return args_;
!   }
    /**
     * 
--- 79,97 ----
      exe_.setUI(impl_);
      exe_.setProgression(_progress);
!     exe_.launch(f,  this);
!     actionToDoJustAfterLaunching();
!     setEtat(
!       FudaaResource.getS("Le calcul est terminé:")
!         + DodicoLib.LINE_SEP
!         + f.getAbsolutePath(),
!       100);
!     new Timer().schedule(new TimerTask() {
!       public void run() {
!         initEtat();
!       }
!     }, 2 * 1000);
      isFinished_= true;
    }
!   public void actionToDoJustAfterLaunching() {}
    /**
     *