[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/navmer NavmerFilleTableauResultats.java,1.5,1.6 NavmerImplementation.java,1.6,1.7

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

Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/navmer
In directory sc8-pr-cvs1:/tmp/cvs-serv29179/org/fudaa/fudaa/navmer

Modified Files:
	NavmerFilleTableauResultats.java NavmerImplementation.java 
Log Message:
Maj general


Index: NavmerFilleTableauResultats.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/navmer/NavmerFilleTableauResultats.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** NavmerFilleTableauResultats.java	25 Nov 2003 10:13:59 -0000	1.5
--- NavmerFilleTableauResultats.java	12 Dec 2003 11:29:40 -0000	1.6
***************
*** 20,23 ****
--- 20,24 ----
  import org.fudaa.ebli.graphe.*;
  import org.fudaa.ebli.geometrie.*;
+ import org.fudaa.ebli.tableau.*;
  import org.fudaa.ebli.calque.*;
  /**
***************
*** 28,32 ****
   * @author       Nicolas Maillot
   */
! public class NavmerFilleTableauResultats extends FudaaFilleTableau {
    NavmerImplementation imp_;
    BuButton btOptions_= null;
--- 29,33 ----
   * @author       Nicolas Maillot
   */
! public class NavmerFilleTableauResultats extends EbliFilleTableau {
    NavmerImplementation imp_;
    BuButton btOptions_= null;

Index: NavmerImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/navmer/NavmerImplementation.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** NavmerImplementation.java	25 Nov 2003 10:13:59 -0000	1.6
--- NavmerImplementation.java	12 Dec 2003 11:29:40 -0000	1.7
***************
*** 19,22 ****
--- 19,23 ----
  import org.fudaa.ebli.geometrie.*;
  import org.fudaa.ebli.ressource.*;
+ import org.fudaa.ebli.tableau.*;
  import org.fudaa.ebli.trace.*;
  import org.fudaa.dodico.navmer.*;
***************
*** 1253,1257 ****
      } else
        tab= (boolean[])projet_.getParam("colonnesres");
!     FudaaFilleTableau ff=
        new NavmerFilleTableauResultats(
          this,
--- 1254,1258 ----
      } else
        tab= (boolean[])projet_.getParam("colonnesres");
!     EbliFilleTableau ff=
        new NavmerFilleTableauResultats(
          this,
***************
*** 1260,1264 ****
    }
    public void cmdTableauOrdres() {
!     FudaaFilleTableau ff= new FudaaFilleTableau();
      ff.setUtiliseFormules(false);
      SParametresINI ini= (SParametresINI)projet_.getParam("ficini");
--- 1261,1265 ----
    }
    public void cmdTableauOrdres() {
!     EbliFilleTableau ff= new EbliFilleTableau();
      ff.setUtiliseFormules(false);
      SParametresINI ini= (SParametresINI)projet_.getParam("ficini");