fudaa-cvs-commit

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

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

Modified Files:
	Serveur.java DGenerationJournaliereAleatoire.java 
	DEcluseMaritime.java DEcluseFluviale.java DNavireType.java 
	DBassin.java DGenerationJournaliereDeterministe.java 
	DReseauMaritime.java NavigationLib.java DOuvrage.java 
	ComparateurGeneration.java ComparateurCreneau.java 
Log Message:
Changement des classes OLB en Olb
Reintegration du package usine

Index: DReseauMaritime.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DReseauMaritime.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DReseauMaritime.java	27 Apr 2004 16:05:37 -0000	1.5
--- DReseauMaritime.java	30 Apr 2004 07:18:34 -0000	1.6
***************
*** 10,16 ****
  //java
  import java.io.Serializable;
! //dodico
! import org.fudaa.dodico.corba.navigation.*;
! import org.fudaa.dodico.objet.*;
  /**
   * navigation:description d'un reseau maritime.
--- 10,18 ----
  //java
  import java.io.Serializable;
! 
! import org.fudaa.dodico.corba.navigation.IMaree;
! import org.fudaa.dodico.corba.navigation.IReseauMaritime;
! import org.fudaa.dodico.corba.navigation.IReseauMaritimeOperations;
! import org.fudaa.dodico.objet.DObjet;
  /**
   * navigation:description d'un reseau maritime.

Index: ComparateurGeneration.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/ComparateurGeneration.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ComparateurGeneration.java	25 Nov 2003 10:11:44 -0000	1.4
--- ComparateurGeneration.java	30 Apr 2004 07:18:34 -0000	1.5
***************
*** 10,17 ****
  //java
  import java.util.Comparator;
! import java.lang.Math;
! import org.omg.CORBA.Object;
! //dodico
! import org.fudaa.dodico.corba.navigation.*;
  /**
   * ComparateurGeneration:compare 2 generations regulieres.
--- 10,20 ----
  //java
  import java.util.Comparator;
! 
! import org.fudaa.dodico.corba.navigation.IGeneration;
! import org.fudaa.dodico.corba.navigation.IGenerationDeterministe;
! import org.fudaa.dodico.corba.navigation.IGenerationDeterministeHelper;
! import org.fudaa.dodico.corba.navigation.IGenerationHelper;
! import org.fudaa.dodico.corba.navigation.IGenerationJournaliere;
! import org.fudaa.dodico.corba.navigation.IGenerationJournaliereHelper;
  /**
   * ComparateurGeneration:compare 2 generations regulieres.

Index: Serveur.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/Serveur.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Serveur.java	25 Nov 2003 10:11:45 -0000	1.5
--- Serveur.java	30 Apr 2004 07:18:33 -0000	1.6
***************
*** 10,13 ****
--- 10,14 ----
  //java
  import java.util.Date;
+ 
  import org.fudaa.dodico.objet.CDodico;
  /**

Index: ComparateurCreneau.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/ComparateurCreneau.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ComparateurCreneau.java	25 Nov 2003 10:11:44 -0000	1.4
--- ComparateurCreneau.java	30 Apr 2004 07:18:34 -0000	1.5
***************
*** 10,16 ****
  //java
  import java.util.Comparator;
! import org.omg.CORBA.Object;
! //dodico
! import org.fudaa.dodico.corba.navigation.*;
  /**
   * ComparateurCreneau:compare 2 creneaux.
--- 10,16 ----
  //java
  import java.util.Comparator;
! 
! import org.fudaa.dodico.corba.navigation.ICreneau;
! import org.fudaa.dodico.corba.navigation.ICreneauHelper;
  /**
   * ComparateurCreneau:compare 2 creneaux.

Index: NavigationLib.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/NavigationLib.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NavigationLib.java	25 Nov 2003 10:11:45 -0000	1.4
--- NavigationLib.java	30 Apr 2004 07:18:34 -0000	1.5
***************
*** 8,19 ****
   */
  package org.fudaa.dodico.navigation;
! import com.memoire.fu.FuLib;
  import com.memoire.fu.FuVectorlong;
