[Fudaa-svn-commit] SF.net SVN: fudaa:[8459] trunk/soft/fudaa-mascaret/ui/src/main/java/org/ fudaa/fudaa/hydraulique1d

[<bma...@us...>]

Revision: 8459
          http://sourceforge.net/p/fudaa/svn/8459
Author:   bmarchan
Date:     2013-07-29 15:44:27 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
Mascaret : clean sources

Modified Paths:
--------------
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dGraphesResultatsEditor.java
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHMRepository.java

Removed Paths:
-------------
    trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ProfilResultats.java

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dGraphesResultatsEditor.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dGraphesResultatsEditor.java	2013-07-29 15:31:59 UTC (rev 8458)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dGraphesResultatsEditor.java	2013-07-29 15:44:27 UTC (rev 8459)
@@ -55,8 +55,6 @@
 import org.fudaa.fudaa.hydraulique1d.Hydraulique1dResource;
 import org.fudaa.fudaa.hydraulique1d.editor.profil.Hydraulique1dProfilPane;
 import org.fudaa.fudaa.hydraulique1d.graphe.Hydraulique1dGrapheResuBief;
-import org.fudaa.fudaa.hydraulique1d.ihmhelper.Hydraulique1dIHMRepository;
-import org.fudaa.fudaa.hydraulique1d.ihmhelper.Hydraulique1dIHM_ProfilResultats;
 
 import com.memoire.bu.BuCommonImplementation;
 import com.memoire.bu.BuCommonInterface;
@@ -184,8 +182,6 @@
       exporter();
     } else if ("EXCEL".equals(cmd)) {
       lanceExcel();
-    } else if ("PROFILS".equals(cmd)) {
-      profils();
     } else if ("POINTRECULERVITE".equals(cmd)) {
       deplaceVisu(-5);
     } else if ("POINTRECULER".equals(cmd)) {
@@ -414,12 +410,6 @@
 
   }
 
-  private void profils() {
-    Hydraulique1dIHM_ProfilResultats ihm = Hydraulique1dIHMRepository.getInstance().PROFIL_RESULTATS();
-
-    ihm.editer();
-  }
-
   protected void personnaliser() {
     BuCommonInterface app =
             (BuCommonInterface) Hydraulique1dBaseApplication.FRAME;

Modified: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHMRepository.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHMRepository.java	2013-07-29 15:31:59 UTC (rev 8458)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHMRepository.java	2013-07-29 15:44:27 UTC (rev 8459)
@@ -284,9 +284,6 @@
   public Hydraulique1dIHM_Planimetrage2 PLANIMETRAGE2() {
     return (Hydraulique1dIHM_Planimetrage2) getIhmHelper("Planimetrage2");
   }
-  public Hydraulique1dIHM_ProfilResultats PROFIL_RESULTATS() {
-    return (Hydraulique1dIHM_ProfilResultats) getIhmHelper("ProfilResultats");
-  }
   public Hydraulique1dIHM_Bief BIEF() {
     return (Hydraulique1dIHM_Bief) getIhmHelper("Bief");
   }

Deleted: trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ProfilResultats.java
===================================================================
--- trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ProfilResultats.java	2013-07-29 15:31:59 UTC (rev 8458)
+++ trunk/soft/fudaa-mascaret/ui/src/main/java/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ProfilResultats.java	2013-07-29 15:44:27 UTC (rev 8459)
@@ -1,60 +0,0 @@
-/*
- * @file         Hydraulique1dIHM_ProfilResultats.java
- * @creation     2004-10-18
- * @modification $Date: 2007-11-20 11:43:15 $
- * @license      GNU General Public License 2
- * @copyright    (c)1998-2004 EDF/LNHE
- * @mail         de...@fu...
- */
-package org.fudaa.fudaa.hydraulique1d.ihmhelper;
-import javax.swing.JComponent;
-
-import org.fudaa.dodico.hydraulique1d.metier.EnumMetierRegime;
-import org.fudaa.dodico.hydraulique1d.metier.MetierEtude1d;
-import org.fudaa.fudaa.hydraulique1d.Hydraulique1dBaseApplication;
-import org.fudaa.fudaa.hydraulique1d.Hydraulique1dResource;
-import org.fudaa.fudaa.hydraulique1d.editor.profil.Hydraulique1dProfilEditor;
-
-import com.memoire.bu.BuAssistant;
-/**
- * Classe faisant le lien entre l'\xE9diteur de profil depuis l'\xE9diteur des r\xE9sultats graphique et l'aide.
- * G\xE9r\xE9 par Hydraulique1dIHMRepository.<br>
- * Utilis\xE9 par Hydraulique1dGraphesResultatsEditor.<br>
- * @version      $Revision: 1.8 $ $Date: 2007-11-20 11:43:15 $ by $Author: bmarchan $
- * @author       Jean-Marc Lacombe
- */
-public class Hydraulique1dIHM_ProfilResultats extends Hydraulique1dIHM_Base {
-  private Hydraulique1dProfilEditor edit_;
-  public Hydraulique1dIHM_ProfilResultats(MetierEtude1d e) {
-    super(e);
-  }
-
-  @Override
-  public void editer() {
-    if (etude_.reseau() == null) return;
-    if (etude_.reseau().biefs() == null) return;
-
-    if (edit_ == null) {
-      edit_= new Hydraulique1dProfilEditor(
-                                           Hydraulique1dProfilEditor.VOIR,
-                                           Hydraulique1dProfilEditor.PROFILS);
-      installContextHelp(edit_);
-      listenToEditor(edit_);
-      BuAssistant ass= Hydraulique1dResource.getAssistant();
-      if (ass != null)
-        ass.addEmitters(edit_);
-    }
-    
-    edit_.setEtude(etude_);
-    edit_.setIsTranscritique(etude_.paramGeneraux().regime().value() == EnumMetierRegime._TRANSCRITIQUE);
-    edit_.show();
-  }
-  @Override
-  protected void installContextHelp(JComponent e) {
-    if (e == null)
-      return;
-    ((Hydraulique1dBaseApplication)Hydraulique1dBaseApplication.FRAME)
-      .getImplementation()
-      .installContextHelp(e.getRootPane(), "mascaret/graphes_resultats.html");
-  }
-}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.