[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux TrRefluxImplHelper.java,1.1,1.2 TrRefluxParametres.java,1.1,1.2 TrRefluxProjet.java,1.1,1.2

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

Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux
In directory sc8-pr-cvs1:/tmp/cvs-serv11020/tr/reflux

Modified Files:
	TrRefluxImplHelper.java TrRefluxParametres.java 
	TrRefluxProjet.java 
Log Message:
Maj tr



Index: TrRefluxImplHelper.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxImplHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrRefluxImplHelper.java	4 Jul 2003 15:50:54 -0000	1.1
--- TrRefluxImplHelper.java	18 Aug 2003 11:54:43 -0000	1.2
***************
*** 16,19 ****
--- 16,20 ----
  import org.fudaa.dodico.commun.DodicoPreferences;
  import org.fudaa.dodico.commun.ProgressionBuAdapter;
+ import org.fudaa.dodico.fichiers.FileFormatSoftware;
  import org.fudaa.dodico.reflux.io.INPFileFormat;
  
***************
*** 31,35 ****
  public class TrRefluxImplHelper extends TrImplHelper
  {
!   public static FudaaExecServerManager SERVEURS= new FudaaExecServerManager(TrPreferences.TR, DodicoPreferences.buildPrefKey(TrProjet.REFLUX_ID,TrPreferences.KEY_SERVEUR_PREFIXE));
  
    public TrRefluxImplHelper(TrImplementation _impl)
--- 32,36 ----
  public class TrRefluxImplHelper extends TrImplHelper
  {
!   public static FudaaExecServerManager SERVEURS= new FudaaExecServerManager(TrPreferences.TR, DodicoPreferences.buildPrefKey(FileFormatSoftware.REFLUX_IS.name,TrPreferences.KEY_SERVEUR_PREFIXE));
  
    public TrRefluxImplHelper(TrImplementation _impl)
***************
*** 58,62 ****
      BuMenuItem r =
        new BuMenuItem(FudaaResource.FUDAA.getToolIcon("appli/telemac"), "Projet Télémac");
!     r.setActionCommand(impl_.PREF_OUVRIR + TrProjet.TELEMAC_ID);
      return new BuMenuItem[]{r};
    }
--- 59,63 ----
      BuMenuItem r =
        new BuMenuItem(FudaaResource.FUDAA.getToolIcon("appli/telemac"), "Projet Télémac");
!     r.setActionCommand(impl_.PREF_OUVRIR + FileFormatSoftware.TELEMAC_IS.name);
      return new BuMenuItem[]{r};
    }
***************
*** 73,77 ****
              TrRefluxProjet.init(
                _fic,
!               INPFileFormat.getInstance(),
                new ProgressionBuAdapter(this),
                getImpl());
--- 74,78 ----
              TrRefluxProjet.init(
                _fic,
!               INPFileFormat.getInstance().getLastINPVersionImpl(),
                new ProgressionBuAdapter(this),
                getImpl());
***************
*** 92,96 ****
    public String getID()
    {
!     return TrProjet.REFLUX_ID;
    }
  
--- 93,97 ----
    public String getID()
    {
!     return FileFormatSoftware.REFLUX_IS.name;
    }
  

Index: TrRefluxParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxParametres.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrRefluxParametres.java	4 Jul 2003 15:50:54 -0000	1.1
--- TrRefluxParametres.java	18 Aug 2003 11:54:43 -0000	1.2
***************
*** 43,47 ****
    public final static TrRefluxParametres init(
      File _f,
!     INPFileFormat _ft,
      ProgressionInterface _progress,
      FudaaUI _ui)
--- 43,47 ----
    public final static TrRefluxParametres init(
      File _f,
!     INPFileFormat.INPVersion _ft,
      ProgressionInterface _progress,
      FudaaUI _ui)
***************
*** 60,64 ****
      r.title_ = s;
      
!     r.dicoParam_=new DicoParams(inter.getEntiteValue(),inter.getDicoModel());
      return r;
    }
--- 60,64 ----
      r.title_ = s;
      
!     r.dicoParam_=new DicoParams(inter.getEntiteValue(),_ft);
      return r;
    }

Index: TrRefluxProjet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrRefluxProjet.java	4 Jul 2003 15:50:54 -0000	1.1
--- TrRefluxProjet.java	18 Aug 2003 11:54:43 -0000	1.2
***************
*** 13,21 ****
  
  import com.memoire.bu.BuInformationsDocument;
- import com.memoire.bu.BuTaskOperation;
  
  import org.fudaa.dodico.calcul.CalculLauncher;
- import org.fudaa.dodico.commun.ProgressionBuAdapter;
  import org.fudaa.dodico.commun.ProgressionInterface;
  import org.fudaa.dodico.h2d.H2dParametres;
  import org.fudaa.dodico.reflux.RefluxExec;
--- 13,20 ----
  
  import com.memoire.bu.BuInformationsDocument;
  
  import org.fudaa.dodico.calcul.CalculLauncher;
  import org.fudaa.dodico.commun.ProgressionInterface;
+ import org.fudaa.dodico.fichiers.FileFormatSoftware;
  import org.fudaa.dodico.h2d.H2dParametres;
  import org.fudaa.dodico.reflux.RefluxExec;
***************
*** 53,57 ****
    public static TrRefluxProjet init(
      File _file,
!     INPFileFormat _fileFormat,
      ProgressionInterface _progress,TrImplementation _ui)
    {
--- 52,56 ----
    public static TrRefluxProjet init(
      File _file,
!     INPFileFormat.INPVersion _fileFormat,
      ProgressionInterface _progress,TrImplementation _ui)
    {
***************
*** 189,198 ****
    
    
- 
-   /**
-    *
-    */
-   
- 
    /**
     *
--- 188,191 ----
***************
*** 200,204 ****
    public String getID()
    {
!     return TrProjet.REFLUX_ID;
    }
  
--- 193,197 ----
    public String getID()
    {
!     return FileFormatSoftware.REFLUX_IS.name;
    }