[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io DunesFileFormat.java,1.4,1.5 DunesReader.java,1.5,1.6 DunesWriter.java,1.5,1.6 DunesKeyWord.java,1.1,NONE

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

Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io
In directory sc8-pr-cvs1:/tmp/cvs-serv3430/dunes/io

Modified Files:
	DunesFileFormat.java DunesReader.java DunesWriter.java 
Removed Files:
	DunesKeyWord.java 
Log Message:
Maj des projets hydraulique 2d


Index: DunesFileFormat.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesFileFormat.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DunesFileFormat.java	4 Jul 2003 12:22:19 -0000	1.4
--- DunesFileFormat.java	18 Aug 2003 11:05:19 -0000	1.5
***************
*** 13,17 ****
--- 13,21 ----
  import org.fudaa.dodico.commun.ProgressionInterface;
  import org.fudaa.dodico.fichiers.FileFormat;
+ import org.fudaa.dodico.fichiers.FileFormatSoftware;
+ import org.fudaa.dodico.fichiers.FileFormatVersion;
  import org.fudaa.dodico.fichiers.FileOperationSynthese;
+ import org.fudaa.dodico.h2d.H2dLib;
+ import org.fudaa.dodico.h2d.type.H2dFileFormatType;
  
  /**
***************
*** 20,83 ****
   * @version $Id$
   */
! public class DunesFileFormat extends FileFormat
! {
  
!   public final static int NB_FILE = 1;
  
!   private static final DunesFileFormat INSTANCE = new DunesFileFormat();
  
!   public static final DunesFileFormat getInstance()
!   {
      return INSTANCE;
    }
  
!   private DunesFileFormat()
!   {
      super(NB_FILE);
!     extensions_ = new String[] { "mail" };
!     ID_ = "DUNES";
!     nom_ = "Dunes";
!     description_ = "utilisé par le mailleur Dunes (logiciel Oasis)";
!     mode_ = MODE_ASCII;
!     software_ = null;
    }
  
!   
!   public DunesKeyWord getKeyWords()
!   {
!      return new DunesKeyWord();
    }
-   
  
!   public DunesKeyWord getKeywords()
!   {
!     return new DunesKeyWord();
!   }
!   
!   public DunesReader createReader()
!   {
!     return new DunesReader(this);
!   }
!   
!   public DunesWriter createWriter()
!   {
!     return new DunesWriter(this);
!   }
!   
!   public FileOperationSynthese write(File _f, DunesInterface _inter, ProgressionInterface _prog)
!   {
!     DunesWriter w = createWriter();
!     FileOperationSynthese synt = FileFormat.initOperation(w, _prog, _f);
!     w.write(_inter, synt);
!     return synt;
    }
  
!   public DunesInterface read(File _f, FileOperationSynthese _synt,ProgressionInterface _prog)
!   {
!     DunesReader r = createReader();
!     FileFormat.initOperation(_synt, r, _prog, _f);
!     return r.read(_synt);
!   }
  
  
  }
--- 24,122 ----
   * @version $Id$
   */
! public class DunesFileFormat extends FileFormat {
  
!   public final static int NB_FILE= 1;
  
!   private static final DunesFileFormat INSTANCE= new DunesFileFormat();
  
!   public static final DunesFileFormat getInstance() {
      return INSTANCE;
    }
  
!   private DunesFileFormat() {
      super(NB_FILE);
!     extensions_= new String[] { "mail" };
!     ID_= "DUNES";
!     nom_= "Dunes";
!     description_= "utilisé par le mailleur Dunes (logiciel Oasis)";
!     mode_= MODE_ASCII;
!     software_= FileFormatSoftware.REFLUX_IS;
!     type_= H2dFileFormatType.MAILLAGE.getId();
    }
  
!   public String getLastVersion() {
!     return "1.0";
    }
  
!   public DunesVersion getLastVersionImpl() {
!     return new DunesVersion(getLastVersion());
    }
  
!   public class DunesVersion extends FileFormatVersion {
! 
!     /**
!     * Returns the aDAPTATIF.
!     * @return int
!     */
!     public int getAdaptatifCode() {
!       return 2;
!     }
! 
!     /**
!      * Returns the eLEMENT_ID.
!      * @return String
!      */
!     public String getElementCode() {
!       return "ELEMENT";
!     }
! 
!     /**
!      * Returns the nOEUD_ID.
!      * @return String
!      */
!     public String getNoeudCode() {
!       return "NOEUD";
!     }
! 
!     /**
!      * Returns the nON_ADAPTATIF.
!      * @return int
!      */
!     public int getNonAdaptatifCode() {
!       return 1;
!     }
  
+     protected DunesVersion(String _v) {
+       super(getInstance(), _v);
+     }
+ 
+     public DunesReader createReader() {
+       return new DunesReader(this);
+     }
+ 
+     public DunesWriter createWriter() {
+       return new DunesWriter(this);
+     }
+ 
+     public FileOperationSynthese write(
+       File _f,
+       DunesInterface _inter,
+       ProgressionInterface _prog) {
+       DunesWriter w= createWriter();
+       FileOperationSynthese synt= FileFormatVersion.initOperation(w, _prog, _f);
+       w.write(_inter, synt);
+       return synt;
+     }
+ 
+     public DunesInterface read(
+       File _f,
+       FileOperationSynthese _synt,
+       ProgressionInterface _prog) {
+       DunesReader r= createReader();
+       FileFormatVersion.initOperation(_synt, r, _prog, _f);
+       return r.read(_synt);
+     }
+ 
+   }
  
  }

Index: DunesReader.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesReader.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DunesReader.java	4 Jul 2003 12:22:19 -0000	1.5
--- DunesReader.java	18 Aug 2003 11:05:19 -0000	1.6
***************
*** 33,38 ****
  {
  
!   DunesKeyWord kw_;
!   DunesFileFormat fileFormat_;
  
    /**
--- 33,37 ----
  {
  
!   DunesFileFormat.DunesVersion version_;
  
    /**
***************
*** 41,51 ****
    public DunesReader()
    {
!     this(null);
    }
  
!   public DunesReader(DunesFileFormat _f)
    {
!     fileFormat_ = (_f == null) ? DunesFileFormat.getInstance() : _f;
!     kw_ = fileFormat_.getKeyWords();
  
    }
--- 40,49 ----
    public DunesReader()
    {
!     this(DunesFileFormat.getInstance().getLastVersionImpl());
    }
  
!   public DunesReader(DunesFileFormat.DunesVersion _f)
    {
!     version_ = _f;
  
    }
***************
*** 73,79 ****
        //Lecture de l'identifiant NOEUD
        in_.readFields();
!       if ((in_.getNumberOfFields() != 1) && (!kw_.getNoeudCode().equals(in_.stringField(0))))
        {
!         _analyze.addError(DodicoLib.geti18n("L'identifiant") + " " + kw_.getNoeudCode() + " " + DodicoLib.geti18n("est attendu"), in_);
          return null;
        }
--- 71,77 ----
        //Lecture de l'identifiant NOEUD
        in_.readFields();
!       if ((in_.getNumberOfFields() != 1) && (!version_.getNoeudCode().equals(in_.stringField(0))))
        {
!         _analyze.addError(DodicoLib.geti18n("L'identifiant") + " " + version_.getNoeudCode() + " " + DodicoLib.geti18n("est attendu"), in_);
          return null;
        }
***************
*** 95,99 ****
        int typeMaillage = in_.intField(1);
        //Si adaptatif, on initialise le tableau stockant les valeurs.
!       if (typeMaillage == kw_.getAdaptatifCode())
        {
          adaptatifs = new double[nbNoeuds];
--- 93,97 ----
        int typeMaillage = in_.intField(1);
        //Si adaptatif, on initialise le tableau stockant les valeurs.
!       if (typeMaillage == version_.getAdaptatifCode())
        {
          adaptatifs = new double[nbNoeuds];
***************
*** 151,157 ****
        //Lecture du mot cle ELEMENT
        in_.readFields();
!       if ((in_.getNumberOfFields() != 1) && (!kw_.getElementCode().equals(in_.stringField(0))))
        {
!         _analyze.addError(DodicoLib.geti18n("L'identifiant") + " " + kw_.getElementCode() + " " + DodicoLib.geti18n("est attendu"), in_);
          return null;
        }
--- 149,155 ----
        //Lecture du mot cle ELEMENT
        in_.readFields();
!       if ((in_.getNumberOfFields() != 1) && (!version_.getElementCode().equals(in_.stringField(0))))
        {
!         _analyze.addError(DodicoLib.geti18n("L'identifiant") + " " + version_.getElementCode() + " " + DodicoLib.geti18n("est attendu"), in_);
          return null;
        }
***************
*** 264,268 ****
    public DunesFileFormat getDunesFileFormat()
      {
!       return fileFormat_;
      }
  
--- 262,266 ----
    public DunesFileFormat getDunesFileFormat()
      {
!       return (DunesFileFormat)version_.getFileFormat();
      }
  

Index: DunesWriter.java
===================================================================
RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesWriter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DunesWriter.java	4 Jul 2003 12:22:19 -0000	1.5
--- DunesWriter.java	18 Aug 2003 11:05:19 -0000	1.6
***************
*** 31,54 ****
  {
  
!   DunesKeyWord format_;
!   DunesFileFormat fileFormat_;
  
    public DunesWriter()
    {
!     this(null);
    }
  
!   public DunesWriter(DunesFileFormat _f)
    {
!     fileFormat_= _f;
!     if (_f == null)
!       format_= DunesFileFormat.getInstance().getKeyWords();
!     else
!       format_= _f.getKeyWords();
    }
  
    public FileFormat getFileFormat()
    {
!     return fileFormat_;
    }
  
--- 31,49 ----
  {
  
!   DunesFileFormat.DunesVersion version_;
  
    public DunesWriter()
    {
!     this(DunesFileFormat.getInstance().getLastVersionImpl());
    }
  
!   public DunesWriter(DunesFileFormat.DunesVersion _f)
    {
!     version_= _f;
    }
  
    public FileFormat getFileFormat()
    {
!     return version_.getFileFormat();
    }
  
***************
*** 98,108 ****
        return;
      }
!     H2dElement[] elems= maillage.getElts();
!     if (elems == null)
!     {
!       analyze_.addFatalError("Le maillage ne contient pas d'éléments !");
!       return;
!     }
!     int nElems= elems.length;
      if (nElems == 0)
      {
--- 93,103 ----
        return;
      }
!     //H2dElement[] elems= maillage.getElts();
! //    if (elems == null)
! //    {
! //      analyze_.addFatalError("Le maillage ne contient pas d'éléments !");
! //      return;
! //    }
!     int nElems= maillage.getEltNb();
      if (nElems == 0)
      {
***************
*** 112,116 ****
  
      StringBuffer b= new StringBuffer(600);
!     b.append(format_.getNoeudCode());
      b.append(' ');
      b.append(lineSep_);
--- 107,111 ----
  
      StringBuffer b= new StringBuffer(600);
!     b.append(version_.getNoeudCode());
      b.append(' ');
      b.append(lineSep_);
***************
*** 121,130 ****
      {
        b.append(' ');
!       b.append(format_.getAdaptatifCode());
        printAdaptatifV= true;
      }
      else
      {
!       b.append(format_.getNonAdaptatifCode());
      }
      b.append(lineSep_);
--- 116,125 ----
      {
        b.append(' ');
!       b.append(version_.getAdaptatifCode());
        printAdaptatifV= true;
      }
      else
      {
!       b.append(version_.getNonAdaptatifCode());
      }
      b.append(lineSep_);
***************
*** 172,176 ****
        b.append(lineSep_);
        //L'identifiant element
!       b.append(format_.getElementCode());
        b.append(lineSep_);
        //le nb d'éléments
--- 167,171 ----
        b.append(lineSep_);
        //L'identifiant element
!       b.append(version_.getElementCode());
        b.append(lineSep_);
        //le nb d'éléments
***************
*** 189,193 ****
        for (int i= 0; i < nElems; i++)
        {
!         ppel= elems[i];
          nppel= ppel.getPtNb();
          //le num d'elements
--- 184,188 ----
        for (int i= 0; i < nElems; i++)
        {
!         ppel= maillage.getElement(i);
          nppel= ppel.getPtNb();
          //le num d'elements

--- DunesKeyWord.java DELETED ---