[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/geometrie DBoite.java,1.2,1.3 DGrille.java,1.2,1.3 DGrilleIrreguliere.java,1.2,1.3 DGrilleReguliere.java,1.2,1.3 DPoint.java,1.2,1.3 DPolygone.java,1.2,1.3 DPolyligne.java,1.2,1.3 DSphere.java,1.2,1.3 DSurfaceComposee.java,1.2,1.3 SPointVecteur.java,1.2,1.3

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

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie
In directory sc8-pr-cvs1:/tmp/cvs-serv19150

Modified Files:
	DBoite.java DGrille.java DGrilleIrreguliere.java 
	DGrilleReguliere.java DPoint.java DPolygone.java 
	DPolyligne.java DSphere.java DSurfaceComposee.java 
	SPointVecteur.java 
Log Message:
Maj des import


Index: DBoite.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DBoite.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DBoite.java	18 Mar 2003 12:39:43 -0000	1.2
--- DBoite.java	4 Jul 2003 13:02:44 -0000	1.3
***************
*** 13,16 ****
--- 13,17 ----
  import org.fudaa.dodico.objet.DObjet;
  import org.fudaa.dodico.objet.CDodico;
+ import org.fudaa.dodico.usine.UsineHelper;
  import org.fudaa.dodico.corba.objet.IObjet;
  import org.fudaa.dodico.corba.usine.IUsine;
***************
*** 38,42 ****
    public DBoite()
    {
!     IUsine u=CDodico.findUsine();
      pmin_ = u.creeGeometriePoint();
      pmax_ = u.creeGeometriePoint();
--- 39,43 ----
    public DBoite()
    {
!     IUsine u=UsineHelper.findUsine();
      pmin_ = u.creeGeometriePoint();
      pmax_ = u.creeGeometriePoint();
***************
*** 150,154 ****
        c[i] = (cmin[i] + cmax[i]) / 2.;
      }
!     IPoint r = CDodico.findUsine().creeGeometriePoint();
      r.coordonnees(c);
      return r;
--- 151,155 ----
        c[i] = (cmin[i] + cmax[i]) / 2.;
      }
!     IPoint r = UsineHelper.findUsine().creeGeometriePoint();
      r.coordonnees(c);
      return r;
***************
*** 480,484 ****
          rcmax[i] = Math.min(bcmax[i], tcmax[i]);
        }
!       IUsine u = CDodico.findUsine();
        r = u.creeGeometrieBoite();
        IPoint tempMax = u.creeGeometriePoint();
--- 481,485 ----
          rcmax[i] = Math.min(bcmax[i], tcmax[i]);
        }
!       IUsine u = UsineHelper.findUsine();
        r = u.creeGeometrieBoite();
        IPoint tempMax = u.creeGeometriePoint();
***************
*** 539,543 ****
          rcmax[i] = Math.min(bcmax[i], tcmax[i]);
        }
!       IUsine u = CDodico.findUsine();
        r = u.creeGeometrieBoite();
        IPoint tempMax = u.creeGeometriePoint();
--- 540,544 ----
          rcmax[i] = Math.min(bcmax[i], tcmax[i]);
        }
!       IUsine u = UsineHelper.findUsine();
        r = u.creeGeometrieBoite();
        IPoint tempMax = u.creeGeometriePoint();