! //java
! import java.util.*;
! //dodico
! import org.fudaa.dodico.corba.navigation.*;
! import org.fudaa.dodico.corba.objet.*;
! import org.fudaa.dodico.objet.*;
  /**
   * Methodes generales utilisees par les objets metiers de navigation.
--- 8,32 ----
   */
  package org.fudaa.dodico.navigation;
! import java.util.Arrays;
! import java.util.TimeZone;
! 
  import com.memoire.fu.FuVectorlong;
! 
! import org.fudaa.dodico.corba.navigation.ICreneau;
! import org.fudaa.dodico.corba.navigation.IDureesEntreeSortie;
! import org.fudaa.dodico.corba.navigation.IGare;
! import org.fudaa.dodico.corba.navigation.IGeneration;
! import org.fudaa.dodico.corba.navigation.IGenerationDeterministe;
! import org.fudaa.dodico.corba.navigation.IGenerationDeterministeHelper;
! import org.fudaa.dodico.corba.navigation.IGenerationJournaliere;
! import org.fudaa.dodico.corba.navigation.IGenerationJournaliereAleatoire;
! import org.fudaa.dodico.corba.navigation.IGenerationJournaliereAleatoireHelper;
! import org.fudaa.dodico.corba.navigation.IGenerationJournaliereHelper;
! import org.fudaa.dodico.corba.navigation.INavireType;
! import org.fudaa.dodico.corba.navigation.IOuvrage;
! import org.fudaa.dodico.corba.navigation.IOuvrageEntreGares;
! import org.fudaa.dodico.corba.navigation.ITrajet;
! import org.fudaa.dodico.corba.navigation.ITrajetFluvial;
! import org.fudaa.dodico.corba.objet.IObjet;
  /**
   * Methodes generales utilisees par les objets metiers de navigation.

Index: DEcluseFluviale.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DEcluseFluviale.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DEcluseFluviale.java	27 Apr 2004 16:05:37 -0000	1.6
--- DEcluseFluviale.java	30 Apr 2004 07:18:33 -0000	1.7
***************
*** 8,17 ****
   */
  package org.fudaa.dodico.navigation;
- import org.fudaa.dodico.boony.BoonyLib;
- import org.fudaa.dodico.corba.boony.IUsine;
  import org.fudaa.dodico.corba.navigation.IDureesManoeuvresEcluseFluviale;
  import org.fudaa.dodico.corba.navigation.IEcluseFluviale;
  import org.fudaa.dodico.corba.navigation.IEcluseFluvialeOperations;
  import org.fudaa.dodico.corba.navigation.INavireType;
  /**
   * Navigation fluviale: definition d'une ecluse fluviale. Une ecluse dispose de
--- 8,17 ----
   */
  package org.fudaa.dodico.navigation;
  import org.fudaa.dodico.corba.navigation.IDureesManoeuvresEcluseFluviale;
  import org.fudaa.dodico.corba.navigation.IEcluseFluviale;
  import org.fudaa.dodico.corba.navigation.IEcluseFluvialeOperations;
  import org.fudaa.dodico.corba.navigation.INavireType;
