fudaa-cvs-commit

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

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31118/src/org/fudaa/dodico/dunes

Modified Files:
	DCalculDunes.java DResultatsDunes.java DParametresDunes.java 
	ServeurDunes.java 
Removed Files:
	DTestDunes.java ServeurTestDunes.java 
Log Message:
Modif DObjets

--- ServeurTestDunes.java DELETED ---

Index: DCalculDunes.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/DCalculDunes.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DCalculDunes.java	19 Mar 2004 17:40:17 -0000	1.6
--- DCalculDunes.java	27 Apr 2004 15:59:20 -0000	1.7
***************
*** 1,3 ****
! /*
   * @file         DCalculDunes.java
   * @creation     1998-04-22
--- 1,3 ----
! /**
   * @file         DCalculDunes.java
   * @creation     1998-04-22
***************
*** 14,17 ****
--- 14,18 ----
  import org.fudaa.dodico.calcul.DCalcul;
  import org.fudaa.dodico.corba.calcul.SProgression;
+ import org.fudaa.dodico.corba.dunes.ICalculDunes;
  import org.fudaa.dodico.corba.dunes.ICalculDunesOperations;
  import org.fudaa.dodico.corba.dunes.IParametresDunes;
***************
*** 20,27 ****
  import org.fudaa.dodico.corba.dunes.IResultatsDunesHelper;
  import org.fudaa.dodico.corba.geometrie.LTypeElement;
- import org.fudaa.dodico.corba.geometrie.SElement;
- import org.fudaa.dodico.corba.geometrie.SMaillage;
- import org.fudaa.dodico.corba.geometrie.SNoeud;
- import org.fudaa.dodico.corba.geometrie.SPoint;
  import org.fudaa.dodico.corba.objet.IConnexion;
  import org.fudaa.dodico.objet.CDodico;
--- 21,24 ----
***************
*** 33,37 ****
   * @author       Sofiane Hadji , Bertrand Marchand
   */
