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

[<emm...@us...>]

Revision: 4391
          http://fudaa.svn.sourceforge.net/fudaa/?rev=4391&view=rev
Author:   emmanuel_martin
Date:     2009-01-22 10:07:02 +0000 (Thu, 22 Jan 2009)

Log Message:
-----------
Tache #132 "Export Rubar : Simplifier pour que l'utilisateur n'ait pas a rentrer l'extension"

Modified Paths:
--------------
    branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gui/CtuluFileChooserPanel.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/rubar/io/RubarStCnFileFormat.java
    branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectExportPanel.java

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gui/CtuluFileChooserPanel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gui/CtuluFileChooserPanel.java	2009-01-21 17:30:56 UTC (rev 4390)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/ctulu/src/org/fudaa/ctulu/gui/CtuluFileChooserPanel.java	2009-01-22 10:07:02 UTC (rev 4391)
@@ -21,6 +21,11 @@
 import javax.swing.filechooser.FileFilter;
 import javax.swing.text.BadLocationException;
 
+import org.fudaa.ctulu.CtuluLib;
+import org.fudaa.ctulu.CtuluLibFile;
+
+import com.memoire.bu.BuFileFilter;
+
 import com.memoire.bu.BuBorderLayout;
 import com.memoire.bu.BuButton;
 import com.memoire.bu.BuLabel;
@@ -28,9 +33,6 @@
 import com.memoire.bu.BuTextField;
 import com.memoire.fu.FuLog;
 
-import org.fudaa.ctulu.CtuluLib;
-import org.fudaa.ctulu.CtuluLibFile;
-
 /**
  * @author Fred Deniger
  * @version $Id: CtuluFileChooserPanel.java,v 1.8 2007-02-02 11:20:11 deniger Exp $
@@ -48,6 +50,9 @@
   JTextField tf_;
 
   boolean writeMode_ = true;
+  
+  /** Le filtre selectionn\xE9. */
+  protected FileFilter selectedFilter_;
 
   protected final int getFileSelectMode() {
     return fileSelectMode_;
@@ -159,15 +164,23 @@
     final int r = writeMode_ ? fileChooser.showSaveDialog(this) : fileChooser.showOpenDialog(this);
     if (r == JFileChooser.APPROVE_OPTION) {
       final File out = fileChooser.getSelectedFile();
-      if ((initFile == null) || (!out.equals(initFile))) {
-        final String s = out.getAbsolutePath();
-        tf_.setText(s);
-      }
+      selectedFilter_=fileChooser.getFileFilter();
+      if(!selectedFilter_.accept(out)&&(selectedFilter_ instanceof BuFileFilter))
+        tf_.setText(out.getAbsolutePath()+"."+((BuFileFilter)selectedFilter_).getFirstExt());
+      else
+        tf_.setText(out.getAbsolutePath());
       fileChooserAccepted(fileChooser);
     }
 
   }
   
+  /**
+   * Retourne le filtre selectionn\xE9.
+   */
+  public FileFilter getSelectedFilter() {
+    return selectedFilter_;
+  }
+  
   protected void fileChooserAccepted(final CtuluFileChooser _fc){
   }
 

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/rubar/io/RubarStCnFileFormat.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/rubar/io/RubarStCnFileFormat.java	2009-01-21 17:30:56 UTC (rev 4390)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/dodico/src/org/fudaa/dodico/rubar/io/RubarStCnFileFormat.java	2009-01-22 10:07:02 UTC (rev 4391)
@@ -27,7 +27,7 @@
 
   public RubarStCnFileFormat() {
     super(1);
-    extensions_ = new String[] { "st", "cn", "m" };
+    extensions_ = new String[] { "st", "cn", "m", "sem" };
     super.description_ = H2dResource.getS("Fichier de sections");
     super.id_ = "RUBAR_ST";
     super.nom_ = "Rubar st";
@@ -35,7 +35,7 @@
   }
 
   public static BuFileFilter createStFilter() {
-    return new BuFileFilter(new String[] { "st" }, "Rubar st");
+    return new BuFileFilter(new String[] { "st", "cn", "sem" }, "Rubar st");
 
   }
 

Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectExportPanel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectExportPanel.java	2009-01-21 17:30:56 UTC (rev 4390)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectExportPanel.java	2009-01-22 10:07:02 UTC (rev 4391)
@@ -258,17 +258,7 @@
       setErrorText(CtuluLib.getS("Donnez un nom au fichier d'exportation"));
       return false;
     }
-    boolean bextok=false;
-    for (int i=0; i<filters_.length; i++) {
-      if (filters_[i].accept(f)) {
-        selectedFilter_=filters_[i];
-        bextok=true;
-      }
-    }
-    if (!bextok) {
-      setErrorText(TrResource.getS("Le fichier choisi a une extension inconnue"));
-      return false;
-    }
+    selectedFilter_=(BuFileFilter) pn_.getSelectedFilter();
     if (CtuluLibFile.getExtension(f.getName())==null) {
       setErrorText(CtuluLib.getS("Le fichier choisi doit avoir une extension."));
       return false;


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