[Fudaa-svn-commit] SF.net SVN: fudaa:[5731] trunk/business/fudaa-sig/src/main/java/org/fudaa/ fudaa/sig/wizard

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

Revision: 5731
          http://fudaa.svn.sourceforge.net/fudaa/?rev=5731&view=rev
Author:   deniger
Date:     2010-03-28 20:48:46 +0000 (Sun, 28 Mar 2010)

Log Message:
-----------


Modified Paths:
--------------
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigVariableInterpolator.java
    trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileModel.java

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigVariableInterpolator.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigVariableInterpolator.java	2010-03-28 20:48:32 UTC (rev 5730)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigVariableInterpolator.java	2010-03-28 20:48:46 UTC (rev 5731)
@@ -160,7 +160,7 @@
 
   public void process(final CtuluAnalyze _analyse, final BitSet _set, final ProgressionInterface _prog) {
     stop_ = false;
-    final FSigVarAttrMapperTableModel.MapperResult res = tableModel_.getResult();
+    final FSigVarAttrMapperTableModel.MapperResult res = getAttModel().getResult();
     final boolean isElt = target_.isElementVar();
     final int nbObj = isElt ? target_.getGrid().getEltNb() : target_.getGrid().getPtsNb();
     final BitSet objectSet = _set == null ? new BitSet(nbObj) : _set;

Modified: trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileModel.java
===================================================================
--- trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileModel.java	2010-03-28 20:48:32 UTC (rev 5730)
+++ trunk/business/fudaa-sig/src/main/java/org/fudaa/fudaa/sig/wizard/FSigWizardFileModel.java	2010-03-28 20:48:46 UTC (rev 5731)
@@ -4,8 +4,14 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.swing.JFileChooser;
+
+import org.fudaa.ctulu.CtuluLib;
 import org.fudaa.ctulu.CtuluLibString;
+import org.fudaa.ctulu.gui.CtuluCellFileEditor;
 import org.fudaa.ctulu.gui.CtuluDialogPanel;
+import org.fudaa.ctulu.gui.CtuluFileChooser;
+import org.fudaa.ctulu.gui.CtuluLibSwing;
 import org.fudaa.ctulu.gui.CtuluListEditorModel;
 import org.fudaa.fudaa.commun.impl.FudaaImportCsvPanel;
 import org.fudaa.fudaa.sig.FSigLib;
@@ -40,21 +46,15 @@
   final BuFileFilter csv_;
 
   protected FSigFileLoaderI createModel(final BuFileFilter _f) {
-    if (_f == null) {
-      return null;
-    }
+    if (_f == null) { return null; }
     return ((FSigFileLoaderI) fmtLoader_.get(_f)).createNew();
   }
 
   BuFileFilter guessFmt(final File _f) {
     for (int i = 0; i < filters_.length; i++) {
-      if (csv_ != filters_[i] && filters_[i].accept(_f)) {
-        return filters_[i];
-      }
+      if (csv_ != filters_[i] && filters_[i].accept(_f)) { return filters_[i]; }
     }
-    if (_f != null && (_f.getName().endsWith(".txt") || _f.getName().endsWith(".csv"))) {
-      return csv_;
-    }
+    if (_f != null && (_f.getName().endsWith(".txt") || _f.getName().endsWith(".csv"))) { return csv_; }
     return null;
   }
 
@@ -142,6 +142,20 @@
     return _columnIndex > 0;
   }
 
+  CtuluFileChooser fileChooser;
+
+  @Override
+  public Object createNewObject() {
+    if (fileChooser == null) {
+      fileChooser = new CtuluFileChooser(false);
+    }
+    fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
+    fileChooser.setMultiSelectionEnabled(false);
+    final int r = fileChooser.showOpenDialog(CtuluLibSwing.getActiveWindow());
+    if (r == JFileChooser.APPROVE_OPTION) { return fileChooser.getSelectedFile(); }
+    return null;
+  }
+
   public void setValueAt(final Object _value, final int _rowIndex, final int _columnIndex) {
     if (_columnIndex == 2) {
       final FSigFileLoaderI loader = (FSigFileLoaderI) fileData_.get(getValueAt(_rowIndex));
@@ -165,12 +179,15 @@
       } else if (_value instanceof String) {
         f = new File((String) _value);
       }
-      final File old = (File) getValueAt(_rowIndex);
-      if (!old.equals(f)) {
-        fileData_.remove(old);
-        super.setValueAt(f, _rowIndex, _columnIndex);
-        setValueAt(guessFmt(f), _rowIndex, _columnIndex + 1);
+      if (getValueAt(_rowIndex) instanceof File) {
+        final File old = (File) getValueAt(_rowIndex);
+        if (!old.equals(f)) {
+          fileData_.remove(old);
+
+        }
       }
+      super.setValueAt(f, _rowIndex, _columnIndex);
+      setValueAt(guessFmt(f), _rowIndex, _columnIndex + 1);
     }
   }
 
@@ -189,9 +206,7 @@
 
     reader.setNumeric(true);
     pn.setReader(reader);
-    if (CtuluDialogPanel.isOkResponse(pn.afficheModale(BuLib.HELPER))) {
-      return pn.buildOption();
-    }
+    if (CtuluDialogPanel.isOkResponse(pn.afficheModale(BuLib.HELPER))) { return pn.buildOption(); }
     return null;
   }
 }
\ No newline at end of file


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