[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/tr TrLauncherDefault.java,1.1,1.2 TrEditorImplementation.java,1.1,1.2 TrSupervisorImplementation.java,1.1,1.2 TrMeshImplementation.java,1.1,1.2 TrPostImplementation.java,1.1,1.2 Tr.java,1.14,1.15

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

Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7396/src/org/fudaa/fudaa/tr

Modified Files:
	TrLauncherDefault.java TrEditorImplementation.java 
	TrSupervisorImplementation.java TrMeshImplementation.java 
	TrPostImplementation.java Tr.java 
Log Message:
Ajout de rubar


Index: Tr.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/Tr.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Tr.java	1 Jun 2004 11:27:44 -0000	1.14
--- Tr.java	11 Jun 2004 16:40:39 -0000	1.15
***************
*** 39,43 ****
      isRt_.name = "prepro";
      isRt_.version = "0.06";
!     isRt_.date = "2004-02-12";
      isRt_.rights = TrResource.getS("Tous droits réservés") + ". CETMEF (c)2003-2004";
      isRt_.contact = "de...@us...";
--- 39,43 ----
      isRt_.name = "prepro";
      isRt_.version = "0.06";
!     isRt_.date = "2004-06-03";
      isRt_.rights = TrResource.getS("Tous droits réservés") + ". CETMEF (c)2003-2004";
      isRt_.contact = "de...@us...";
***************
*** 47,51 ****
      isRt_.banner = TrResource.TR.getIcon("banner");
      isRt_.http = "http://fudaa.sourceforge.net/prepro/";
!     isRt_.update = "";
      isRt_.man = FudaaCommonImplementation.LOCAL_MAN + "prepro/html/";
      isRt_.authors = new String[] { "Frédéric Deniger"};
--- 47,51 ----
      isRt_.banner = TrResource.TR.getIcon("banner");
      isRt_.http = "http://fudaa.sourceforge.net/prepro/";
!     isRt_.update = "http://fudaa.sourceforge.net/prepro/update.php?version="+isRt_.version;
      isRt_.man = FudaaCommonImplementation.LOCAL_MAN + "prepro/html/";
      isRt_.authors = new String[] { "Frédéric Deniger"};

Index: TrMeshImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrMeshImplementation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrMeshImplementation.java	1 Jun 2004 11:27:44 -0000	1.1
--- TrMeshImplementation.java	11 Jun 2004 16:40:39 -0000	1.2
***************
*** 20,23 ****
--- 20,24 ----
  import org.fudaa.fudaa.tr.common.TrResource;
  
+ import com.memoire.bu.BuIcon;
  import com.memoire.bu.BuInformationsSoftware;
  import com.memoire.fu.FuLib;
***************
*** 29,37 ****
  public class TrMeshImplementation extends TrCommonImplementation {
  
    private MvActLoad loader_;
    private MvActSave save_;
  
    protected void ouvrir() {
!     cmdOuvrirFile(super.ouvrirFileChooser(null, MvResource.getS("Maillage")));
    }
  
--- 30,46 ----
  public class TrMeshImplementation extends TrCommonImplementation {
  
+   protected BuIcon getSpecificIcon() {
+     return TrResource.getMeshIcon();
+   }
+ 
+   protected String getSpecificName() {
+     return TrResource.getMeshName();
+   }
+ 
    private MvActLoad loader_;
    private MvActSave save_;
  
    protected void ouvrir() {
!     loadFile(null);
    }
  
***************
*** 54,57 ****
--- 63,72 ----
     */
    public void cmdOuvrirFile(File _f) {
+     if (_f != null) {
+       loadFile(_f);
+     }
+   }
+ 
+   private void loadFile(File _f) {
      MvControllerSrc s = new MvControllerSrc();
      s.setChecker(new MvActCheckDefault());
***************
*** 60,69 ****
      s.setParent(i);
      s.setViewer(i);
!     if (_f != null) loader_.load(_f, s);
!     i.setTitle(_f.getName());
!     i.setToolTipText(FuLib.reducedPath(_f.getAbsolutePath()));
      i.getMvVisuPanel().refreshArbreCalque(getArbreCalque());
      i.addInternalFrameListener(arbre_);
- 
    }
  
--- 75,84 ----
      s.setParent(i);
      s.setViewer(i);
!     File f=loader_.load(_f, s);
!     if(f==null) return;
!     i.setTitle(f.getName());
!     i.setToolTipText(FuLib.reducedPath(f.getAbsolutePath()));
      i.getMvVisuPanel().refreshArbreCalque(getArbreCalque());
      i.addInternalFrameListener(arbre_);
    }
  
***************
*** 76,83 ****
    public void start() {
      super.start();
-     getFrame().setIconImage(TrResource.getMeshIcon().getImage());
-     getFrame().setTitle(TrResource.getMeshName());
-     getFrame().repaint();
-     getFrame().show();
      setEnabledForAction("OUVRIR", true);
    }
--- 91,94 ----

Index: TrPostImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrPostImplementation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrPostImplementation.java	1 Jun 2004 11:27:44 -0000	1.1
--- TrPostImplementation.java	11 Jun 2004 16:40:39 -0000	1.2
***************
*** 19,22 ****
--- 19,23 ----
  import org.fudaa.fudaa.tr.post.TrPostSourceActivator;
  
+ import com.memoire.bu.BuIcon;
  import com.memoire.bu.BuInformationsSoftware;
  import com.memoire.fu.FuLib;
***************
*** 29,32 ****
--- 30,39 ----
  
    
+   protected BuIcon getSpecificIcon() {
+     return TrResource.getPostIcon();
+   }
+   protected String getSpecificName() {
+     return TrResource.getPostName();
+   }
    /**
     * 
***************
*** 55,65 ****
    }
  
-   private void initFrame() {
-     JFrame f = (JFrame)getFrame();
-     f.setIconImage(TrResource.TR.getImage("post.gif"));
-     f.setTitle("Post ");
- //    f.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-     f.repaint();
-   }
  
    private void majFrame(File _f) {
--- 62,65 ----
***************
*** 108,112 ****
    public void start() {
      super.start();
-     initFrame();
      setEnabledForAction("OUVRIR", true);
    }
--- 108,111 ----

Index: TrLauncherDefault.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrLauncherDefault.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrLauncherDefault.java	1 Jun 2004 11:27:43 -0000	1.1
--- TrLauncherDefault.java	11 Jun 2004 16:40:39 -0000	1.2
***************
*** 26,30 ****
  import org.fudaa.fudaa.commun.FudaaLib;
  import org.fudaa.fudaa.ressource.FudaaResource;
- import org.fudaa.fudaa.tr.common.TrApplicationManager;
  import org.fudaa.fudaa.tr.common.TrCommonImplementation;
  import org.fudaa.fudaa.tr.common.TrFileFormatManager;
--- 26,29 ----
***************
*** 33,39 ****
  import org.fudaa.fudaa.tr.common.TrPreferences;
  import org.fudaa.fudaa.tr.common.TrResource;
- import org.fudaa.fudaa.tr.reflux.TrRefluxAppliManager;
  import org.fudaa.fudaa.tr.reflux.TrRefluxImplHelper;
! import org.fudaa.fudaa.tr.telemac.TrTelemacAppliManager;
  import org.fudaa.fudaa.tr.telemac.TrTelemacImplHelper;
  
--- 32,37 ----
  import org.fudaa.fudaa.tr.common.TrPreferences;
  import org.fudaa.fudaa.tr.common.TrResource;
  import org.fudaa.fudaa.tr.reflux.TrRefluxImplHelper;
! import org.fudaa.fudaa.tr.rubar.TrRubarImplHelper;
  import org.fudaa.fudaa.tr.telemac.TrTelemacImplHelper;
  
***************
*** 78,83 ****
    protected FollowApp                  tail_;
    TrImplHelperAbstract                 helper_;
!   protected TrRefluxImplHelper refluxImplHelper_;
!   protected TrTelemacImplHelper telemacImplHelper_;
    protected TrSupervisorImplementation impl_;
  
--- 76,82 ----
    protected FollowApp                  tail_;
    TrImplHelperAbstract                 helper_;
!   private TrRefluxImplHelper           refluxImplHelper_;
!   private TrTelemacImplHelper          telemacImplHelper_;
!   private TrRubarImplHelper            rubarImplHelper_;
    protected TrSupervisorImplementation impl_;
  
***************
*** 88,107 ****
     */
    public TrLauncherDefault() {
!     helper_=getImplHelper(getHydIdFromPrefFile());
!     if(helper_==null) changeChaineCalcul(BuLib.HELPER);
!     helper_=getImplHelper(getHydIdFromPrefFile());
!     if(helper_==null) changeChaineCalcul(BuLib.HELPER);
!     helper_=getImplHelper(getHydIdFromPrefFile());
    }
!   
!   public TrRefluxImplHelper getRefluxImplHelper(){
!     if(refluxImplHelper_==null) refluxImplHelper_=new TrRefluxImplHelper(this);
      return refluxImplHelper_;
    }
!   public TrTelemacImplHelper getTelemacImplHelper(){
!     if(telemacImplHelper_==null) telemacImplHelper_=new TrTelemacImplHelper(this);
      return telemacImplHelper_;
    }
!   
  
    /**
--- 87,111 ----
     */
    public TrLauncherDefault() {
!     helper_ = getImplHelper(getHydIdFromPrefFile());
!     if (helper_ == null) changeChaineCalcul(BuLib.HELPER);
!     helper_ = getImplHelper(getHydIdFromPrefFile());
!     if (helper_ == null) changeChaineCalcul(BuLib.HELPER);
!     helper_ = getImplHelper(getHydIdFromPrefFile());
    }
! 
!   public TrRefluxImplHelper getRefluxImplHelper() {
!     if (refluxImplHelper_ == null) refluxImplHelper_ = new TrRefluxImplHelper(this);
      return refluxImplHelper_;
    }
! 
!   public TrTelemacImplHelper getTelemacImplHelper() {
!     if (telemacImplHelper_ == null) telemacImplHelper_ = new TrTelemacImplHelper(this);
      return telemacImplHelper_;
    }
! 
!   public TrRubarImplHelper getRubarImplHelper() {
!     if (rubarImplHelper_ == null) rubarImplHelper_ = new TrRubarImplHelper(this);
!     return rubarImplHelper_;
!   }
  
    /**
***************
*** 137,145 ****
    }
  
-   
    public TrImplHelperAbstract getImplHelper(String _id) {
      if (_id == null) return null;
      if (FileFormatSoftware.REFLUX_IS.name.equals(_id)) return getRefluxImplHelper();
      else if (FileFormatSoftware.TELEMAC_IS.name.equals(_id)) return getTelemacImplHelper();
      new Throwable().printStackTrace();
      return null;
--- 141,149 ----
    }
  
    public TrImplHelperAbstract getImplHelper(String _id) {
      if (_id == null) return null;
      if (FileFormatSoftware.REFLUX_IS.name.equals(_id)) return getRefluxImplHelper();
      else if (FileFormatSoftware.TELEMAC_IS.name.equals(_id)) return getTelemacImplHelper();
+     else if (FileFormatSoftware.RUBAR_IS.name.equals(_id)) return getRubarImplHelper();
      new Throwable().printStackTrace();
      return null;
***************
*** 152,156 ****
      return helper_.getSoftwareID();
    }
!   
    /**
     * @return l'identifiant de la chaine hyd 2d courante
--- 156,160 ----
      return helper_.getSoftwareID();
    }
! 
    /**
     * @return l'identifiant de la chaine hyd 2d courante
***************
*** 159,167 ****
      return TrPreferences.TR.getStringProperty("tr.code.id", null);
    }
!   
    public static String[] getChoices() {
!     return new String[] { FileFormatSoftware.REFLUX_IS.name, FileFormatSoftware.TELEMAC_IS.name};
    }
!   
    /**
     * Permet de changer le systeme utilise
--- 163,175 ----
      return TrPreferences.TR.getStringProperty("tr.code.id", null);
    }
! 
!   /**
!    * @return les choix
!    */
    public static String[] getChoices() {
!     return new String[] { FileFormatSoftware.REFLUX_IS.name, FileFormatSoftware.RUBAR_IS.name,
!         FileFormatSoftware.TELEMAC_IS.name};
    }
! 
    /**
     * Permet de changer le systeme utilise
***************
*** 180,189 ****
          TrPreferences.TR.putStringProperty("tr.code.id", id);
          TrPreferences.TR.writeIniFile();
! //        helper_=getImplHelper(id);
        }
  
      }
    }
!   
    /**
     * @see org.fudaa.fudaa.tr.common.TrLauncher#openLogFrame(java.io.File)
--- 188,197 ----
          TrPreferences.TR.putStringProperty("tr.code.id", id);
          TrPreferences.TR.writeIniFile();
!         //        helper_=getImplHelper(id);
        }
  
      }
    }
! 
    /**
     * @see org.fudaa.fudaa.tr.common.TrLauncher#openLogFrame(java.io.File)

Index: TrEditorImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrEditorImplementation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrEditorImplementation.java	1 Jun 2004 11:27:43 -0000	1.1
--- TrEditorImplementation.java	11 Jun 2004 16:40:39 -0000	1.2
***************
*** 10,14 ****
  
  import java.awt.Component;
- import java.awt.Dimension;
  import java.awt.Frame;
  import java.awt.Image;
--- 10,13 ----
***************
*** 20,27 ****
  import java.io.FileOutputStream;
  import java.io.IOException;
- import java.util.ArrayList;
  import java.util.Map;
  
- import javax.swing.AbstractButton;
  import javax.swing.JComponent;
  import javax.swing.JFrame;
--- 19,24 ----
***************
*** 29,33 ****
  import javax.swing.JMenu;
  import javax.swing.JMenuItem;
- import javax.swing.JScrollPane;
  import javax.swing.SwingUtilities;
  
--- 26,29 ----
***************
*** 41,62 ****
  import org.fudaa.dodico.h2d.H2dFileFormatEvolutionVersion;
  import org.fudaa.dodico.h2d.type.H2dFileFormatType;
- import org.fudaa.ebli.calque.BArbreCalque;
  import org.fudaa.ebli.calque.EbliFilleCalquesInterface;
- import org.fudaa.ebli.commun.EbliPreferences;
- import org.fudaa.ebli.dialog.EbliFavoriteFiles;
  import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
  import org.fudaa.ebli.impression.EbliMiseEnPagePreferencesPanel;
- import org.fudaa.ebli.ressource.EbliResource;
  import org.fudaa.fudaa.commun.FudaaImportCsvPanel;
- import org.fudaa.fudaa.commun.FudaaPreferences;
- import org.fudaa.fudaa.fdico.FDicoPreferences;
  import org.fudaa.fudaa.ressource.FudaaResource;
  import org.fudaa.fudaa.tr.common.TrFileFormatManager;
  import org.fudaa.fudaa.tr.common.TrImplHelperAbstract;
  import org.fudaa.fudaa.tr.common.TrImplementationEditorAbstract;
- import org.fudaa.fudaa.tr.common.TrLib;
- import org.fudaa.fudaa.tr.common.TrPreferences;
  import org.fudaa.fudaa.tr.common.TrProjet;
  import org.fudaa.fudaa.tr.common.TrResource;
  import org.fudaa.fudaa.tr.telemac.TrTelemacAppliManager;
  import org.fudaa.fudaa.tr.telemac.TrTelemacExecPreferencesPanel;
--- 37,52 ----
  import org.fudaa.dodico.h2d.H2dFileFormatEvolutionVersion;
  import org.fudaa.dodico.h2d.type.H2dFileFormatType;
  import org.fudaa.ebli.calque.EbliFilleCalquesInterface;
  import org.fudaa.ebli.dialog.EbliSimpleDialogPanel;
  import org.fudaa.ebli.impression.EbliMiseEnPagePreferencesPanel;
  import org.fudaa.fudaa.commun.FudaaImportCsvPanel;
  import org.fudaa.fudaa.ressource.FudaaResource;
  import org.fudaa.fudaa.tr.common.TrFileFormatManager;
  import org.fudaa.fudaa.tr.common.TrImplHelperAbstract;
  import org.fudaa.fudaa.tr.common.TrImplementationEditorAbstract;
  import org.fudaa.fudaa.tr.common.TrProjet;
  import org.fudaa.fudaa.tr.common.TrResource;
+ import org.fudaa.fudaa.tr.reflux.TrRefluxExecPreferencesPanel;
+ import org.fudaa.fudaa.tr.reflux.TrRefluxImplHelper;
  import org.fudaa.fudaa.tr.telemac.TrTelemacAppliManager;
  import org.fudaa.fudaa.tr.telemac.TrTelemacExecPreferencesPanel;
***************
*** 64,87 ****
  
  import com.memoire.acme.AcmeGifEncoder;
- import com.memoire.bu.BuBrowserPreferencesPanel;
- import com.memoire.bu.BuColumn;
  import com.memoire.bu.BuDesktopPreferencesPanel;
  import com.memoire.bu.BuGlassPaneStop;
  import com.memoire.bu.BuInformationsDocument;
  import com.memoire.bu.BuInformationsSoftware;
  import com.memoire.bu.BuLanguagePreferencesPanel;
  import com.memoire.bu.BuLookPreferencesPanel;
- import com.memoire.bu.BuMainPanel;
  import com.memoire.bu.BuMenu;
  import com.memoire.bu.BuMenuBar;
  import com.memoire.bu.BuMenuItem;
  import com.memoire.bu.BuPreferences;
- import com.memoire.bu.BuPreferencesFrame;
  import com.memoire.bu.BuPreferencesEditorPanel;
  import com.memoire.bu.BuResource;
- import com.memoire.bu.BuScrollPane;
- import com.memoire.bu.BuSeparator;
  import com.memoire.bu.BuTaskOperation;
- import com.memoire.bu.BuTaskView;
  import com.memoire.bu.BuUserPreferencesPanel;
  import com.memoire.fu.FuLib;
--- 54,71 ----
  
  import com.memoire.acme.AcmeGifEncoder;
  import com.memoire.bu.BuDesktopPreferencesPanel;
  import com.memoire.bu.BuGlassPaneStop;
+ import com.memoire.bu.BuIcon;
  import com.memoire.bu.BuInformationsDocument;
  import com.memoire.bu.BuInformationsSoftware;
  import com.memoire.bu.BuLanguagePreferencesPanel;
  import com.memoire.bu.BuLookPreferencesPanel;
  import com.memoire.bu.BuMenu;
  import com.memoire.bu.BuMenuBar;
  import com.memoire.bu.BuMenuItem;
  import com.memoire.bu.BuPreferences;
  import com.memoire.bu.BuPreferencesEditorPanel;
  import com.memoire.bu.BuResource;
  import com.memoire.bu.BuTaskOperation;
  import com.memoire.bu.BuUserPreferencesPanel;
  import com.memoire.fu.FuLib;
***************
*** 250,258 ****
      preferences_.addTab(new BuLookPreferencesPanel(this));
      preferences_.addTab(new EbliMiseEnPagePreferencesPanel());
!     preferences_.addTab(new TrChainePreferencePanel());
!     if (getImplHelper().getSoftwareID().equals(TrTelemacImplHelper.getID())) {
        preferences_.addTab(new TrTelemacExecPreferencesPanel((TrTelemacAppliManager) launcher_
            .getCurrentImplHelper().getAppliMng()));
      }
      return preferences_;
    }
--- 234,246 ----
      preferences_.addTab(new BuLookPreferencesPanel(this));
      preferences_.addTab(new EbliMiseEnPagePreferencesPanel());
!     String soft = launcher_.getCurrentImplHelper().getSoftwareID();
!     if (soft.equals(TrTelemacImplHelper.getID())) {
        preferences_.addTab(new TrTelemacExecPreferencesPanel((TrTelemacAppliManager) launcher_
            .getCurrentImplHelper().getAppliMng()));
      }
+     else if (soft.equals(TrRefluxImplHelper.getID())) {
+       preferences_.addTab(new TrRefluxExecPreferencesPanel());
+     }
+     preferences_.addTab(new TrChainePreferencePanel());
      return preferences_;
    }
***************
*** 370,375 ****
      if (currentProject_ == null) return;
      Frame f = getFrame();
      f.setTitle(currentProject_.getSoftwareID() + ": "
!         + FuLib.reducedPath(currentProject_.getParamsFile().getAbsolutePath()));
      setEnabledForAction("FERMER", true);
      setEnabledForAction("ENREGISTRER", true);
--- 358,364 ----
      if (currentProject_ == null) return;
      Frame f = getFrame();
+     File file=currentProject_.getParamsFile();
      f.setTitle(currentProject_.getSoftwareID() + ": "
!         + (file==null?"?":FuLib.reducedPath(file.getAbsolutePath())));
      setEnabledForAction("FERMER", true);
      setEnabledForAction("ENREGISTRER", true);
***************
*** 379,383 ****
      setEnabledForAction("IMPORTER", true);
      updateImportMenu();
!     _o.active(this);
    }
  
--- 368,372 ----
      setEnabledForAction("IMPORTER", true);
      updateImportMenu();
!     _o.active();
    }
  
***************
*** 541,566 ****
      it.addActionListener(TrEditorImplementation.this);
      menuFile.add(it, indexInsert);
- 
-     //Menu aide : on enleve le superflu
-     menuFile = mb.getMenu("MENU_AIDE");
-     Component c;
-     int n = menuFile.getMenuComponentCount();
-     ArrayList temp = new ArrayList(n);
-     for (int i = 0; i < n; i++) {
-       c = menuFile.getMenuComponent(i);
-       if (c instanceof AbstractButton) {
-         String com = ((AbstractButton) c).getActionCommand();
-         if (!("ASSISTANT".equals(com)) && (!"INDEX_THEMA".equals(com)) && (!"MAJ".equals(com))
-             && (!"ASTUCE".equals(com))) {
-           temp.add(c);
-         }
-       }
-       else temp.add(c);
-     }
-     menuFile.removeAll();
-     n = temp.size();
-     for (int i = 0; i < n; i++) {
-       menuFile.add((Component) temp.get(i));
-     }
      buildTaskView();
  
--- 530,533 ----
***************
*** 686,688 ****
--- 653,662 ----
    }
  
+   protected BuIcon getSpecificIcon() {
+     return TrResource.getEditorIcon();
+   }
+ 
+   protected String getSpecificName() {
+     return TrResource.getEditorName();
+   }
  }
\ No newline at end of file

Index: TrSupervisorImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrSupervisorImplementation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TrSupervisorImplementation.java	1 Jun 2004 11:27:43 -0000	1.1
--- TrSupervisorImplementation.java	11 Jun 2004 16:40:39 -0000	1.2
***************
*** 8,12 ****
  package org.fudaa.fudaa.tr;
  
- import java.awt.Frame;
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
--- 8,11 ----
***************
*** 19,22 ****
--- 18,22 ----
  
  import org.fudaa.ebli.dialog.EbliFavoriteFiles;
+ import org.fudaa.fudaa.commun.FudaaLib;
  import org.fudaa.fudaa.ressource.FudaaResource;
  import org.fudaa.fudaa.tr.common.TrApplicationManager;
***************
*** 25,28 ****
--- 25,30 ----
  import org.fudaa.fudaa.tr.common.TrLauncher;
  import org.fudaa.fudaa.tr.common.TrResource;
+ import org.fudaa.fudaa.tr.reflux.TrRefluxExecPreferencesPanel;
+ import org.fudaa.fudaa.tr.reflux.TrRefluxImplHelper;
  import org.fudaa.fudaa.tr.telemac.TrTelemacAppliManager;
  import org.fudaa.fudaa.tr.telemac.TrTelemacExecPreferencesPanel;
***************
*** 30,33 ****
--- 32,36 ----
  
  import com.memoire.bu.BuDynamicMenu;
+ import com.memoire.bu.BuIcon;
  import com.memoire.bu.BuInformationsSoftware;
  import com.memoire.bu.BuLanguagePreferencesPanel;
***************
*** 47,50 ****
--- 50,61 ----
  public class TrSupervisorImplementation extends TrCommonImplementation implements Observer {
  
+   /**
+    * @see org.fudaa.fudaa.tr.common.TrCommonImplementation#getSpecificHtmlHelp()
+    */
+   public String getSpecificHtmlHelp() {
+     if (FudaaLib.isLocalFrench()) { return "pt02.html"; }
+     return "pt02.en.html";
+   }
+ 
    protected void ouvrir() {}
  
***************
*** 89,97 ****
      BuMenu r = new BuMenu(BuResource.BU.getString("Aide"), "MENU_AIDE");
      r.setIcon(null);
      r.addMenuItem(BuResource.BU.getString("Page principale"), "AIDE_INDEX", true, KeyEvent.VK_F1);
      r.addMenuItem(BuResource.BU.getString("A propos de..."), "APROPOSDE", true);
      r.addMenuItem(BuResource.BU.getString("Licence..."), "TEXTE_LICENCE", true);
      r.addMenuItem(BuResource.BU.getString("Site WWW"), "WWW_ACCUEIL", true);
!     r.addMenuItem(BuResource.BU.getString("Mise à jour"), "MAJ", false);
      r.addActionListener(_l);
      return r;
--- 100,109 ----
      BuMenu r = new BuMenu(BuResource.BU.getString("Aide"), "MENU_AIDE");
      r.setIcon(null);
+     r.add(buildAideContextItem(_l));
      r.addMenuItem(BuResource.BU.getString("Page principale"), "AIDE_INDEX", true, KeyEvent.VK_F1);
      r.addMenuItem(BuResource.BU.getString("A propos de..."), "APROPOSDE", true);
      r.addMenuItem(BuResource.BU.getString("Licence..."), "TEXTE_LICENCE", true);
      r.addMenuItem(BuResource.BU.getString("Site WWW"), "WWW_ACCUEIL", true);
!     r.addMenuItem(BuResource.BU.getString("Mise à jour"), "MAJ", true);
      r.addActionListener(_l);
      return r;
***************
*** 122,127 ****
      r.addMenuItem(BuResource.BU.getString("Préférences"), "PREFERENCE", true, KeyEvent.VK_F2)
          .addActionListener(_l);
!     r.addMenuItem(FudaaResource.getS("Modifier les applications externes"), "MANAGER", true)
!         .addActionListener(_l);
      return r;
    }
--- 134,141 ----
      r.addMenuItem(BuResource.BU.getString("Préférences"), "PREFERENCE", true, KeyEvent.VK_F2)
          .addActionListener(_l);
!     r.addMenuItem(FudaaResource.getS("Modifier les applications externes"), "MANAGER",
!         BuResource.BU.getIcon("vide"), true).addActionListener(_l);
!     r.addMenuItem(FudaaResource.getS("Console"), "CONSOLE", FudaaResource.FUDAA.getIcon("tail"),
!         false).addActionListener(_l);
      return r;
    }
