[Fudaa-svn-commit] SF.net SVN: fudaa:[6200] trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/ fudaa/modeleur

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

Revision: 6200
          http://fudaa.svn.sourceforge.net/fudaa/?rev=6200&view=rev
Author:   bmarchan
Date:     2011-03-31 13:52:29 +0000 (Thu, 31 Mar 2011)

Log Message:
-----------
Fix : Pb Wizard d'import (pas de visibilit?\195?\169 de l'?\195?\169tape 2).

Modified Paths:
--------------
    trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlWizardImport.java
    trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlWizardImportStepDestination.java

Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlWizardImport.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlWizardImport.java	2011-03-31 08:09:35 UTC (rev 6199)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlWizardImport.java	2011-03-31 13:52:29 UTC (rev 6200)
@@ -59,7 +59,6 @@
 import com.memoire.bu.BuButtonPanel;
 import com.memoire.bu.BuGlassPaneStop;
 import com.memoire.bu.BuWizardTask;
-import com.memoire.fu.FuLog;
 
 /**
  * Un Wizard d'import de fichiers contenant des donn\xE9es g\xE9om\xE9triques sous des formats tr\xE8s divers. Ce Wizard demande
@@ -141,6 +140,7 @@
     return null;
   }
   
+  @Override
   public void doTask() {
     if(pnDest_==null)
       return;
@@ -233,7 +233,7 @@
     
     // Selection des g\xE9om\xE9tries avec la nature \\
     
-    if(_natureOrigine=="")
+    if(_natureOrigine.isEmpty())
       _modelDonnees = new GISDataModelSelectionAdapter(_modelDonnees, new Object[][]{{GISAttributeConstants.NATURE, ""}, {GISAttributeConstants.NATURE, GISDataModelSelectionAdapter.ATTRIBUT_NOT_EXIST}});
     else
       _modelDonnees = new GISDataModelSelectionAdapter(_modelDonnees, new Object[][]{{GISAttributeConstants.NATURE, _natureOrigine}});
@@ -323,6 +323,7 @@
     return 2;
   }
 
+  @Override
   public int getStepDisabledButtons() {
     return super.getStepDisabledButtons() | BuButtonPanel.DETRUIRE;
   }
@@ -349,6 +350,7 @@
     return FudaaLib.getS("Importation");
   }
 
+  @Override
   public void nextStep() {
     if (current_ == 0 && data_ == null) {
       if (dialog_ != null) {

Modified: trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlWizardImportStepDestination.java
===================================================================
--- trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlWizardImportStepDestination.java	2011-03-31 08:09:35 UTC (rev 6199)
+++ trunk/soft/fudaa-modeleur/src/main/java/org/fudaa/fudaa/modeleur/MdlWizardImportStepDestination.java	2011-03-31 13:52:29 UTC (rev 6200)
@@ -7,9 +7,9 @@
  */
 package org.fudaa.fudaa.modeleur;
 
+import com.memoire.bu.BuBorderLayout;
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -47,13 +47,13 @@
 import org.fudaa.fudaa.sig.FSigLib;
 import org.fudaa.fudaa.sig.wizard.FSigWizardImportHelper;
 
-import com.memoire.bu.BuBorderLayout;
 import com.memoire.bu.BuCheckBox;
 import com.memoire.bu.BuLabel;
 import com.memoire.bu.BuPanel;
 import com.memoire.bu.BuResource;
 import com.memoire.bu.BuScrollPane;
 import com.memoire.bu.BuVerticalLayout;
+import java.awt.Dimension;
 import org.fudaa.ctulu.table.CtuluTable;
 
 /**
@@ -97,7 +97,8 @@
       titreColonnes_ = _columnTitles;
       data_ = _data;
     }
-    
+
+    @Override
     public Class<?> getColumnClass(int columnIndex) {
       switch(columnIndex){
         case 0: return String.class;
@@ -112,6 +113,7 @@
       return titreColonnes_.length;
     }
     
+    @Override
     public String getColumnName(int _columnIndex) {
       if(_columnIndex>=0 && _columnIndex<titreColonnes_.length)
         return titreColonnes_[_columnIndex];
@@ -130,6 +132,7 @@
         return new String();
     }
     
+    @Override
     public boolean isCellEditable(int rowIndex, int columnIndex) {
       switch(columnIndex){
         case 0:  return false;
@@ -140,6 +143,7 @@
       }
     }
 
+    @Override
     public void setValueAt(Object value, int _rowIndex, int _columnIndex) {
       if (_rowIndex>=0&&_rowIndex<data_.length&&_columnIndex>=0&&_columnIndex<titreColonnes_.length) 
           data_[_rowIndex][_columnIndex] = value;
@@ -271,7 +275,7 @@
     CalqueSelectorVisitor visitor = new CalqueSelectorVisitor(ZModeleGeometry.class);
     racine_.apply(visitor);
     allDestLayers_= visitor.getSelectedCalques();
-    
+
     setLayout(new BuVerticalLayout(2, true, true));
     // Frame d'information \\
     pnInfo_ = new FSigWizardImportHelper.InfoPanel();
@@ -601,9 +605,9 @@
     return -1;
   }
   
-  public boolean isValid() {
-    return true;
-  }
+//  public boolean isValid() {
+//    return true;
+//  }
 
   /* (non-Javadoc)
    * @see javax.swing.event.CellEditorListener#editingCanceled(javax.swing.event.ChangeEvent)


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