***************
*** 607,611 ****
      else
      {
!       r = CDodico.findUsine().creeGeometrieBoite();
        r.pmin(pmin_);
        r.pmax(pmax_);
--- 608,612 ----
      else
      {
!       r = UsineHelper.findUsine().creeGeometrieBoite();
        r.pmin(pmin_);
        r.pmax(pmax_);

Index: DGrille.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DGrille.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DGrille.java	18 Mar 2003 12:39:43 -0000	1.2
--- DGrille.java	4 Jul 2003 13:02:44 -0000	1.3
***************
*** 10,14 ****
  package org.fudaa.dodico.geometrie;
  
! import org.fudaa.dodico.corba.geometrie.*;
  
  /**
--- 10,16 ----
  package org.fudaa.dodico.geometrie;
  
! import org.fudaa.dodico.corba.geometrie.IBoite;
! import org.fudaa.dodico.corba.geometrie.IGrilleOperations;
! import org.fudaa.dodico.corba.geometrie.IPoint;
  
  /**

Index: DGrilleIrreguliere.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DGrilleIrreguliere.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DGrilleIrreguliere.java	18 Mar 2003 12:39:43 -0000	1.2
--- DGrilleIrreguliere.java	4 Jul 2003 13:02:44 -0000	1.3
***************
*** 11,14 ****
--- 11,15 ----
  
  import org.fudaa.dodico.objet.CDodico;
+ import org.fudaa.dodico.usine.UsineHelper;
  import org.fudaa.dodico.corba.usine.IUsine;
  import org.fudaa.dodico.corba.geometrie.*;
***************
*** 54,58 ****
        newz[i] = ( double[] )z_[i].clone();
      }
!     IGrilleIrreguliere r=CDodico.findUsine().creeGeometrieGrilleIrreguliere();
      r.vvz(z_);
      r.vy(y_);
--- 55,59 ----
        newz[i] = ( double[] )z_[i].clone();
      }
!     IGrilleIrreguliere r=UsineHelper.findUsine().creeGeometrieGrilleIrreguliere();
      r.vvz(z_);
      r.vy(y_);
***************
*** 168,172 ****
        }
      }
!     IUsine u=CDodico.findUsine();
      IBoite boite=u.creeGeometrieBoite();
      IPoint pmax=u.creeGeometriePoint();
--- 169,173 ----
        }
      }
!     IUsine u=UsineHelper.findUsine();
      IBoite boite=u.creeGeometrieBoite();
      IPoint pmax=u.creeGeometriePoint();
***************
*** 210,214 ****
      ymoy /= x_.length * y_.length;
      zmoy /= x_.length * y_.length;
!     IUsine u=CDodico.findUsine();
      IPoint r=u.creeGeometriePoint();
      r.coordonnees( new double[] {xmoy, ymoy, zmoy});
--- 211,215 ----
      ymoy /= x_.length * y_.length;
      zmoy /= x_.length * y_.length;
!     IUsine u=UsineHelper.findUsine();
      IPoint r=u.creeGeometriePoint();
      r.coordonnees( new double[] {xmoy, ymoy, zmoy});
***************
*** 386,390 ****
    {
      IPoint[] pts = new IPoint[x_.length * y_.length];
!     IUsine u=CDodico.findUsine();
      for( int j = 0; j < x_.length; j++ )
      {
--- 387,391 ----
    {
      IPoint[] pts = new IPoint[x_.length * y_.length];
!     IUsine u=UsineHelper.findUsine();
      for( int j = 0; j < x_.length; j++ )
      {

Index: DGrilleReguliere.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DGrilleReguliere.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DGrilleReguliere.java	18 Mar 2003 12:39:43 -0000	1.2
--- DGrilleReguliere.java	4 Jul 2003 13:02:44 -0000	1.3
***************
*** 10,16 ****
  package org.fudaa.dodico.geometrie;
  
! import org.fudaa.dodico.objet.CDodico;
  import org.fudaa.dodico.corba.usine.IUsine;
! import org.fudaa.dodico.corba.geometrie.*;
  
  /**
--- 10,19 ----
  package org.fudaa.dodico.geometrie;
  
! import org.fudaa.dodico.corba.geometrie.IBoite;
! import org.fudaa.dodico.corba.geometrie.IGrilleReguliereOperations;
! import org.fudaa.dodico.corba.geometrie.IPoint;
  import org.fudaa.dodico.corba.usine.IUsine;
! import org.fudaa.dodico.objet.CDodico;
! import org.fudaa.dodico.usine.UsineHelper;
  
  /**
***************
*** 127,131 ****
        }
      }
!     IUsine u = CDodico.findUsine();
      IBoite boite = u.creeGeometrieBoite();
      IPoint pmax = u.creeGeometriePoint();
--- 130,134 ----
        }
      }
!     IUsine u = UsineHelper.findUsine();
      IBoite boite = u.creeGeometrieBoite();
      IPoint pmax = u.creeGeometriePoint();
***************
*** 157,161 ****
      }
      zmoy /= nbX_ * nbY_;
!     IPoint r = CDodico.findUsine().creeGeometriePoint();
      r.coordonnees( new double[]{( xmax_ - xmin_ ) / 2, ( ymax_ - ymin_ ) / 2, zmoy} );
      return r;
--- 160,164 ----
      }
      zmoy /= nbX_ * nbY_;
!     IPoint r = UsineHelper.findUsine().creeGeometriePoint();
      r.coordonnees( new double[]{( xmax_ - xmin_ ) / 2, ( ymax_ - ymin_ ) / 2, zmoy} );
      return r;
***************
*** 314,318 ****
      double ypas = ( ymax_ - ymin_ ) / nbY_;
      IPoint[] pts = new IPoint[nbX_ * nbY_];
!     IUsine u = CDodico.findUsine();
      for( int j = 0; j < nbX_; j++ )
      {
--- 317,321 ----
      double ypas = ( ymax_ - ymin_ ) / nbY_;
      IPoint[] pts = new IPoint[nbX_ * nbY_];
!     IUsine u = UsineHelper.findUsine();
      for( int j = 0; j < nbX_; j++ )
      {

Index: DPoint.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPoint.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DPoint.java	18 Mar 2003 12:39:43 -0000	1.2
--- DPoint.java	4 Jul 2003 13:02:44 -0000	1.3
***************
*** 10,14 ****
  package org.fudaa.dodico.geometrie;
  
! import org.fudaa.dodico.corba.geometrie.*;
  
  /**
--- 10,17 ----
  package org.fudaa.dodico.geometrie;
  
! import org.fudaa.dodico.corba.geometrie.IBoite;
! import org.fudaa.dodico.corba.geometrie.IPoint;
! import org.fudaa.dodico.corba.geometrie.IPointHelper;
! import org.fudaa.dodico.corba.geometrie.IPointOperations;
  
  /**
***************
*** 212,216 ****
    public IPoint centreApparent()
    {
!     return IPointHelper.narrow( this.tie_ );
    }
  
--- 215,219 ----
    public IPoint centreApparent()
    {
!     return IPointHelper.narrow( tie() );
    }
  
***************
*** 223,227 ****
    public IPoint barycentre()
    {
!     return IPointHelper.narrow( this.tie_ );
    }
  
--- 226,230 ----
    public IPoint barycentre()
    {
!     return IPointHelper.narrow( tie() );
    }
  

Index: DPolygone.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPolygone.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DPolygone.java	18 Mar 2003 12:39:43 -0000	1.2
--- DPolygone.java	4 Jul 2003 13:02:44 -0000	1.3
***************
*** 10,16 ****
  package org.fudaa.dodico.geometrie;
  
! import org.fudaa.dodico.objet.CDodico;
  import org.fudaa.dodico.corba.objet.IObjet;
! import org.fudaa.dodico.corba.geometrie.*;
  
  /**
--- 10,22 ----
  package org.fudaa.dodico.geometrie;
  
! import org.fudaa.dodico.corba.geometrie.IBoite;
! import org.fudaa.dodico.corba.geometrie.IPoint;
! import org.fudaa.dodico.corba.geometrie.IPolygone;
! import org.fudaa.dodico.corba.geometrie.IPolygoneHelper;
! import org.fudaa.dodico.corba.geometrie.IPolygoneOperations;
! import org.fudaa.dodico.corba.geometrie.IPolyligne;
  import org.fudaa.dodico.corba.objet.IObjet;
! import org.fudaa.dodico.objet.CDodico;
! import org.fudaa.dodico.usine.UsineHelper;
  
  /**
***************
*** 34,38 ****
    public DPolygone()
    {
!     sommets_ = CDodico.findUsine().creeGeometriePolyligne();
    }
  
--- 40,44 ----
    public DPolygone()
    {
!     sommets_ = UsineHelper.findUsine().creeGeometriePolyligne();
    }
  

Index: DPolyligne.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DPolyligne.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DPolyligne.java	18 Mar 2003 12:39:43 -0000	1.2
--- DPolyligne.java	4 Jul 2003 13:02:44 -0000	1.3
***************
*** 10,18 ****
  package org.fudaa.dodico.geometrie;
  
! import org.fudaa.dodico.corba.objet.IObjet;
  import org.fudaa.dodico.corba.usine.IUsine;
  import org.fudaa.dodico.objet.CDodico;
! import org.fudaa.dodico.corba.geometrie.*;
! import org.fudaa.dodico.corba.collection.ITableau;
  
  /**
--- 10,21 ----
  package org.fudaa.dodico.geometrie;
  
! import org.fudaa.dodico.corba.collection.ITableau;
! import org.fudaa.dodico.corba.geometrie.IBoite;
! import org.fudaa.dodico.corba.geometrie.IPoint;
! import org.fudaa.dodico.corba.geometrie.IPointHelper;
! import org.fudaa.dodico.corba.geometrie.IPolyligneOperations;
  import org.fudaa.dodico.corba.usine.IUsine;
  import org.fudaa.dodico.objet.CDodico;
! import org.fudaa.dodico.usine.UsineHelper;
  
  /**
***************
*** 34,38 ****
    public DPolyligne()
    {
!     points_ = CDodico.findUsine().creeCollectionTableau();
    }
  
--- 37,41 ----
    public DPolyligne()
    {
!     points_ = UsineHelper.findUsine().creeCollectionTableau();
    }
  
***************
*** 124,128 ****
    {
      points_.vide();
!     IUsine u=CDodico.findUsine();
      for( int i = 0; i < _r.length; i++ )
      {
--- 127,131 ----
    {
      points_.vide();
!     IUsine u=UsineHelper.findUsine();
      for( int i = 0; i < _r.length; i++ )
      {
***************
*** 162,166 ****
      {
        IPoint p0 = point( 0 );
!       r = CDodico.findUsine().creeGeometrieBoite();
        r.pmin(p0);
        r.pmax(p0);
--- 165,169 ----
      {
        IPoint p0 = point( 0 );
!       r = UsineHelper.findUsine().creeGeometrieBoite();
        r.pmin(p0);
        r.pmax(p0);
***************
*** 203,207 ****
        }
  
!       r =CDodico.findUsine().creeGeometriePoint();
        r.coordonnees(c);
      }
--- 206,210 ----
        }
  
!       r =UsineHelper.findUsine().creeGeometriePoint();
        r.coordonnees(c);
      }
***************
*** 235,239 ****
          c[i] /= ( double )l;
        }
!       r =CDodico.findUsine().creeGeometriePoint();
        r.coordonnees(c);
      }
--- 238,242 ----
          c[i] /= ( double )l;
        }
!       r =UsineHelper.findUsine().creeGeometriePoint();
        r.coordonnees(c);
      }

Index: DSphere.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSphere.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DSphere.java	18 Mar 2003 12:39:43 -0000	1.2
--- DSphere.java	4 Jul 2003 13:02:44 -0000	1.3
***************
*** 14,17 ****
--- 14,18 ----
  import org.fudaa.dodico.corba.usine.IUsine;
  import org.fudaa.dodico.objet.CDodico;
+ import org.fudaa.dodico.usine.UsineHelper;
  
  /**
***************
*** 41,45 ****
    public DSphere()
    {
!     centre_ = CDodico.findUsine().creeGeometriePoint();
      rayon_ = 0.0;
    }
--- 42,46 ----
    public DSphere()
    {
!     centre_ = UsineHelper.findUsine().creeGeometriePoint();
      rayon_ = 0.0;
    }
***************
*** 110,114 ****
      // REM: faire une methode d'acces indicee a un IPoint
      double[] cen = centre_.coordonnees();
!     IUsine u=CDodico.findUsine();
      IBoite boite=u.creeGeometrieBoite();
      IPoint pmax=u.creeGeometriePoint();
--- 111,115 ----
      // REM: faire une methode d'acces indicee a un IPoint
      double[] cen = centre_.coordonnees();
!     IUsine u=UsineHelper.findUsine();
      IBoite boite=u.creeGeometrieBoite();
      IPoint pmax=u.creeGeometriePoint();

Index: DSurfaceComposee.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/DSurfaceComposee.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DSurfaceComposee.java	18 Mar 2003 12:39:43 -0000	1.2
--- DSurfaceComposee.java	4 Jul 2003 13:02:44 -0000	1.3
***************
*** 11,14 ****
--- 11,15 ----
  
  import org.fudaa.dodico.objet.CDodico;
+ import org.fudaa.dodico.usine.UsineHelper;
  import org.fudaa.dodico.corba.usine.IUsine;
  import org.fudaa.dodico.corba.objet.IObjet;
***************
*** 39,43 ****
    public DSurfaceComposee()
    {
!     IUsine u = CDodico.findUsine();
      positives_ = u.creeCollectionTableau();
      negatives_ = u.creeCollectionTableau();
--- 40,44 ----
    public DSurfaceComposee()
    {
!     IUsine u = UsineHelper.findUsine();
      positives_ = u.creeCollectionTableau();
      negatives_ = u.creeCollectionTableau();

Index: SPointVecteur.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/geometrie/SPointVecteur.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SPointVecteur.java	18 Mar 2003 12:39:43 -0000	1.2
--- SPointVecteur.java	4 Jul 2003 13:02:44 -0000	1.3
***************
*** 11,16 ****
  
  
! import java.io.*;
! import java.util.*;
  
  import org.fudaa.dodico.corba.geometrie.SPoint;
--- 11,16 ----
  
  
! import java.io.Serializable;
! import java.util.NoSuchElementException;
  
  import org.fudaa.dodico.corba.geometrie.SPoint;