[Fudaa-svn-commit] SF.net SVN: fudaa:[4253] branches/FudaaModeleur_TC1Bis/fudaa_devel

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

Revision: 4253
          http://fudaa.svn.sourceforge.net/fudaa/?rev=4253&view=rev
Author:   bmarchan
Date:     2008-12-01 10:20:16 +0000 (Mon, 01 Dec 2008)

Log Message:
-----------
Debut de mise en place des menus pour acc?\195?\168s au 1D.

Modified Paths:
--------------
    branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuCommonImplementation.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjet.java

Added Paths:
-----------
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/MdlShow1DFrameAction.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/MdlShow2DFrameAction.java

Property Changed:
----------------
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjet.java

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuCommonImplementation.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuCommonImplementation.java	2008-11-28 17:01:34 UTC (rev 4252)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/com/memoire/bu/BuCommonImplementation.java	2008-12-01 10:20:16 UTC (rev 4253)
@@ -88,6 +88,9 @@
 
   protected boolean buildMainPanel_ = true;
 
+  /** 
+   * @return Si false, le desktop n'a pas de scrollbar.
+   */
   protected boolean useScrollInBuDesktop() {
     return true;
   }

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java	2008-11-28 17:01:34 UTC (rev 4252)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java	2008-12-01 10:20:16 UTC (rev 4253)
@@ -1,6 +1,6 @@
 /**
  * @creation 12 juin 2003
- * @modification $Date: 2008-03-18 11:05:42 $
+ * @modification $Date$
  * @license GNU General Public License 2
  * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
  * @mail de...@fu...
@@ -95,7 +95,7 @@
 
 /**
  * @author deniger
- * @version $Id: FudaaCommonImplementation.java,v 1.10.4.1 2008-03-18 11:05:42 bmarchan Exp $
+ * @version $Id$
  */
 public abstract class FudaaCommonImplementation extends BuCommonImplementation implements FudaaUI {
 
@@ -220,6 +220,10 @@
     }
   }
 