+ import org.fudaa.dodico.corba.usine.IUsine;
+ import org.fudaa.dodico.objet.UsineLib;
  /**
   * Navigation fluviale: definition d'une ecluse fluviale. Une ecluse dispose de
***************
*** 311,315 ****
        return retour.toString();
      }
!     IUsine usine= BoonyLib.findUsine();
      if (usine == null) {
        return "\nUsine non trouvée";
--- 311,315 ----
        return retour.toString();
      }
!     IUsine usine= UsineLib.findUsine();
      if (usine == null) {
        return "\nUsine non trouvée";

Index: DOuvrage.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DOuvrage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DOuvrage.java	27 Apr 2004 16:05:37 -0000	1.6
--- DOuvrage.java	30 Apr 2004 07:18:34 -0000	1.7
***************
*** 11,20 ****
  import java.io.Serializable;
  
- import org.fudaa.dodico.boony.BoonyLib;
- import org.fudaa.dodico.corba.boony.IUsine;
  import org.fudaa.dodico.corba.navigation.ICreneau;
  import org.fudaa.dodico.corba.navigation.IOuvrage;
  import org.fudaa.dodico.corba.navigation.IOuvrageOperations;
  import org.fudaa.dodico.objet.DObjet;
  /**
   * navigation: classe de factorisation pour les ouvrages.
--- 11,20 ----
  import java.io.Serializable;
  
  import org.fudaa.dodico.corba.navigation.ICreneau;
  import org.fudaa.dodico.corba.navigation.IOuvrage;
  import org.fudaa.dodico.corba.navigation.IOuvrageOperations;
+ import org.fudaa.dodico.corba.usine.IUsine;
  import org.fudaa.dodico.objet.DObjet;
+ import org.fudaa.dodico.objet.UsineLib;
  /**
   * navigation: classe de factorisation pour les ouvrages.
***************
*** 179,183 ****
      long _heureDebut,
      long _heureFin) {
!     IUsine usine= BoonyLib.findUsine();
      if (usine == null) {
        return "\nUsine non trouvée";
--- 179,183 ----
      long _heureDebut,
      long _heureFin) {
!     IUsine usine= UsineLib.findUsine();
      if (usine == null) {
        return "\nUsine non trouvée";
***************
*** 299,303 ****
     */
    public String ajouteCreneauConstant(long _heureDebut, long _heureFin) {
!     IUsine usine= BoonyLib.findUsine();
      if (usine == null) {
        return "\nUsine non trouvée";
--- 299,303 ----
     */
    public String ajouteCreneauConstant(long _heureDebut, long _heureFin) {
!     IUsine usine= UsineLib.findUsine();
      if (usine == null) {
        return "\nUsine non trouvée";

Index: DGenerationJournaliereDeterministe.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DGenerationJournaliereDeterministe.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DGenerationJournaliereDeterministe.java	27 Apr 2004 16:05:37 -0000	1.5
--- DGenerationJournaliereDeterministe.java	30 Apr 2004 07:18:34 -0000	1.6
***************
*** 8,15 ****
   */
  package org.fudaa.dodico.navigation;
- import java.util.*;
  import com.memoire.fu.FuVectorlong;
! import org.fudaa.dodico.corba.navigation.*;
! import org.fudaa.dodico.objet.*;
  /**
   * Loi deterministe.
--- 8,16 ----
   */
  package org.fudaa.dodico.navigation;
  import com.memoire.fu.FuVectorlong;
! 
! import org.fudaa.dodico.corba.navigation.IGenerationJournaliereDeterministe;
! import org.fudaa.dodico.corba.navigation.IGenerationJournaliereDeterministeOperations;
! import org.fudaa.dodico.corba.navigation.LTypeLoi;
  /**
   * Loi deterministe.

Index: DGenerationJournaliereAleatoire.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DGenerationJournaliereAleatoire.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DGenerationJournaliereAleatoire.java	27 Apr 2004 16:05:37 -0000	1.7
--- DGenerationJournaliereAleatoire.java	30 Apr 2004 07:18:33 -0000	1.8
***************
*** 8,19 ****
   */
  package org.fudaa.dodico.navigation;
  import com.memoire.fu.FuVectorlong;
! //java
! import java.util.*;
! //dodico
! import org.fudaa.dodico.boony.BoonyLib;
! import org.fudaa.dodico.corba.navigation.*;
! import org.fudaa.dodico.corba.probabilite.*;
! import org.fudaa.dodico.objet.*;
  /**
   * creneau dans lequel les evenements ( apparition navire) sont generes
--- 8,21 ----
   */
  package org.fudaa.dodico.navigation;
+ import java.util.Arrays;
+ 
  import com.memoire.fu.FuVectorlong;
! 
! import org.fudaa.dodico.corba.navigation.IGenerationJournaliereAleatoire;
! import org.fudaa.dodico.corba.navigation.IGenerationJournaliereAleatoireOperations;
! import org.fudaa.dodico.corba.navigation.LTypeLoi;
! import org.fudaa.dodico.corba.probabilite.IGenerateurLoiErlang;
! import org.fudaa.dodico.corba.probabilite.SParametresGenerateurLoiErlang;
! import org.fudaa.dodico.objet.UsineLib;
  /**
   * creneau dans lequel les evenements ( apparition navire) sont generes
***************
*** 138,142 ****
      if (GENERATEUR == null) {
        System.err.println("Echec de connection par réseau");
!       GENERATEUR= BoonyLib.findUsine().creeProbabiliteGenerateurLoiErlang();
      }
    }
--- 140,144 ----
      if (GENERATEUR == null) {
        System.err.println("Echec de connection par réseau");
!       GENERATEUR= UsineLib.findUsine().creeProbabiliteGenerateurLoiErlang();
      }
    }

Index: DNavireType.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DNavireType.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DNavireType.java	27 Apr 2004 16:05:38 -0000	1.6
--- DNavireType.java	30 Apr 2004 07:18:34 -0000	1.7
***************
*** 9,15 ****
  package org.fudaa.dodico.navigation;
  import java.io.Serializable;
! import org.fudaa.dodico.corba.navigation.*;
! import org.fudaa.dodico.objet.*;
! import org.fudaa.dodico.objet.CDodico;
  /**
   * navigation
--- 9,18 ----
  package org.fudaa.dodico.navigation;
  import java.io.Serializable;
! 
! import org.fudaa.dodico.corba.navigation.INavireType;
! import org.fudaa.dodico.corba.navigation.INavireTypeOperations;
! import org.fudaa.dodico.corba.navigation.LGroupeNavireType;
! import org.fudaa.dodico.corba.navigation.LPrioriteNavireType;
! import org.fudaa.dodico.objet.DObjet;
  /**
   * navigation

Index: DBassin.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DBassin.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DBassin.java	27 Apr 2004 16:05:37 -0000	1.5
--- DBassin.java	30 Apr 2004 07:18:34 -0000	1.6
***************
*** 8,12 ****
   */
  package org.fudaa.dodico.navigation;
! import org.fudaa.dodico.corba.navigation.*;
  /**
   * Domaine navigation maritime: <br>
--- 8,16 ----
   */
  package org.fudaa.dodico.navigation;
! import org.fudaa.dodico.corba.navigation.IBassin;
! import org.fudaa.dodico.corba.navigation.IBassinOperations;
! import org.fudaa.dodico.corba.navigation.IDureesEntreeSortie;
! import org.fudaa.dodico.corba.navigation.IQuai;
! import org.fudaa.dodico.corba.navigation.IRegleSecuriteEntreeSortie;
  /**
   * Domaine navigation maritime: <br>

Index: DEcluseMaritime.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/navigation/DEcluseMaritime.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DEcluseMaritime.java	27 Apr 2004 16:05:37 -0000	1.6
--- DEcluseMaritime.java	30 Apr 2004 07:18:33 -0000	1.7
***************
*** 9,18 ****
  package org.fudaa.dodico.navigation;
  //dodico
- import org.fudaa.dodico.boony.BoonyLib;
- import org.fudaa.dodico.corba.boony.IUsine;
  import org.fudaa.dodico.corba.navigation.IDureesManoeuvresEcluseMaritime;
  import org.fudaa.dodico.corba.navigation.IEcluseMaritime;
  import org.fudaa.dodico.corba.navigation.IEcluseMaritimeOperations;
  import org.fudaa.dodico.corba.navigation.INavireType;
  /**
   * Navigation maritime: classe modelisant une ecluse maritime. Les durees
--- 9,18 ----
  package org.fudaa.dodico.navigation;
  //dodico
  import org.fudaa.dodico.corba.navigation.IDureesManoeuvresEcluseMaritime;
  import org.fudaa.dodico.corba.navigation.IEcluseMaritime;
  import org.fudaa.dodico.corba.navigation.IEcluseMaritimeOperations;
  import org.fudaa.dodico.corba.navigation.INavireType;
+ import org.fudaa.dodico.corba.usine.IUsine;
+ import org.fudaa.dodico.objet.UsineLib;
  /**
   * Navigation maritime: classe modelisant une ecluse maritime. Les durees
***************
*** 258,262 ****
        return "\nParamètres invalides.";
      }
!     IUsine usine= BoonyLib.findUsine();
      if (usine == null) {
        return "\nUsine non trouvée";
--- 258,262 ----
        return "\nParamètres invalides.";
      }
!     IUsine usine= UsineLib.findUsine();
      if (usine == null) {
        return "\nUsine non trouvée";