! public class DCalculDunes extends DCalcul implements ICalculDunesOperations {
    /**
     * Structure decrivant l'etat d'avancement du calcul.
--- 30,34 ----
   * @author       Sofiane Hadji , Bertrand Marchand
   */
! public class DCalculDunes extends DCalcul implements ICalculDunes,ICalculDunesOperations {
    /**
     * Structure decrivant l'etat d'avancement du calcul.

--- DTestDunes.java DELETED ---

Index: DResultatsDunes.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/DResultatsDunes.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DResultatsDunes.java	22 Mar 2004 10:16:10 -0000	1.6
--- DResultatsDunes.java	27 Apr 2004 15:59:20 -0000	1.7
***************
*** 1,3 ****
! /*
   * @file         DResultatsDunes.java
   * @creation     1998-04-23
--- 1,3 ----
! /**
   * @file         DResultatsDunes.java
   * @creation     1998-04-23
***************
*** 8,22 ****
   */
  package org.fudaa.dodico.dunes;
  import org.fudaa.dodico.corba.dunes.IResultatsDunesOperations;
  import org.fudaa.dodico.corba.geometrie.LTypeElement;
  import org.fudaa.dodico.corba.geometrie.SMaillage;
  import org.fudaa.dodico.corba.geometrie.SNoeud;
  import org.fudaa.dodico.corba.geometrie.SPoint;
- import org.fudaa.dodico.corba.geometrie.SElement;
- import org.fudaa.dodico.objet.CDodico;
- import org.fudaa.dodico.calcul.DResultats;
  import org.fudaa.dodico.fortran.FortranReader;
! import java.io.FileReader;
! import java.io.IOException;
  /**
   * Classe d'implantation de l'interface <code>IResultatsDunes</code> gerant les
--- 8,24 ----
   */
  package org.fudaa.dodico.dunes;
+ import java.io.FileReader;
+ import java.io.IOException;
+ 
+ import org.fudaa.dodico.calcul.DResultats;
+ import org.fudaa.dodico.corba.dunes.IResultatsDunes;
  import org.fudaa.dodico.corba.dunes.IResultatsDunesOperations;
  import org.fudaa.dodico.corba.geometrie.LTypeElement;
+ import org.fudaa.dodico.corba.geometrie.SElement;
  import org.fudaa.dodico.corba.geometrie.SMaillage;
  import org.fudaa.dodico.corba.geometrie.SNoeud;
  import org.fudaa.dodico.corba.geometrie.SPoint;
  import org.fudaa.dodico.fortran.FortranReader;
! import org.fudaa.dodico.objet.CDodico;
  /**
   * Classe d'implantation de l'interface <code>IResultatsDunes</code> gerant les
***************
*** 30,34 ****
  public class DResultatsDunes
    extends DResultats
!   implements IResultatsDunesOperations {
    /**
     * Le nom du fichier (sans extenssion) genere par le code de calcul 
--- 32,36 ----
  public class DResultatsDunes
    extends DResultats
!   implements IResultatsDunes,IResultatsDunesOperations {
    /**
     * Le nom du fichier (sans extenssion) genere par le code de calcul 

Index: ServeurDunes.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/ServeurDunes.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ServeurDunes.java	25 Nov 2003 10:11:31 -0000	1.4
--- ServeurDunes.java	27 Apr 2004 15:59:20 -0000	1.5
***************
*** 8,13 ****
   */
  package org.fudaa.dodico.dunes;
- import org.fudaa.dodico.objet.CDodico;
  import java.util.Date;
  /**
   * Lance le serveur du code de calcul <code>dunes</code>.
--- 8,15 ----
   */
  package org.fudaa.dodico.dunes;
  import java.util.Date;
+ 
+ import org.fudaa.dodico.boony.BoonyLib;
+ import org.fudaa.dodico.objet.CDodico;
  /**
   * Lance le serveur du code de calcul <code>dunes</code>.
***************
*** 30,35 ****
          ? args[0]
          : CDodico.generateName("::dunes::ICalculDunes"));
!     DCalculDunes s= new DCalculDunes();
!     CDodico.rebind(nom, s.tie());
      System.out.println("Dunes server running... ");
      System.out.println("Name: " + nom);
--- 32,38 ----
          ? args[0]
          : CDodico.generateName("::dunes::ICalculDunes"));
!     //Cas particulier : il s'agit de creer un serveur de calcul dans une jvm donne
!     //Cete Méthode n'est pas a imiter. If faut utiliser Boony pour creer des objet corba.
!     CDodico.rebind(nom, BoonyLib.createService(DCalculDunes.class));
      System.out.println("Dunes server running... ");
      System.out.println("Name: " + nom);

Index: DParametresDunes.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/DParametresDunes.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DParametresDunes.java	25 Nov 2003 10:11:31 -0000	1.5
--- DParametresDunes.java	27 Apr 2004 15:59:20 -0000	1.6
***************
*** 8,23 ****
   */
  package org.fudaa.dodico.dunes;
! import org.fudaa.dodico.corba.dunes.IParametresDunesOperations;
  import org.fudaa.dodico.corba.dunes.IParametresDunes;
  import org.fudaa.dodico.corba.geometrie.SPoint;
  import org.fudaa.dodico.corba.geometrie.SPolyligne;
  import org.fudaa.dodico.corba.geometrie.SRegion;
  import org.fudaa.dodico.corba.geometrie.STrou;
- import org.fudaa.dodico.calcul.DParametres;
  import org.fudaa.dodico.fortran.FortranWriter;
- import org.fudaa.dodico.objet.CDodico;
  import org.fudaa.dodico.geometrie.SPointVecteur;
! import java.io.FileWriter;
! import java.io.IOException;
  /**
   * Classe d'implantation de l'interface <code>IParametresDunes</code> gerant
--- 8,24 ----
   */
  package org.fudaa.dodico.dunes;
! import java.io.FileWriter;
! import java.io.IOException;
! 
! import org.fudaa.dodico.calcul.DParametres;
  import org.fudaa.dodico.corba.dunes.IParametresDunes;
+ import org.fudaa.dodico.corba.dunes.IParametresDunesOperations;
  import org.fudaa.dodico.corba.geometrie.SPoint;
  import org.fudaa.dodico.corba.geometrie.SPolyligne;
  import org.fudaa.dodico.corba.geometrie.SRegion;
  import org.fudaa.dodico.corba.geometrie.STrou;
  import org.fudaa.dodico.fortran.FortranWriter;
  import org.fudaa.dodico.geometrie.SPointVecteur;
! import org.fudaa.dodico.objet.CDodico;
  /**
   * Classe d'implantation de l'interface <code>IParametresDunes</code> gerant
***************
*** 29,33 ****
  public class DParametresDunes
    extends DParametres
!   implements IParametresDunesOperations {
    private STrou[] sT_;
    private SRegion[] sR_;
--- 30,34 ----
  public class DParametresDunes
    extends DParametres
!   implements IParametresDunes,IParametresDunesOperations {
    private STrou[] sT_;
    private SRegion[] sR_;