+  /**
+   * Ajoute un composant d'acc\xE8s a la liste des InternalFrame a gauche du frame
+   * principal.
+   */
   protected void addFrameListLeft() {
     if (getMainPanel() != null) {
       final BuColumn left = getMainPanel().getLeftColumn();
@@ -321,7 +325,7 @@
   /**
    * Methode a surcharger pour ajouter ces propres panneaux de pref.
    */
-  protected void buildPreferences(final List _frAddTab) {
+  protected void buildPreferences(final List<BuAbstractPreferencesPanel> _frAddTab) {
     _frAddTab.add(new BuUserPreferencesPanel(this));
     _frAddTab.add(new BuLanguagePreferencesPanel(this));
     _frAddTab.add(new BuDesktopPreferencesPanel(this));


Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
___________________________________________________________________
Added: svn:keywords
   + Date Revision Author URL Id

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java	2008-11-28 17:01:34 UTC (rev 4252)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java	2008-12-01 10:20:16 UTC (rev 4253)
@@ -1,6 +1,6 @@
 /*
  * @creation 7 juin 07
- * @modification $Date: 2008/05/13 12:10:12 $
+ * @modification $Date$
  * @license GNU General Public License 2
  * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
  * @mail de...@fu...
@@ -50,6 +50,9 @@
 import org.fudaa.fudaa.commun.save.FudaaSaveLib;
 import org.fudaa.fudaa.commun.save.FudaaSaveProject;
 import org.fudaa.fudaa.commun.save.FudaaSaveZipLoader;
+import org.fudaa.fudaa.modeleur.action.MdlShow1DFrameAction;
+import org.fudaa.fudaa.modeleur.action.MdlShow2DFrameAction;
+import org.fudaa.fudaa.ressource.FudaaResource;
 import org.fudaa.fudaa.sig.FSigLib;
 import org.fudaa.fudaa.sig.FSigProjectPersistence;
 import org.fudaa.fudaa.sig.FSigResource;
@@ -58,10 +61,12 @@
 import org.fudaa.fudaa.tr.common.TrProjectPersistence;
 import org.fudaa.fudaa.tr.common.TrResource;
 
+import com.memoire.bu.BuAbstractPreferencesPanel;
 import com.memoire.bu.BuBrowserPreferencesPanel;
 import com.memoire.bu.BuColumn;
 import com.memoire.bu.BuDesktopPreferencesPanel;
 import com.memoire.bu.BuInformationsSoftware;
+import com.memoire.bu.BuInternalFrame;
 import com.memoire.bu.BuLanguagePreferencesPanel;
 import com.memoire.bu.BuLib;
 import com.memoire.bu.BuMainPanel;
@@ -82,7 +87,7 @@
  * actions, des \xE9tats de l'interface, etc.
  * 
  * @author Bertrand Marchand
- * @version $Id: MdlImplementation.java,v 1.1.2.9 2008/05/13 12:10:12 bmarchan Exp $
+ * @version $Id$
  */
 public class MdlImplementation extends FudaaCommonImplementation implements FudaaProjectStateListener {
 
@@ -127,15 +132,23 @@
     return isMdl_;
   }
 
-  MdlFille2d currentFrame_;
-  MdlProjet project_;
   public final static FileFilter FILTER = new MdlFileFilter();
 
+  /** Fenetre interne pour le modeleur 2D. */
+  MdlFille2d mdl2dFrame_;
+  /** Projet modeleur. */
+  MdlProjet project_;
+
   public MdlImplementation() {
     super();
     useNewHelp_ = false;
   }
 
+  /**
+   * Retourne le fichier s\xE9lectionn\xE9 par boite de dialogue.
+   * @param _saveDialog true : Save dialog, test si fichier existant avant ecriture.
+   * @return LE fichier, ou null si op\xE9ration abort\xE9e.
+   */
   private File chooseNewFile(boolean _saveDialog) {
     return getDestFile(chooseFile(_saveDialog));
   }
@@ -170,10 +183,20 @@
     setEnabledForAction(CtuluExportDataInterface.EXPORT_CMD, bprjOpen);
   }
 
-  void createNewInternalFrame(/*boolean _add*/) {
-    currentFrame_ = new MdlFille2d(this);
-    /*if (_add) */addInternalFrame(currentFrame_);
+  /**
+   * Creation de la vue 2D, et ajout.
+   */
+  void createNew2dFrame() {
+    mdl2dFrame_ = new MdlFille2d(this);
+    addInternalFrame(mdl2dFrame_);
   }
+  
+  /**
+   * @return La vue 2D, ou null si inexistante.
+   */
+  public MdlFille2d get2dFrame() {
+    return mdl2dFrame_;
+  }
 
   protected boolean buildExportDataToolIcon() {
     return true;
@@ -195,22 +218,25 @@
     if (project_==null) return; 
     project_.close();
     try {
-      currentFrame_.setClosed(true);
+      mdl2dFrame_.setClosed(true);
     } catch (PropertyVetoException _evt) {
       FuLog.error(_evt);
 
     }
     removeInternalFrames(getAllInternalFrames());
-//    removeInternalFrame(currentFrame_);
-    getMainMenuBar().repaint();
+    getMainMenuBar().getMenu("mnPROJECT").setVisible(false);
     project_ = null;
   }
 
+  /**
+   * Cr\xE9e un nouveau projet, la fenetre 2D si necessaire.
+   * @param _add true : Recr\xE9e la fenetre.
+   */
   protected void createProject(final boolean _add) {
     project_ = new MdlProjet();
     project_.setOpening(true);
-    if (_add) createNewInternalFrame();
-    else      ((MdlVisuPanel)currentFrame_.getVisuPanel()).initCalques(false);
+    if (_add) createNew2dFrame();
+    else      ((MdlVisuPanel)mdl2dFrame_.getVisuPanel()).initCalques(false);
     project_.install(this);
     BuLib.invokeLater(new Runnable() {
 
@@ -219,7 +245,7 @@
 //        changeSaveActions(false);
         updateActionsState();
         project_.setSaved();
-        getMainMenuBar().repaint();
+        getMainMenuBar().getMenu("mnPROJECT").setVisible(true);
       }
     });
   }
@@ -293,6 +319,9 @@
     return true;
   }
 
+  /**
+   * Action "Creer" un nouveau projet.
+   */
   public void create() {
     saveAndCloseProjet(new Runnable() {
       public void run() {
@@ -301,6 +330,9 @@
     });
   }
   
+  /**
+   * Action "Fermer" le projet en cours.
+   */
   public void close() {
     saveAndCloseProjet(null);
     updateActionsState();
@@ -319,7 +351,7 @@
   }
 
   /**
-   * Ouvre un nouveau projet. Peut demander la sauvegarde du projet pr\xE9c\xE9demment ouvert si
+   * Action "Ouvrir" un nouveau projet. Peut demander la sauvegarde du projet pr\xE9c\xE9demment ouvert si
    * existant.
    * @param _f Le fichier projet \xE0 ouvrir. null, si le fichier doit etre choisi par l'utilisateur.
    */
@@ -353,7 +385,7 @@
             BuInformationsSoftware is=FudaaSaveProject.getSoftwareInfos(loader);
             FuLog.warning("File version : "+(is.version==null ? "Undefined":is.version));
             
-            r= FudaaSaveLib.restoreFille(MdlImplementation.this, currentFrame_, _proj,loader);
+            r= FudaaSaveLib.restoreFille(MdlImplementation.this, mdl2dFrame_, _proj,loader);
           } catch (final IOException _evt) {
             FuLog.error(_evt);
 
@@ -368,7 +400,7 @@
 
             public void run() {
               try {
-                addInternalFrame(currentFrame_);
+                addInternalFrame(mdl2dFrame_);
                 if (swingRun != null) swingRun.run();
 
                 // le projet a ete install\xE9: on enl\xE8ve les flag de modification
@@ -395,6 +427,9 @@
     }.run();
   }
 
+  /**
+   * Action "Enregistrer" le projet.
+   */
   public void save() {
     if (project_.getParamsFile() != null) {
       CtuluRunnable act = new CtuluRunnable(FudaaSaveLib.getActionSaveTitle(), this) {
@@ -413,6 +448,9 @@
       saveAs();
   }
 
+  /**
+   * Action "Enregistrer sous" le projet.
+   */
   public void saveAs() {
     final File f = chooseNewFile(true);
     if (f == null) return;
@@ -452,7 +490,7 @@
 // Probable pb de deadlock.
 //        createTask.start(new Runnable() {
 //          public void run() {
-            FudaaSaveLib.restoreAndLaunch(MdlImplementation.this, currentFrame_, createTask.getStateReceiver(), loader);
+            FudaaSaveLib.restoreAndLaunch(MdlImplementation.this, mdl2dFrame_, createTask.getStateReceiver(), loader);
 //          }
 //        });
 
@@ -532,11 +570,24 @@
       }
     };
   }
+  
+  /**
+   * Construit le menu projet.
+   * @return Le menu projet.
+   */
+  protected BuMenu buildProjectMenu() {
+    BuMenu mn=new BuMenu(FudaaResource.FUDAA.getString("Projet"),"mnPROJECT");
+    mn.add(new MdlShow2DFrameAction(this));
+//    mnProject.add(new MdlShow1DFrameAction(this));
+    
+    mn.setVisible(false);
+    return mn;
+  }
 
   /**
    * Methode surcharg\xE9e pour les panneau de pr\xE9f\xE9rence.
    */
-  protected void buildPreferences(final List _frAddTab) {
+  protected void buildPreferences(final List<BuAbstractPreferencesPanel> _frAddTab) {
     _frAddTab.add(new BuUserPreferencesPanel(this));
     _frAddTab.add(new BuLanguagePreferencesPanel(this));
     _frAddTab.add(new BuDesktopPreferencesPanel(this));
@@ -648,6 +699,9 @@
     super.initExportDataButton(itExportData);
     mnExport.add(itExportData);
     
+    BuMenu mnProject=buildProjectMenu();
+    mb.addMenu(mnProject);
+    
 /*    setEnabledForAction("RANGERICONES", true);
     if (!isSupervisor()) {
       final JComponent cp = getMainPanel().getMiddleComponent();


Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java
___________________________________________________________________
Added: svn:keywords
   + Date Revision Author URL Id

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjet.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjet.java	2008-11-28 17:01:34 UTC (rev 4252)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjet.java	2008-12-01 10:20:16 UTC (rev 4253)
@@ -1,6 +1,6 @@
 /*
  * @creation 7 juin 07
- * @modification $Date: 2008/02/01 14:39:36 $
+ * @modification $Date$
  * @license GNU General Public License 2
  * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
  * @mail de...@fu...
@@ -27,7 +27,7 @@
 /**
  * Une implementation de l'interface projet pour le modeleur.
  * @author Bertrand Marchand
- * @version $Id: MdlProjet.java,v 1.1.2.1 2008/02/01 14:39:36 bmarchan Exp $
+ * @version $Id$
  */
 public class MdlProjet implements FSigProjet, Observer {
   BuInformationsDocument doc_ = new BuInformationsDocument();
@@ -99,7 +99,7 @@
   boolean isInstalled_;
 
   public void install(MdlImplementation _impl) {
-    _impl.currentFrame_.getArbreCalqueModel().getObservable().addObserver(this);
+    _impl.get2dFrame().getArbreCalqueModel().getObservable().addObserver(this);
     state_.addListener(new FudaaProjectStateFrameListener(_impl.getFrame(), this));
     state_.addListener(_impl);
     state_.clearStates();


Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjet.java
___________________________________________________________________
Added: svn:keywords
   + Date Revision Author URL Id

Added: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/MdlShow1DFrameAction.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/MdlShow1DFrameAction.java	                        (rev 0)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/MdlShow1DFrameAction.java	2008-12-01 10:20:16 UTC (rev 4253)
@@ -0,0 +1,35 @@
+/*
+ *  @creation     1 avr. 2005
+ *  @modification $Date$
+ *  @license      GNU General Public License 2
+ *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.fudaa.modeleur.action;
+
+import java.awt.event.ActionEvent;
+
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.ebli.ressource.EbliResource;
+import org.fudaa.fudaa.modeleur.MdlImplementation;
+
+/**
+ * Une action pour visualiser la fenetre 2D.
+ * @author Bertrand Marchand
+ * @version $Id$
+ */
+public class MdlShow1DFrameAction extends EbliActionSimple {
+  MdlImplementation impl_;
+
+  /**
+   * @param _m l'arbre des calques
+   */
+  public MdlShow1DFrameAction(MdlImplementation _impl) {
+    super(EbliResource.EBLI.getString("Vue 1D"), null, "VUE1D");
+    impl_=_impl;
+  }
+
+  public void actionPerformed(final ActionEvent _e) {
+    impl_.warn("Pas impl\xE9ment\xE9","La fenetre 1D est a venir...");
+  }
+}


Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/MdlShow1DFrameAction.java
___________________________________________________________________
Added: svn:keywords
   + Date Revision Author URL Id
Added: svn:eol-style
   + native

Added: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/MdlShow2DFrameAction.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/MdlShow2DFrameAction.java	                        (rev 0)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/MdlShow2DFrameAction.java	2008-12-01 10:20:16 UTC (rev 4253)
@@ -0,0 +1,35 @@
+/*
+ *  @creation     1 avr. 2005
+ *  @modification $Date$
+ *  @license      GNU General Public License 2
+ *  @copyright    (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.fudaa.modeleur.action;
+
+import java.awt.event.ActionEvent;
+
+import org.fudaa.ebli.commun.EbliActionSimple;
+import org.fudaa.ebli.ressource.EbliResource;
+import org.fudaa.fudaa.modeleur.MdlImplementation;
+
+/**
+ * Une action pour visualiser la fenetre 2D.
+ * @author Bertrand Marchand
+ * @version $Id$
+ */
+public class MdlShow2DFrameAction extends EbliActionSimple {
+  MdlImplementation impl_;
+
+  /**
+   * @param _m l'arbre des calques
+   */
+  public MdlShow2DFrameAction(MdlImplementation _impl) {
+    super(EbliResource.EBLI.getString("Vue 2D"), null, "VUE2D");
+    impl_=_impl;
+  }
+
+  public void actionPerformed(final ActionEvent _e) {
+    impl_.activateInternalFrame(impl_.get2dFrame());
+  }
+}


Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/MdlShow2DFrameAction.java
___________________________________________________________________
Added: svn:keywords
   + Date Revision Author URL Id
Added: svn:eol-style
   + native


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