fudaa-cvs-commit

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

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

Modified Files:
	DResultatsLido.java DParametresLido.java DCalculLido.java 
	ServeurLido.java 
Log Message:
Modif DObjets

Index: DCalculLido.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/DCalculLido.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DCalculLido.java	25 Nov 2003 10:11:40 -0000	1.7
--- DCalculLido.java	27 Apr 2004 16:04:16 -0000	1.8
***************
*** 1,3 ****
! /*
   * @file         DCalculLido.java
   * @creation     1998-11-19
--- 1,3 ----
! /**
   * @file         DCalculLido.java
   * @creation     1998-11-19
***************
*** 11,14 ****
--- 11,15 ----
  import org.fudaa.dodico.calcul.DCalcul;
  import org.fudaa.dodico.corba.calcul.SProgression;
+ import org.fudaa.dodico.corba.lido.ICalculLido;
  import org.fudaa.dodico.corba.lido.ICalculLidoOperations;
  import org.fudaa.dodico.corba.lido.IParametresLido;
***************
*** 25,29 ****
   * @author       Mickael Rubens , Axel von Arnim
   */
! public class DCalculLido extends DCalcul implements ICalculLidoOperations {
    private SProgression strOperation_;
    public DCalculLido() {
--- 26,30 ----
   * @author       Mickael Rubens , Axel von Arnim
   */
! public class DCalculLido extends DCalcul implements ICalculLido,ICalculLidoOperations {
    private SProgression strOperation_;
    public DCalculLido() {

Index: DResultatsLido.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/DResultatsLido.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DResultatsLido.java	25 Nov 2003 10:11:40 -0000	1.6
--- DResultatsLido.java	27 Apr 2004 16:04:16 -0000	1.7
***************
*** 1,3 ****
! /*
   * @file         DResultatsLido.java
   * @creation     1998-10-21
--- 1,3 ----
! /**
   * @file         DResultatsLido.java
   * @creation     1998-10-21
***************
*** 8,20 ****
   */
  package org.fudaa.dodico.lido;
! import java.io.*;
! import java.util.*;
! import java.text.*;
! import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.corba.objet.*;
! import org.fudaa.dodico.calcul.*;
! import org.fudaa.dodico.corba.calcul.*;
! import org.fudaa.dodico.fortran.*;
! import org.fudaa.dodico.corba.lido.*;
  /**
   * Les resultats Lido
--- 8,37 ----
   */
  package org.fudaa.dodico.lido;
! import java.io.EOFException;
! import java.io.File;
! import java.io.FileReader;
! import java.io.FileWriter;
! import java.io.IOException;
! import java.text.NumberFormat;
! import java.util.Calendar;
! 
! import org.fudaa.dodico.calcul.DResultats;
! import org.fudaa.dodico.corba.calcul.SProgression;
! import org.fudaa.dodico.corba.lido.IResultatsLido;
! import org.fudaa.dodico.corba.lido.IResultatsLidoOperations;
! import org.fudaa.dodico.corba.lido.SParametresCAL;
! import org.fudaa.dodico.corba.lido.SParametresLIG;
! import org.fudaa.dodico.corba.lido.SParametresLimBiefLIG;
! import org.fudaa.dodico.corba.lido.SResultatsBiefLigneRSN;
! import org.fudaa.dodico.corba.lido.SResultatsBiefRSN;
! import org.fudaa.dodico.corba.lido.SResultatsDonBiefBlocSTA;
! import org.fudaa.dodico.corba.lido.SResultatsDonBiefLigneSTA;
! import org.fudaa.dodico.corba.lido.SResultatsDonBiefTempsSTA;
! import org.fudaa.dodico.corba.lido.SResultatsERN;
! import org.fudaa.dodico.corba.lido.SResultatsRSN;
! import org.fudaa.dodico.corba.lido.SResultatsSTA;
! import org.fudaa.dodico.corba.lido.SResultatsTempRSN;
! import org.fudaa.dodico.fortran.FortranReader;
! import org.fudaa.dodico.fortran.FortranWriter;
  /**
   * Les resultats Lido
***************
*** 25,29 ****
  public class DResultatsLido
    extends DResultats
!   implements IResultatsLidoOperations {
    private static boolean DEBUG= "yes".equals(System.getProperty("fudaa.debug"));
    private SResultatsRSN resultsRSN_;
--- 42,46 ----
  public class DResultatsLido
    extends DResultats
!   implements IResultatsLido,IResultatsLidoOperations {
    private static boolean DEBUG= "yes".equals(System.getProperty("fudaa.debug"));
    private SResultatsRSN resultsRSN_;

Index: ServeurLido.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/ServeurLido.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ServeurLido.java	25 Nov 2003 10:11:41 -0000	1.5
--- ServeurLido.java	27 Apr 2004 16:04:16 -0000	1.6
***************
*** 8,16 ****
   */
  package org.fudaa.dodico.lido;
! import java.net.*;
! import java.util.*;
! import org.fudaa.dodico.corba.objet.*;
! import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.corba.lido.*;
  /**
   * Une classe serveur pour Lido
--- 8,15 ----
   */
  package org.fudaa.dodico.lido;
! import java.util.Date;
! 
! import org.fudaa.dodico.boony.BoonyLib;
! import org.fudaa.dodico.objet.CDodico;
  /**
   * Une classe serveur pour Lido
***************
*** 23,28 ****
      String nom=
        (args.length > 0 ? args[0] : CDodico.generateName("::lido::ICalculLido"));
!     DCalculLido s= new DCalculLido();
!     CDodico.rebind(nom, s.tie());
      System.out.println("Lido server running... ");
      System.out.println("Name: " + nom);
--- 22,28 ----
      String nom=
        (args.length > 0 ? args[0] : CDodico.generateName("::lido::ICalculLido"));
!     //Cas particulier : il s'agit de creer un serveur de calcul dans une jvm donne
!     //Cette Méthode n'est pas a imiter. If faut utiliser Boony pour creer des objet corba.
!     CDodico.rebind(nom, BoonyLib.createService(DCalculLido.class));
      System.out.println("Lido server running... ");
      System.out.println("Name: " + nom);

Index: DParametresLido.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/lido/DParametresLido.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DParametresLido.java	25 Nov 2003 10:11:40 -0000	1.7
--- DParametresLido.java	27 Apr 2004 16:04:16 -0000	1.8
***************
*** 1,3 ****
! /*
   * @file         DParametresLido.java
   * @creation     1998-10-19
--- 1,3 ----
! /**
   * @file         DParametresLido.java
   * @creation     1998-10-19
***************
*** 19,22 ****
--- 19,23 ----
  import java.io.OutputStreamWriter;
  import org.fudaa.dodico.calcul.DParametres;
+ import org.fudaa.dodico.corba.lido.IParametresLido;
  import org.fudaa.dodico.corba.lido.IParametresLidoOperations;
  import org.fudaa.dodico.corba.lido.SParametresApportLigneCLM;
***************
*** 65,69 ****
  public class DParametresLido
    extends DParametres
!   implements IParametresLidoOperations {
    private final static boolean DEBUG=
      "yes".equals(System.getProperty("fudaa.debug"));
--- 66,70 ----
  public class DParametresLido
    extends DParametres
!   implements IParametresLido,IParametresLidoOperations {
    private final static boolean DEBUG=
      "yes".equals(System.getProperty("fudaa.debug"));