Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/dodico/src/org/fudaa/dodico/fichiers FileFormatVersion.java,1.6,1.7 FileFormat.java,1.8,1.9 FileReadOperationAbstract.java,1.6,1.7 FileOpWriterCharSimpleAbstract.java,1.6,1.7 MaillageCORELEBTH.java,1.9,1.10 FileWriteOperationAbstract.java,1.7,1.8 FileOperationSynthese.java,1.7,1.8 FileOpReadCharSimpleAbstract.java,1.6,1.7
|
From: Frederic D. <de...@us...> - 2004-04-30 07:19:31
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1703/src/org/fudaa/dodico/fichiers Modified Files: FileFormatVersion.java FileFormat.java FileReadOperationAbstract.java FileOpWriterCharSimpleAbstract.java MaillageCORELEBTH.java FileWriteOperationAbstract.java FileOperationSynthese.java FileOpReadCharSimpleAbstract.java Log Message: Changement des classes OLB en Olb Reintegration du package usine Index: FileFormatVersion.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileFormatVersion.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FileFormatVersion.java 25 Nov 2003 10:11:34 -0000 1.6 --- FileFormatVersion.java 30 Apr 2004 07:18:51 -0000 1.7 *************** *** 9,12 **** --- 9,13 ---- package org.fudaa.dodico.fichiers; import java.io.File; + import org.fudaa.dodico.commun.ProgressionInterface; /** Index: FileOperationSynthese.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileOperationSynthese.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FileOperationSynthese.java 12 Feb 2004 15:32:44 -0000 1.7 --- FileOperationSynthese.java 30 Apr 2004 07:18:51 -0000 1.8 *************** *** 8,15 **** */ package org.fudaa.dodico.fichiers; - import java.io.File; import org.fudaa.dodico.commun.DodicoAnalyze; import org.fudaa.dodico.fortran.FortranInterface; - import org.fudaa.dodico.fortran.FortranLib; /** * --- 8,13 ---- Index: MaillageCORELEBTH.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/MaillageCORELEBTH.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MaillageCORELEBTH.java 27 Apr 2004 16:34:26 -0000 1.9 --- MaillageCORELEBTH.java 30 Apr 2004 07:18:51 -0000 1.10 *************** *** 19,24 **** import java.util.List; - import org.fudaa.dodico.boony.BoonyLib; - import org.fudaa.dodico.corba.boony.IUsine; import org.fudaa.dodico.corba.ef.IElement; import org.fudaa.dodico.corba.ef.IMaillage; --- 19,22 ---- *************** *** 26,32 **** import org.fudaa.dodico.corba.geometrie.IPoint; import org.fudaa.dodico.corba.geometrie.LTypeElement; import org.fudaa.dodico.fortran.FortranReader; import org.fudaa.dodico.fortran.FortranWriter; ! import org.fudaa.dodico.objet.CDodico; /** * Filtre sur les fichiers maillage .cor/.ele/.bth (format Preflux) --- 24,31 ---- import org.fudaa.dodico.corba.geometrie.IPoint; import org.fudaa.dodico.corba.geometrie.LTypeElement; + import org.fudaa.dodico.corba.usine.IUsine; import org.fudaa.dodico.fortran.FortranReader; import org.fudaa.dodico.fortran.FortranWriter; ! import org.fudaa.dodico.objet.UsineLib; /** * Filtre sur les fichiers maillage .cor/.ele/.bth (format Preflux) *************** *** 76,80 **** System.err.println("### Lecture " + racine + eleExt); elements= lireFichierELE(racine + eleExt, noeuds); ! IMaillage res= BoonyLib.findUsine().creeEfMaillage(); res.elements(elements); return res; --- 75,79 ---- System.err.println("### Lecture " + racine + eleExt); elements= lireFichierELE(racine + eleExt, noeuds); ! IMaillage res= UsineLib.findUsine().creeEfMaillage(); res.elements(elements); return res; *************** *** 232,236 **** // Coordonnées <x>,<y> fmt= new int[] { formatCol1, 10, 10 }; ! IUsine usine= BoonyLib.findUsine(); for (int i= 0; i < nbNoeuds; i++) { file.readFields(fmt); --- 231,235 ---- // Coordonnées <x>,<y> fmt= new int[] { formatCol1, 10, 10 }; ! IUsine usine= UsineLib.findUsine(); for (int i= 0; i < nbNoeuds; i++) { file.readFields(fmt); *************** *** 360,364 **** formatCol1, formatCol1 }; ! IUsine usine= BoonyLib.findUsine(); for (int i= 0; i < nbElements; i++) { file.readFields(fmt); --- 359,363 ---- formatCol1, formatCol1 }; ! IUsine usine= UsineLib.findUsine(); for (int i= 0; i < nbElements; i++) { file.readFields(fmt); Index: FileReadOperationAbstract.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileReadOperationAbstract.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FileReadOperationAbstract.java 12 Feb 2004 15:32:44 -0000 1.6 --- FileReadOperationAbstract.java 30 Apr 2004 07:18:51 -0000 1.7 *************** *** 11,15 **** import org.fudaa.ctulu.CtuluLib; - import org.fudaa.dodico.commun.DodicoResource; import org.fudaa.dodico.commun.ProgressionInterface; --- 11,14 ---- Index: FileWriteOperationAbstract.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileWriteOperationAbstract.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FileWriteOperationAbstract.java 12 Feb 2004 15:32:44 -0000 1.7 --- FileWriteOperationAbstract.java 30 Apr 2004 07:18:51 -0000 1.8 *************** *** 11,15 **** import org.fudaa.ctulu.CtuluLib; - import org.fudaa.dodico.commun.DodicoResource; import org.fudaa.dodico.commun.ProgressionInterface; --- 11,14 ---- Index: FileOpWriterCharSimpleAbstract.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileOpWriterCharSimpleAbstract.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FileOpWriterCharSimpleAbstract.java 12 Feb 2004 15:32:44 -0000 1.6 --- FileOpWriterCharSimpleAbstract.java 30 Apr 2004 07:18:51 -0000 1.7 *************** *** 14,18 **** import org.fudaa.ctulu.CtuluLib; - import org.fudaa.dodico.commun.DodicoAnalyze; import org.fudaa.dodico.fortran.FortranInterface; --- 14,17 ---- Index: FileFormat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileFormat.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FileFormat.java 10 Mar 2004 09:08:37 -0000 1.8 --- FileFormat.java 30 Apr 2004 07:18:51 -0000 1.9 *************** *** 10,14 **** --- 10,16 ---- import java.io.File; import java.util.Comparator; + import com.memoire.bu.BuInformationsSoftware; + import org.fudaa.dodico.commun.DodicoLib; /** Index: FileOpReadCharSimpleAbstract.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/fichiers/FileOpReadCharSimpleAbstract.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FileOpReadCharSimpleAbstract.java 12 Feb 2004 15:32:44 -0000 1.6 --- FileOpReadCharSimpleAbstract.java 30 Apr 2004 07:18:51 -0000 1.7 *************** *** 12,17 **** import java.io.FileReader; import java.io.Reader; import org.fudaa.dodico.commun.DodicoAnalyze; - import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoResource; import org.fudaa.dodico.fortran.FortranInterface; --- 12,17 ---- import java.io.FileReader; import java.io.Reader; + import org.fudaa.dodico.commun.DodicoAnalyze; import org.fudaa.dodico.commun.DodicoResource; import org.fudaa.dodico.fortran.FortranInterface; |
