[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/lido LidoImplementation.java,1.14,1.15

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

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

Modified Files:
	LidoImplementation.java 
Log Message:


Index: LidoImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoImplementation.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** LidoImplementation.java	5 May 2004 12:42:41 -0000	1.14
--- LidoImplementation.java	1 Jun 2004 11:27:45 -0000	1.15
***************
*** 28,71 ****
  import javax.swing.JOptionPane;
  
- import com.memoire.bu.BuApplication;
- import com.memoire.bu.BuAssistant;
- import com.memoire.bu.BuBorderLayout;
- import com.memoire.bu.BuBrowserPreferencesPanel;
- import com.memoire.bu.BuColumn;
- import com.memoire.bu.BuCommonInterface;
- import com.memoire.bu.BuDesktopPreferencesPanel;
- import com.memoire.bu.BuDialogConfirmation;
- import com.memoire.bu.BuDialogError;
- import com.memoire.bu.BuDialogMessage;
- import com.memoire.bu.BuDialogWarning;
- import com.memoire.bu.BuGlassPaneStop;
- import com.memoire.bu.BuGridLayout;
- import com.memoire.bu.BuHelpFrame;
- import com.memoire.bu.BuInformationsDocument;
- import com.memoire.bu.BuInformationsSoftware;
- import com.memoire.bu.BuLabel;
- import com.memoire.bu.BuLabelMultiLine;
- 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.BuMenuRecentFiles;
- import com.memoire.bu.BuPanel;
- import com.memoire.bu.BuPicture;
- import com.memoire.bu.BuPreferences;
- import com.memoire.bu.BuPreferencesFrame;
- import com.memoire.bu.BuProgressBar;
- import com.memoire.bu.BuResource;
- import com.memoire.bu.BuScrollPane;
- import com.memoire.bu.BuTaskOperation;
- import com.memoire.bu.BuTaskView;
- import com.memoire.bu.BuTextField;
- import com.memoire.bu.BuToolBar;
- import com.memoire.bu.BuUserPreferencesPanel;
- import com.memoire.bu.BuVerticalLayout;
- import com.memoire.fu.FuLib;
- 
- import org.fudaa.ctulu.CtuluLib;
  import org.fudaa.dodico.corba.calcul.SProgression;
  import org.fudaa.dodico.corba.lido.ICalculLido;
--- 28,31 ----
***************
*** 99,103 ****
  import org.fudaa.ebli.ressource.EbliResource;
  import org.fudaa.fudaa.commun.FudaaBrowserControl;
- import org.fudaa.fudaa.commun.FudaaCommonImplementation;
  import org.fudaa.fudaa.commun.FudaaImplementation;
  import org.fudaa.fudaa.commun.FudaaLib;
--- 59,62 ----
***************
*** 106,110 ****
  import org.fudaa.fudaa.commun.aide.FudaaAstucesDialog;
  import org.fudaa.fudaa.commun.dodico.FudaaDodicoTacheConnexion;
- import org.fudaa.fudaa.commun.dodico.FudaaDodicoSelectionServeur;
  import org.fudaa.fudaa.commun.projet.FudaaFiltreFichier;
  import org.fudaa.fudaa.commun.projet.FudaaParamChangeLog;
--- 65,68 ----
***************
*** 120,123 ****
--- 78,121 ----
  import org.fudaa.fudaa.lido.ihmhelper.gestion.LidoParamsHelper;
  import org.fudaa.fudaa.ressource.FudaaResource;
+ 
+ import com.memoire.bu.BuApplication;
+ import com.memoire.bu.BuAssistant;
+ import com.memoire.bu.BuBorderLayout;
+ import com.memoire.bu.BuBrowserPreferencesPanel;
+ import com.memoire.bu.BuColumn;
+ import com.memoire.bu.BuCommonInterface;
+ import com.memoire.bu.BuDesktopPreferencesPanel;
+ import com.memoire.bu.BuDialogConfirmation;
+ import com.memoire.bu.BuDialogError;
+ import com.memoire.bu.BuDialogMessage;
+ import com.memoire.bu.BuDialogWarning;
+ import com.memoire.bu.BuGlassPaneStop;
+ import com.memoire.bu.BuGridLayout;
+ import com.memoire.bu.BuHelpFrame;
+ import com.memoire.bu.BuInformationsDocument;
+ import com.memoire.bu.BuInformationsSoftware;
+ import com.memoire.bu.BuLabel;
+ import com.memoire.bu.BuLabelMultiLine;
+ 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.BuMenuRecentFiles;
+ import com.memoire.bu.BuPanel;
+ import com.memoire.bu.BuPicture;
+ import com.memoire.bu.BuPreferences;
+ import com.memoire.bu.BuPreferencesFrame;
+ import com.memoire.bu.BuPreferencesEditorPanel;
+ import com.memoire.bu.BuProgressBar;
+ import com.memoire.bu.BuResource;
+ import com.memoire.bu.BuScrollPane;
+ import com.memoire.bu.BuTaskOperation;
+ import com.memoire.bu.BuTaskView;
+ import com.memoire.bu.BuTextField;
+ import com.memoire.bu.BuToolBar;
+ import com.memoire.bu.BuUserPreferencesPanel;
+ import com.memoire.bu.BuVerticalLayout;
+ import com.memoire.fu.FuLib;
  /**
   * @version $Revision$ $Date$ by $Author$
***************
*** 141,145 ****
    //  private String args [] = new String [2];
    private FudaaProjet                        projet_;
-   private BuPreferencesFrame                 preferences_;
    private FudaaProjetInformationsFrame       fProprietes_;
    //ajout de l'impression
--- 139,142 ----
***************
*** 220,224 ****
        projet_ = null;
        ts_ = null;
-       preferences_ = null;
        BuInformationsSoftware infSoft = getInformationsSoftware();
        getApp().setTitle("Lido");
--- 217,220 ----
***************
*** 1402,1407 ****
    }
  
!   protected void buildPreferences() {
!     preferences_ = new BuPreferencesFrame();
      preferences_.addTab(new BuUserPreferencesPanel(this));
      preferences_.addTab(new BuDesktopPreferencesPanel(this));
--- 1398,1403 ----
    }
  
!   protected BuPreferencesEditorPanel buildPreferences() {
!     BuPreferencesEditorPanel preferences_ = new BuPreferencesEditorPanel();
      preferences_.addTab(new BuUserPreferencesPanel(this));
      preferences_.addTab(new BuDesktopPreferencesPanel(this));
***************
*** 1412,1415 ****
--- 1408,1412 ----
      preferences_.addTab(new FudaaAidePreferencesPanel(this, LidoPreferences.LIDO));
      preferences_.addTab(new EbliMiseEnPagePreferencesPanel());
+     return preferences_;
    }