[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi SinaviBateauxParametres.java,1.2,1.3 SinaviDefinitionXmlListener.java,1.2,1.3 SinaviFilleLoiAleatoireTrajet.java,1.2,1.3 SinaviFilleLoiDeterministeTrajet.java,1.3,1.4 SinaviImplementation.java,1.2,1.3 SinaviReseauFrame.java,1.2,1.3 SinaviReseauGridAdapter.java,1.2,1.3

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

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

Modified Files:
	SinaviBateauxParametres.java SinaviDefinitionXmlListener.java 
	SinaviFilleLoiAleatoireTrajet.java 
	SinaviFilleLoiDeterministeTrajet.java 
	SinaviImplementation.java SinaviReseauFrame.java 
	SinaviReseauGridAdapter.java 
Log Message:
Ajout de FudaaCommonImplementation


Index: SinaviBateauxParametres.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviBateauxParametres.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SinaviBateauxParametres.java	19 Mar 2003 07:54:48 -0000	1.2
--- SinaviBateauxParametres.java	4 Jul 2003 15:56:40 -0000	1.3
***************
*** 27,30 ****
--- 27,31 ----
  import org.fudaa.dodico.navigation.*;
  import org.fudaa.dodico.objet.CDodico;
+ import org.fudaa.dodico.usine.UsineHelper;
  
  /**
***************
*** 370,374 ****
        if(validBateauParametres())
        {
!         INavireType bateautemp_ = CDodico.findUsine().creeNavigationNavireType();
          setBateauParametres(bateautemp_);
          SinaviImplementation.ETUDE_SINAVI.ajouteNavireType(bateautemp_);
--- 371,375 ----
        if(validBateauParametres())
        {
!         INavireType bateautemp_ = UsineHelper.findUsine().creeNavigationNavireType();
          setBateauParametres(bateautemp_);
          SinaviImplementation.ETUDE_SINAVI.ajouteNavireType(bateautemp_);

Index: SinaviDefinitionXmlListener.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviDefinitionXmlListener.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SinaviDefinitionXmlListener.java	19 Mar 2003 07:54:48 -0000	1.2
--- SinaviDefinitionXmlListener.java	4 Jul 2003 15:56:40 -0000	1.3
***************
*** 17,20 ****
--- 17,21 ----
  import org.fudaa.dodico.corba.navigation.*;
  import org.fudaa.dodico.objet.CDodico;
+ import org.fudaa.dodico.usine.UsineHelper;
  
  /**
***************
*** 82,86 ****
      if(_tag.equals("NAVIRE"))
      {
!       navires_[nbcat_].addElement(CDodico.findUsine().creeNavigationNavireType());
        nbnavire_++;
      }
--- 83,87 ----
      if(_tag.equals("NAVIRE"))
      {
!       navires_[nbcat_].addElement(UsineHelper.findUsine().creeNavigationNavireType());
        nbnavire_++;
      }

Index: SinaviFilleLoiAleatoireTrajet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleLoiAleatoireTrajet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SinaviFilleLoiAleatoireTrajet.java	19 Mar 2003 07:54:48 -0000	1.2
--- SinaviFilleLoiAleatoireTrajet.java	4 Jul 2003 15:56:40 -0000	1.3
***************
*** 19,22 ****
--- 19,23 ----
  import org.fudaa.dodico.corba.navigation.*;
  import org.fudaa.dodico.objet.CDodico;
+ import org.fudaa.dodico.usine.UsineHelper;
  
  /**
***************
*** 281,285 ****
        if(loi_ == null)
        {
!         IGenerationJournaliereAleatoire creneauGenerationAleatoire_ = CDodico.findUsine().creeNavigationGenerationJournaliereAleatoire();
          creneauGenerationAleatoire_.definitHeuresDebutFin(dfAleatoireHeureDebut_.getDureeField(), dfAleatoireHeureFin_.getDureeField());
          creneauGenerationAleatoire_.definitDatesDebutFin(((int)(((Date)tfAleatoireJourDebut_.getValue()).getTime() / 1000l)), ((int)(((Date)tfAleatoireJourFin_.getValue()).getTime() / 1000l)));
--- 282,286 ----
        if(loi_ == null)
        {
!         IGenerationJournaliereAleatoire creneauGenerationAleatoire_ = UsineHelper.findUsine().creeNavigationGenerationJournaliereAleatoire();
          creneauGenerationAleatoire_.definitHeuresDebutFin(dfAleatoireHeureDebut_.getDureeField(), dfAleatoireHeureFin_.getDureeField());
          creneauGenerationAleatoire_.definitDatesDebutFin(((int)(((Date)tfAleatoireJourDebut_.getValue()).getTime() / 1000l)), ((int)(((Date)tfAleatoireJourFin_.getValue()).getTime() / 1000l)));

Index: SinaviFilleLoiDeterministeTrajet.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleLoiDeterministeTrajet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SinaviFilleLoiDeterministeTrajet.java	19 Mar 2003 07:54:48 -0000	1.3
--- SinaviFilleLoiDeterministeTrajet.java	4 Jul 2003 15:56:40 -0000	1.4
***************
*** 20,23 ****
--- 20,24 ----
  import org.fudaa.dodico.corba.navigation.*;
  import org.fudaa.dodico.objet.CDodico;
+ import org.fudaa.dodico.usine.UsineHelper;
  
  /**
***************
*** 169,173 ****
        if(loi_ == null)
        {
!         loi_ = CDodico.findUsine().creeNavigationGenerationDeterministe();
          //loi_.definitInstants(instants_.toArray());
          loi_.definitInstants(instantsLong);
--- 170,174 ----
        if(loi_ == null)
        {
!         loi_ = UsineHelper.findUsine().creeNavigationGenerationDeterministe();
          //loi_.definitInstants(instants_.toArray());
          loi_.definitInstants(instantsLong);

Index: SinaviImplementation.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviImplementation.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SinaviImplementation.java	19 Mar 2003 07:54:48 -0000	1.2
--- SinaviImplementation.java	4 Jul 2003 15:56:40 -0000	1.3
***************
*** 19,22 ****
--- 19,24 ----
  
  import org.fudaa.fudaa.commun.*;
+ import org.fudaa.fudaa.commun.dodico.*;
+ 
  import com.memoire.bu.*;
  import com.memoire.dja.*;
***************
*** 29,32 ****
--- 31,35 ----
  import org.fudaa.dodico.corba.sinavi.*;
  import org.fudaa.dodico.objet.DService;
+ import org.fudaa.dodico.usine.UsineHelper;
  
  /**
***************
*** 423,428 ****
      assistant_.changeAttitude(BuAssistant.PAROLE, "Création d'une nouvelle\n étude");
      // Création d'une nouvelle usine et d'un nouveau reseau
!     ETUDE_SINAVI = CDodico.findUsine().creeNavigationEtudeNavigationFluviale();
!     ETUDE_SINAVI.reseau(CDodico.findUsine().creeNavigationReseauFluvial());
      if(ETUDE_SINAVI==null)
        System.err.println("Etude nulle!!!!!");
--- 426,431 ----
      assistant_.changeAttitude(BuAssistant.PAROLE, "Création d'une nouvelle\n étude");
      // Création d'une nouvelle usine et d'un nouveau reseau
!     ETUDE_SINAVI = UsineHelper.findUsine().creeNavigationEtudeNavigationFluviale();
!     ETUDE_SINAVI.reseau(UsineHelper.findUsine().creeNavigationReseauFluvial());
      if(ETUDE_SINAVI==null)
        System.err.println("Etude nulle!!!!!");

Index: SinaviReseauFrame.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviReseauFrame.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SinaviReseauFrame.java	19 Mar 2003 07:54:48 -0000	1.2
--- SinaviReseauFrame.java	4 Jul 2003 15:56:40 -0000	1.3
***************
*** 20,23 ****
--- 20,24 ----
  import org.fudaa.dodico.navigation.*;
  import org.fudaa.dodico.objet.*;
+ import org.fudaa.dodico.usine.UsineHelper;
  
  /**
***************
*** 129,133 ****
    public void ajouteGare()
    {
!     IGare gare = CDodico.findUsine().creeNavigationGare();
      SinaviImplementation.ETUDE_SINAVI.reseau().ajouteGare(gare);
      grid_.add(new SinaviReseauGare(gare));
--- 130,134 ----
    public void ajouteGare()
    {
!     IGare gare = UsineHelper.findUsine().creeNavigationGare();
      SinaviImplementation.ETUDE_SINAVI.reseau().ajouteGare(gare);
      grid_.add(new SinaviReseauGare(gare));
***************
*** 145,150 ****
    public void ajouteBief(DjaGridInteractive _grilleinteractive)
    {
!     IBiefNavigation bief_ = CDodico.findUsine().creeNavigationBiefNavigation();
!     bief_.regle(CDodico.findUsine().creeNavigationRegleNavigationFluviale());
      if(_grilleinteractive.getSelection().size() == 2)
      {
--- 146,151 ----
    public void ajouteBief(DjaGridInteractive _grilleinteractive)
    {
!     IBiefNavigation bief_ = UsineHelper.findUsine().creeNavigationBiefNavigation();
!     bief_.regle(UsineHelper.findUsine().creeNavigationRegleNavigationFluviale());
      if(_grilleinteractive.getSelection().size() == 2)
      {
***************
*** 241,245 ****
    public void ajouteEcluse(DjaGridInteractive _grilleinteractive)
    {
!     IEcluseFluviale eclusefluviale_ = CDodico.findUsine().creeNavigationEcluseFluviale();
      if(_grilleinteractive.getSelection().size() == 2)
      {
--- 242,246 ----
    public void ajouteEcluse(DjaGridInteractive _grilleinteractive)
    {
!     IEcluseFluviale eclusefluviale_ = UsineHelper.findUsine().creeNavigationEcluseFluviale();
      if(_grilleinteractive.getSelection().size() == 2)
      {

Index: SinaviReseauGridAdapter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviReseauGridAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SinaviReseauGridAdapter.java	19 Mar 2003 07:54:48 -0000	1.2
--- SinaviReseauGridAdapter.java	4 Jul 2003 15:56:40 -0000	1.3
***************
*** 10,13 ****
--- 10,14 ----
  package org.fudaa.fudaa.sinavi;
  import org.fudaa.dodico.objet.CDodico;
+ import org.fudaa.dodico.usine.UsineHelper;
  import org.fudaa.dodico.corba.navigation.IGare;
  import com.memoire.bu.*;
***************
*** 53,57 ****
      if(_evt.getObject() instanceof SinaviReseauGare)
      {
!       CDodico.findUsine().supprimeNavigationGare(((SinaviReseauGare)_evt.getObject()).getGare());
      }
      if(_evt.getObject() instanceof SinaviReseauBief)
--- 54,58 ----
      if(_evt.getObject() instanceof SinaviReseauGare)
      {
!       UsineHelper.findUsine().supprimeNavigationGare(((SinaviReseauGare)_evt.getObject()).getGare());
      }
      if(_evt.getObject() instanceof SinaviReseauBief)