***************
*** 133,140 ****
      r.addTab(new BuLookPreferencesPanel(this));
      r.addTab(new TrChainePreferencePanel());
!     if (launcher_.getCurrentImplHelper().getSoftwareID().equals(TrTelemacImplHelper.getID())) {
        r.addTab(new TrTelemacExecPreferencesPanel((TrTelemacAppliManager) launcher_
            .getCurrentImplHelper().getAppliMng()));
      }
      return r;
    }
--- 147,158 ----
      r.addTab(new BuLookPreferencesPanel(this));
      r.addTab(new TrChainePreferencePanel());
!     String soft = launcher_.getCurrentImplHelper().getSoftwareID();
!     if (soft.equals(TrTelemacImplHelper.getID())) {
        r.addTab(new TrTelemacExecPreferencesPanel((TrTelemacAppliManager) launcher_
            .getCurrentImplHelper().getAppliMng()));
      }
+     else if (soft.equals(TrRefluxImplHelper.getID())) {
+       r.addTab(new TrRefluxExecPreferencesPanel());
+     }
      return r;
    }
***************
*** 175,180 ****
      content_.revalidate();
      main_toolbar_.removeAll();
-     setEnabledForAction("PREFERENCE", true);
-     setEnabledForAction("QUITTER", true);
      BuMenuBar mb = getMainMenuBar();
      mb.removeAll();
--- 193,196 ----
***************
*** 184,187 ****
--- 200,204 ----
      appliMenu_ = new TrAppliMainMenu();
      mb.add(appliMenu_);
+     mb.add(explorer_.getFavoriteMenu());
      mb.add(buildHelpMenu(this));
      mb.computeMnemonics();
***************
*** 222,228 ****
    public void start() {
      super.start();
!     Frame f = getFrame();
!     f.setTitle(TrResource.getSupervisorName());
!     f.setIconImage(TrResource.getSupervisorIcon().getImage());
    }
  
--- 239,243 ----
    public void start() {
      super.start();
! 
    }
  
***************
*** 235,237 ****
--- 250,259 ----
    }
  
+   protected BuIcon getSpecificIcon() {
+     return TrResource.getSupervisorIcon();
+   }
+ 
+   protected String getSpecificName() {
+     return TrResource.getSupervisorName();
+   }
  }
\ No newline at end of file