Menu
▾
▴
fudaa-cvs-commit — Mailing list for CVS commit messages
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
(89) |
Mar
(219) |
Apr
(82) |
May
(33) |
Jun
(11) |
Jul
(129) |
Aug
(357) |
Sep
(34) |
Oct
(37) |
Nov
(42) |
Dec
(182) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(59) |
Feb
(74) |
Mar
(196) |
Apr
(205) |
May
(109) |
Jun
(268) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Frederic D. <de...@us...> - 2004-05-05 12:43:19
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3787/src/org/fudaa/fudaa/meshviewer Modified Files: MvPanelLayer.java Removed Files: MvItemActionsPanel.java MvItemAction.java MvItemActionUI.java Log Message: Suppression inter-dépendances --- MvItemAction.java DELETED --- Index: MvPanelLayer.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvPanelLayer.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MvPanelLayer.java 31 Mar 2004 08:17:50 -0000 1.2 --- MvPanelLayer.java 5 May 2004 12:42:39 -0000 1.3 *************** *** 32,37 **** import org.fudaa.ebli.calque.ZEbliCalquesPanel; import org.fudaa.fudaa.meshviewer.controle.MvControlResult; - import org.fudaa.fudaa.meshviewer.layer.MvCheckLayerGroup; import org.fudaa.fudaa.meshviewer.layer.MvGridLayerGroup; import org.fudaa.fudaa.meshviewer.layer.MvInfoDelegateAbstract; --- 32,37 ---- import org.fudaa.ebli.calque.ZEbliCalquesPanel; + import org.fudaa.fudaa.meshviewer.controle.MvCheckLayerGroup; import org.fudaa.fudaa.meshviewer.controle.MvControlResult; import org.fudaa.fudaa.meshviewer.layer.MvGridLayerGroup; import org.fudaa.fudaa.meshviewer.layer.MvInfoDelegateAbstract; --- MvItemActionUI.java DELETED --- --- MvItemActionsPanel.java DELETED --- |
|
From: Frederic D. <de...@us...> - 2004-05-05 12:43:19
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3787/src/org/fudaa/fudaa/commun/projet Modified Files: FudaaProjet.java Added Files: FudaaDialogNewProject.java FudaaFiltreFichier.java Log Message: Suppression inter-dépendances Index: FudaaProjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet/FudaaProjet.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FudaaProjet.java 19 Mar 2004 17:40:25 -0000 1.6 --- FudaaProjet.java 5 May 2004 12:42:35 -0000 1.7 *************** *** 36,41 **** import javax.swing.JOptionPane; - import org.fudaa.ctulu.CtuluLib; - import com.memoire.bu.BuCommonInterface; import com.memoire.bu.BuDialogConfirmation; --- 36,39 ---- *************** *** 50,57 **** import fr.dyade.koala.xml.koml.KOMLSerializer; ! import org.fudaa.ebli.filechooser.EbliFileChooser; ! ! import org.fudaa.fudaa.commun.FudaaDialogNewProject; ! import org.fudaa.fudaa.commun.FudaaFiltreFichier; import org.fudaa.fudaa.ressource.FudaaResource; /** --- 48,53 ---- import fr.dyade.koala.xml.koml.KOMLSerializer; ! import org.fudaa.ctulu.CtuluLib; ! import org.fudaa.ebli.dialog.EbliFileChooser; import org.fudaa.fudaa.ressource.FudaaResource; /** --- NEW FILE: FudaaDialogNewProject.java --- /* * @file FudaaDialogNewProject.java * @creation 1998-10-06 * @modification $Date: 2004/05/05 12:42:35 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.fudaa.commun.projet; import java.awt.Component; import java.awt.Container; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Frame; import java.awt.GridLayout; import java.awt.Insets; import java.awt.Toolkit; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import java.io.File; import javax.swing.JButton; import javax.swing.JDialog; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JTextField; import javax.swing.border.EmptyBorder; import com.memoire.bu.BuBorderLayout; import com.memoire.bu.BuButton; import com.memoire.bu.BuFileChooser; import com.memoire.bu.BuGridLayout; import com.memoire.bu.BuLib; import com.memoire.bu.BuResource; import org.fudaa.ctulu.CtuluLib; import org.fudaa.ebli.dialog.EbliFileChooser; import org.fudaa.fudaa.ressource.FudaaResource; /** * Une boite d'entree de texte. * * @version $Revision: 1.1 $ $Date: 2004/05/05 12:42:35 $ by $Author: deniger $ * @author Axel von Arnim */ public class FudaaDialogNewProject extends JDialog implements ActionListener, WindowListener { // Donnees membres publiques public final static int CANCEL= 0; public final static int OK= 1; // Donnees membres privees protected JTextField tf_titre_, tf_fichier_, tf_comment_; protected JPanel p_titre_, p_fichier_, p_comment_, p_ok_; protected GridLayout lo_; protected JButton b_ok_, b_cancel_, b_fichier_; protected String titre_; protected String fichier_; protected FudaaFiltreFichier filtre_; protected String comment_; protected String dirOpen_; protected Frame parent_; protected int status_; // Constructeurs public FudaaDialogNewProject(Frame _parent) { this(_parent, null, null); status_= 2; } public FudaaDialogNewProject( Frame _parent, FudaaFiltreFichier f, String _dirOpen) { super(_parent, BuResource.BU.getString("Nouveau"), true); parent_= _parent; titre_= null; fichier_= null; filtre_= f; comment_= null; if ((_dirOpen != null) && (new File(_dirOpen).exists())) dirOpen_= _dirOpen; else dirOpen_= null; BuGridLayout lo= new BuGridLayout(); lo.setColumns(3); lo.setVgap(5); lo.setHgap(5); JPanel panel= new JPanel(); panel.setLayout(lo); panel.setBorder(new EmptyBorder(5, 5, 5, 5)); int n= 0; tf_titre_= new JTextField(); tf_titre_.setColumns(20); String s= ":"; panel.add( new JLabel(BuResource.BU.getString("Titre") + s, JLabel.RIGHT), n++); panel.add(tf_titre_, n++); panel.add(new JLabel(CtuluLib.EMPTY_STRING), n++); tf_fichier_= new JTextField(); tf_fichier_.setColumns(20); panel.add( new JLabel(BuResource.BU.getString("Fichier") + s, JLabel.RIGHT), n++); panel.add(tf_fichier_, n++); b_fichier_= new JButton(FudaaResource.getS("Parcourir")); b_fichier_.setMargin(new Insets(0, 0, 0, 0)); b_fichier_.setActionCommand("PARCOURIR"); b_fichier_.addActionListener(this); panel.add(b_fichier_, n++); tf_comment_= new JTextField(); tf_comment_.setColumns(20); panel.add( new JLabel(BuResource.BU.getString("Commentaires") + s, JLabel.RIGHT), n++); panel.add(tf_comment_, n++); panel.add(new JLabel(""), n++); b_ok_= new BuButton(); b_ok_.setText(BuResource.BU.getString("Valider")); b_ok_.setIcon(BuLib.loadCommandIcon("VALIDER")); b_ok_.setActionCommand("VALIDER"); b_ok_.addActionListener(this); b_cancel_= new BuButton(); b_cancel_.setText(BuResource.BU.getString("Annuler")); b_cancel_.setIcon(BuLib.loadCommandIcon("ANNULER")); b_cancel_.setActionCommand("ANNULER"); b_cancel_.addActionListener(this); p_ok_= new JPanel(new FlowLayout(FlowLayout.RIGHT)); p_ok_.add(b_cancel_); p_ok_.add(b_ok_); getRootPane().setDefaultButton(b_ok_); Container content= getContentPane(); content.setLayout(new BuBorderLayout()); content.add(panel, BuBorderLayout.NORTH); content.add(p_ok_, BuBorderLayout.SOUTH); pack(); setResizable(false); if (_parent instanceof Component){ Dimension dParent= Toolkit.getDefaultToolkit().getScreenSize(); Dimension dThis= getPreferredSize(); setLocation((dParent.width - dThis.width) / 2,(dParent.height - dThis.height) / 2); // super.setLocationRelativeTo(_parent); } } // Methodes publiques public String getTitre() { return titre_; } public void setTitre(String _titre) { if ((_titre == null) || (_titre.equals(titre_))) return; titre_= _titre; tf_titre_.setText(titre_); } public String getFichier() { return fichier_; } public void setFichier(String _fichier) { if ((_fichier == null) || (_fichier.equals(fichier_))) return; fichier_= _fichier; tf_fichier_.setText(fichier_); } public String getComment() { return comment_; } public void setComment(String _comment) { if ((_comment == null) || (_comment.equals(comment_))) return; comment_= _comment; tf_comment_.setText(comment_); } public int getStatus() { return status_; } // Actions public void actionPerformed(ActionEvent _evt) { String action= _evt.getActionCommand(); System.err.println("ACTION=" + action); if (action.equals("ANNULER")) { titre_= null; fichier_= null; comment_= null; dispose(); status_= CANCEL; } else if (action.equals("VALIDER")) { titre_= tf_titre_.getText(); fichier_= tf_fichier_.getText(); comment_= tf_comment_.getText(); if (fichier_.equals("")); // A FAIRE: pop fenetre erreur fichier! dispose(); status_= OK; } else if (action.equals("PARCOURIR")) { String text= popFileChooser(); tf_fichier_.setText(text == null ? "" : text); } } // Window events public void windowActivated(WindowEvent e) {} public void windowClosed(WindowEvent e) {} public void windowClosing(WindowEvent e) { titre_= null; fichier_= null; comment_= null; dispose(); } public void windowDeactivated(WindowEvent e) {} public void windowDeiconified(WindowEvent e) {} public void windowIconified(WindowEvent e) {} public void windowOpened(WindowEvent e) {} // Methodes privees private String popFileChooser() { BuFileChooser chooser= new EbliFileChooser(false); if (filtre_ != null) chooser.setFileFilter(filtre_); if (dirOpen_ == null) dirOpen_= System.getProperty("user.dir") + File.separator + "exemples"; if (dirOpen_ != null) chooser.setCurrentDirectory(new File(dirOpen_)); int returnVal= chooser.showOpenDialog(this); dirOpen_= chooser.getCurrentDirectory().getAbsolutePath(); String filename= null; if (returnVal == BuFileChooser.APPROVE_OPTION) { filename= chooser.getSelectedFile().getAbsolutePath(); } return filename; } } --- NEW FILE: FudaaFiltreFichier.java --- /* * @file FudaaFiltreFichier.java * @creation 1999-01-07 * @modification $Date: 2004/05/05 12:42:35 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.fudaa.commun.projet; /** * Le filtre de fichiers generique de Fudaa. * * @version $Revision: 1.1 $ $Date: 2004/05/05 12:42:35 $ by $Author: deniger $ * @author Axel von Arnim */ public class FudaaFiltreFichier extends javax.swing.filechooser.FileFilter { private String[] ext_; private int mode_; public FudaaFiltreFichier(String _ext) { ext_= new String[1]; ext_[0]= _ext; mode_= FudaaProjet.BIN; } public FudaaFiltreFichier(String[] _ext) { if (_ext.length == 0) { ext_= new String[1]; ext_[0]= "fud"; } else ext_= _ext; mode_= FudaaProjet.BIN; } public String toString() { return "FudaaFiltreFichier : *." + ext_[0]; } public void setMode(int _mode) { if (_mode == mode_) return; mode_= _mode; } public int getMode() { return mode_; } public boolean accept(java.io.File fic) { boolean res= fic.isDirectory(); String name= fic.getName(); for (int i= 0; i < ext_.length; i++) { String ext= ext_[i]; if (mode_ == FudaaProjet.ASC) ext += ".asc"; else if (mode_ == FudaaProjet.ASCGZ) ext += ".asc.gz"; else if (mode_ == FudaaProjet.XML) ext += ".xml"; else if (mode_ == FudaaProjet.XMLGZ) ext += ".xml.gz"; res= res || (name.endsWith("." + ext.toLowerCase()) || name.endsWith("." + ext.toUpperCase())); } return res; } public String getDescription() { switch (mode_) { case FudaaProjet.BIN : return "*." + ext_[0]; case FudaaProjet.ASC : return "*." + ext_[0] + ".asc"; case FudaaProjet.XML : return "*." + ext_[0] + ".xml"; case FudaaProjet.ASCGZ : return "*." + ext_[0] + ".asc.gz"; case FudaaProjet.XMLGZ : return "*." + ext_[0] + ".xml.gz"; } return ""; } public String fudify(String name) { switch (mode_) { case FudaaProjet.BIN : { name += "." + ext_[0]; break; } case FudaaProjet.ASC : case FudaaProjet.XML : { int mode= mode_; mode_= FudaaProjet.BIN; name= fudify(name); mode_= mode; if (mode_ == FudaaProjet.ASC) name += ".asc"; else if (mode_ == FudaaProjet.XML) name += ".xml"; break; } case FudaaProjet.ASCGZ : { int mode= mode_; mode_= FudaaProjet.ASC; name= fudify(name); mode_= mode; name += ".gz"; break; } case FudaaProjet.XMLGZ : { int mode= mode_; mode_= FudaaProjet.XML; name= fudify(name); mode_= mode; name += ".gz"; break; } default : break; } return name; } public String unfudify(String name) { int index= name.toLowerCase().indexOf("." + ext_[0]); if (index > 0) return name.substring(0, index); else return name; } } |
|
From: Frederic D. <de...@us...> - 2004-05-05 12:42:03
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3703/src/org/fudaa/fudaa/tr/common Log Message: Directory /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common added to the repository |
|
From: Frederic D. <de...@us...> - 2004-05-05 12:42:03
|
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/action In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3703/src/org/fudaa/fudaa/meshviewer/action Log Message: Directory /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/action added to the repository |
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3233/src/org/fudaa/ebli/volume Modified Files: BGroupeLumiere.java BEtiquette.java BVolume.java BGroupeVolume.java BObjetVRML.java BTriangles.java BUnivers.java BGroupeStandard.java BGrilleIrreguliere.java BObjet2D.java BNuagePoints.java BGrilleReguliere.java BGrille.java BChampVecteurs.java BLumiere.java EbliFilleVue3D.java Added Files: BImportVolume.java Removed Files: ParametresVolumes.java Objet3DInterface.java GroupeInterface.java Log Message: Suppression des inter-dépendances --- GroupeInterface.java DELETED --- Index: BGrille.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BGrille.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BGrille.java 25 Nov 2003 10:06:48 -0000 1.4 --- BGrille.java 5 May 2004 12:40:05 -0000 1.5 *************** *** 8,24 **** */ package org.fudaa.ebli.volume; ! import java.applet.Applet; ! import java.awt.*; ! import javax.swing.*; ! import com.sun.j3d.utils.geometry.*; ! import com.sun.j3d.utils.universe.*; ! import com.sun.j3d.utils.behaviors.mouse.*; ! import javax.media.j3d.*; ! import javax.vecmath.*; ! import java.lang.reflect.*; ! import java.beans.*; ! import java.util.*; ! import org.fudaa.ebli.geometrie.*; ! import org.fudaa.ebli.palette.*; /** * Classe de base pour les grilles ( grilles*, nuage de points, champs de vecteurs) --- 8,41 ---- */ package org.fudaa.ebli.volume; ! import java.awt.Color; ! import java.beans.PropertyChangeListener; ! import java.util.BitSet; ! ! import javax.media.j3d.Appearance; ! import javax.media.j3d.BoundingBox; ! import javax.media.j3d.ColoringAttributes; ! import javax.media.j3d.GeometryArray; ! import javax.media.j3d.LineAttributes; ! import javax.media.j3d.Material; ! import javax.media.j3d.PointAttributes; ! import javax.media.j3d.PolygonAttributes; ! import javax.media.j3d.Shape3D; ! import javax.media.j3d.Switch; ! import javax.media.j3d.Texture; ! import javax.media.j3d.TextureAttributes; ! import javax.media.j3d.Transform3D; ! import javax.media.j3d.TransparencyAttributes; ! import javax.vecmath.Color3f; ! import javax.vecmath.Color4f; ! import javax.vecmath.Matrix4d; ! import javax.vecmath.Point3d; ! import javax.vecmath.Vector3d; ! ! import org.fudaa.ebli.geometrie.GrBoite; ! import org.fudaa.ebli.geometrie.GrMorphisme; ! import org.fudaa.ebli.geometrie.GrPoint; ! import org.fudaa.ebli.palette.BPaletteCouleur; ! import org.fudaa.ebli.palette.BPaletteCouleurSimple; ! import org.fudaa.ebli.volume.common.BGrilleAbstract; /** * Classe de base pour les grilles ( grilles*, nuage de points, champs de vecteurs) *************** *** 27,31 **** * @author Christophe Delhorbe */ ! public class BGrille extends BVolume implements PropertyChangeListener { protected BoundingBox bbox_; // l'objet en lui meme --- 44,48 ---- * @author Christophe Delhorbe */ ! public class BGrille extends BVolume implements PropertyChangeListener,BGrilleAbstract { protected BoundingBox bbox_; // l'objet en lui meme Index: BUnivers.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BUnivers.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BUnivers.java 25 Nov 2003 10:06:49 -0000 1.4 --- BUnivers.java 5 May 2004 12:40:05 -0000 1.5 *************** *** 8,26 **** */ package org.fudaa.ebli.volume; ! import java.applet.Applet; ! import java.awt.*; ! import java.awt.event.*; ! import javax.swing.*; ! import javax.swing.event.*; ! import com.sun.j3d.utils.geometry.*; ! import com.sun.j3d.utils.universe.*; ! import javax.media.j3d.*; ! import javax.vecmath.*; ! import java.util.Enumeration; ! import com.sun.j3d.utils.behaviors.keyboard.*; ! import java.util.*; ! import org.fudaa.ebli.geometrie.*; ! import com.memoire.bu.BuPicture; import java.awt.image.BufferedImage; /** * Composant AWT de visualisation de la scene 3D. --- 8,37 ---- */ package org.fudaa.ebli.volume; ! import java.awt.Color; ! import java.awt.GraphicsConfiguration; ! import java.awt.Image; ! import java.awt.event.ActionEvent; ! import java.awt.event.ActionListener; import java.awt.image.BufferedImage; + import java.util.Vector; + + import javax.media.j3d.Background; + import javax.media.j3d.BoundingSphere; + import javax.media.j3d.BranchGroup; + import javax.media.j3d.Canvas3D; + import javax.media.j3d.ImageComponent; + import javax.media.j3d.ImageComponent2D; + import javax.media.j3d.Raster; + import javax.media.j3d.Transform3D; + import javax.media.j3d.TransformGroup; + import javax.vecmath.AxisAngle4d; + import javax.vecmath.Color3f; + import javax.vecmath.Point3f; + import javax.vecmath.Vector3d; + + import com.sun.j3d.utils.universe.SimpleUniverse; + + import org.fudaa.ebli.geometrie.GrBoite; + import org.fudaa.ebli.volume.common.BUniversInterface; /** * Composant AWT de visualisation de la scene 3D. *************** *** 29,33 **** * @author Christophe Delhorbe */ ! public class BUnivers extends Canvas3D { // SimpleUniverse genere les elements de bases pour visualiser une scene private SimpleUniverse simpleuniverse; --- 40,44 ---- * @author Christophe Delhorbe */ ! public class BUnivers extends Canvas3D implements BUniversInterface{ // SimpleUniverse genere les elements de bases pour visualiser une scene private SimpleUniverse simpleuniverse; *************** *** 229,238 **** vues_[vue_].set(t3d); } /** - * * Tourne la camera sur un axe * @param _axe axe de rotation (X,Y ou Z) * @param _valeur angle, en radians - * */ public void rotation(int _axe, double _valeur) { --- 240,248 ---- vues_[vue_].set(t3d); } + /** * Tourne la camera sur un axe * @param _axe axe de rotation (X,Y ou Z) * @param _valeur angle, en radians */ public void rotation(int _axe, double _valeur) { Index: BObjet2D.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BObjet2D.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BObjet2D.java 25 Nov 2003 10:06:49 -0000 1.4 --- BObjet2D.java 5 May 2004 12:40:05 -0000 1.5 *************** *** 11,14 **** --- 11,16 ---- import java.beans.*; import java.lang.reflect.*; + + import org.fudaa.ebli.volume.common.*; /** * @version $Revision$ $Date$ by $Author$ Index: BEtiquette.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BEtiquette.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** BEtiquette.java 25 Nov 2003 10:06:48 -0000 1.5 --- BEtiquette.java 5 May 2004 12:40:05 -0000 1.6 *************** *** 22,25 **** --- 22,26 ---- import org.fudaa.ebli.geometrie.*; import org.fudaa.ebli.ressource.*; + import org.fudaa.ebli.volume.common.*; /** * Volume qui affiche un texte 2D dans l'espace . --- ParametresVolumes.java DELETED --- Index: BVolume.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BVolume.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BVolume.java 25 Nov 2003 10:06:49 -0000 1.4 --- BVolume.java 5 May 2004 12:40:05 -0000 1.5 *************** *** 11,14 **** --- 11,16 ---- import javax.vecmath.*; import org.fudaa.ebli.geometrie.*; + import org.fudaa.ebli.volume.common.*; + import java.awt.*; import javax.swing.*; *************** *** 21,26 **** */ public abstract class BVolume ! extends BranchGroup ! implements PropertyChangeListener, Objet3DInterface { // l'ID de l'objet protected int index_; --- 23,28 ---- */ public abstract class BVolume ! extends BVolumeAbstract ! implements PropertyChangeListener { // l'ID de l'objet protected int index_; Index: BNuagePoints.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BNuagePoints.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** BNuagePoints.java 25 Nov 2003 10:06:49 -0000 1.5 --- BNuagePoints.java 5 May 2004 12:40:05 -0000 1.6 *************** *** 17,20 **** --- 17,21 ---- import javax.vecmath.*; import org.fudaa.ebli.geometrie.*; + import org.fudaa.ebli.volume.common.*; /** * @version $Revision$ $Date$ by $Author$ Index: EbliFilleVue3D.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/EbliFilleVue3D.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EbliFilleVue3D.java 25 Nov 2003 10:06:49 -0000 1.4 --- EbliFilleVue3D.java 5 May 2004 12:40:05 -0000 1.5 *************** *** 50,54 **** import org.fudaa.ebli.volume.controles.BControleLumiere; import org.fudaa.ebli.volume.controles.BControleVolume; - import org.fudaa.ebli.volume.controles.BImportVolume; import org.fudaa.ebli.volume.controles.BMagnetoscope; import org.fudaa.ebli.volume.controles.BPas; --- 50,53 ---- Index: BGrilleIrreguliere.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BGrilleIrreguliere.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** BGrilleIrreguliere.java 25 Nov 2003 10:06:48 -0000 1.5 --- BGrilleIrreguliere.java 5 May 2004 12:40:05 -0000 1.6 *************** *** 17,20 **** --- 17,21 ---- import javax.vecmath.*; import org.fudaa.ebli.geometrie.*; + import org.fudaa.ebli.volume.common.*; /** * @version $Revision$ $Date$ by $Author$ --- NEW FILE: BImportVolume.java --- /* * @file BImportVolume.java * @creation 2000-01-20 * @modification $Date: 2004/05/05 12:40:05 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.ebli.volume; import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; import javax.swing.JButton; import javax.swing.JFileChooser; import com.memoire.bu.BuButton; import com.memoire.bu.BuFileFilter; /** * @version $Revision: 1.1 $ $Date: 2004/05/05 12:40:05 $ by $Author: deniger $ * @author Christophe Delhorbe */ public class BImportVolume extends BuButton implements ActionListener { Component parent; // PropertyChangeSupport pcs; File directory; public BImportVolume() { directory= null; addActionListener(this); // pcs=new PropertyChangeSupport(this); } /* public void addPropertyChangeListener(PropertyChangeListener _p) { pcs.addPropertyChangeListener(_p); } */ public void actionPerformed(ActionEvent e) { File file= null; String filename= null; JFileChooser chooser= new JFileChooser(); BuFileFilter filter= new BuFileFilter(new String[] { "wrl" }, "Objets VRML"); chooser.setFileFilter(filter); chooser.setCurrentDirectory(directory); int returnval= chooser.showOpenDialog(parent); if (returnval == JFileChooser.APPROVE_OPTION) { file= chooser.getSelectedFile(); directory= chooser.getCurrentDirectory(); System.out.println(file); filename= file.getAbsolutePath(); System.out.println(filename); BObjetVRML obj= null; obj= new BObjetVRML(filename); //pcs. firePropertyChange("nouvelObjet", null, obj); } } } Index: BGroupeStandard.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BGroupeStandard.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** BGroupeStandard.java 25 Nov 2003 10:06:48 -0000 1.5 --- BGroupeStandard.java 5 May 2004 12:40:05 -0000 1.6 *************** *** 19,22 **** --- 19,23 ---- import java.lang.reflect.*; import org.fudaa.ebli.geometrie.*; + import org.fudaa.ebli.volume.common.*; /** * Groupe d'objets quelconques. Index: BGroupeLumiere.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BGroupeLumiere.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BGroupeLumiere.java 25 Nov 2003 10:06:48 -0000 1.4 --- BGroupeLumiere.java 5 May 2004 12:40:05 -0000 1.5 *************** *** 18,21 **** --- 18,22 ---- import java.util.*; import org.fudaa.ebli.geometrie.*; + import org.fudaa.ebli.volume.common.*; /** * Groupe de lumieres. Index: BChampVecteurs.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BChampVecteurs.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BChampVecteurs.java 25 Nov 2003 10:06:48 -0000 1.4 --- BChampVecteurs.java 5 May 2004 12:40:05 -0000 1.5 *************** *** 17,20 **** --- 17,21 ---- import javax.vecmath.*; import org.fudaa.ebli.geometrie.*; + import org.fudaa.ebli.volume.common.*; /** * Représentation d'un champ de vecteurs 3D. Index: BTriangles.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BTriangles.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BTriangles.java 25 Nov 2003 10:06:49 -0000 1.4 --- BTriangles.java 5 May 2004 12:40:05 -0000 1.5 *************** *** 17,20 **** --- 17,21 ---- import javax.vecmath.*; import org.fudaa.ebli.geometrie.*; + import org.fudaa.ebli.volume.common.*; /** * @version $Revision$ $Date$ by $Author$ Index: BLumiere.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BLumiere.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** BLumiere.java 25 Nov 2003 10:06:48 -0000 1.5 --- BLumiere.java 5 May 2004 12:40:05 -0000 1.6 *************** *** 11,14 **** --- 11,16 ---- import javax.vecmath.*; import org.fudaa.ebli.geometrie.*; + import org.fudaa.ebli.volume.common.*; + import java.awt.*; import javax.swing.*; --- Objet3DInterface.java DELETED --- Index: BGroupeVolume.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BGroupeVolume.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** BGroupeVolume.java 25 Nov 2003 10:06:48 -0000 1.5 --- BGroupeVolume.java 5 May 2004 12:40:05 -0000 1.6 *************** *** 18,21 **** --- 18,22 ---- import java.util.*; import org.fudaa.ebli.geometrie.*; + import org.fudaa.ebli.volume.common.*; /** * Groupe de Volumes. Index: BGrilleReguliere.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BGrilleReguliere.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** BGrilleReguliere.java 25 Nov 2003 10:06:48 -0000 1.5 --- BGrilleReguliere.java 5 May 2004 12:40:05 -0000 1.6 *************** *** 17,20 **** --- 17,21 ---- import javax.vecmath.*; import org.fudaa.ebli.geometrie.*; + import org.fudaa.ebli.volume.common.*; /** * @version $Revision$ $Date$ by $Author$ Index: BObjetVRML.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/BObjetVRML.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BObjetVRML.java 25 Nov 2003 10:06:49 -0000 1.4 --- BObjetVRML.java 5 May 2004 12:40:05 -0000 1.5 *************** *** 1,3 **** ! /* * @file BObjetVRML.java * @creation 2000-01-20 --- 1,3 ---- ! /** * @file BObjetVRML.java * @creation 2000-01-20 |
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/tableau In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3233/src/org/fudaa/ebli/tableau Modified Files: EbliCellBooleanEditor.java EbliPanelListEditor.java EbliCellButtonEditor.java Removed Files: EbliCellFileEditor.java EbliCellDialogEditor.java Log Message: Suppression des inter-dépendances --- EbliCellFileEditor.java DELETED --- --- EbliCellDialogEditor.java DELETED --- Index: EbliPanelListEditor.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/tableau/EbliPanelListEditor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EbliPanelListEditor.java 19 Dec 2003 12:06:42 -0000 1.2 --- EbliPanelListEditor.java 5 May 2004 12:40:05 -0000 1.3 *************** *** 1,3 **** ! /* * @file FudaaListEditor.java * @creation 28 mai 2003 --- 1,3 ---- ! /** * @file FudaaListEditor.java * @creation 28 mai 2003 Index: EbliCellButtonEditor.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/tableau/EbliCellButtonEditor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EbliCellButtonEditor.java 19 Dec 2003 12:06:42 -0000 1.1 --- EbliCellButtonEditor.java 5 May 2004 12:40:05 -0000 1.2 *************** *** 12,29 **** import java.awt.event.ActionListener; import java.awt.event.MouseEvent; - import java.awt.event.MouseListener; import java.util.EventObject; ! import javax.swing.DefaultCellEditor; import javax.swing.JButton; - import javax.swing.JOptionPane; import javax.swing.JTable; - import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.event.CellEditorListener; import javax.swing.event.ChangeEvent; - import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableCellEditor; - import com.memoire.bu.BuButton; - import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; /** * @author deniger --- 12,23 ---- import java.awt.event.ActionListener; import java.awt.event.MouseEvent; import java.util.EventObject; ! import javax.swing.JButton; import javax.swing.JTable; import javax.swing.UIManager; import javax.swing.event.CellEditorListener; import javax.swing.event.ChangeEvent; import javax.swing.table.TableCellEditor; /** * @author deniger Index: EbliCellBooleanEditor.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/tableau/EbliCellBooleanEditor.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** EbliCellBooleanEditor.java 12 Dec 2003 10:52:26 -0000 1.1 --- EbliCellBooleanEditor.java 5 May 2004 12:40:05 -0000 1.2 *************** *** 8,22 **** */ package org.fudaa.ebli.tableau; - import java.awt.Component; - import java.awt.event.ActionEvent; - import java.awt.event.ActionListener; - import java.awt.event.MouseEvent; - import java.util.EventObject; import javax.swing.DefaultCellEditor; import javax.swing.JCheckBox; ! import javax.swing.JTable; ! import javax.swing.event.CellEditorListener; ! import javax.swing.event.ChangeEvent; ! import javax.swing.table.TableCellEditor; import com.memoire.bu.BuCheckBox; /** --- 8,14 ---- */ package org.fudaa.ebli.tableau; import javax.swing.DefaultCellEditor; import javax.swing.JCheckBox; ! import com.memoire.bu.BuCheckBox; /** |
|
From: Frederic D. <de...@us...> - 2004-05-05 12:40:14
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/filechooser In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3233/src/org/fudaa/ebli/filechooser Removed Files: EbliFavoriteFiles.java EbliFileChooser.java Log Message: Suppression des inter-dépendances --- EbliFavoriteFiles.java DELETED --- --- EbliFileChooser.java DELETED --- |
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/dialog In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3233/src/org/fudaa/ebli/dialog Modified Files: EbliSimpleDialogPanel.java Added Files: EbliCellFileEditor.java EbliFavoriteFiles.java EbliCellDialogEditor.java EbliFileChooser.java Log Message: Suppression des inter-dépendances --- NEW FILE: EbliCellDialogEditor.java --- /* * @file TrCellDialogEditor.java * @creation 13 mai 2003 * @modification $Date: 2004/05/05 12:40:04 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.ebli.dialog; import org.fudaa.ebli.tableau.EbliCellButtonEditor; import org.fudaa.ebli.tableau.EbliCellDecorator; /** * @author deniger * @version $Id: EbliCellDialogEditor.java,v 1.1 2004/05/05 12:40:04 deniger Exp $ */ public class EbliCellDialogEditor extends EbliCellButtonEditor{ protected EbliSimpleDialog dialog_; public EbliCellDialogEditor(EbliSimpleDialog _dialog) { this(_dialog, null); } public EbliCellDialogEditor( EbliSimpleDialog _dialog, EbliCellDecorator _deco) { super(_deco); dialog_= _dialog; } protected void doAction() { dialog_.setValue(value_); dialog_.doLayout(); int r= dialog_.afficheDialogModal(); if (EbliSimpleDialogPanel.isOkResponse(r)) { value_= dialog_.getValue(); setValue(value_); } else cancelCellEditing(); stopCellEditing(); if (getParent() != null) { getParent().requestFocus(); } } public EbliSimpleDialog getDialog(){ return dialog_; } } --- NEW FILE: EbliCellFileEditor.java --- /* * @file FudaaCellfileEditor.java * @creation 3 juin 2003 * @modification $Date: 2004/05/05 12:40:04 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.ebli.dialog; import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseEvent; import java.io.File; import java.util.EventObject; import javax.swing.JButton; import javax.swing.JTable; import javax.swing.UIManager; import javax.swing.event.CellEditorListener; import javax.swing.event.ChangeEvent; import javax.swing.table.TableCellEditor; import org.fudaa.ctulu.CtuluLib; import com.memoire.bu.BuFileChooser; import org.fudaa.ebli.tableau.EbliCellDecorator; /** * @author deniger * @version $Id: EbliCellFileEditor.java,v 1.1 2004/05/05 12:40:04 deniger Exp $ */ public class EbliCellFileEditor extends JButton implements TableCellEditor, ActionListener { protected transient ChangeEvent changeEvent; BuFileChooser bfc_; int fileChooserSelectionMode_; boolean multipleSelection_; private File baseDir_; boolean onlyName_; EbliCellDecorator decorator_; String value_; boolean doubleClick_; int maxParentForRelativePath_= 3; public EbliCellFileEditor() { this(null); } /** * */ public EbliCellFileEditor(EbliCellDecorator _deco) { setOpaque(false); setEnabled(true); addActionListener(this); decorator_= _deco; setBorder(UIManager.getBorder("Label.border")); setFont(UIManager.getFont("Table.font")); setHorizontalAlignment(0); setAlignmentX(0); } /** * */ public Component getTableCellEditorComponent( JTable table, Object value, boolean isSelected, int row, int column) { setValue((String)value); if (decorator_ != null) decorator_.decore(this, table, value, row, column); return this; } public void setValue(String _o) { value_= _o; setText(value_); } /** * */ public Object getCellEditorValue() { return value_; } /** * */ public boolean isCellEditable(EventObject anEvent) { if (!doubleClick_) return true; if (anEvent instanceof MouseEvent) { return ((MouseEvent)anEvent).getClickCount() >= 2; } return true; } /** * */ public boolean shouldSelectCell(EventObject anEvent) { return true; } /** * */ public void cancelCellEditing() { Object[] listeners= listenerList.getListenerList(); for (int i= listeners.length - 2; i >= 0; i -= 2) { if (listeners[i] == CellEditorListener.class) { if (changeEvent == null) changeEvent= new ChangeEvent(this); ((CellEditorListener)listeners[i + 1]).editingCanceled(changeEvent); } } } /** * */ public void addCellEditorListener(CellEditorListener l) { listenerList.add(CellEditorListener.class, l); } /** * */ public void removeCellEditorListener(CellEditorListener l) { listenerList.remove(CellEditorListener.class, l); } public boolean stopCellEditing() { Object[] listeners= listenerList.getListenerList(); for (int i= listeners.length - 2; i >= 0; i -= 2) { if (listeners[i] == CellEditorListener.class) { if (changeEvent == null) changeEvent= new ChangeEvent(this); ((CellEditorListener)listeners[i + 1]).editingStopped(changeEvent); } } return false; } /** * */ public void actionPerformed(ActionEvent _ae) { if (bfc_ == null) { bfc_= new EbliFileChooser(false); } bfc_.setFileSelectionMode(fileChooserSelectionMode_); bfc_.setMultiSelectionEnabled(multipleSelection_); if ((baseDir_ != null) && ((value_ != null))) { System.out.println( CtuluLib.getAbsolutePath(baseDir_, value_).getParentFile()); bfc_.setCurrentDirectory( CtuluLib.getAbsolutePath(baseDir_, value_).getParentFile()); } int r= bfc_.showOpenDialog(EbliCellFileEditor.this); if (r == BuFileChooser.APPROVE_OPTION) { if (onlyName_) setValue(bfc_.getSelectedFile().getName()); else if (baseDir_ == null) { setValue(bfc_.getSelectedFile().getAbsolutePath()); } else { setValue(CtuluLib.getRelativeFile(bfc_.getSelectedFile(), baseDir_, 3)); } } stopCellEditing(); } /** * */ public EbliCellDecorator getDecorator() { return decorator_; } public void setDecorator(EbliCellDecorator _decorator) { decorator_= _decorator; } /** * */ public boolean isDoubleClick() { return doubleClick_; } /** * */ public void setDoubleClick(boolean _b) { doubleClick_= _b; } /** * */ public int getFileChooserSelectionMode() { return fileChooserSelectionMode_; } /** * */ public File getBaseDir() { return baseDir_; } /** * */ public boolean isMultipleSelection() { return multipleSelection_; } /** * */ public boolean isOnlyName() { return onlyName_; } /** * */ public void setFileChooserSelectionMode(int _i) { fileChooserSelectionMode_= _i; } /** * */ public void setBaseDir(File _file) { baseDir_= _file; } /** * */ public void setMultipleSelection(boolean _b) { multipleSelection_= _b; } /** * */ public void setOnlyName(boolean _b) { onlyName_= _b; } /** * */ public String getValue() { return value_; } } --- NEW FILE: EbliFavoriteFiles.java --- /* * @file FudaaFavoriteFiles.java * @creation 23 juin 2003 * @modification $Date: 2004/05/05 12:40:04 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.ebli.dialog; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.io.File; import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; import java.util.List; import java.util.Observer; import javax.swing.AbstractListModel; import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JFileChooser; import javax.swing.JLabel; import javax.swing.MutableComboBoxModel; import com.memoire.bu.BuBorderLayout; import com.memoire.bu.BuButtonLayout; import com.memoire.bu.BuPanel; import com.memoire.bu.BuPreferences; import com.memoire.bu.BuResource; import com.memoire.bu.BuToolButton; import com.memoire.fu.FuLib; import org.fudaa.ctulu.CtuluLib; import org.fudaa.ebli.ressource.EbliResource; import org.fudaa.ebli.tableau.EbliCellTextRenderer; import org.fudaa.ebli.tableau.EbliPanelListEditor; import org.fudaa.ebli.tableau.EbliPanelListEditorModel; /** * Permet de gerer les dossiers favoris et le dernier repertoire favori * @author deniger * @version $Id: EbliFavoriteFiles.java,v 1.1 2004/05/05 12:40:04 deniger Exp $ */ public class EbliFavoriteFiles { /** * Le prefix pour les favoris */ public static final String PREF_ID = "explorer.favorite."; /** * Le suffixe pardi */ public static final String SUF_ID = ".path"; /** * La cle de la pref pour le nombre de dossier favoris */ public static final String PREF_NB = "explorer.favorite.nb"; /** * La cle pour le dernier rep ouvert */ public static final String PREF_LAST = "explorer.last.dir"; /** * Le singleton */ public static final EbliFavoriteFiles INSTANCE = new EbliFavoriteFiles(); List list_; private Observer observer_; /** * */ private EbliFavoriteFiles() { loadFavorites(); } /** * @return le dernier dossier visite selon la pref PREF_LAST */ public static File getLastDir() { return new File(getLastDirPath()); } /** * @return le dernier dossier visite selon la pref PREF_LAST */ public static String getLastDirPath() { return BuPreferences.BU.getStringProperty( EbliFavoriteFiles.PREF_LAST, FuLib.getUserHome()); } /** * L'observer recevra un update avec des arguments null a chaque modif des favoris. * @param _o le nouvel Observer */ public void setObserver(Observer _o) { observer_ = _o; } /** * @param _f un nouveau rep favoris */ public void addFile(File _f) { if ((_f != null) && (_f.exists()) && (_f.isDirectory())) { String s = _f.getAbsolutePath(); if (!list_.contains(s)) { list_.add(s); fireChange(); } } } private void loadFavorites() { list_ = new ArrayList(20); int nb = BuPreferences.BU.getIntegerProperty(PREF_NB, -1); if (nb < 0) { for (Enumeration e = BuPreferences.BU.keys(); e.hasMoreElements();) { String k = (String) e.nextElement(); if (k.startsWith(PREF_ID)) { String val = BuPreferences.BU.getStringProperty(k); File f = new File(val); if ((!f.exists()) || (!f.isDirectory())) { BuPreferences.BU.removeProperty(k); } else { list_.add(val); } } } } for (int i = 1; i <= nb; i++) { String k = PREF_ID + i+SUF_ID; String val = BuPreferences.BU.getStringProperty(k); if (val != null) { File f = new File(val); if ((!f.exists()) || (!f.isDirectory())) { BuPreferences.BU.removeProperty(k); } else { list_.add(val); } } } Collections.sort(list_); } private class FavoriteModel extends AbstractListModel implements MutableComboBoxModel { Object selected_; /** * @return l'obj selectionne */ public Object getSelectedItem() { return selected_; } /** * @see javax.swing.ComboBoxModel#setSelectedItem(java.lang.Object) */ public void setSelectedItem(Object anItem) { if (((anItem != null) && (!anItem.equals(selected_)) || ((anItem == null) && selected_ != null))) { selected_ = anItem; fireContentsChanged(this, -1, -1); } } /** * @param o l'objet a tester * @return true si l'objet est contenu dans la liste */ public boolean contains(Object o) { return list_.contains(o); } /** * @see javax.swing.MutableComboBoxModel#addElement(java.lang.Object) */ public void addElement(Object obj) { if (obj instanceof String) { list_.add(obj); Collections.sort(list_); fireContentsChanged(this, 0, list_.size()); } } /** * @see javax.swing.MutableComboBoxModel#insertElementAt(java.lang.Object, int) */ public void insertElementAt(Object obj, int index) { addElement(obj); } /** * Removes an item at a specific index * @param _i l'index a supprimer et pan! */ public void removeElementAt(int _i) { if (_i >= 0) { list_.remove(_i); fireIntervalRemoved(this, _i, _i); } } protected void update() { if (list_.contains(getSelectedItem())) { setSelectedItem(null); } fireContentsChanged(this, 0, list_.size()); } /** * @see javax.swing.ListModel#getElementAt(int) */ public Object getElementAt(int arg0) { return list_.get(arg0); } /** * @see javax.swing.ListModel#getSize() */ public int getSize() { return list_.size(); } /** * @see javax.swing.MutableComboBoxModel#removeElement(java.lang.Object) */ public void removeElement(Object obj) { removeElementAt(list_.indexOf(obj)); } } /** * @param _f le file chooser dans lequel le composant sera affiche * @return un composant a ajouter au JFileChooser _f */ public JComponent createComponent(final JFileChooser _f) { BuPanel pnMain = new BuPanel(); pnMain.setLayout(new BuBorderLayout(2, 2)); JLabel lb = new JLabel(EbliResource.getS("Favoris") + ":"); pnMain.add(lb, BuBorderLayout.WEST); final FavoriteModel model = new FavoriteModel(); final JComboBox j = new JComboBox(model); EbliCellTextRenderer cellRenderer = new EbliCellTextRenderer() { protected void setValue(Object value) { String s = (String) value; setToolTipText(s); setText(s); } }; cellRenderer.setIcon(BuResource.BU.getToolIcon("ouvrir")); j.setRenderer(cellRenderer); j.addItemListener(new ItemListener() { public void itemStateChanged(ItemEvent e) { if (e.getStateChange() == ItemEvent.SELECTED) { if (model.getSelectedItem() != null) { _f.setCurrentDirectory(new File((String) model.getSelectedItem())); } } } }); pnMain.add(j, BuBorderLayout.CENTER); BuToolButton bt = new BuToolButton(BuResource.BU.loadMenuCommandIcon("oui")); bt.setToolTipText( EbliResource.getS("Ajouter le répertoire courant aux favoris")); bt.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent _ae) { String s = _f.getCurrentDirectory().getAbsolutePath(); if (!list_.contains(s)) { model.addElement(s); EbliFavoriteFiles.this.fireChange(); } } }); BuPanel pnBt = new BuPanel(); pnBt.setLayout(new BuButtonLayout(1, BuButtonLayout.CENTER)); pnBt.add(bt); bt = new BuToolButton(BuResource.BU.loadMenuCommandIcon("editer")); bt.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent _ae) { EbliPanelListEditorModel listmodel = new EbliPanelListEditorModel(list_, false); EbliPanelListEditor editor = new EbliPanelListEditor(listmodel, false, true, false) { public void initCellRendererEditor() { EbliCellTextRenderer txt = new EbliCellTextRenderer(); txt.setIcon(BuResource.BU.getToolIcon("ouvrir")); table_.getColumnModel().getColumn(0).setCellRenderer(txt); } }; EbliSimpleDialogPanel pn = new EbliSimpleDialogPanel(); pn.setLayout(new BuBorderLayout()); pn.add(editor, BuBorderLayout.CENTER); if (EbliSimpleDialogPanel .isOkResponse( pn.afficheModale(j, EbliResource.getS("Edition des favoris")))) { list_ = listmodel.getValuesInList(); model.update(); fireChange(); } } }); bt.setToolTipText(EbliResource.getS("Editer les favoris")); pnBt.add(bt); pnMain.add(pnBt, BuBorderLayout.EAST); return pnMain; } /** * Enregistre les preferences dans FudaaPreferences mais n'ecrit pas le fichier de pref. */ public void saveFavorites() { int nb = BuPreferences.BU.getIntegerProperty(PREF_NB, -1); if (nb < 0) { for (Enumeration e = BuPreferences.BU.keys(); e.hasMoreElements();) { String k = (String) e.nextElement(); if (k.startsWith(PREF_ID)) { BuPreferences.BU.removeProperty(k); } } } else{ for(int i=1;i<=nb;i++){ BuPreferences.BU.removeProperty(PREF_ID+i+SUF_ID); } } int n = list_.size(); for (int i = 0; i < n; i++) { String key = PREF_ID+CtuluLib.getString(i+1)+SUF_ID; BuPreferences.BU.putStringProperty(key, (String) list_.get(i)); } BuPreferences.BU.putIntegerProperty(PREF_NB,list_.size()); } protected void fireChange() { saveFavorites(); if (observer_ != null) observer_.update(null, null); } } Index: EbliSimpleDialogPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/dialog/EbliSimpleDialogPanel.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** EbliSimpleDialogPanel.java 30 Apr 2004 07:22:42 -0000 1.16 --- EbliSimpleDialogPanel.java 5 May 2004 12:40:04 -0000 1.17 *************** *** 46,50 **** import com.memoire.bu.BuVerticalLayout; - import org.fudaa.ebli.filechooser.EbliFileChooser; /** * Un panneau qui peut etre facilement affichable dans une boite de dialogue. Cette classe reprend --- 46,49 ---- --- NEW FILE: EbliFileChooser.java --- /* * @file TestBrowser.java * @creation 23 juin 2003 * @modification $Date: 2004/05/05 12:40:04 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.ebli.dialog; import java.awt.Component; import java.awt.Dimension; import java.awt.Frame; import java.awt.Toolkit; import javax.swing.BorderFactory; import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.SwingUtilities; import com.memoire.bu.BuBorderLayout; import com.memoire.bu.BuFileChooser; import com.memoire.bu.BuPanel; import com.memoire.bu.BuPreferences; /** * @author deniger * @version $Id: EbliFileChooser.java,v 1.1 2004/05/05 12:40:04 deniger Exp $ */ public class EbliFileChooser extends BuFileChooser { int response_; JDialog dial_; public EbliFileChooser() { this(true); } /** * Si _lastDir, le fileChooser est ouvert dans le dernier repertoire ouvert. * @param _lastDir si true le rep courant est le dernier rep ouvert */ public EbliFileChooser(boolean _lastDir) { super(); response_= BuFileChooser.ERROR_OPTION; if (_lastDir){ setCurrentDirectory(EbliFavoriteFiles.getLastDir()); } } public static void main(String[] args) { JFrame f= new JFrame(); EbliFileChooser tb= new EbliFileChooser(); tb.setFileSelectionMode(EbliFileChooser.FILES_ONLY); f.setVisible(true); int r= tb.showDialog(f); EbliFavoriteFiles.INSTANCE.saveFavorites(); BuPreferences.BU.writeIniFile(); // JFileChooser jfc=new JFileChooser(); // jfc.setFileSelectionMode(FudaaFileChooser.FILES_ONLY); // jfc.showOpenDialog(f); } /** * @param parent * @return */ public int showDialog(Frame parent) { dial_= new JDialog(parent); init(dial_); rescanCurrentDirectory(); Dimension dParent= Toolkit.getDefaultToolkit().getScreenSize(); Dimension dThis= getPreferredSize(); dial_.setLocation((dParent.width - dThis.width) / 2,(dParent.height - dThis.height) / 2); dial_.show(); return response_; } private void init(JDialog _dial) { BuPanel pn= new BuPanel(); pn.setLayout(new BuBorderLayout()); pn.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5)); pn.add(this, BuBorderLayout.CENTER); pn.add( EbliFavoriteFiles.INSTANCE.createComponent(this), BuBorderLayout.NORTH); _dial.setContentPane(pn); String title= getDialogTitle(); _dial.setModal(true); _dial.setTitle(title); _dial.pack(); } /** * */ public int showOpenDialog(Frame parent) { setDialogType(BuFileChooser.OPEN_DIALOG); return showDialog(parent); } /** * */ public int showSaveDialog(Frame parent) { setDialogType(BuFileChooser.SAVE_DIALOG); return showDialog(parent); } /** * */ public int showDialog(Component parent, String approveButtonText) { Frame frame= parent instanceof Frame ? (Frame)parent : (Frame)SwingUtilities.getAncestorOfClass(Frame.class, parent); return showDialog(frame); } /** * */ public int showOpenDialog(Component parent) { Frame frame= parent instanceof Frame ? (Frame)parent : (Frame)SwingUtilities.getAncestorOfClass(Frame.class, parent); return showOpenDialog(frame); } /** * */ public int showSaveDialog(Component parent) { Frame frame= parent instanceof Frame ? (Frame)parent : (Frame)SwingUtilities.getAncestorOfClass(Frame.class, parent); return showSaveDialog(frame); } /** * */ public void approveSelection() { BuPreferences.BU.putStringProperty( EbliFavoriteFiles.PREF_LAST, getCurrentDirectory().getAbsolutePath()); response_= EbliFileChooser.APPROVE_OPTION; if (dial_ != null) { dial_.dispose(); dial_= null; } } /** * */ public void cancelSelection() { response_= EbliFileChooser.CANCEL_OPTION; if (dial_ != null) { dial_.dispose(); dial_= null; } } } |
|
From: Frederic D. <de...@us...> - 2004-05-05 12:40:14
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/controles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3233/src/org/fudaa/ebli/volume/controles Modified Files: TrajectoireCamera.java BArbreVolume.java BVolumeTransformation.java BControleVolume.java BUniversInteraction.java BPosition.java BSelecteurTexture.java BControleEchelle.java BPas.java BControleLumiere.java BMagnetoscope.java TransformTypeIn.java Removed Files: BImportVolume.java Log Message: Suppression des inter-dépendances Index: BPosition.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/controles/BPosition.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BPosition.java 25 Nov 2003 10:06:49 -0000 1.4 --- BPosition.java 5 May 2004 12:40:04 -0000 1.5 *************** *** 8,20 **** */ package org.fudaa.ebli.volume.controles; ! import javax.swing.*; ! import javax.swing.event.*; ! import java.awt.*; ! import java.awt.event.*; ! import java.text.*; ! import java.beans.*; ! import javax.media.j3d.*; ! import javax.vecmath.*; ! import org.fudaa.ebli.volume.ParametresVolumes; /** * Affiche la position de la caméra dans l'univers. --- 8,21 ---- */ package org.fudaa.ebli.volume.controles; ! import java.awt.GridLayout; ! import java.beans.PropertyChangeEvent; ! import java.beans.PropertyChangeListener; ! import java.text.DecimalFormat; ! ! import javax.swing.JLabel; ! import javax.swing.JPanel; ! import javax.vecmath.Vector3d; ! ! import org.fudaa.ebli.volume.common.ParametresVolumes; /** * Affiche la position de la caméra dans l'univers. --- BImportVolume.java DELETED --- Index: BPas.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/controles/BPas.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BPas.java 25 Nov 2003 10:06:49 -0000 1.4 --- BPas.java 5 May 2004 12:40:04 -0000 1.5 *************** *** 8,15 **** */ package org.fudaa.ebli.volume.controles; ! import javax.swing.*; ! import javax.swing.event.*; ! import java.awt.*; ! import java.awt.event.*; /** * Classe de selection du pas de translation --- 8,18 ---- */ package org.fudaa.ebli.volume.controles; ! import java.awt.GridLayout; ! import java.awt.event.ActionEvent; ! import java.awt.event.ActionListener; ! ! import javax.swing.ButtonGroup; ! import javax.swing.JPanel; ! import javax.swing.JRadioButton; /** * Classe de selection du pas de translation Index: BMagnetoscope.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/controles/BMagnetoscope.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** BMagnetoscope.java 25 Nov 2003 10:06:49 -0000 1.5 --- BMagnetoscope.java 5 May 2004 12:40:04 -0000 1.6 *************** *** 8,21 **** */ package org.fudaa.ebli.volume.controles; ! import javax.vecmath.*; ! import javax.media.j3d.*; ! import org.fudaa.ebli.volume.*; ! import com.memoire.bu.*; ! import java.util.*; ! import java.awt.*; ! import javax.swing.*; ! import java.awt.event.*; ! import java.io.*; ! import java.text.*; /** * @version $Revision$ $Date$ by $Author$ --- 8,45 ---- */ package org.fudaa.ebli.volume.controles; ! import java.awt.BorderLayout; ! import java.awt.Component; ! import java.awt.FlowLayout; ! import java.awt.GridLayout; ! import java.awt.event.ActionEvent; ! import java.awt.event.ActionListener; ! import java.io.File; ! import java.io.FileNotFoundException; ! import java.io.FileOutputStream; ! import java.io.FileReader; ! import java.io.IOException; ! import java.io.LineNumberReader; ! import java.io.PrintStream; ! import java.text.NumberFormat; ! import java.util.StringTokenizer; ! import java.util.Vector; ! ! import javax.media.j3d.Transform3D; ! import javax.swing.JButton; ! import javax.swing.JCheckBox; ! import javax.swing.JComponent; ! import javax.swing.JFileChooser; ! import javax.swing.JLabel; ! import javax.swing.JPanel; ! import javax.swing.JSeparator; ! import javax.vecmath.Point3f; ! import javax.vecmath.Quat4f; ! import javax.vecmath.Tuple3f; ! import javax.vecmath.Vector3f; ! ! import com.memoire.bu.BuFileFilter; ! import com.memoire.bu.BuVerticalLayout; ! ! import org.fudaa.ebli.volume.common.BUniversInterface; /** * @version $Revision$ $Date$ by $Author$ *************** *** 35,39 **** int cle_; JCheckBox boucle_; ! BUnivers u_; Vector pos_; Vector dir_; --- 59,63 ---- int cle_; JCheckBox boucle_; ! BUniversInterface u_; Vector pos_; Vector dir_; *************** *** 43,47 **** Component parent; boolean boolmarche= false; ! public BMagnetoscope(BUnivers _u) { parent= this; u_= _u; --- 67,71 ---- Component parent; boolean boolmarche= false; ! public BMagnetoscope(BUniversInterface _u) { parent= this; u_= _u; Index: BControleLumiere.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/controles/BControleLumiere.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BControleLumiere.java 25 Nov 2003 10:06:49 -0000 1.4 --- BControleLumiere.java 5 May 2004 12:40:04 -0000 1.5 *************** *** 8,18 **** */ package org.fudaa.ebli.volume.controles; ! import javax.swing.*; ! import javax.swing.event.*; ! import java.awt.event.*; ! import java.awt.*; ! import java.util.*; ! import java.beans.*; ! import javax.vecmath.*; import com.memoire.bu.BuVerticalLayout; /** --- 8,29 ---- */ package org.fudaa.ebli.volume.controles; ! import java.awt.Color; ! import java.awt.Dimension; ! import java.awt.FlowLayout; ! import java.awt.Graphics; ! import java.awt.event.MouseEvent; ! import java.awt.event.MouseListener; ! import java.beans.PropertyChangeListener; ! import java.beans.PropertyChangeSupport; ! ! import javax.swing.JComponent; ! import javax.swing.JLabel; ! import javax.swing.JPanel; ! import javax.swing.JSlider; ! import javax.swing.SwingUtilities; ! import javax.swing.event.ChangeEvent; ! import javax.swing.event.ChangeListener; ! import javax.vecmath.Vector3f; ! import com.memoire.bu.BuVerticalLayout; /** Index: BControleVolume.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/controles/BControleVolume.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** BControleVolume.java 25 Nov 2003 10:06:49 -0000 1.5 --- BControleVolume.java 5 May 2004 12:40:04 -0000 1.6 *************** *** 8,21 **** */ package org.fudaa.ebli.volume.controles; ! import javax.swing.*; ! import javax.swing.event.*; ! import java.awt.event.*; ! import java.awt.*; ! import java.util.*; ! import org.fudaa.ebli.repere.*; ! import com.memoire.bu.*; ! import org.fudaa.ebli.ressource.*; ! import java.beans.*; ! import org.fudaa.ebli.volume.*; /** * @version $Revision$ $Date$ by $Author$ --- 8,33 ---- */ package org.fudaa.ebli.volume.controles; ! import java.awt.Dialog; ! import java.awt.Dimension; ! import java.awt.Frame; ! import java.awt.Graphics; ! import java.awt.Image; ! import java.awt.MediaTracker; ! import java.awt.event.KeyEvent; ! import java.awt.event.KeyListener; ! import java.awt.event.MouseEvent; ! import java.awt.event.MouseListener; ! import java.awt.event.MouseMotionListener; ! import java.util.Vector; ! ! import javax.swing.JComponent; ! import javax.swing.SwingUtilities; ! ! import com.memoire.bu.BuLightBorder; ! ! import org.fudaa.ebli.repere.RepereEvent; ! import org.fudaa.ebli.repere.RepereEventListener; ! import org.fudaa.ebli.ressource.EbliResource; ! import org.fudaa.ebli.volume.common.ParametresVolumes; /** * @version $Revision$ $Date$ by $Author$ Index: TransformTypeIn.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/controles/TransformTypeIn.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TransformTypeIn.java 25 Nov 2003 10:06:50 -0000 1.4 --- TransformTypeIn.java 5 May 2004 12:40:04 -0000 1.5 *************** *** 8,24 **** */ package org.fudaa.ebli.volume.controles; ! import javax.swing.*; ! import javax.swing.event.*; ! import java.awt.event.*; ! import java.awt.*; ! import java.util.*; ! import org.fudaa.ebli.repere.*; ! import com.memoire.bu.*; ! import org.fudaa.ebli.ressource.*; ! import java.beans.*; ! import org.fudaa.ebli.volume.*; ! import javax.media.j3d.*; ! import javax.vecmath.*; import java.text.DecimalFormat; /** * @version $Revision$ $Date$ by $Author$ --- 8,30 ---- */ package org.fudaa.ebli.volume.controles; ! import java.awt.GridLayout; ! import java.awt.event.ActionEvent; ! import java.awt.event.ActionListener; ! import java.awt.event.ItemEvent; ! import java.awt.event.ItemListener; ! import java.beans.PropertyChangeEvent; ! import java.beans.PropertyChangeListener; import java.text.DecimalFormat; + import java.util.Vector; + + import javax.swing.JCheckBox; + import javax.swing.JComponent; + import javax.swing.JLabel; + import javax.swing.JTextField; + import javax.vecmath.Vector3d; + + import org.fudaa.ebli.repere.RepereEvent; + import org.fudaa.ebli.repere.RepereEventListener; + import org.fudaa.ebli.volume.common.ParametresVolumes; /** * @version $Revision$ $Date$ by $Author$ Index: TrajectoireCamera.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/controles/TrajectoireCamera.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TrajectoireCamera.java 25 Nov 2003 10:06:50 -0000 1.4 --- TrajectoireCamera.java 5 May 2004 12:40:04 -0000 1.5 *************** *** 8,14 **** */ package org.fudaa.ebli.volume.controles; ! import javax.vecmath.*; ! import javax.media.j3d.*; ! import org.fudaa.ebli.volume.*; /** * @version $Revision$ $Date$ by $Author$ --- 8,21 ---- */ package org.fudaa.ebli.volume.controles; ! import javax.media.j3d.Alpha; ! import javax.media.j3d.BoundingSphere; ! import javax.media.j3d.BranchGroup; ! import javax.media.j3d.RotPosPathInterpolator; ! import javax.media.j3d.Transform3D; ! import javax.vecmath.AxisAngle4f; ! import javax.vecmath.Point3f; ! import javax.vecmath.Quat4f; ! ! import org.fudaa.ebli.volume.common.BUniversInterface; /** * @version $Revision$ $Date$ by $Author$ *************** *** 20,24 **** Point3f[] positions_; Quat4f[] directions_; ! BUnivers univers_; boolean boucle_; RotPosPathInterpolator trajectoire_; --- 27,31 ---- Point3f[] positions_; Quat4f[] directions_; ! BUniversInterface univers_; boolean boucle_; RotPosPathInterpolator trajectoire_; *************** *** 29,33 **** public TrajectoireCamera( int _nbCles, ! BUnivers _u, boolean _boucle, int _temps, --- 36,40 ---- public TrajectoireCamera( int _nbCles, ! BUniversInterface _u, boolean _boucle, int _temps, Index: BControleEchelle.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/controles/BControleEchelle.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BControleEchelle.java 25 Nov 2003 10:06:49 -0000 1.4 --- BControleEchelle.java 5 May 2004 12:40:04 -0000 1.5 *************** *** 8,19 **** */ package org.fudaa.ebli.volume.controles; ! import javax.swing.*; ! import javax.swing.event.*; ! import java.awt.event.*; ! import java.awt.*; ! import java.util.*; ! import java.beans.*; ! import javax.vecmath.*; ! import com.memoire.bu.BuVerticalLayout; /** * @version $Revision$ $Date$ by $Author$ --- 8,21 ---- */ package org.fudaa.ebli.volume.controles; ! import java.awt.FlowLayout; ! import java.beans.PropertyChangeListener; ! import java.beans.PropertyChangeSupport; ! ! import javax.swing.JComponent; ! import javax.swing.JLabel; ! import javax.swing.JSlider; ! import javax.swing.SwingConstants; ! import javax.swing.event.ChangeEvent; ! import javax.swing.event.ChangeListener; /** * @version $Revision$ $Date$ by $Author$ Index: BUniversInteraction.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/controles/BUniversInteraction.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BUniversInteraction.java 25 Nov 2003 10:06:49 -0000 1.4 --- BUniversInteraction.java 5 May 2004 12:40:04 -0000 1.5 *************** *** 8,18 **** */ package org.fudaa.ebli.volume.controles; ! import javax.swing.event.*; ! import java.awt.event.*; ! import org.fudaa.ebli.repere.*; ! import org.fudaa.ebli.commun.*; ! import org.fudaa.ebli.volume.*; ! import org.fudaa.ebli.ressource.*; ! import java.beans.*; /** * Permet l'interaction avec l'Univers en gerant les déplacements --- 8,22 ---- */ package org.fudaa.ebli.volume.controles; ! import java.awt.event.ActionEvent; ! import java.awt.event.ActionListener; ! import java.awt.event.ItemEvent; ! import java.awt.event.ItemListener; ! import java.beans.PropertyChangeEvent; ! import java.beans.PropertyChangeListener; ! ! import org.fudaa.ebli.commun.EbliPreferences; ! import org.fudaa.ebli.repere.RepereEvent; ! import org.fudaa.ebli.repere.RepereEventListener; ! import org.fudaa.ebli.volume.common.BUniversInterface; /** * Permet l'interaction avec l'Univers en gerant les déplacements *************** *** 23,27 **** public class BUniversInteraction implements RepereEventListener, ActionListener, ItemListener, PropertyChangeListener { ! BUnivers u; static boolean orbital= false; /** --- 27,31 ---- public class BUniversInteraction implements RepereEventListener, ActionListener, ItemListener, PropertyChangeListener { ! BUniversInterface u; static boolean orbital= false; /** *************** *** 31,35 **** * */ ! public BUniversInteraction(BUnivers _u) { u= _u; } --- 35,39 ---- * */ ! public BUniversInteraction(BUniversInterface _u) { u= _u; } Index: BArbreVolume.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/controles/BArbreVolume.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** BArbreVolume.java 25 Nov 2003 10:06:49 -0000 1.6 --- BArbreVolume.java 5 May 2004 12:40:04 -0000 1.7 *************** *** 8,22 **** */ package org.fudaa.ebli.volume.controles; ! import javax.swing.*; ! import javax.swing.border.*; ! import javax.swing.event.*; ! import javax.swing.tree.*; ! import com.memoire.bu.*; ! import org.fudaa.ebli.ressource.*; ! import org.fudaa.ebli.volume.*; ! import java.awt.*; ! import java.awt.event.*; ! import java.beans.*; ! import java.util.*; /** * @version $Revision$ $Date$ by $Author$ --- 8,43 ---- */ package org.fudaa.ebli.volume.controles; ! import java.awt.Component; ! import java.awt.event.ActionEvent; ! import java.awt.event.ActionListener; ! import java.awt.event.MouseEvent; ! import java.awt.event.MouseListener; ! import java.beans.PropertyChangeEvent; ! import java.beans.PropertyChangeListener; ! import java.util.Vector; ! ! import javax.swing.JButton; ! import javax.swing.JCheckBoxMenuItem; ! import javax.swing.JComponent; ! import javax.swing.JLabel; ! import javax.swing.JMenuItem; ! import javax.swing.JTree; ! import javax.swing.UIManager; ! import javax.swing.border.EmptyBorder; ! import javax.swing.event.TreeModelListener; ! import javax.swing.tree.TreeCellRenderer; ! import javax.swing.tree.TreeModel; ! import javax.swing.tree.TreePath; ! import javax.swing.tree.TreeSelectionModel; ! ! import com.memoire.bu.BuIcon; ! import com.memoire.bu.BuMenu; ! import com.memoire.bu.BuPopupMenu; ! ! import org.fudaa.ebli.ressource.EbliResource; ! import org.fudaa.ebli.volume.common.BGrilleAbstract; ! import org.fudaa.ebli.volume.common.BVolumeAbstract; ! import org.fudaa.ebli.volume.common.GroupeInterface; ! import org.fudaa.ebli.volume.common.Objet3DInterface; /** * @version $Revision$ $Date$ by $Author$ *************** *** 241,245 **** true, volume_.isVisible()); ! if (volume_ instanceof BVolume) addMenuItem( EbliResource.EBLI.getString("Rapide"), --- 262,266 ---- true, volume_.isVisible()); ! if (volume_ instanceof BVolumeAbstract) addMenuItem( EbliResource.EBLI.getString("Rapide"), *************** *** 247,256 **** true, volume_.isRapide()); ! if (volume_ instanceof BGrille) addMenuItem( EbliResource.EBLI.getString("Filaire"), "FILAIRE", true, ! ((BGrille)volume_).isFilaire()); if (volume_.isDestructible()) { addSeparator(); --- 268,277 ---- true, volume_.isRapide()); ! if (volume_ instanceof BGrilleAbstract) addMenuItem( EbliResource.EBLI.getString("Filaire"), "FILAIRE", true, ! ((BGrilleAbstract)volume_).isFilaire()); if (volume_.isDestructible()) { addSeparator(); *************** *** 279,283 **** } if (action.equals("FILAIRE")) { ! ((BGrille)volume_).setFilaire(!((BGrille)volume_).isFilaire()); arbre_.repaint(); } --- 300,304 ---- } if (action.equals("FILAIRE")) { ! ((BGrilleAbstract)volume_).setFilaire(!((BGrilleAbstract)volume_).isFilaire()); arbre_.repaint(); } Index: BSelecteurTexture.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/controles/BSelecteurTexture.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BSelecteurTexture.java 25 Nov 2003 10:06:49 -0000 1.4 --- BSelecteurTexture.java 5 May 2004 12:40:04 -0000 1.5 *************** *** 8,20 **** */ package org.fudaa.ebli.volume.controles; ! import java.awt.*; ! import java.awt.event.*; ! import javax.swing.*; ! import javax.swing.event.*; ! import java.beans.*; ! import com.memoire.bu.*; ! import com.sun.j3d.utils.image.TextureLoader; ! import javax.media.j3d.*; import java.io.File; /** * @version $Revision$ $Date$ by $Author$ --- 8,42 ---- */ package org.fudaa.ebli.volume.controles; ! import java.awt.BorderLayout; ! import java.awt.Component; ! import java.awt.Dimension; ! import java.awt.FlowLayout; ! import java.awt.Graphics; ! import java.awt.GridLayout; ! import java.awt.Image; ! import java.awt.MediaTracker; ! import java.awt.event.ActionEvent; ! import java.awt.event.ActionListener; ! import java.beans.PropertyChangeListener; ! import java.beans.PropertyChangeSupport; import java.io.File; + + import javax.media.j3d.Texture; + import javax.swing.ButtonGroup; + import javax.swing.JButton; + import javax.swing.JCheckBox; + import javax.swing.JComponent; + import javax.swing.JFileChooser; + import javax.swing.JLabel; + import javax.swing.JPanel; + import javax.swing.JRadioButton; + import javax.swing.JSeparator; + import javax.swing.JSlider; + import javax.swing.event.ChangeEvent; + import javax.swing.event.ChangeListener; + + import com.memoire.bu.BuFileFilter; + import com.memoire.bu.BuVerticalLayout; + import com.sun.j3d.utils.image.TextureLoader; /** * @version $Revision$ $Date$ by $Author$ Index: BVolumeTransformation.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/controles/BVolumeTransformation.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BVolumeTransformation.java 25 Nov 2003 10:06:50 -0000 1.4 --- BVolumeTransformation.java 5 May 2004 12:40:04 -0000 1.5 *************** *** 8,17 **** */ package org.fudaa.ebli.volume.controles; ! import javax.swing.*; ! import javax.swing.event.*; ! import java.awt.event.*; ! import java.awt.*; ! import java.util.*; ! import org.fudaa.ebli.volume.*; /** * @version $Revision$ $Date$ by $Author$ --- 8,19 ---- */ package org.fudaa.ebli.volume.controles; ! import java.awt.GridLayout; ! import java.awt.event.ActionEvent; ! import java.awt.event.ActionListener; ! ! import javax.swing.JCheckBox; ! import javax.swing.JComponent; ! import javax.swing.JLabel; ! import javax.swing.JTextField; /** * @version $Revision$ $Date$ by $Author$ |
|
From: Frederic D. <de...@us...> - 2004-05-05 12:40:13
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3233/src/org/fudaa/ebli/volume/common Added Files: BUniversInterface.java BVolumeAbstract.java Objet3DInterface.java ParametresVolumes.java BGrilleAbstract.java GroupeInterface.java Log Message: Suppression des inter-dépendances --- NEW FILE: GroupeInterface.java --- /** * @file GroupeInterface.java * @creation 1999-12-30 * @modification $Date: 2004/05/05 12:40:04 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.ebli.volume.common; import java.util.Vector; /** * Interface définissant un Groupe abstrait. * * @version $Revision: 1.1 $ $Date: 2004/05/05 12:40:04 $ by $Author: deniger $ * @author Christophe Delhorbe */ public interface GroupeInterface { /** * Renvoie les enfants directs du groupe. * Seuls les enfants au premier niveau sont renvoyes. * @return les enfants direct du groupe */ Vector getEnfants(); /** * Renvoie tous les enfants (directs et indirects) du groupe. * Les niveaux sont parcourus recursivement. * @return les enfants directs et indirects du groupe */ Vector getTousEnfants(); /** * Ajoute un objet au groupe. * @param _objet l'objet a ajouter */ void add(Objet3DInterface _objet); /** * Renvoie le nombre d'enfants directs du groupe. * Au premier niveau. * @return le nombre d'enfants directs du groupe */ int getNumChildren(); /** * Supprime l'objet du groupe * @param _index l'index de l'objet dans le groupe */ void remove(int _index); } --- NEW FILE: BVolumeAbstract.java --- /** * @file BVolumeAbstract.java * @creation 5 mai 2004 * @modification $Date: 2004/05/05 12:40:04 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.ebli.volume.common; import javax.media.j3d.BranchGroup; /** * @author Fred Deniger * @version $Id: BVolumeAbstract.java,v 1.1 2004/05/05 12:40:04 deniger Exp $ */ public abstract class BVolumeAbstract extends BranchGroup implements Objet3DInterface { /** * */ public BVolumeAbstract() { super(); } } --- NEW FILE: Objet3DInterface.java --- /* * @file Objet3DInterface.java * @creation 1999-11-29 * @modification $Date: 2004/05/05 12:40:04 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.ebli.volume.common; /** * Interface definissant un Objet abstrait. * * @version $Revision: 1.1 $ $Date: 2004/05/05 12:40:04 $ by $Author: deniger $ * @author Christophe Delhorbe */ public interface Objet3DInterface { /** * Nomme l'objet. * @param _nom le nom de l'objet */ void setName(String _nom); /** * Renvoie le nom de l'objet. * @return le nom de l'objet */ String getName(); /** * Modifie la visibilite de cet objet. * @param _visible indique si l'objet est visible */ void setVisible(boolean _visible); /** * L'objet est-il visible ? * @return la reponse a cette epineuse question */ boolean isVisible(); /** * Modifie le mode d'affichage de l'objet (rapide ou non). * En mode rapide, il s'affichera par exemple sous la forme d'une boite. * @param _rapide indique si le mode d'affichage rapide est selectione */ void setRapide(boolean _rapide); /** * Indique si l'objet doit etre afficher rapidement. * @return vrai si le mode rapide est selectionne pour cet objet */ boolean isRapide(); /** * Modifie l'indice de l'objet dans son groupe. * @param _index le nouvel indice de l'objet */ void setIndex(int _index); /** * Renvoie l'indice de l'objet dans le groupe * @return l'indice de l'objet */ int getIndex(); /** * Modifie le pere de l'objet. * (cad le groupe auquel l'objet appartient). * @param _pere le groupe pere */ void setPere(GroupeInterface _pere); /** * Renvoie le groupe pere de l'objet. * @return le groupe pere */ GroupeInterface getPere(); /** * Methode qui modifie une propriete de l'objet. * @param _name le nom de la propriete * @param _value sa nouvelle valeur */ void setProperty(String _name, Object _value); /** * Indique si l'objet peut etre supprime de la scene. * @return vrai si l'objet peut etre detruit */ boolean isDestructible(); /** * Modifie le caractere suppressible de l'objet. * @param _destructible indique si l'objet peut etre detruit */ void setDestructible(boolean _destructible); /** * Detruit l'objet. * Il est retire de l'arbre. */ void detruire(); } --- NEW FILE: ParametresVolumes.java --- /* * @file ParametresVolumes.java * @creation 1999-11-29 * @modification $Date: 2004/05/05 12:40:04 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.ebli.volume.common; /** * @version $Revision: 1.1 $ $Date: 2004/05/05 12:40:04 $ by $Author: deniger $ * @author Christophe Delhorbe */ public class ParametresVolumes { public static int ECHELLE= 1000; public static void setEchelle(int _echelle) { ECHELLE= _echelle; } } --- NEW FILE: BGrilleAbstract.java --- /** * @file BGrilleAbstract.java * @creation 5 mai 2004 * @modification $Date: 2004/05/05 12:40:04 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.ebli.volume.common; /** * @author Fred Deniger * @version $Id: BGrilleAbstract.java,v 1.1 2004/05/05 12:40:04 deniger Exp $ */ public interface BGrilleAbstract { public boolean isFilaire(); public void setFilaire(boolean _b); } --- NEW FILE: BUniversInterface.java --- /** * @file BUniversInterface.java * @creation 5 mai 2004 * @modification $Date: 2004/05/05 12:40:04 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.ebli.volume.common; import javax.media.j3d.BranchGroup; import javax.media.j3d.Transform3D; import javax.media.j3d.TransformGroup; /** * @author Fred Deniger * @version $Id: BUniversInterface.java,v 1.1 2004/05/05 12:40:04 deniger Exp $ */ public interface BUniversInterface { /** * @return la position et l'orientation de la camera */ Transform3D[] getUniversTransforms(); /** * @param _t la nouveau trasnfo pour la camera */ void setUniversTransform(Transform3D _t); /** * @return le TransformGroup, pour pouvoir controler la camera */ TransformGroup getTransformGroup(); /** * Ajoute une Branche à l'arbre de la scene, apres l'avoir compilée * * @param bg BranchGroup à ajouter */ void addBranchGraph(BranchGroup bg); /** * Retire une Branche à l'arbre de la scene * * @param bg BranchGroup à supprimer */ void removeBranchGraph(BranchGroup bg); /** * * Initialise la camera : calcul de la boite englobante generale * et positionement de la camera en consequence. * */ void init(); /** * Change l'affichage de la scène : choix entre rapidité et apparence * @param _rapide : mode rapide? ( =affichage détérioré) */ void setRapide(boolean _rapide); /** * Tourne les objets sur un des axes d'origine * @param _axe axe de rotation (X,Y ou Z) * @param _valeur angle, en radians */ void orbital(int _axe, double _valeur); /** * Translate la camera sur un axe * @param _axe axe de translation (X,Y ou Z) * @param _valeur longueur de la translation en metres */ void translation(int _axe, double _valeur); /** * Tourne la camera sur un axe * @param _axe axe de rotation (X,Y ou Z) * @param _valeur angle, en radians */ public void rotation(int _axe, double _valeur); } |
|
From: Frederic D. <de...@us...> - 2004-05-05 12:40:03
|
Update of /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/common In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3199/src/org/fudaa/ebli/volume/common Log Message: Directory /cvsroot/fudaa/fudaa_devel/ebli/src/org/fudaa/ebli/volume/common added to the repository |
|
From: Frederic D. <de...@us...> - 2004-05-05 12:39:18
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2626/src/org/fudaa/dodico/h2d Modified Files: H2dBoundary.java H2dParameters.java Removed Files: H2dResource.java h2d_en.fr_txt Log Message: Maj --- H2dResource.java DELETED --- Index: H2dParameters.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dParameters.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** H2dParameters.java 12 Feb 2004 15:32:45 -0000 1.4 --- H2dParameters.java 5 May 2004 12:38:36 -0000 1.5 *************** *** 15,18 **** --- 15,19 ---- import org.fudaa.dodico.dico.DicoParams; import org.fudaa.dodico.ef.*; + import org.fudaa.dodico.h2d.resource.*; /** * Index: H2dBoundary.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/H2dBoundary.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** H2dBoundary.java 12 Feb 2004 15:32:44 -0000 1.5 --- H2dBoundary.java 5 May 2004 12:38:36 -0000 1.6 *************** *** 11,14 **** --- 11,15 ---- import org.fudaa.ctulu.CtuluLib; + import org.fudaa.dodico.h2d.resource.*; import org.fudaa.dodico.h2d.type.H2dBoundaryType; /** --- h2d_en.fr_txt DELETED --- |
|
From: Frederic D. <de...@us...> - 2004-05-05 12:39:17
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2626/src/org/fudaa/dodico/commun Modified Files: DodicoAnalyze.java DodicoPermanentTreeMap.java DodicoPermanentList.java DodicoLib.java Log Message: Maj Index: DodicoPermanentList.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoPermanentList.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DodicoPermanentList.java 11 Dec 2003 12:41:26 -0000 1.5 --- DodicoPermanentList.java 5 May 2004 12:38:35 -0000 1.6 *************** *** 11,21 **** import java.util.Arrays; import java.util.Collection; - import java.util.Collections; - import java.util.List; - import java.util.Set; import javax.swing.AbstractListModel; import javax.swing.ComboBoxModel; - import javax.swing.JComboBox; /** * @author deniger --- 11,17 ---- Index: DodicoLib.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoLib.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** DodicoLib.java 31 Mar 2004 08:14:32 -0000 1.24 --- DodicoLib.java 5 May 2004 12:38:35 -0000 1.25 *************** *** 8,14 **** */ package org.fudaa.dodico.commun; - import gnu.trove.TObjectDoubleHashMap; - import gnu.trove.TObjectDoubleIterator; - import java.io.BufferedInputStream; import java.io.BufferedOutputStream; --- 8,11 ---- *************** *** 37,48 **** import java.util.HashMap; import java.util.HashSet; - import java.util.Locale; import java.util.StringTokenizer; - import org.fudaa.ctulu.CtuluLib; - import com.memoire.fu.FuLib; ! import org.fudaa.dodico.ef.EfLib; /** * Des methodes statiques qui "semblent" utiles --- 34,42 ---- import java.util.HashMap; import java.util.HashSet; import java.util.StringTokenizer; import com.memoire.fu.FuLib; ! import org.fudaa.ctulu.CtuluLib; /** * Des methodes statiques qui "semblent" utiles Index: DodicoAnalyze.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoAnalyze.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** DodicoAnalyze.java 10 Mar 2004 09:08:36 -0000 1.12 --- DodicoAnalyze.java 5 May 2004 12:38:35 -0000 1.13 *************** *** 12,20 **** import java.io.LineNumberReader; import java.util.ArrayList; - import java.util.Collection; import org.fudaa.ctulu.CtuluLib; - - import org.fudaa.dodico.fortran.FortranReader; /** * Cette classe sert a transmettre les informations d'une operation de lecture --- 12,17 ---- *************** *** 26,40 **** */ public class DodicoAnalyze { ! private DodicoAnalyze.Canal errors_; ! private DodicoAnalyze.Canal warns_; ! private DodicoAnalyze.Canal infos_; ! private DodicoAnalyze.Field fatalError_; ! private String desc_; ! private String ressource_; ! public DodicoAnalyze() {} ! ! public void printResume() { ! System.out.println(getResume()); } public static String getResume(DodicoAnalyze[] _analyzes) { if (_analyzes == null) --- 23,70 ---- */ public class DodicoAnalyze { ! ! protected static String getResume( ! String _titre, ! DodicoAnalyze.Canal _ls, ! String _prefix) { ! if ((_ls == null) || (_ls.isEmpty())) { ! return null; ! } ! StringBuffer r= new StringBuffer(200); ! getResume(r, _titre, _ls, _prefix); ! return r.toString(); ! } ! protected static boolean getResume( ! StringBuffer _bufferStockage, ! String _titre, ! DodicoAnalyze.Canal _ls, ! String _prefix) { ! if ((_ls == null) || (_ls.isEmpty())) { ! return false; ! } ! _bufferStockage.append(_prefix); ! _bufferStockage.append(_titre); ! String lineSep= CtuluLib.LINE_SEP; ! Field element; ! int nb= _ls.messages_.size(); ! for (int i= 0; i < nb; i++) { ! _bufferStockage.append(lineSep); ! element= (Field)_ls.messages_.get(i); ! _bufferStockage.append(_prefix); ! int t= element.getOffset(); ! _bufferStockage.append( ! CtuluLib.ESPACE ! + DodicoResource.getS("Ligne") ! + CtuluLib.ESPACE ! + (t > 0 ? Integer.toString(t) : CtuluLib.EMPTY_STRING) ! + ": " ! + element.getMessage()); ! } ! return true; } + /** + * @param _analyzes les analyses a visu + * @return une chaine correspondante a toutes les analyses + */ public static String getResume(DodicoAnalyze[] _analyzes) { if (_analyzes == null) *************** *** 54,63 **** return b.toString(); } /** ! * Ecrit sur la sortie standart le resume de l'analyse ! * @param _prefix le prefixe pour chaque ligne */ ! public void printResume(String _prefix) { ! System.out.println(getResume(_prefix)); } /** --- 84,258 ---- return b.toString(); } + private String desc_; + private DodicoAnalyze.Canal errors_; + private DodicoAnalyze.Field fatalError_; + private DodicoAnalyze.Canal infos_; + private String ressource_; + private DodicoAnalyze.Canal warns_; /** ! * Ne fait rien */ ! public DodicoAnalyze() {} ! ! /** ! * @param _m message d'erreur ! * @param _index num de ligne ! * @return le champ ajoute ! */ ! public Field addError(String _m, int _index) { ! return getErrorCanal().addMessage(_m, _index); ! } ! ! ! /** ! * @param _m message d'erreur ! * @param _in afin de recuperer le num de ligne ! * @return le champ ajoute ! */ ! public Field addError(String _m, LineNumberReader _in) { ! return getErrorCanal().addMessage(_m, _in.getLineNumber()); ! } ! ! /** ! * Initialise le champ "erreur fatale". Si une erreur fatale a deja ete initialisee, ne fait rien. ! * @param _f le champ a considerer comme une erreur fatale. ! * @return le champ ! */ ! public Field addFatalError(Field _f) { ! if (fatalError_ == null) { ! fatalError_= _f; ! } ! return fatalError_; ! } ! /** ! * Initialise le champ "erreur fatale". Si une erreur fatale a deja ete initialisee, ne fait rien. ! * @param _m le message ! * @return le champ ! */ ! public Field addFatalError(String _m) { ! return addFatalError(_m, 0); ! } ! ! ! /** ! * Initialise le champ "erreur fatale". Si une erreur fatale a deja ete initialisee, ne fait rien. ! * @param _m le message ! * @param _index le num de ligne ! * @return le champ ! */ ! public Field addFatalError(String _m, int _index) { ! return addFatalError(new Field(_m, _index)); ! } ! ! ! /** ! * Initialise le champ "erreur fatale". Si une erreur fatale a deja ete initialisee, ne fait rien. ! * @param _m le message ! * @param _in pour recuperer le num de ligne ! * @return le champ ! */ ! public Field addFatalError(String _m, LineNumberReader _in) { ! return addFatalError(new Field(_m, _in.getLineNumber())); ! } ! ! public Field addInfo(String _m) { ! return addInfo(_m, -1); ! } ! ! public Field addInfo(String _m, int _index) { ! return getInfoCanal().addMessage(_m, _index); ! } ! ! ! public Field addInfo(String _m, LineNumberReader _in) { ! return getInfoCanal().addMessage(_m, _in.getLineNumber()); ! } ! ! public Field addWarn(String _m, int _index) { ! return getWarnCanal().addMessage(_m, _index); ! } ! ! ! public Field addWarn(String _m, LineNumberReader _in) { ! return getWarnCanal().addMessage(_m, _in.getLineNumber()); ! } ! ! public void clear() { ! if (warns_ != null) ! warns_.clear(); ! if (errors_ != null) ! errors_.clear(); ! if (infos_ != null) ! infos_.clear(); ! } ! /** ! * @return true si contient au moins une erreur ! */ ! public boolean containsErrors() { ! return ( ! (fatalError_ != null) || ((errors_ != null) && (!errors_.isEmpty()))); ! } ! ! /** ! * @return true si contient une erreur fatale ! */ ! public boolean containsFatalError() { ! return fatalError_ != null; ! } ! /** ! * @return true si contient au moins une info ! */ ! public boolean containsInfos() { ! return ((infos_ != null) && (!infos_.isEmpty())); ! } ! /** ! * @return true si contient au moins un avertissement ! */ ! public boolean containsWarnings() { ! return ((warns_ != null) && (!warns_.isEmpty())); ! } ! /** ! * ! */ ! public String getDesc() { ! return desc_; ! } ! ! public Canal getErrorCanal() { ! if (errors_ == null) ! errors_= new Canal(); ! return errors_; ! } ! /** ! * Returns the erreurs. ! * @return Field[] ! */ ! public DodicoAnalyze.Field[] getErrors() { ! return errors_.getFields(); ! } ! /** ! * ! */ ! public DodicoAnalyze.Field getFatalError() { ! return fatalError_; ! } ! ! public Canal getInfoCanal() { ! if (infos_ == null) ! infos_= new Canal(); ! return infos_; ! } ! /** ! * Returns the warns. ! * @return Field[] ! */ ! public DodicoAnalyze.Field[] getInfos() { ! return infos_.getFields(); ! } ! /** ! * ! */ ! public String getResource() { ! return ressource_; } /** *************** *** 68,72 **** } /** ! * Renvoie une chaine formatee contenant toutes les erreurs de l'analyse. */ public String getResume(String _prefix) { --- 263,268 ---- } /** ! * @return une chaine formatee contenant toutes les erreurs de l'analyse. ! * @param _prefix la chaine a ajouter a chaque debut de chaine */ public String getResume(String _prefix) { *************** *** 104,113 **** return s.toString(); } ! /** ! * Returns the erreurs. ! * @return Field[] ! */ ! public DodicoAnalyze.Field[] getErrors() { ! return errors_.getFields(); } /** --- 300,308 ---- return s.toString(); } ! ! public Canal getWarnCanal() { ! if (warns_ == null) ! warns_= new Canal(); ! return warns_; } /** *************** *** 118,170 **** return warns_.getFields(); } - /** - * Returns the warns. - * @return Field[] - */ - public DodicoAnalyze.Field[] getInfos() { - return infos_.getFields(); - } - - public boolean containsFatalError() { - return fatalError_ != null; - } - public boolean containsErrors() { - return ( - (fatalError_ != null) || ((errors_ != null) && (!errors_.isEmpty()))); - } - public boolean containsWarnings() { - return ((warns_ != null) && (!warns_.isEmpty())); - } - public boolean containsInfos() { - return ((infos_ != null) && (!infos_.isEmpty())); - } public boolean isEmpty() { return (!containsErrors()) && (!containsWarnings()) && (!containsInfos()); } ! public void manageException( ! FileNotFoundException _e) { ! getErrorCanal().addMessage( ! DodicoResource.getS("Fichier non trouvé")); ! getInfoCanal().addMessage(_e.getMessage()); ! if (CtuluLib.DEBUG) ! _e.printStackTrace(); ! } ! public void manageException(IOException _e) { ! addFatalError(DodicoResource.getS("Erreur d'entrée/sortie")); getInfoCanal().addMessage(_e.getMessage()); if (CtuluLib.DEBUG) _e.printStackTrace(); } public void manageException( ! NumberFormatException _e, ! FortranReader _l) { ! addFatalError( ! DodicoResource.getS("Format du champ incorrect"), ! _l); getInfoCanal().addMessage(_e.getMessage()); if (CtuluLib.DEBUG) _e.printStackTrace(); } public void manageException( IllegalArgumentException _e) { --- 313,348 ---- return warns_.getFields(); } + /** + * @return true si vide + */ public boolean isEmpty() { return (!containsErrors()) && (!containsWarnings()) && (!containsInfos()); } ! /** ! * @param _e l'exception a ajouter a l'anayse ! */ ! public void manageException(Exception _e) { ! addFatalError(DodicoResource.getS("Erreur à l'exécution")); getInfoCanal().addMessage(_e.getMessage()); if (CtuluLib.DEBUG) _e.printStackTrace(); } + /** + * Ajoute un message d'erreur + * @param _e l'exception a loguer + */ public void manageException( ! FileNotFoundException _e) { ! getErrorCanal().addMessage( ! DodicoResource.getS("Fichier non trouvé")); getInfoCanal().addMessage(_e.getMessage()); if (CtuluLib.DEBUG) _e.printStackTrace(); } + + /** + * @param _e l'exception a ajouter a l'anayse + */ public void manageException( IllegalArgumentException _e) { *************** *** 175,265 **** _e.printStackTrace(); } ! public void manageException(Exception _e) { ! addFatalError(DodicoResource.getS("Erreur à l'exécution")); getInfoCanal().addMessage(_e.getMessage()); if (CtuluLib.DEBUG) _e.printStackTrace(); } ! protected static String getResume( ! String _titre, ! DodicoAnalyze.Canal _ls, ! String _prefix) { ! if ((_ls == null) || (_ls.isEmpty())) { ! return null; } ! StringBuffer r= new StringBuffer(200); ! getResume(r, _titre, _ls, _prefix); ! return r.toString(); } ! protected static boolean getResume( ! StringBuffer _bufferStockage, ! String _titre, ! DodicoAnalyze.Canal _ls, ! String _prefix) { ! if ((_ls == null) || (_ls.isEmpty())) { ! return false; ! } ! _bufferStockage.append(_prefix); ! _bufferStockage.append(_titre); ! String lineSep= CtuluLib.LINE_SEP; ! Field element; ! int nb= _ls.messages_.size(); ! for (int i= 0; i < nb; i++) { ! _bufferStockage.append(lineSep); ! element= (Field)_ls.messages_.get(i); ! _bufferStockage.append(_prefix); ! int t= element.getOffset(); ! _bufferStockage.append( ! CtuluLib.ESPACE ! + DodicoResource.getS("Ligne") ! + CtuluLib.ESPACE ! + (t > 0 ? Integer.toString(t) : CtuluLib.EMPTY_STRING) ! + ": " ! + element.getMessage()); ! } ! return true; } public static class Canal { ArrayList messages_; public Canal() {} ! ! public void clear() { ! if (messages_ != null) ! messages_.clear(); ! } ! ! public void merge(Canal _c){ ! if(_c!=null) { ! if(messages_==null) messages_=_c.messages_; ! else if(_c.messages_!=null) messages_.addAll(_c.messages_); ! } ! } ! ! public DodicoAnalyze.Field[] getFields() { ! if (isEmpty()) ! return null; ! Field[] r= new Field[messages_.size()]; ! messages_.toArray(r); ! return r; ! } ! ! public boolean containsMessage() { ! return messages_ == null ? false : messages_.size() > 0; ! } ! public boolean isEmpty() { ! return !containsMessage(); ! } public Field addMessage(String _message) { return addMessage(_message, 0); } - public Field addMessage(String _message, LineNumberReader _in) { - return addMessage(_message, _in.getLineNumber()); - } - - public Field addMessage(String _message, FortranReader _in) { - return addMessage(_message, _in.getLineNumber()); - } public synchronized Field addMessage(String _message, int _offset) { if (messages_ == null) --- 353,449 ---- _e.printStackTrace(); } ! /** ! * Ajoute un message d'erreur ! * @param _e l'exception a loguer ! */ ! public void manageException(IOException _e) { ! addFatalError(DodicoResource.getS("Erreur d'entrée/sortie")); getInfoCanal().addMessage(_e.getMessage()); if (CtuluLib.DEBUG) _e.printStackTrace(); } ! /** ! * @param _e l'exception a ajouter a l'anayse ! * @param _l le numero de ligne ! */ ! public void manageException( ! NumberFormatException _e, ! int _l) { ! addFatalError( ! DodicoResource.getS("Format du champ incorrect"), ! _l); ! getInfoCanal().addMessage(_e.getMessage()); ! if (CtuluLib.DEBUG) ! _e.printStackTrace(); } ! ! public void merge(DodicoAnalyze _analyze){ ! if(_analyze==null) return; ! if(errors_==null) errors_=_analyze.errors_; ! else errors_.merge(_analyze.errors_); ! if(warns_==null) warns_=_analyze.warns_; ! else warns_.merge(_analyze.warns_); ! if(infos_==null) errors_=_analyze.infos_; ! else infos_.merge(_analyze.infos_); } ! ! /** ! * Permet d'ecrire sur la sortie standart le contenu de cette analyse ! */ ! public void printResume() { ! System.out.println(getResume()); ! } ! /** ! * Ecrit sur la sortie standart le resume de l'analyse ! * @param _prefix le prefixe pour chaque ligne ! */ ! public void printResume(String _prefix) { ! System.out.println(getResume(_prefix)); ! } ! /** ! * ! */ ! public void setDesc(String _string) { ! desc_= _string; ! } ! /** ! * ! */ ! public void setResource(String _string) { ! ressource_= _string; ! } ! ! /** ! * ! */ ! public void setRessource(String _string) { ! ressource_= _string; } + /** + * UN canal de cette analyse + * @author Fred Deniger + * @version $Id$ + */ public static class Canal { ArrayList messages_; + /** + * Ne fait rien + */ public Canal() {} ! /** ! * Ajoute un message avec un num de ligne egal a 0. ! * @param _message le message a ajouter ! * @return le champ ajouté ! */ public Field addMessage(String _message) { return addMessage(_message, 0); } + /** + * @param _message le message + * @param _offset le num de ligne + * @return le champ ajouté + */ public synchronized Field addMessage(String _message, int _offset) { if (messages_ == null) *************** *** 273,373 **** } ! } ! ! public void clear() { ! if (warns_ != null) ! warns_.clear(); ! if (errors_ != null) ! errors_.clear(); ! if (infos_ != null) ! infos_.clear(); ! } ! ! public Field addFatalError(Field _f) { ! if (fatalError_ == null) { ! fatalError_= _f; } - return fatalError_; - } - - public Field addFatalError(String _m) { - return addFatalError(_m, 0); - } - - public Field addFatalError(String _m, LineNumberReader _in) { - return addFatalError(new Field(_m, _in.getLineNumber())); - } - - public Field addFatalError(String _m, FortranReader _in) { - return addFatalError(new Field(_m, _in.getLineNumber())); - } - - public Field addFatalError(String _m, int _index) { - return addFatalError(new Field(_m, _index)); - } ! public Field addError(String _m, FortranReader _in) { ! return getErrorCanal().addMessage(_m, _in.getLineNumber()); ! } ! ! public Field addError(String _m, LineNumberReader _in) { ! return getErrorCanal().addMessage(_m, _in.getLineNumber()); } ! public Field addError(String _m, int _index) { ! return getErrorCanal().addMessage(_m, _index); ! } ! ! public Field addWarn(String _m, FortranReader _in) { ! return getWarnCanal().addMessage(_m, _in.getLineNumber()); ! } ! ! public Field addWarn(String _m, LineNumberReader _in) { ! return getWarnCanal().addMessage(_m, _in.getLineNumber()); ! } ! ! public Field addWarn(String _m, int _index) { ! return getWarnCanal().addMessage(_m, _index); ! } ! ! public Field addInfo(String _m) { ! return addInfo(_m, -1); ! } ! ! public Field addInfo(String _m, FortranReader _in) { ! return getInfoCanal().addMessage(_m, _in.getLineNumber()); ! } ! ! public Field addInfo(String _m, LineNumberReader _in) { ! return getInfoCanal().addMessage(_m, _in.getLineNumber()); } ! public Field addInfo(String _m, int _index) { ! return getInfoCanal().addMessage(_m, _index); ! } ! ! public Canal getErrorCanal() { ! if (errors_ == null) ! errors_= new Canal(); ! return errors_; ! } ! ! public Canal getWarnCanal() { ! if (warns_ == null) ! warns_= new Canal(); ! return warns_; ! } ! ! public Canal getInfoCanal() { ! if (infos_ == null) ! infos_= new Canal(); ! return infos_; ! } - /** - * - */ - public void setRessource(String _string) { - ressource_= _string; } --- 457,512 ---- } ! /** ! * Ajoute un message avec un num de ligne egal issu du LineNumberReader. ! * @param _message le message ! * @param _in Afin de récuperer le num de ligne ! * @return le champ ajouté ! */ ! public Field addMessage(String _message, LineNumberReader _in) { ! return addMessage(_message, _in.getLineNumber()); } ! /** ! * Efface les msg de ce canal ! */ ! public void clear() { ! if (messages_ != null) ! messages_.clear(); } ! /** ! * @return true si contient des messages ! */ ! public boolean containsMessage() { ! return messages_ == null ? false : messages_.size() > 0; } ! /** ! * @return les champs de ce canal ! */ ! public DodicoAnalyze.Field[] getFields() { ! if (isEmpty()) ! return null; ! Field[] r= new Field[messages_.size()]; ! messages_.toArray(r); ! return r; ! } ! /** ! * @return true si vide ! */ ! public boolean isEmpty() { ! return !containsMessage(); ! } ! ! /** ! * @param _c le canal a ajouter a celui ci ! */ ! public void merge(Canal _c){ ! if(_c!=null) { ! if(messages_==null) messages_=_c.messages_; ! else if(_c.messages_!=null) messages_.addAll(_c.messages_); ! } ! } } *************** *** 416,458 **** } } - /** - * - */ - public DodicoAnalyze.Field getFatalError() { - return fatalError_; - } - /** - * - */ - public String getDesc() { - return desc_; - } - /** - * - */ - public void setDesc(String _string) { - desc_= _string; - } - /** - * - */ - public String getResource() { - return ressource_; - } - /** - * - */ - public void setResource(String _string) { - ressource_= _string; - } - - public void merge(DodicoAnalyze _analyze){ - if(_analyze==null) return; - if(errors_==null) errors_=_analyze.errors_; - else errors_.merge(_analyze.errors_); - if(warns_==null) warns_=_analyze.warns_; - else warns_.merge(_analyze.warns_); - if(infos_==null) errors_=_analyze.infos_; - else infos_.merge(_analyze.infos_); - } } --- 555,557 ---- Index: DodicoPermanentTreeMap.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/commun/DodicoPermanentTreeMap.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DodicoPermanentTreeMap.java 25 Nov 2003 10:11:25 -0000 1.2 --- DodicoPermanentTreeMap.java 5 May 2004 12:38:35 -0000 1.3 *************** *** 8,18 **** */ package org.fudaa.dodico.commun; - import java.io.IOException; - import java.io.ObjectInputStream; - import java.util.Comparator; import java.util.Iterator; import java.util.Map; import java.util.SortedMap; - import java.util.SortedSet; import java.util.TreeMap; /** --- 8,14 ---- |
|
From: Frederic D. <de...@us...> - 2004-05-05 12:39:17
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2626/src/org/fudaa/dodico/h2d/type Modified Files: H2dProjetType.java H2dVariableType.java H2dFileFormatType.java H2dResolutionSchemaType.java H2dResolutionMethodType.java H2dBcType.java H2dBoundaryType.java H2dRefluxImpressionType.java Log Message: Maj Index: H2dProjetType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dProjetType.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** H2dProjetType.java 15 Mar 2004 08:28:01 -0000 1.7 --- H2dProjetType.java 5 May 2004 12:38:21 -0000 1.8 *************** *** 11,18 **** import java.util.List; ! import org.fudaa.dodico.commun.*; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; ! import org.fudaa.dodico.h2d.H2dResource; /** * @author deniger --- 11,18 ---- import java.util.List; ! import org.fudaa.dodico.commun.DodicoEnumType; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; ! import org.fudaa.dodico.h2d.resource.H2dResource; /** * @author deniger Index: H2dResolutionSchemaType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dResolutionSchemaType.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** H2dResolutionSchemaType.java 12 Feb 2004 15:32:45 -0000 1.4 --- H2dResolutionSchemaType.java 5 May 2004 12:38:34 -0000 1.5 *************** *** 12,19 **** import java.util.List; ! import org.fudaa.dodico.commun.*; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; ! import org.fudaa.dodico.h2d.H2dResource; /** * @author deniger --- 12,19 ---- import java.util.List; ! import org.fudaa.dodico.commun.DodicoEnumType; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; ! import org.fudaa.dodico.h2d.resource.H2dResource; /** * @author deniger Index: H2dRefluxImpressionType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dRefluxImpressionType.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** H2dRefluxImpressionType.java 12 Feb 2004 15:32:45 -0000 1.4 --- H2dRefluxImpressionType.java 5 May 2004 12:38:35 -0000 1.5 *************** *** 8,16 **** */ package org.fudaa.dodico.h2d.type; - import java.util.Collections; import java.util.Iterator; import java.util.List; ! import org.fudaa.dodico.commun.*; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; --- 8,15 ---- */ package org.fudaa.dodico.h2d.type; import java.util.Iterator; import java.util.List; ! import org.fudaa.dodico.commun.DodicoEnumType; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; Index: H2dVariableType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dVariableType.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** H2dVariableType.java 31 Mar 2004 08:14:33 -0000 1.10 --- H2dVariableType.java 5 May 2004 12:38:34 -0000 1.11 *************** *** 9,15 **** package org.fudaa.dodico.h2d.type; import org.fudaa.ctulu.CtuluLib; ! ! import org.fudaa.dodico.commun.*; ! import org.fudaa.dodico.h2d.H2dResource; /** * @author deniger --- 9,14 ---- package org.fudaa.dodico.h2d.type; import org.fudaa.ctulu.CtuluLib; ! import org.fudaa.dodico.commun.DodicoEnumType; ! import org.fudaa.dodico.h2d.resource.H2dResource; /** * @author deniger Index: H2dResolutionMethodType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dResolutionMethodType.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** H2dResolutionMethodType.java 12 Feb 2004 15:32:45 -0000 1.4 --- H2dResolutionMethodType.java 5 May 2004 12:38:34 -0000 1.5 *************** *** 12,19 **** import java.util.List; ! import org.fudaa.dodico.commun.*; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; ! import org.fudaa.dodico.h2d.H2dResource; /** * @author deniger --- 12,19 ---- import java.util.List; ! import org.fudaa.dodico.commun.DodicoEnumType; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; ! import org.fudaa.dodico.h2d.resource.H2dResource; /** * @author deniger Index: H2dFileFormatType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dFileFormatType.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** H2dFileFormatType.java 12 Feb 2004 15:32:45 -0000 1.8 --- H2dFileFormatType.java 5 May 2004 12:38:34 -0000 1.9 *************** *** 10,17 **** import java.util.List; ! import org.fudaa.dodico.commun.*; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; ! import org.fudaa.dodico.h2d.H2dResource; /** * @author deniger --- 10,17 ---- import java.util.List; ! import org.fudaa.dodico.commun.DodicoEnumType; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; ! import org.fudaa.dodico.h2d.resource.H2dResource; /** * @author deniger Index: H2dBoundaryType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dBoundaryType.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** H2dBoundaryType.java 12 Feb 2004 15:32:45 -0000 1.3 --- H2dBoundaryType.java 5 May 2004 12:38:35 -0000 1.4 *************** *** 8,13 **** */ package org.fudaa.dodico.h2d.type; ! import org.fudaa.dodico.commun.*; ! import org.fudaa.dodico.h2d.H2dResource; /** * @author deniger --- 8,13 ---- */ package org.fudaa.dodico.h2d.type; ! import org.fudaa.dodico.commun.DodicoEnumType; ! import org.fudaa.dodico.h2d.resource.H2dResource; /** * @author deniger Index: H2dBcType.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/type/H2dBcType.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** H2dBcType.java 12 Feb 2004 15:32:45 -0000 1.3 --- H2dBcType.java 5 May 2004 12:38:34 -0000 1.4 *************** *** 8,14 **** */ package org.fudaa.dodico.h2d.type; ! import org.fudaa.dodico.commun.*; ! import org.fudaa.dodico.commun.DodicoResource; ! import org.fudaa.dodico.h2d.H2dResource; /** * @author deniger --- 8,13 ---- */ package org.fudaa.dodico.h2d.type; ! import org.fudaa.dodico.commun.DodicoEnumType; ! import org.fudaa.dodico.h2d.resource.H2dResource; /** * @author deniger |
|
From: Frederic D. <de...@us...> - 2004-05-05 12:39:03
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2626/src/org/fudaa/dodico/reflux/io Modified Files: CLVReader.java CorEleBthFileFormat.java INPFileFormat.java RefluxSolutionReader.java CLTransitoireFileFormat.java CorEleBthReader.java CorEleBthWriter.java INPReader.java CrbFileFormat.java PnTransitoireFileFormat.java INPWriter.java Log Message: Maj Index: INPFileFormat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/INPFileFormat.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** INPFileFormat.java 31 Mar 2004 08:14:29 -0000 1.18 --- INPFileFormat.java 5 May 2004 12:38:20 -0000 1.19 *************** *** 29,34 **** import org.fudaa.dodico.fichiers.FileReadOperationAbstract; import org.fudaa.dodico.fichiers.FileWriteOperationAbstract; - import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.reflux.H2dRefluxDicoModel; import org.fudaa.dodico.h2d.type.H2dBcType; import org.fudaa.dodico.h2d.type.H2dBoundaryType; --- 29,34 ---- import org.fudaa.dodico.fichiers.FileReadOperationAbstract; import org.fudaa.dodico.fichiers.FileWriteOperationAbstract; import org.fudaa.dodico.h2d.reflux.H2dRefluxDicoModel; + import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.type.H2dBcType; import org.fudaa.dodico.h2d.type.H2dBoundaryType; Index: PnTransitoireFileFormat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/PnTransitoireFileFormat.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PnTransitoireFileFormat.java 11 Dec 2003 12:41:28 -0000 1.4 --- PnTransitoireFileFormat.java 5 May 2004 12:38:20 -0000 1.5 *************** *** 17,21 **** import org.fudaa.dodico.fichiers.FileWriteOperationAbstract; import org.fudaa.dodico.h2d.H2dEvolution; ! import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.type.H2dFileFormatType; /** --- 17,21 ---- import org.fudaa.dodico.fichiers.FileWriteOperationAbstract; import org.fudaa.dodico.h2d.H2dEvolution; ! import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.type.H2dFileFormatType; /** Index: INPWriter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/INPWriter.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** INPWriter.java 12 Feb 2004 15:32:47 -0000 1.14 --- INPWriter.java 5 May 2004 12:38:20 -0000 1.15 *************** *** 42,49 **** import org.fudaa.dodico.h2d.H2dEvolution; import org.fudaa.dodico.h2d.H2dNodalPropertyMixte; - import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.H2dTimeStepGroup; import org.fudaa.dodico.h2d.reflux.H2dRefluxBordIndexGeneral; import org.fudaa.dodico.h2d.reflux.H2dRefluxBoundaryCondition; import org.fudaa.dodico.h2d.type.H2dBcType; import org.fudaa.dodico.h2d.type.H2dBoundaryType; --- 42,49 ---- import org.fudaa.dodico.h2d.H2dEvolution; import org.fudaa.dodico.h2d.H2dNodalPropertyMixte; import org.fudaa.dodico.h2d.H2dTimeStepGroup; import org.fudaa.dodico.h2d.reflux.H2dRefluxBordIndexGeneral; import org.fudaa.dodico.h2d.reflux.H2dRefluxBoundaryCondition; + import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.type.H2dBcType; import org.fudaa.dodico.h2d.type.H2dBoundaryType; Index: CorEleBthReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/CorEleBthReader.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** CorEleBthReader.java 12 Feb 2004 15:32:46 -0000 1.14 --- CorEleBthReader.java 5 May 2004 12:38:20 -0000 1.15 *************** *** 14,24 **** import org.fudaa.ctulu.CtuluLib; - import org.fudaa.dodico.commun.DodicoAnalyze; import org.fudaa.dodico.commun.ProgressionUpdater; import org.fudaa.dodico.ef.EfElement; import org.fudaa.dodico.ef.EfGridMutable; import org.fudaa.dodico.ef.EfLib; - import org.fudaa.dodico.ef.EfElementType; import org.fudaa.dodico.ef.EfNode; import org.fudaa.dodico.fichiers.FileFormat; --- 14,23 ---- import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.commun.DodicoAnalyze; import org.fudaa.dodico.commun.ProgressionUpdater; import org.fudaa.dodico.ef.EfElement; + import org.fudaa.dodico.ef.EfElementType; import org.fudaa.dodico.ef.EfGridMutable; import org.fudaa.dodico.ef.EfLib; import org.fudaa.dodico.ef.EfNode; import org.fudaa.dodico.fichiers.FileFormat; *************** *** 28,32 **** import org.fudaa.dodico.fortran.FortranInterface; import org.fudaa.dodico.fortran.FortranReader; ! import org.fudaa.dodico.h2d.H2dResource; /** * Lecture des fichiers cor,ele,bth. --- 27,31 ---- import org.fudaa.dodico.fortran.FortranInterface; import org.fudaa.dodico.fortran.FortranReader; ! import org.fudaa.dodico.h2d.resource.H2dResource; /** * Lecture des fichiers cor,ele,bth. *************** *** 242,249 **** analyze_.addFatalError( H2dResource.getS("L'indice est invalide"), ! eleIn_); analyze_.addInfo( H2dResource.getS("Indice attendu") + ": " + (i + 1), ! eleIn_); return; } --- 241,248 ---- analyze_.addFatalError( H2dResource.getS("L'indice est invalide"), ! eleIn_.getLineNumber()); analyze_.addInfo( H2dResource.getS("Indice attendu") + ": " + (i + 1), ! eleIn_.getLineNumber()); return; } *************** *** 252,256 **** analyze_.addFatalError( H2dResource.getS("Une ligne doit posséder au moins 5 champs"), ! eleIn_); return; } --- 251,255 ---- analyze_.addFatalError( H2dResource.getS("Une ligne doit posséder au moins 5 champs"), ! eleIn_.getLineNumber()); return; } *************** *** 265,269 **** "L'indice {0} n'est pas valide", CtuluLib.getString(indexPt)), ! eleIn_); analyze_.addInfo( H2dResource.getS("L'indice doit appartenir à l'intervalle") --- 264,268 ---- "L'indice {0} n'est pas valide", CtuluLib.getString(indexPt)), ! eleIn_.getLineNumber()); analyze_.addInfo( H2dResource.getS("L'indice doit appartenir à l'intervalle") *************** *** 271,275 **** + indexMax + "]", ! eleIn_); return; } --- 270,274 ---- + indexMax + "]", ! eleIn_.getLineNumber()); return; } *************** *** 290,294 **** CtuluLib.debug("Reading end"); } catch (NumberFormatException fe) { ! analyze_.manageException(fe, eleIn_); return; } --- 289,293 ---- CtuluLib.debug("Reading end"); } catch (NumberFormatException fe) { ! analyze_.manageException(fe, eleIn_.getLineNumber()); return; } *************** *** 297,301 **** analyze_.addFatalError( H2dResource.getS("Des éléments ne sont pas définis"), ! eleIn_); return; } --- 296,300 ---- analyze_.addFatalError( H2dResource.getS("Des éléments ne sont pas définis"), ! eleIn_.getLineNumber()); return; } *************** *** 364,368 **** "L'index du noeud {0} ne correspond pas", CtuluLib.getString(num)), ! corIn_); return null; } --- 363,367 ---- "L'index du noeud {0} ne correspond pas", CtuluLib.getString(num)), ! corIn_.getLineNumber()); return null; } *************** *** 381,385 **** CtuluLib.debug("Reading end"); } catch (NumberFormatException fe) { ! analyze_.manageException(fe, corIn_); return null; } --- 380,384 ---- CtuluLib.debug("Reading end"); } catch (NumberFormatException fe) { ! analyze_.manageException(fe, corIn_.getLineNumber()); return null; } *************** *** 442,446 **** CtuluLib.debug("Reading end"); } catch (NumberFormatException fe) { ! analyze_.manageException(fe, bthIn_); return; } --- 441,445 ---- CtuluLib.debug("Reading end"); } catch (NumberFormatException fe) { ! analyze_.manageException(fe, bthIn_.getLineNumber()); return; } *************** *** 452,456 **** "La bathymétrie des derniers points n'a pas été initialisée (nb pt initialisés {0})", CtuluLib.getString(index)), ! bthIn_); } //la lecture est terminee.... --- 451,455 ---- "La bathymétrie des derniers points n'a pas été initialisée (nb pt initialisés {0})", CtuluLib.getString(index)), ! bthIn_.getLineNumber()); } //la lecture est terminee.... Index: CLVReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/CLVReader.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CLVReader.java 16 Mar 2004 16:47:28 -0000 1.5 --- CLVReader.java 5 May 2004 12:38:20 -0000 1.6 *************** *** 22,26 **** import org.fudaa.dodico.fortran.FortranInterface; import org.fudaa.dodico.h2d.H2dEvolutionMutable; ! import org.fudaa.dodico.h2d.H2dResource; /** * @author deniger --- 22,26 ---- import org.fudaa.dodico.fortran.FortranInterface; import org.fudaa.dodico.h2d.H2dEvolutionMutable; ! import org.fudaa.dodico.h2d.resource.H2dResource; /** * @author deniger Index: CorEleBthFileFormat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/CorEleBthFileFormat.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** CorEleBthFileFormat.java 12 Feb 2004 15:32:46 -0000 1.12 --- CorEleBthFileFormat.java 5 May 2004 12:38:20 -0000 1.13 *************** *** 21,25 **** import org.fudaa.dodico.fichiers.FileReadOperationAbstract; import org.fudaa.dodico.fichiers.FileWriteOperationAbstract; ! import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.type.H2dFileFormatType; import org.fudaa.dodico.mnt.FileFormatListMNTPoint; --- 21,25 ---- import org.fudaa.dodico.fichiers.FileReadOperationAbstract; import org.fudaa.dodico.fichiers.FileWriteOperationAbstract; ! import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.type.H2dFileFormatType; import org.fudaa.dodico.mnt.FileFormatListMNTPoint; Index: INPReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/INPReader.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** INPReader.java 12 Feb 2004 15:32:47 -0000 1.15 --- INPReader.java 5 May 2004 12:38:20 -0000 1.16 *************** *** 16,26 **** import java.io.IOException; import java.util.ArrayList; - import java.util.Arrays; import java.util.HashMap; import java.util.StringTokenizer; import org.fudaa.ctulu.CtuluLib; - - import org.fudaa.dodico.commun.DodicoAnalyze; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoResource; --- 16,23 ---- *************** *** 35,43 **** import org.fudaa.dodico.h2d.H2dEvolutionMutable; import org.fudaa.dodico.h2d.H2dNodalPropertyMixte; - import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.H2dTimeStepGroup; import org.fudaa.dodico.h2d.reflux.H2dRefluxBordIndexGeneral; import org.fudaa.dodico.h2d.reflux.H2dRefluxBoundaryConditionMutable; import org.fudaa.dodico.h2d.reflux.H2dRefluxDicoModel; import org.fudaa.dodico.h2d.type.H2dBcType; import org.fudaa.dodico.h2d.type.H2dBoundaryType; --- 32,40 ---- import org.fudaa.dodico.h2d.H2dEvolutionMutable; import org.fudaa.dodico.h2d.H2dNodalPropertyMixte; import org.fudaa.dodico.h2d.H2dTimeStepGroup; import org.fudaa.dodico.h2d.reflux.H2dRefluxBordIndexGeneral; import org.fudaa.dodico.h2d.reflux.H2dRefluxBoundaryConditionMutable; import org.fudaa.dodico.h2d.reflux.H2dRefluxDicoModel; + import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.type.H2dBcType; import org.fudaa.dodico.h2d.type.H2dBoundaryType; *************** *** 264,268 **** analyze_.addFatalError( H2dResource.getS("Bloc de données non trouvé"), ! in_); addAnalyzeLigneLue(); return null; --- 261,265 ---- analyze_.addFatalError( H2dResource.getS("Bloc de données non trouvé"), ! in_.getLineNumber()); addAnalyzeLigneLue(); return null; *************** *** 277,281 **** H2dProjetType.getProjetFromRefluxId(refluxProjetNom); if (typeProjet == null) { ! analyze_.addFatalError(H2dResource.getS("Type de projet inconnu"), in_); addAnalyzeLigneLue(); return null; --- 274,278 ---- H2dProjetType.getProjetFromRefluxId(refluxProjetNom); if (typeProjet == null) { ! analyze_.addFatalError(H2dResource.getS("Type de projet inconnu"), in_.getLineNumber()); addAnalyzeLigneLue(); return null; *************** *** 295,299 **** analyze_.addFatalError( H2dResource.getS("Le bloc des coordonnées est introuvable"), ! in_); addAnalyzeLigneLue(); return null; --- 292,296 ---- analyze_.addFatalError( H2dResource.getS("Le bloc des coordonnées est introuvable"), ! in_.getLineNumber()); addAnalyzeLigneLue(); return null; *************** *** 310,314 **** analyze_.addFatalError( H2dResource.getS("Le nombre de coordonnées doit être égal à 3"), ! in_); addAnalyzeLigneLue(); return null; --- 307,311 ---- analyze_.addFatalError( H2dResource.getS("Le nombre de coordonnées doit être égal à 3"), ! in_.getLineNumber()); addAnalyzeLigneLue(); return null; *************** *** 319,323 **** analyze_.addFatalError( H2dResource.getS("Le nombre de points est invalide"), ! in_); addAnalyzeLigneLue(); return null; --- 316,320 ---- analyze_.addFatalError( H2dResource.getS("Le nombre de points est invalide"), ! in_.getLineNumber()); addAnalyzeLigneLue(); return null; *************** *** 357,361 **** analyze_.addFatalError( H2dResource.getS("Le bloc degrés de de liberté n'a pas été trouvé"), ! in_); addAnalyzeLigneLue(); return null; --- 354,358 ---- analyze_.addFatalError( H2dResource.getS("Le bloc degrés de de liberté n'a pas été trouvé"), ! in_.getLineNumber()); addAnalyzeLigneLue(); return null; *************** *** 396,400 **** analyze_.addFatalError( H2dResource.getS("Le bloc COND n'a pas été trouvé"), ! in_); addAnalyzeLigneLue(); return null; --- 393,397 ---- analyze_.addFatalError( H2dResource.getS("Le bloc COND n'a pas été trouvé"), ! in_.getLineNumber()); addAnalyzeLigneLue(); return null; *************** *** 427,431 **** analyze_.addFatalError( H2dResource.getS("Le code pour la vitesse Un est inconnu"), ! in_); addAnalyzeLigneLue(); return null; --- 424,428 ---- analyze_.addFatalError( H2dResource.getS("Le code pour la vitesse Un est inconnu"), ! in_.getLineNumber()); addAnalyzeLigneLue(); return null; *************** *** 436,440 **** analyze_.addFatalError( H2dResource.getS("Le code pour la vitesse ut est inconnu"), ! in_); addAnalyzeLigneLue(); return null; --- 433,437 ---- analyze_.addFatalError( H2dResource.getS("Le code pour la vitesse ut est inconnu"), ! in_.getLineNumber()); addAnalyzeLigneLue(); return null; *************** *** 445,449 **** analyze_.addFatalError( H2dResource.getS("Le code pour la hauteur est inconnu"), ! in_); addAnalyzeLigneLue(); return null; --- 442,446 ---- analyze_.addFatalError( H2dResource.getS("Le code pour la hauteur est inconnu"), ! in_.getLineNumber()); addAnalyzeLigneLue(); return null; *************** *** 505,509 **** "Le point {0} est spécifié plusieurs fois", CtuluLib.getString(temp1 + 1)), ! in_); addAnalyzeLigneLue(); } --- 502,506 ---- "Le point {0} est spécifié plusieurs fois", CtuluLib.getString(temp1 + 1)), ! in_.getLineNumber()); addAnalyzeLigneLue(); } *************** *** 562,566 **** H2dResource.getS( "Bloc PRND: Seuls 2 propriétés seront autorisées (normales et débit linéïque)"), ! in_); addAnalyzeLigneLue(); return null; --- 559,563 ---- H2dResource.getS( "Bloc PRND: Seuls 2 propriétés seront autorisées (normales et débit linéïque)"), ! in_.getLineNumber()); addAnalyzeLigneLue(); return null; *************** *** 614,618 **** "La normale n'est pas définie pour le point {0}", CtuluLib.getString(indexEnCours)), ! in_); addAnalyzeLigneLue(); } --- 611,615 ---- "La normale n'est pas définie pour le point {0}", CtuluLib.getString(indexEnCours)), ! in_.getLineNumber()); addAnalyzeLigneLue(); } *************** *** 629,633 **** analyze_.addWarn( H2dResource.getS("Code inconnu") + "(" + index + ")", ! in_); addAnalyzeLigneLue(); } --- 626,630 ---- analyze_.addWarn( H2dResource.getS("Code inconnu") + "(" + index + ")", ! in_.getLineNumber()); addAnalyzeLigneLue(); } *************** *** 662,666 **** H2dResource.getS( "La valeur de la normale ne sera pas prise en compte"), ! in_); addAnalyzeLigneLue(); } --- 659,663 ---- H2dResource.getS( "La valeur de la normale ne sera pas prise en compte"), ! in_.getLineNumber()); addAnalyzeLigneLue(); } *************** *** 678,682 **** H2dResource.getS( "La valeur du débit linéïque ne sera pas prise en compte"), ! in_); addAnalyzeLigneLue(); } else if (type == H2dBcType.TRANSITOIRE) { --- 675,679 ---- H2dResource.getS( "La valeur du débit linéïque ne sera pas prise en compte"), ! in_.getLineNumber()); addAnalyzeLigneLue(); } else if (type == H2dBcType.TRANSITOIRE) { *************** *** 684,688 **** H2dResource.getS( "Le débit est de type transitoire. La valeur ne sera pas prise en compte"), ! in_); addAnalyzeLigneLue(); } else if (type == H2dBcType.LIBRE) { --- 681,685 ---- H2dResource.getS( "Le débit est de type transitoire. La valeur ne sera pas prise en compte"), ! in_.getLineNumber()); addAnalyzeLigneLue(); } else if (type == H2dBcType.LIBRE) { *************** *** 690,694 **** H2dResource.getS( "Le débit est de type libre. La valeur ne sera pas prise en compte"), ! in_); addAnalyzeLigneLue(); } else { --- 687,691 ---- H2dResource.getS( "Le débit est de type libre. La valeur ne sera pas prise en compte"), ! in_.getLineNumber()); addAnalyzeLigneLue(); } else { *************** *** 710,714 **** analyze_.addFatalError( H2dResource.getS("Le bloc ELEM n'a pas été trouvé"), ! in_); addAnalyzeLigneLue(); return null; --- 707,711 ---- analyze_.addFatalError( H2dResource.getS("Le bloc ELEM n'a pas été trouvé"), ! in_.getLineNumber()); addAnalyzeLigneLue(); return null; *************** *** 722,726 **** analyze_.addFatalError( H2dResource.getS("Seuls les éléments T6 sont autorisés"), ! in_); addAnalyzeLigneLue(); return null; --- 719,723 ---- analyze_.addFatalError( H2dResource.getS("Seuls les éléments T6 sont autorisés"), ! in_.getLineNumber()); addAnalyzeLigneLue(); return null; *************** *** 760,764 **** H2dResource.getS( "Des éléments T6 se trouvent après des éléments T3"), ! in_); addAnalyzeLigneLue(); return null; --- 757,761 ---- H2dResource.getS( "Des éléments T6 se trouvent après des éléments T3"), ! in_.getLineNumber()); addAnalyzeLigneLue(); return null; *************** *** 805,809 **** analyze_.addFatalError( H2dResource.getS("Le bloc TPEL est introuvable"), ! in_); addAnalyzeLigneLue(); return null; --- 802,806 ---- analyze_.addFatalError( H2dResource.getS("Le bloc TPEL est introuvable"), ! in_.getLineNumber()); addAnalyzeLigneLue(); return null; *************** *** 836,840 **** H2dResource.getS( "Erreur de lecture des éléments. Bords non trouvés"), ! in_); return null; } --- 833,837 ---- H2dResource.getS( "Erreur de lecture des éléments. Bords non trouvés"), ! in_.getLineNumber()); return null; } *************** *** 868,872 **** analyze_.addFatalError( H2dResource.getS("Code d'élément inconnu") + "(" + temp1 + ")", ! in_); addAnalyzeLigneLue(); return null; --- 865,869 ---- analyze_.addFatalError( H2dResource.getS("Code d'élément inconnu") + "(" + temp1 + ")", ! in_.getLineNumber()); addAnalyzeLigneLue(); return null; *************** *** 922,926 **** analyze_.addFatalError( H2dResource.getS("Le bloc PREL est introuvable"), ! in_); addAnalyzeLigneLue(); return null; --- 919,923 ---- analyze_.addFatalError( H2dResource.getS("Le bloc PREL est introuvable"), ! in_.getLineNumber()); addAnalyzeLigneLue(); return null; *************** *** 981,985 **** "L'élément {0} possède un numéro de groupe non valide", CtuluLib.getString(indexEnCours)), ! in_); } indexEnCours++; --- 978,982 ---- "L'élément {0} possède un numéro de groupe non valide", CtuluLib.getString(indexEnCours)), ! in_.getLineNumber()); } indexEnCours++; *************** *** 1060,1064 **** "Le bord {0} n'est pas un bord solide avec frottement", CtuluLib.getString(indexElement - nbElemFond)), ! in_); } else { //on affecte le bon type pour le bord. --- 1057,1061 ---- "Le bord {0} n'est pas un bord solide avec frottement", CtuluLib.getString(indexElement - nbElemFond)), ! in_.getLineNumber()); } else { //on affecte le bon type pour le bord. *************** *** 1079,1083 **** H2dResource.getS( "Seule la rugosité est spécifiée alors que ce n'est pas un point de bord"), ! in_); } } --- 1076,1080 ---- H2dResource.getS( "Seule la rugosité est spécifiée alors que ce n'est pas un point de bord"), ! in_.getLineNumber()); } } *************** *** 1085,1089 **** analyze_.addError( H2dResource.getS("Des propriétés ne sont pas renseignées"), ! in_); } } else { --- 1082,1086 ---- analyze_.addError( H2dResource.getS("Des propriétés ne sont pas renseignées"), ! in_.getLineNumber()); } } else { *************** *** 1103,1111 **** H2dResource.getS( "Le nombre de caractéristiques pour les propriétés élémentaires est incorrect"), ! in_); analyze_.addInfo( H2dResource.getS( "les indexs correspondants seront supposés libres"), ! in_); for (int j= 0; j < temp; j++) propElem[j].ajouteLibre(elemsFori, temp2); --- 1100,1108 ---- H2dResource.getS( "Le nombre de caractéristiques pour les propriétés élémentaires est incorrect"), ! in_.getLineNumber()); analyze_.addInfo( H2dResource.getS( "les indexs correspondants seront supposés libres"), ! in_.getLineNumber()); for (int j= 0; j < temp; j++) propElem[j].ajouteLibre(elemsFori, temp2); *************** *** 1252,1256 **** sTemp1= version_.getTRANS(); if (sTemp.startsWith(sTemp1)) { ! analyze_.addWarn("Le bloc TRANS est ignoré", in_); sTemp= in_.readLine().trim(); } --- 1249,1253 ---- sTemp1= version_.getTRANS(); if (sTemp.startsWith(sTemp1)) { ! analyze_.addWarn("Le bloc TRANS est ignoré", in_.getLineNumber()); sTemp= in_.readLine().trim(); } *************** *** 1314,1318 **** analyze_.addError( H2dResource.getS("Méthode de résolution non trouvée"), ! in_); addAnalyzeLigneLue(); } else if (!schema.isSupported(meth)) { --- 1311,1315 ---- analyze_.addError( H2dResource.getS("Méthode de résolution non trouvée"), ! in_.getLineNumber()); addAnalyzeLigneLue(); } else if (!schema.isSupported(meth)) { *************** *** 1322,1326 **** + " " + schema.getNom(), ! in_); addAnalyzeLigneLue(); } else { --- 1319,1323 ---- + " " + schema.getNom(), ! in_.getLineNumber()); addAnalyzeLigneLue(); } else { *************** *** 1346,1350 **** H2dResource.getS( "Le bloc est invalide. Le bloc des coefficients est attendu"), ! in_); } //en general, 12 coefs --- 1343,1347 ---- H2dResource.getS( "Le bloc est invalide. Le bloc des coefficients est attendu"), ! in_.getLineNumber()); } //en general, 12 coefs *************** *** 1378,1382 **** H2dResource.getS( "Coefficent de contribution non pris en compte"), ! in_); } } --- 1375,1379 ---- H2dResource.getS( "Coefficent de contribution non pris en compte"), ! in_.getLineNumber()); } } *************** *** 1400,1408 **** CtuluLib.debug("End of file for inp file"); if (!foundEntete) { ! analyze_.addFatalError(H2dResource.getS("Fichier invalide"), in_); return null; } } catch (NumberFormatException _e) { ! analyze_.manageException(_e, in_); return null; } catch (IOException _e) { --- 1397,1405 ---- CtuluLib.debug("End of file for inp file"); if (!foundEntete) { ! analyze_.addFatalError(H2dResource.getS("Fichier invalide"), in_.getLineNumber()); return null; } } catch (NumberFormatException _e) { ! analyze_.manageException(_e, in_.getLineNumber()); return null; } catch (IOException _e) { Index: CLTransitoireFileFormat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/CLTransitoireFileFormat.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CLTransitoireFileFormat.java 21 Jan 2004 10:59:10 -0000 1.7 --- CLTransitoireFileFormat.java 5 May 2004 12:38:20 -0000 1.8 *************** *** 21,25 **** import org.fudaa.dodico.h2d.H2dEvolution; import org.fudaa.dodico.h2d.H2dFileFormatEvolutionVersion; ! import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.type.H2dFileFormatType; /** --- 21,25 ---- import org.fudaa.dodico.h2d.H2dEvolution; import org.fudaa.dodico.h2d.H2dFileFormatEvolutionVersion; ! import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.type.H2dFileFormatType; /** Index: RefluxSolutionReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/RefluxSolutionReader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RefluxSolutionReader.java 16 Mar 2004 16:47:28 -0000 1.2 --- RefluxSolutionReader.java 5 May 2004 12:38:20 -0000 1.3 *************** *** 22,27 **** import org.fudaa.dodico.commun.DodicoResource; import org.fudaa.dodico.fichiers.FileOpReadCharSimpleAbstract; - import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.reflux.H2dRefluxSICourant2D; --- 22,27 ---- import org.fudaa.dodico.commun.DodicoResource; import org.fudaa.dodico.fichiers.FileOpReadCharSimpleAbstract; import org.fudaa.dodico.h2d.reflux.H2dRefluxSICourant2D; + import org.fudaa.dodico.h2d.resource.H2dResource; *************** *** 95,99 **** int nbVar = in_.intField(1); if(nbVar<=0){ ! analyze_.addFatalError(DodicoResource.getS("Format du champ incorrect"), in_); return null; } --- 95,99 ---- int nbVar = in_.intField(1); if(nbVar<=0){ ! analyze_.addFatalError(DodicoResource.getS("Format du champ incorrect"), in_.getLineNumber()); return null; } *************** *** 143,147 **** } if(idxEnCours!=nbNodeRead){ ! analyze_.addFatalError(H2dResource.getS("Le nombre de noeuds lu est incorrect"),in_); return null; } --- 143,147 ---- } if(idxEnCours!=nbNodeRead){ ! analyze_.addFatalError(H2dResource.getS("Le nombre de noeuds lu est incorrect"),in_.getLineNumber()); return null; } *************** *** 151,155 **** line=in_.readLine(); if((line!=null) && (Integer.parseInt(line.trim())!=delim)){ ! analyze_.addFatalError(DodicoResource.getS("Format du champ incorrect"), in_); } } --- 151,155 ---- line=in_.readLine(); if((line!=null) && (Integer.parseInt(line.trim())!=delim)){ ! analyze_.addFatalError(DodicoResource.getS("Format du champ incorrect"), in_.getLineNumber()); } } Index: CrbFileFormat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/CrbFileFormat.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CrbFileFormat.java 5 Mar 2004 15:18:39 -0000 1.3 --- CrbFileFormat.java 5 May 2004 12:38:20 -0000 1.4 *************** *** 21,25 **** import org.fudaa.dodico.h2d.H2dEvolution; import org.fudaa.dodico.h2d.H2dFileFormatEvolutionVersion; ! import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.type.H2dFileFormatType; /** --- 21,25 ---- import org.fudaa.dodico.h2d.H2dEvolution; import org.fudaa.dodico.h2d.H2dFileFormatEvolutionVersion; ! import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.type.H2dFileFormatType; /** Index: CorEleBthWriter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/reflux/io/CorEleBthWriter.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** CorEleBthWriter.java 12 Feb 2004 15:32:46 -0000 1.13 --- CorEleBthWriter.java 5 May 2004 12:38:20 -0000 1.14 *************** *** 28,32 **** import org.fudaa.dodico.fortran.FortranInterface; import org.fudaa.dodico.fortran.FortranWriter; ! import org.fudaa.dodico.h2d.H2dResource; /** * --- 28,32 ---- import org.fudaa.dodico.fortran.FortranInterface; import org.fudaa.dodico.fortran.FortranWriter; ! import org.fudaa.dodico.h2d.resource.H2dResource; /** * |
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2626/src/org/fudaa/dodico/telemac/io Modified Files: MatisseFileFormat.java TelemacCLFileFormat.java TelemacCLReader.java TelemacLiquideFileFormat.java TelemacCLWriter.java TelemacLiquideReader.java SinusxWriter.java SerafinWriter.java SinusxReader.java SerafinFileFormat.java SerafinMaillageAdapter.java SerafinGridSourceAdapter.java TelemacLiquideWriter.java SerafinReader.java Removed Files: TelemacDicoFileFormatVersion.java TelemacDicoFileFormat.java Telemac2dFileFormat.java Log Message: Maj Index: MatisseFileFormat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/MatisseFileFormat.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MatisseFileFormat.java 2 Apr 2004 13:54:07 -0000 1.1 --- MatisseFileFormat.java 5 May 2004 12:38:18 -0000 1.2 *************** *** 23,27 **** import org.fudaa.dodico.fichiers.FileReadOperationAbstract; import org.fudaa.dodico.fichiers.FileWriteOperationAbstract; ! import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.type.H2dFileFormatType; import org.fudaa.dodico.mnt.FileFormatListMNTPoint; --- 23,27 ---- import org.fudaa.dodico.fichiers.FileReadOperationAbstract; import org.fudaa.dodico.fichiers.FileWriteOperationAbstract; ! import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.type.H2dFileFormatType; import org.fudaa.dodico.mnt.FileFormatListMNTPoint; Index: SerafinWriter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/SerafinWriter.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** SerafinWriter.java 16 Mar 2004 16:47:28 -0000 1.13 --- SerafinWriter.java 5 May 2004 12:38:18 -0000 1.14 *************** *** 27,31 **** import org.fudaa.dodico.fortran.FortranInterface; import org.fudaa.dodico.fortran.NativeBinaryInputStream; ! import org.fudaa.dodico.h2d.H2dResource; /** * Classe permettant d'ecrire un fichier serafin (utilise un buffer pour l'ecriture). --- 27,31 ---- import org.fudaa.dodico.fortran.FortranInterface; import org.fudaa.dodico.fortran.NativeBinaryInputStream; ! import org.fudaa.dodico.h2d.resource.H2dResource; /** * Classe permettant d'ecrire un fichier serafin (utilise un buffer pour l'ecriture). Index: SinusxReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/SinusxReader.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SinusxReader.java 2 Apr 2004 13:54:07 -0000 1.7 --- SinusxReader.java 5 May 2004 12:38:18 -0000 1.8 *************** *** 17,21 **** import org.fudaa.dodico.fichiers.FileFormatVersion; import org.fudaa.dodico.fichiers.FileOpReadCharSimpleAbstract; ! import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.mnt.MNTEntite; import org.fudaa.dodico.mnt.MNTPolyligne; --- 17,21 ---- import org.fudaa.dodico.fichiers.FileFormatVersion; import org.fudaa.dodico.fichiers.FileOpReadCharSimpleAbstract; ! import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.mnt.MNTEntite; import org.fudaa.dodico.mnt.MNTPolyligne; *************** *** 134,138 **** analyze_.addInfo( H2dResource.getS("Erreur MapInfo traité"), ! in_); type= key.getTypeCourbeNiveau(); } --- 134,138 ---- analyze_.addInfo( H2dResource.getS("Erreur MapInfo traité"), ! in_.getLineNumber()); type= key.getTypeCourbeNiveau(); } *************** *** 195,199 **** ent.setNom(nom); } else if (key.isTypeProfil(type)) { ! analyze_.addWarn(H2dResource.getS("Pofils non gérés"), in_); MNTProfil temp= new MNTProfil(); defZone.ajouteProfil(temp); --- 195,199 ---- ent.setNom(nom); } else if (key.isTypeProfil(type)) { ! analyze_.addWarn(H2dResource.getS("Pofils non gérés"), in_.getLineNumber()); MNTProfil temp= new MNTProfil(); defZone.ajouteProfil(temp); *************** *** 205,209 **** analyze_.addWarn( H2dResource.getS("TYPE inconnu : assimilé a un semis"), ! in_); MNTZone zoneInconnue= new MNTZone(); mntZones_.add(zoneInconnue); --- 205,209 ---- analyze_.addWarn( H2dResource.getS("TYPE inconnu : assimilé a un semis"), ! in_.getLineNumber()); MNTZone zoneInconnue= new MNTZone(); mntZones_.add(zoneInconnue); *************** *** 219,223 **** analyze_.addWarn( H2dResource.getS("Liste de points uniquement"), ! in_); ent= defZone.getSemis(); if (ent.getNbPoints() > 0) { --- 219,223 ---- analyze_.addWarn( H2dResource.getS("Liste de points uniquement"), ! in_.getLineNumber()); ent= defZone.getSemis(); if (ent.getNbPoints() > 0) { Index: TelemacCLWriter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/TelemacCLWriter.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** TelemacCLWriter.java 12 Feb 2004 15:32:49 -0000 1.14 --- TelemacCLWriter.java 5 May 2004 12:38:18 -0000 1.15 *************** *** 19,23 **** import org.fudaa.dodico.fichiers.FileOpWriterCharSimpleAbstract; import org.fudaa.dodico.fichiers.FileOperationSynthese; ! import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.telemac.H2dTelemacCLElementSource; import org.fudaa.dodico.h2d.telemac.H2dTelemacCLSourceInterface; --- 19,23 ---- import org.fudaa.dodico.fichiers.FileOpWriterCharSimpleAbstract; import org.fudaa.dodico.fichiers.FileOperationSynthese; ! import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.telemac.H2dTelemacCLElementSource; import org.fudaa.dodico.h2d.telemac.H2dTelemacCLSourceInterface; Index: TelemacLiquideWriter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/TelemacLiquideWriter.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TelemacLiquideWriter.java 12 Feb 2004 15:32:49 -0000 1.10 --- TelemacLiquideWriter.java 5 May 2004 12:38:19 -0000 1.11 *************** *** 22,26 **** import org.fudaa.dodico.fichiers.FileOperationSynthese; import org.fudaa.dodico.h2d.H2dEvolutionFrontiereLiquide; ! import org.fudaa.dodico.h2d.H2dResource; /** * @author deniger --- 22,26 ---- import org.fudaa.dodico.fichiers.FileOperationSynthese; import org.fudaa.dodico.h2d.H2dEvolutionFrontiereLiquide; ! import org.fudaa.dodico.h2d.resource.H2dResource; /** * @author deniger Index: SerafinFileFormat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/SerafinFileFormat.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** SerafinFileFormat.java 12 Feb 2004 15:32:49 -0000 1.13 --- SerafinFileFormat.java 5 May 2004 12:38:19 -0000 1.14 *************** *** 23,27 **** import org.fudaa.dodico.fichiers.FileReadOperationAbstract; import org.fudaa.dodico.fichiers.FileWriteOperationAbstract; ! import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.type.H2dFileFormatType; /** --- 23,27 ---- import org.fudaa.dodico.fichiers.FileReadOperationAbstract; import org.fudaa.dodico.fichiers.FileWriteOperationAbstract; ! import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.type.H2dFileFormatType; /** Index: SerafinMaillageAdapter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/SerafinMaillageAdapter.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SerafinMaillageAdapter.java 12 Feb 2004 15:32:49 -0000 1.7 --- SerafinMaillageAdapter.java 5 May 2004 12:38:19 -0000 1.8 *************** *** 11,15 **** import org.fudaa.dodico.ef.EfGridSourcesAbstract; import org.fudaa.dodico.fichiers.FileFormat; ! import org.fudaa.dodico.h2d.H2dResource; /** * @author deniger --- 11,15 ---- import org.fudaa.dodico.ef.EfGridSourcesAbstract; import org.fudaa.dodico.fichiers.FileFormat; ! import org.fudaa.dodico.h2d.resource.H2dResource; /** * @author deniger --- TelemacDicoFileFormatVersion.java DELETED --- Index: TelemacCLReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/TelemacCLReader.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** TelemacCLReader.java 12 Feb 2004 15:32:49 -0000 1.17 --- TelemacCLReader.java 5 May 2004 12:38:18 -0000 1.18 *************** *** 20,24 **** import org.fudaa.dodico.fichiers.FileFormatVersion; import org.fudaa.dodico.fichiers.FileOpReadCharSimpleAbstract; ! import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.telemac.H2dTelemacCLElementSource; import org.fudaa.dodico.h2d.telemac.H2dTelemacCLSourceInterface; --- 20,24 ---- import org.fudaa.dodico.fichiers.FileFormatVersion; import org.fudaa.dodico.fichiers.FileOpReadCharSimpleAbstract; ! import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.telemac.H2dTelemacCLElementSource; import org.fudaa.dodico.h2d.telemac.H2dTelemacCLSourceInterface; *************** *** 69,77 **** analyze_.addError( H2dResource.getS("Ligne non valide: elle doit contenir 13 champs"), ! in_); if (nbField == 14) { analyze_.addInfo( H2dResource.getS("Maillage cartésien non supporté"), ! in_); } return null; --- 69,77 ---- analyze_.addError( H2dResource.getS("Ligne non valide: elle doit contenir 13 champs"), ! in_.getLineNumber()); if (nbField == 14) { analyze_.addInfo( H2dResource.getS("Maillage cartésien non supporté"), ! in_.getLineNumber()); } return null; *************** *** 83,87 **** + " " + cl.lihbor_, ! in_); return null; } --- 83,87 ---- + " " + cl.lihbor_, ! in_.getLineNumber()); return null; } *************** *** 92,96 **** + " " + cl.liubor_, ! in_); return null; } --- 92,96 ---- + " " + cl.liubor_, ! in_.getLineNumber()); return null; } *************** *** 101,105 **** + " " + cl.livbor_, ! in_); return null; } --- 101,105 ---- + " " + cl.livbor_, ! in_.getLineNumber()); return null; } *************** *** 112,116 **** analyze_.addError( H2dResource.getS("Code inconnu pour le traceur") + " " + cl.litbor_, ! in_); return null; } --- 112,116 ---- analyze_.addError( H2dResource.getS("Code inconnu pour le traceur") + " " + cl.litbor_, ! in_.getLineNumber()); return null; } *************** *** 126,130 **** CtuluLib.getString(cl.k_), CtuluLib.getString(index)), ! in_); return null; } --- 126,130 ---- CtuluLib.getString(cl.k_), CtuluLib.getString(index)), ! in_.getLineNumber()); return null; } *************** *** 145,149 **** CtuluLib.debug("Telemac boundary file read end"); } catch (NumberFormatException _ex) { ! analyze_.manageException(_ex, in_); return null; } catch (IOException _ex) { --- 145,149 ---- CtuluLib.debug("Telemac boundary file read end"); } catch (NumberFormatException _ex) { ! analyze_.manageException(_ex, in_.getLineNumber()); return null; } catch (IOException _ex) { Index: SerafinGridSourceAdapter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/SerafinGridSourceAdapter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SerafinGridSourceAdapter.java 12 Feb 2004 15:32:49 -0000 1.1 --- SerafinGridSourceAdapter.java 5 May 2004 12:38:19 -0000 1.2 *************** *** 12,16 **** import org.fudaa.dodico.ef.EfGridSource; import org.fudaa.dodico.fichiers.FileFormat; ! import org.fudaa.dodico.h2d.H2dResource; /** --- 12,16 ---- import org.fudaa.dodico.ef.EfGridSource; import org.fudaa.dodico.fichiers.FileFormat; ! import org.fudaa.dodico.h2d.resource.H2dResource; /** --- Telemac2dFileFormat.java DELETED --- Index: TelemacLiquideFileFormat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/TelemacLiquideFileFormat.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** TelemacLiquideFileFormat.java 21 Jan 2004 10:59:10 -0000 1.10 --- TelemacLiquideFileFormat.java 5 May 2004 12:38:18 -0000 1.11 *************** *** 21,25 **** import org.fudaa.dodico.h2d.H2dEvolutionFrontiereLiquide; import org.fudaa.dodico.h2d.H2dFileFormatEvolutionVersion; ! import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.type.H2dFileFormatType; /** --- 21,25 ---- import org.fudaa.dodico.h2d.H2dEvolutionFrontiereLiquide; import org.fudaa.dodico.h2d.H2dFileFormatEvolutionVersion; ! import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.type.H2dFileFormatType; /** Index: SerafinReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/SerafinReader.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** SerafinReader.java 16 Mar 2004 16:47:28 -0000 1.16 --- SerafinReader.java 5 May 2004 12:38:19 -0000 1.17 *************** *** 25,28 **** --- 25,29 ---- import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.ef.EfLib; + import org.fudaa.dodico.ef.EfNodeMutable; import org.fudaa.dodico.fichiers.FileFormat; import org.fudaa.dodico.fichiers.FileFormatVersion; *************** *** 31,35 **** import org.fudaa.dodico.fortran.FortranInterface; import org.fudaa.dodico.fortran.NativeBinaryInputStream; ! import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.mnt.MNTPointMutable; /** --- 32,36 ---- import org.fudaa.dodico.fortran.FortranInterface; import org.fudaa.dodico.fortran.NativeBinaryInputStream; ! import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.mnt.MNTPointMutable; /** *************** *** 221,225 **** inter_.setIdisc1(in.readInteger()); // SMaillageIndex maillage = new SMaillageIndex(); ! MNTPointMutable[] points= new MNTPointMutable[npoin1]; EfElement[] elements= new EfElement[nelem1]; //Si nbv2>0 on ignore --- 222,226 ---- inter_.setIdisc1(in.readInteger()); // SMaillageIndex maillage = new SMaillageIndex(); ! EfNodeMutable[] points= new EfNodeMutable[npoin1]; EfElement[] elements= new EfElement[nelem1]; //Si nbv2>0 on ignore *************** *** 279,283 **** in.readRecord(); for (int i= 0; i < npoin1; i++) { ! points[i]= new MNTPointMutable(); points[i].setX((double)in.readReal()); } --- 280,284 ---- in.readRecord(); for (int i= 0; i < npoin1; i++) { ! points[i]= new EfNodeMutable(); points[i].setX((double)in.readReal()); } Index: SinusxWriter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/SinusxWriter.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SinusxWriter.java 2 Apr 2004 13:54:06 -0000 1.6 --- SinusxWriter.java 5 May 2004 12:38:18 -0000 1.7 *************** *** 19,23 **** import org.fudaa.dodico.fichiers.FileFormatVersion; import org.fudaa.dodico.fichiers.FileOpWriterCharSimpleAbstract; ! import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.mnt.MNT; import org.fudaa.dodico.mnt.MNTEntite; --- 19,23 ---- import org.fudaa.dodico.fichiers.FileFormatVersion; import org.fudaa.dodico.fichiers.FileOpWriterCharSimpleAbstract; ! import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.mnt.MNT; import org.fudaa.dodico.mnt.MNTEntite; Index: TelemacCLFileFormat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/TelemacCLFileFormat.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TelemacCLFileFormat.java 11 Dec 2003 12:41:28 -0000 1.11 --- TelemacCLFileFormat.java 5 May 2004 12:38:18 -0000 1.12 *************** *** 16,20 **** import org.fudaa.dodico.fichiers.FileReadOperationAbstract; import org.fudaa.dodico.fichiers.FileWriteOperationAbstract; ! import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.telemac.H2dTelemacCLSourceInterface; import org.fudaa.dodico.h2d.type.H2dFileFormatType; --- 16,20 ---- import org.fudaa.dodico.fichiers.FileReadOperationAbstract; import org.fudaa.dodico.fichiers.FileWriteOperationAbstract; ! import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.telemac.H2dTelemacCLSourceInterface; import org.fudaa.dodico.h2d.type.H2dFileFormatType; Index: TelemacLiquideReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/io/TelemacLiquideReader.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** TelemacLiquideReader.java 12 Feb 2004 15:32:49 -0000 1.12 --- TelemacLiquideReader.java 5 May 2004 12:38:18 -0000 1.13 *************** *** 19,23 **** import org.fudaa.dodico.fichiers.FileOpReadCharSimpleAbstract; import org.fudaa.dodico.h2d.H2dEvolutionFrontiereLiquideMutable; ! import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.telemac.H2dTelemacTransient; import org.fudaa.dodico.h2d.type.H2dVariableType; --- 19,23 ---- import org.fudaa.dodico.fichiers.FileOpReadCharSimpleAbstract; import org.fudaa.dodico.h2d.H2dEvolutionFrontiereLiquideMutable; ! import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.telemac.H2dTelemacTransient; import org.fudaa.dodico.h2d.type.H2dVariableType; *************** *** 90,98 **** } if (ligneNonReconnue) { ! analyze_.addFatalError(H2dResource.getS("Ligne non valide"), in_); analyze_.addInfo( H2dResource.getS("Ligne lue") + ": " + in_.getLine(), ! in_); ! analyze_.addInfo(H2dResource.getS("Ligne attendue") + ": T Q ...", in_); return null; } --- 90,98 ---- } if (ligneNonReconnue) { ! analyze_.addFatalError(H2dResource.getS("Ligne non valide"), in_.getLineNumber()); analyze_.addInfo( H2dResource.getS("Ligne lue") + ": " + in_.getLine(), ! in_.getLineNumber()); ! analyze_.addInfo(H2dResource.getS("Ligne attendue") + ": T Q ...", in_.getLineNumber()); return null; } *************** *** 104,116 **** //lecture des unites if (in_.getNumberOfFields() != nbChamp) { ! analyze_.addError(H2dResource.getS("Nombre de champs invalide"), in_); analyze_.addInfo( H2dResource.getS("Ligne lue") + ": " + in_.getLine(), ! in_); return null; } stemp= in_.stringField(0); if (!"s".equals(stemp)) { ! analyze_.addInfo(H2dResource.getS("L'unité du temps est traitée en tant que seconde"),in_); } for (int i= 1; i < nbChamp; i++) { --- 104,116 ---- //lecture des unites if (in_.getNumberOfFields() != nbChamp) { ! analyze_.addError(H2dResource.getS("Nombre de champs invalide"), in_.getLineNumber()); analyze_.addInfo( H2dResource.getS("Ligne lue") + ": " + in_.getLine(), ! in_.getLineNumber()); return null; } stemp= in_.stringField(0); if (!"s".equals(stemp)) { ! analyze_.addInfo(H2dResource.getS("L'unité du temps est traitée en tant que seconde"),in_.getLineNumber()); } for (int i= 1; i < nbChamp; i++) { *************** *** 123,130 **** analyze_.addError( H2dResource.getS("nombre de champs invalide"), ! in_); analyze_.addInfo( H2dResource.getS("Ligne lue") + ": " + in_.getLine(), ! in_); return null; } --- 123,130 ---- analyze_.addError( H2dResource.getS("nombre de champs invalide"), ! in_.getLineNumber()); analyze_.addInfo( H2dResource.getS("Ligne lue") + ": " + in_.getLine(), ! in_.getLineNumber()); return null; } --- TelemacDicoFileFormat.java DELETED --- |
|
From: Frederic D. <de...@us...> - 2004-05-05 12:39:02
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2626/src/org/fudaa/dodico/dunes/io Modified Files: DunesReader.java DunesFileFormat.java DunesWriter.java Log Message: Maj Index: DunesFileFormat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesFileFormat.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** DunesFileFormat.java 12 Feb 2004 15:32:44 -0000 1.12 --- DunesFileFormat.java 5 May 2004 12:38:19 -0000 1.13 *************** *** 21,25 **** import org.fudaa.dodico.fichiers.FileReadOperationAbstract; import org.fudaa.dodico.fichiers.FileWriteOperationAbstract; ! import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.type.H2dFileFormatType; /** --- 21,25 ---- import org.fudaa.dodico.fichiers.FileReadOperationAbstract; import org.fudaa.dodico.fichiers.FileWriteOperationAbstract; ! import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.type.H2dFileFormatType; /** Index: DunesReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesReader.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** DunesReader.java 31 Mar 2004 08:14:30 -0000 1.14 --- DunesReader.java 5 May 2004 12:38:19 -0000 1.15 *************** *** 21,25 **** import org.fudaa.dodico.fichiers.FileFormatVersion; import org.fudaa.dodico.fichiers.FileOpReadCharSimpleAbstract; ! import org.fudaa.dodico.h2d.H2dResource; /** * Lecteur de fichiers dunes (.mail) --- 21,25 ---- import org.fudaa.dodico.fichiers.FileFormatVersion; import org.fudaa.dodico.fichiers.FileOpReadCharSimpleAbstract; ! import org.fudaa.dodico.h2d.resource.H2dResource; /** * Lecteur de fichiers dunes (.mail) *************** *** 66,70 **** "L'identifiant {0} est attendu", version_.getNoeudCode()), ! in_); return null; } --- 66,70 ---- "L'identifiant {0} est attendu", version_.getNoeudCode()), ! in_.getLineNumber()); return null; } *************** *** 76,80 **** analyze_.addFatalError( H2dResource.getS("Nombre de noeuds non trouvé"), ! in_); return null; } --- 76,80 ---- analyze_.addFatalError( H2dResource.getS("Nombre de noeuds non trouvé"), ! in_.getLineNumber()); return null; } *************** *** 103,112 **** analyze_.addInfo( H2dResource.getS("Format attendu") + ": NUM_POINT X Y Z", ! in_); analyze_.addError( H2dResource.getS( "La définition du noeud {0} n'est pas valide", CtuluLib.getString(i + 1)), ! in_); return null; } --- 103,112 ---- analyze_.addInfo( H2dResource.getS("Format attendu") + ": NUM_POINT X Y Z", ! in_.getLineNumber()); analyze_.addError( H2dResource.getS( "La définition du noeud {0} n'est pas valide", CtuluLib.getString(i + 1)), ! in_.getLineNumber()); return null; } *************** *** 116,120 **** H2dResource.getS( "Le numéro du point ne correspond pas au numéro réel"), ! in_); } points[i] = --- 116,120 ---- H2dResource.getS( "Le numéro du point ne correspond pas au numéro réel"), ! in_.getLineNumber()); } points[i] = *************** *** 129,133 **** H2dResource.getS( "La ligne du coefficient adaptatif ne doit contenir qu'un champ"), ! in_); } adaptatifs[i] = in_.doubleField(0); --- 129,133 ---- H2dResource.getS( "La ligne du coefficient adaptatif ne doit contenir qu'un champ"), ! in_.getLineNumber()); } adaptatifs[i] = in_.doubleField(0); *************** *** 143,147 **** "L'identifiant {0} est attendu", version_.getElementCode()), ! in_); return null; } --- 143,147 ---- "L'identifiant {0} est attendu", version_.getElementCode()), ! in_.getLineNumber()); return null; } *************** *** 152,156 **** analyze_.addFatalError( H2dResource.getS("Cette ligne est invalide"), ! in_); return null; } --- 152,156 ---- analyze_.addFatalError( H2dResource.getS("Cette ligne est invalide"), ! in_.getLineNumber()); return null; } *************** *** 167,174 **** H2dResource.getS("Format attendu") + "NUM_ELEMENT NB_POINT P[1] ...P[NB_POINT]", ! in_); analyze_.addError( H2dResource.getS("La définition de l'élément {0} n'est pas valide"), ! in_); return null; } --- 167,174 ---- H2dResource.getS("Format attendu") + "NUM_ELEMENT NB_POINT P[1] ...P[NB_POINT]", ! in_.getLineNumber()); analyze_.addError( H2dResource.getS("La définition de l'élément {0} n'est pas valide"), ! in_.getLineNumber()); return null; } *************** *** 179,183 **** H2dResource.getS( "L'index de l'élément ne correspond pas à l'index réel"), ! in_); } temp = in_.intField(1); --- 179,183 ---- H2dResource.getS( "L'index de l'élément ne correspond pas à l'index réel"), ! in_.getLineNumber()); } temp = in_.intField(1); *************** *** 187,191 **** "Le nombre de points est négatif ou nul pour l'élément d'indice {0}", CtuluLib.getString(i + 1)), ! in_); return null; } --- 187,191 ---- "Le nombre de points est négatif ou nul pour l'élément d'indice {0}", CtuluLib.getString(i + 1)), ! in_.getLineNumber()); return null; } *************** *** 199,206 **** + ": " + (in_.getNumberOfFields() - 2), ! in_); analyze_.addFatalError( H2dResource.getS("Le nombre d'éléments est incorrect"), ! in_); return null; } --- 199,206 ---- + ": " + (in_.getNumberOfFields() - 2), ! in_.getLineNumber()); analyze_.addFatalError( H2dResource.getS("Le nombre d'éléments est incorrect"), ! in_.getLineNumber()); return null; } *************** *** 218,222 **** analyze_.addWarn( H2dResource.getS("Cette ligne et les suivantes sont ignorées"), ! in_); } in_.readFields(); --- 218,222 ---- analyze_.addWarn( H2dResource.getS("Cette ligne et les suivantes sont ignorées"), ! in_.getLineNumber()); } in_.readFields(); *************** *** 224,233 **** analyze_.addWarn( H2dResource.getS("Cette ligne et les suivantes sont ignorées"), ! in_); } catch (EOFException e) { if (CtuluLib.DEBUG) CtuluLib.debug("Dunes Read end"); } catch (NumberFormatException fe) { ! analyze_.manageException(fe, in_); } catch (IOException _e) { analyze_.manageException(_e); --- 224,233 ---- analyze_.addWarn( H2dResource.getS("Cette ligne et les suivantes sont ignorées"), ! in_.getLineNumber()); } catch (EOFException e) { if (CtuluLib.DEBUG) CtuluLib.debug("Dunes Read end"); } catch (NumberFormatException fe) { ! analyze_.manageException(fe, in_.getLineNumber()); } catch (IOException _e) { analyze_.manageException(_e); Index: DunesWriter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/dunes/io/DunesWriter.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** DunesWriter.java 31 Mar 2004 08:14:30 -0000 1.13 --- DunesWriter.java 5 May 2004 12:38:19 -0000 1.14 *************** *** 20,24 **** import org.fudaa.dodico.fichiers.FileOpWriterCharSimpleAbstract; import org.fudaa.dodico.fichiers.FileOperationSynthese; ! import org.fudaa.dodico.h2d.H2dResource; /** * @author deniger --- 20,24 ---- import org.fudaa.dodico.fichiers.FileOpWriterCharSimpleAbstract; import org.fudaa.dodico.fichiers.FileOperationSynthese; ! import org.fudaa.dodico.h2d.resource.H2dResource; /** * @author deniger |
|
From: Frederic D. <de...@us...> - 2004-05-05 12:39:02
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mnt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2626/src/org/fudaa/dodico/mnt Modified Files: MNTCsvWriter.java MNTPointMutable.java MNTCsvReader.java MNTEntiteAbstraite.java MNTEntite.java Log Message: Maj Index: MNTEntiteAbstraite.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mnt/MNTEntiteAbstraite.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MNTEntiteAbstraite.java 2 Apr 2004 13:54:09 -0000 1.6 --- MNTEntiteAbstraite.java 5 May 2004 12:38:21 -0000 1.7 *************** *** 9,13 **** package org.fudaa.dodico.mnt; - import org.fudaa.dodico.ef.*; /** --- 9,12 ---- Index: MNTCsvWriter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mnt/MNTCsvWriter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MNTCsvWriter.java 12 Feb 2004 15:32:46 -0000 1.1 --- MNTCsvWriter.java 5 May 2004 12:38:21 -0000 1.2 *************** *** 11,19 **** import java.io.IOException; - import org.fudaa.ctulu.CtuluLib; - import org.fudaa.dodico.commun.DodicoResource; import org.fudaa.dodico.commun.ProgressionUpdater; - import org.fudaa.dodico.fichiers.FileFormatVersion; import org.fudaa.dodico.fichiers.FileOpWriterCharSimpleAbstract; --- 11,16 ---- Index: MNTCsvReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mnt/MNTCsvReader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MNTCsvReader.java 12 Feb 2004 15:32:46 -0000 1.1 --- MNTCsvReader.java 5 May 2004 12:38:21 -0000 1.2 *************** *** 23,27 **** import org.fudaa.dodico.fortran.CsvDoubleReader; import org.fudaa.dodico.fortran.FortranInterface; ! import org.fudaa.dodico.h2d.H2dResource; /** --- 23,27 ---- import org.fudaa.dodico.fortran.CsvDoubleReader; import org.fudaa.dodico.fortran.FortranInterface; ! import org.fudaa.dodico.h2d.resource.H2dResource; /** Index: MNTEntite.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mnt/MNTEntite.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MNTEntite.java 12 Feb 2004 15:32:46 -0000 1.6 --- MNTEntite.java 5 May 2004 12:38:21 -0000 1.7 *************** *** 9,13 **** package org.fudaa.dodico.mnt; - import org.fudaa.dodico.ef.*; /** --- 9,12 ---- Index: MNTPointMutable.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mnt/MNTPointMutable.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MNTPointMutable.java 12 Feb 2004 15:32:46 -0000 1.1 --- MNTPointMutable.java 5 May 2004 12:38:21 -0000 1.2 *************** *** 9,15 **** package org.fudaa.dodico.mnt; - import org.fudaa.dodico.ef.EfNode; - import org.fudaa.dodico.mnt.*; - import org.fudaa.dodico.mnt.*; /** --- 9,12 ---- *************** *** 17,21 **** * @version $Id$ */ ! public class MNTPointMutable extends EfNode { /** * @param _x --- 14,18 ---- * @version $Id$ */ ! public class MNTPointMutable extends MNTPoint { /** * @param _x *************** *** 26,30 **** super(); } ! public MNTPointMutable(EfNode _pt) { x_= _pt.x_; y_= _pt.y_; --- 23,27 ---- super(); } ! public MNTPointMutable(MNTPoint _pt) { x_= _pt.x_; y_= _pt.y_; |
|
From: Frederic D. <de...@us...> - 2004-05-05 12:39:02
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2626/src/org/fudaa/dodico/objet Modified Files: UsineLib.java DConnexion.java Removed Files: ServeurDefaut.java Log Message: Maj Index: UsineLib.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/UsineLib.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** UsineLib.java 30 Apr 2004 13:50:59 -0000 1.2 --- UsineLib.java 5 May 2004 12:38:19 -0000 1.3 *************** *** 201,207 **** if (isAllLocal_) { if (usine_ == null) usine_ = creeUsine(); return usine_; } ! int n = 0; IUsine u = null; --- 201,208 ---- if (isAllLocal_) { if (usine_ == null) usine_ = creeUsine(); + System.out.println("fonctionnement local pour l'usine"); return usine_; } ! System.out.println("fonctionnement distant pour l'usine"); int n = 0; IUsine u = null; Index: DConnexion.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/objet/DConnexion.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** DConnexion.java 30 Apr 2004 13:51:00 -0000 1.7 --- DConnexion.java 5 May 2004 12:38:19 -0000 1.8 *************** *** 10,14 **** import java.text.DateFormat; import java.util.Date; - import java.util.Vector; import org.fudaa.dodico.corba.objet.IConnexion; --- 10,13 ---- --- ServeurDefaut.java DELETED --- |
|
From: Frederic D. <de...@us...> - 2004-05-05 12:39:02
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2626/src/org/fudaa/dodico/h2d/telemac Modified Files: H2dTelemacParameters.java H2dTelemacBcManager.java H2dTelemacTransient.java Log Message: Maj Index: H2dTelemacParameters.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacParameters.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** H2dTelemacParameters.java 12 Feb 2004 15:32:45 -0000 1.6 --- H2dTelemacParameters.java 5 May 2004 12:38:19 -0000 1.7 *************** *** 18,22 **** import org.fudaa.dodico.h2d.H2dEvolutionManager; import org.fudaa.dodico.h2d.H2dParameters; ! import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.type.H2dBoundaryType; /** --- 18,22 ---- import org.fudaa.dodico.h2d.H2dEvolutionManager; import org.fudaa.dodico.h2d.H2dParameters; ! import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.type.H2dBoundaryType; /** Index: H2dTelemacBcManager.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacBcManager.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** H2dTelemacBcManager.java 31 Mar 2004 08:14:31 -0000 1.7 --- H2dTelemacBcManager.java 5 May 2004 12:38:19 -0000 1.8 *************** *** 40,44 **** import org.fudaa.dodico.h2d.H2dEvolution; import org.fudaa.dodico.h2d.H2dEvolutionFrontiereLiquide; ! import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.type.H2dBcType; import org.fudaa.dodico.h2d.type.H2dBoundaryType; --- 40,44 ---- import org.fudaa.dodico.h2d.H2dEvolution; import org.fudaa.dodico.h2d.H2dEvolutionFrontiereLiquide; ! import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.type.H2dBcType; import org.fudaa.dodico.h2d.type.H2dBoundaryType; Index: H2dTelemacTransient.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/h2d/telemac/H2dTelemacTransient.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** H2dTelemacTransient.java 11 Dec 2003 12:41:27 -0000 1.3 --- H2dTelemacTransient.java 5 May 2004 12:38:20 -0000 1.4 *************** *** 12,16 **** import org.fudaa.dodico.commun.DodicoPermanentList; import org.fudaa.dodico.h2d.H2dEvolution; ! import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.type.H2dVariableType; /** --- 12,16 ---- import org.fudaa.dodico.commun.DodicoPermanentList; import org.fudaa.dodico.h2d.H2dEvolution; ! import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.type.H2dVariableType; /** |
|
From: Frederic D. <de...@us...> - 2004-05-05 12:38:56
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/trigrid In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2626/src/org/fudaa/dodico/trigrid Modified Files: TrigridWriter.java TrigridFileFormat.java TrigridReader.java Log Message: Maj Index: TrigridReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/trigrid/TrigridReader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TrigridReader.java 10 Mar 2004 09:08:37 -0000 1.2 --- TrigridReader.java 5 May 2004 12:38:18 -0000 1.3 *************** *** 148,152 **** CtuluLib.debug("NGH Read end"); } catch (NumberFormatException fe) { ! analyze_.manageException(fe, in_); } catch (IOException _e) { analyze_.manageException(_e); --- 148,152 ---- CtuluLib.debug("NGH Read end"); } catch (NumberFormatException fe) { ! analyze_.manageException(fe, in_.getLineNumber()); } catch (IOException _e) { analyze_.manageException(_e); Index: TrigridFileFormat.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/trigrid/TrigridFileFormat.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TrigridFileFormat.java 12 Feb 2004 15:45:32 -0000 1.1 --- TrigridFileFormat.java 5 May 2004 12:38:18 -0000 1.2 *************** *** 22,26 **** import org.fudaa.dodico.fichiers.FileReadOperationAbstract; import org.fudaa.dodico.fichiers.FileWriteOperationAbstract; ! import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.type.H2dFileFormatType; /** --- 22,26 ---- import org.fudaa.dodico.fichiers.FileReadOperationAbstract; import org.fudaa.dodico.fichiers.FileWriteOperationAbstract; ! import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.type.H2dFileFormatType; /** Index: TrigridWriter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/trigrid/TrigridWriter.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TrigridWriter.java 12 Feb 2004 15:45:32 -0000 1.1 --- TrigridWriter.java 5 May 2004 12:38:18 -0000 1.2 *************** *** 26,30 **** import org.fudaa.dodico.fortran.FortranLib; import org.fudaa.dodico.fortran.FortranWriter; ! import org.fudaa.dodico.h2d.H2dResource; /** --- 26,30 ---- import org.fudaa.dodico.fortran.FortranLib; import org.fudaa.dodico.fortran.FortranWriter; ! import org.fudaa.dodico.h2d.resource.H2dResource; /** |
|
From: Frederic D. <de...@us...> - 2004-05-05 12:38:56
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2626/src/org/fudaa/dodico/test/telemac Modified Files: TestJCas.java Log Message: Maj Index: TestJCas.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/test/telemac/TestJCas.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TestJCas.java 5 Mar 2004 15:18:24 -0000 1.1 --- TestJCas.java 5 May 2004 12:38:17 -0000 1.2 *************** *** 14,18 **** import org.fudaa.dodico.dico.DicoModelAbstract; import org.fudaa.dodico.fichiers.FileOperationSynthese; ! import org.fudaa.dodico.telemac.io.Telemac2dFileFormat; import org.fudaa.dodico.test.TestIO; --- 14,18 ---- import org.fudaa.dodico.dico.DicoModelAbstract; import org.fudaa.dodico.fichiers.FileOperationSynthese; ! import org.fudaa.dodico.telemac.Telemac2dFileFormat; import org.fudaa.dodico.test.TestIO; |
|
From: Frederic D. <de...@us...> - 2004-05-05 12:38:55
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2626/src/org/fudaa/dodico/telemac Modified Files: TelemacDicoManager.java Added Files: TelemacDicoFileFormat.java Telemac2dFileFormat.java TelemacDicoFileFormatVersion.java Log Message: Maj --- NEW FILE: TelemacDicoFileFormatVersion.java --- /* * @file TelemacDicoFileFormatVersion.java * @creation 29 sept. 2003 * @modification $Date: 2004/05/05 12:38:17 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.telemac; import java.util.Set; import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.dico.DicoCasFileFormat; import org.fudaa.dodico.dico.DicoEntite; import org.fudaa.dodico.dico.DicoManager; import org.fudaa.dodico.dico.DicoModelAbstract; import org.fudaa.dodico.dico.DicoParamsInterface; import org.fudaa.dodico.fichiers.FileFormat; import org.fudaa.dodico.h2d.telemac.H2dTelemacDicoFileFormatVersion; import org.fudaa.dodico.h2d.type.H2dFileFormatType; import org.fudaa.dodico.telemac.io.SerafinFileFormat; import org.fudaa.dodico.telemac.io.TelemacCLFileFormat; import org.fudaa.dodico.telemac.io.TelemacLiquideFileFormat; import org.fudaa.dodico.telemac.io.SerafinFileFormat.SerafinVersion; import org.fudaa.dodico.telemac.io.TelemacCLFileFormat.TelemacCLVersion; import org.fudaa.dodico.telemac.io.TelemacLiquideFileFormat.TelemacLiquideVersion; /** * @author deniger * @version $Id: TelemacDicoFileFormatVersion.java,v 1.1 2004/05/05 12:38:17 deniger Exp $ */ public class TelemacDicoFileFormatVersion extends H2dTelemacDicoFileFormatVersion { private DicoEntite clEntite_; private DicoEntite gridEntite_; /** * @param _ft * @param _dico */ public TelemacDicoFileFormatVersion( DicoCasFileFormat _ft, DicoModelAbstract _dico) { super(_ft, _dico); getCLEntiteFile(); getMaillageEntiteFile(); if (clEntite_ != null) clEntite_.setRequired(true); if (gridEntite_ != null) gridEntite_.setRequired(true); } public void fillListWithNotSetRequiredEntite( DicoParamsInterface _i, Set _l) { if ((clEntite_ != null) && (!_i.isValueSetFor(clEntite_))) _l.add(clEntite_); if ((gridEntite_ != null) && (!_i.isValueSetFor(gridEntite_))) _l.add(gridEntite_); } public DicoCasFileFormat getDicoFileFormat() { return (DicoCasFileFormat)super.getFileFormat(); } public DicoEntite getMaillageEntiteFile() { if (gridEntite_ == null) gridEntite_= getEntiteFor(new String[] { "FICHIER DE GEOMETRIE", "GEOMETRY FILE" }); return gridEntite_; } public DicoEntite getCLLiquideEntiteFile() { return getEntiteFor( new String[] { "FICHIER DES FRONTIERES LIQUIDES", "LIQUID BOUNDARIES FILE" }); } public DicoEntite getCLEntiteFile() { if (clEntite_ == null) clEntite_= getEntiteFor( new String[] { "FICHIER DES CONDITIONS AUX LIMITES", "BOUNDARY CONDITIONS FILE" }); return clEntite_; } public DicoEntite getFONDEntiteFile() { return getEntiteFor( new String[] { "FICHIER DES FONDS", "BOTTOM TOPOGRAPHY FILE" }); } public boolean isEntiteFileRequired(DicoEntite _e) { return (_e == getMaillageEntiteFile() || (_e == getCLEntiteFile())); } public SerafinFileFormat.SerafinVersion getDefaultSerafinFormat() { return (SerafinFileFormat.SerafinVersion)SerafinFileFormat .getInstance() .getLastVersionImpl(); } public TelemacCLFileFormat.TelemacCLVersion getDefaultTelemacCLFormat() { return (TelemacCLFileFormat.TelemacCLVersion)TelemacCLFileFormat .getInstance() .getLastVersionImpl(); } public TelemacLiquideFileFormat .TelemacLiquideVersion getDefaultTelemacLiquideFormat() { return ( TelemacLiquideFileFormat.TelemacLiquideVersion)TelemacLiquideFileFormat .getInstance() .getLastVersionImpl(); } public H2dFileFormatType getSpecialType(DicoEntite ent) { if (ent == null) return null; DicoEntite test; //entite du fichier cas test= getMaillageEntiteFile(); if (ent.equals(test)) return H2dFileFormatType.MAILLAGE; //entite du fichier cl test= getCLEntiteFile(); if (ent.equals(test)) return H2dFileFormatType.CL; //entite du fichier de fond test= getFONDEntiteFile(); if (ent.equals(test)) return H2dFileFormatType.FOND; return null; } public FileFormat getFileFormat(DicoEntite ent) { if (ent == null) return null; //entite du fichier cas if (ent.equals(getMaillageEntiteFile())) return SerafinFileFormat.getInstance(); //entite du fichier cl else if (ent.equals(getCLEntiteFile())) return TelemacCLFileFormat.getInstance(); else if (ent.equals(getCLLiquideEntiteFile())) { return TelemacLiquideFileFormat.getInstance(); } return null; } /** * */ public DicoManager getDicoManager() { return TelemacDicoManager.getINSTANCE(); } /** * */ public DicoEntite getPrescribedElevation() { return getEntiteFor( new String[] { "COTES IMPOSEES", "PRESCRIBED ELEVATIONS" }); } /** * */ public DicoEntite getPrescribedFlowrate() { return getEntiteFor( new String[] { "DEBITS IMPOSES", "PRESCRIBED FLOWRATES" }); } /** * */ public DicoEntite getPrescribedVelocity() { return getEntiteFor( new String[] { "VITESSES IMPOSEES", "PRESCRIBED VELOCITIES" }); } public DicoEntite getPrescribedTracer() { return getEntiteFor( new String[] { "VALEURS IMPOSEES DU TRACEUR", "PRESCRIBED TRACER VALUES" }); } public DicoEntite getVelocityProfils() { return getEntiteFor( new String[] { "PROFILS DE VITESSE", "VELOCITY PROFILES" }); } public DicoEntite getLiquidBoundaryOption() { return getEntiteFor( new String[] { "OPTION POUR LES FRONTIERES LIQUIDES", "OPTION FOR LIQUID BOUNDARIES" }); } /** * */ public boolean isFlowrateComputeFromVelocities(String _v) { return CtuluLib.DEUX.equals(_v); } /** * */ public boolean isFlowrateComputeFromElevation(String _v) { return CtuluLib.QUATRE.equals(_v); } /** * */ public boolean isFlowrateComputeFromVelocityU(String _v) { return CtuluLib.TROIS.equals(_v); } /** * */ public DicoEntite getDureeDuCalcul() { return getEntiteFor( new String[] { "DUREE DU CALCUL", "DURATION" }); } /** * */ public DicoEntite getNbPasTemps() { return getEntiteFor( new String[] { "NOMBRE DE PAS DE TEMPS", "NUMBER OF TIME STEPS" }); } /** * */ public DicoEntite getPasTemps() { return getEntiteFor( new String[] { "PAS DE TEMPS", "TIME STEP" }); } } Index: TelemacDicoManager.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/telemac/TelemacDicoManager.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** TelemacDicoManager.java 31 Mar 2004 08:14:34 -0000 1.17 --- TelemacDicoManager.java 5 May 2004 12:38:17 -0000 1.18 *************** *** 16,22 **** import org.fudaa.dodico.dico.DicoManager; import org.fudaa.dodico.dico.DicoModelAbstract; - import org.fudaa.dodico.telemac.io.Telemac2dFileFormat; - import org.fudaa.dodico.telemac.io.TelemacDicoFileFormat; - import org.fudaa.dodico.telemac.io.TelemacDicoFileFormatVersion; /** * @author deniger --- 16,19 ---- --- NEW FILE: Telemac2dFileFormat.java --- /* * @file TelemacCasFileFormat.java * @creation 14 avr. 2003 * @modification $Date: 2004/05/05 12:38:17 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail de...@fu... */ package org.fudaa.dodico.telemac; import org.fudaa.dodico.dico.DicoEntite; import org.fudaa.dodico.dico.DicoModelAbstract; import org.fudaa.dodico.fichiers.FileFormatSoftware; import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.type.H2dFileFormatType; import org.fudaa.dodico.telemac.io.TelemacLiquideFileFormat; import org.fudaa.dodico.telemac.io.TelemacLiquideFileFormat.TelemacLiquideVersion; /** * @author deniger * @version $Id: Telemac2dFileFormat.java,v 1.1 2004/05/05 12:38:17 deniger Exp $ */ public class Telemac2dFileFormat extends TelemacDicoFileFormat { /** * Initialise les variables de ce format. Par defaut, la version v5p2 est utilisee. */ private static final Telemac2dFileFormat INSTANCE= new Telemac2dFileFormat(); public static final Telemac2dFileFormat getInstance() { return INSTANCE; } protected Telemac2dFileFormat() { super("telemac2d"); extensions_= new String[] { "" }; ID_= nom_.toUpperCase(); description_= H2dResource.getS("fichier de paramètres pour Télémac 2D"); mode_= MODE_ASCII; software_= FileFormatSoftware.TELEMAC_IS; type_= H2dFileFormatType.PROJET.getId(); } public TelemacVersion createVersion(DicoModelAbstract _dico) { return new TelemacVersion(_dico); } public class TelemacVersion extends TelemacDicoFileFormatVersion { public TelemacVersion(DicoModelAbstract _dico) { super(getInstance(), _dico); } public TelemacLiquideFileFormat .TelemacLiquideVersion getDefaultTelemacLiquideFormat() { return ( TelemacLiquideFileFormat.TelemacLiquideVersion)TelemacLiquideFileFormat .getInstance() .getLastVersionImpl(); } public H2dFileFormatType getSpecialType(DicoEntite ent) { H2dFileFormatType r= super.getSpecialType(ent); if (r == null) { if (ent.equals(getCLLiquideEntiteFile())) return H2dFileFormatType.COURBE_TRANSITOIRE; } return r; } } } --- NEW FILE: TelemacDicoFileFormat.java --- (This appears to be a binary file; contents omitted.) |
|
From: Frederic D. <de...@us...> - 2004-05-05 12:38:55
|
Update of /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mesure In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2626/src/org/fudaa/dodico/mesure Modified Files: EvolutionReader.java Log Message: Maj Index: EvolutionReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/src/org/fudaa/dodico/mesure/EvolutionReader.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EvolutionReader.java 30 Apr 2004 07:18:32 -0000 1.4 --- EvolutionReader.java 5 May 2004 12:38:16 -0000 1.5 *************** *** 25,29 **** import org.fudaa.dodico.fortran.FortranInterface; import org.fudaa.dodico.fortran.FortranReader; - import org.fudaa.dodico.h2d.H2dEvolution; /** --- 25,28 ---- *************** *** 122,126 **** r= new EvolutionReguliere[reader_.vals_.length]; for (int i= reader_.vals_.length - 1; i >= 0; i--) { ! r[i]= new H2dEvolution(getName(i + 1)); } } --- 121,125 ---- r= new EvolutionReguliere[reader_.vals_.length]; for (int i= reader_.vals_.length - 1; i >= 0; i--) { ! r[i]= new EvolutionReguliere(getName(i + 1)); } } |
|
From: Frederic D. <de...@us...> - 2004-05-05 12:38:47
|
Update of /cvsroot/fudaa/fudaa_devel/dodico In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2626 Modified Files: build.xml Log Message: Maj Index: build.xml =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/dodico/build.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** build.xml 30 Apr 2004 07:18:59 -0000 1.16 --- build.xml 5 May 2004 12:38:38 -0000 1.17 *************** *** 342,347 **** </echo> <mkdir dir="${dodico.classes.dir}" /> ! <javac srcdir="${dodico.src.dir}" destdir="${dodico.classes.dir}" classpath="${dodico.classpath}" target="${build.compiler.target}" failonerror="${build.compiler.failonerror}" debug="${build.compiler.debug}" depend="${build.compiler.depend}" optimize="${build.compiler.optimize}" deprecation="${build.compiler.deprecation}" nowarn="${build.compiler.nowarn}" verbose="${build.compiler.verbose}" includes="**/org/fudaa/dodico/ant/genereUsine.java" /> ! <taskdef classname="org.fudaa.dodico.ant.genereUsine" name="usine" classpath="${dodico.classpath}" /> <dependset> <srcfileset dir="${dodico.idl.dir}" includes="**/*.idl" /> --- 342,347 ---- </echo> <mkdir dir="${dodico.classes.dir}" /> ! <javac srcdir="${dodico.src.dir}" destdir="${dodico.classes.dir}" classpath="${dodico.classpath}" target="${build.compiler.target}" failonerror="${build.compiler.failonerror}" debug="${build.compiler.debug}" depend="${build.compiler.depend}" optimize="${build.compiler.optimize}" deprecation="${build.compiler.deprecation}" nowarn="${build.compiler.nowarn}" verbose="${build.compiler.verbose}" includes="**/org/fudaa/dodico/ant/GenereUsine.java" /> ! <taskdef classname="org.fudaa.dodico.ant.GenereUsine" name="usine" classpath="${dodico.classpath}" /> <dependset> <srcfileset dir="${dodico.idl.dir}" includes="**/*.idl" /> |
