Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer MvFindDialog.java,NONE,1.1 MvFindComponent.java,NONE,1.1 MvVisuPanel.java,NONE,1.1 numelements_16.gif,NONE,1.1 MvFindAction.java,NONE,1.1 numnoeuds_16.gif,NONE,1.1 numelements_24.gif,NONE,1.1 MvResource.java,NONE,1.1 numnoeuds_24.gif,NONE,1.1 MvInternalFrame.java,NONE,1.1 MvFindActionDefault.java,NONE,1.1 MvFindComponentDefault.java,NONE,1.1 mv_en.fr_txt,NONE,1.1 MvActCheckDefault.java,1.2,1.3 MvControllerSrc.java,1.1,1.2 MvActModifyDefault.java,1.1,1.2 MvActView.java,1.1,1.2 MvAct.java,1.1,1.2 MvActCheck.java,1.1,1.2 MvActLoadDefault.java,1.4,1.5 MvParentInterface.java,1.1,1.2 Mv.java,1.1,NONE MvActViewDefault.java,1.2,NONE MvFrameContentDefault.java,1.1,NONE MvProgressAdapter.java,1.1,NONE MvPanelMain.java,1.2,NONE MvPanelViewer.java,1.1,NONE MvPanelLayer.java,1.3,NONE MvTask.java,1.1,NONE
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809/src/org/fudaa/fudaa/meshviewer Modified Files: MvActCheckDefault.java MvControllerSrc.java MvActModifyDefault.java MvActView.java MvAct.java MvActCheck.java MvActLoadDefault.java MvParentInterface.java Added Files: MvFindDialog.java MvFindComponent.java MvVisuPanel.java numelements_16.gif MvFindAction.java numnoeuds_16.gif numelements_24.gif MvResource.java numnoeuds_24.gif MvInternalFrame.java MvFindActionDefault.java MvFindComponentDefault.java mv_en.fr_txt Removed Files: Mv.java MvActViewDefault.java MvFrameContentDefault.java MvProgressAdapter.java MvPanelMain.java MvPanelViewer.java MvPanelLayer.java MvTask.java Log Message: --- NEW FILE: numelements_24.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: mv_en.fr_txt --- (This appears to be a binary file; contents omitted.) --- MvActViewDefault.java DELETED --- --- MvPanelMain.java DELETED --- --- MvFrameContentDefault.java DELETED --- Index: MvActCheck.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvActCheck.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MvActCheck.java 12 Feb 2004 16:15:20 -0000 1.1 --- MvActCheck.java 1 Jun 2004 11:27:42 -0000 1.2 *************** *** 20,24 **** public interface MvActCheck extends MvAct{ ! public void check(EfGridSource _s,MvControllerSrc _src); } --- 20,24 ---- public interface MvActCheck extends MvAct{ ! public void check(MvControllerSrc _src); } --- NEW FILE: MvFindComponentDefault.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: numnoeuds_24.gif --- (This appears to be a binary file; contents omitted.) Index: MvActView.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvActView.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MvActView.java 12 Feb 2004 16:15:20 -0000 1.1 --- MvActView.java 1 Jun 2004 11:27:42 -0000 1.2 *************** *** 24,29 **** public interface MvActView extends MvAct{ - public void build(Container _c); - public void init(FileOperationSynthese _s); /** --- 24,27 ---- --- NEW FILE: numelements_16.gif --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvInternalFrame.java --- /** * @creation 27 mai 2004 * @modification $Date: 2004/06/01 11:27:42 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.fudaa.meshviewer; import java.awt.Component; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.ef.EfGrid; import org.fudaa.dodico.ef.EfGridSource; import org.fudaa.dodico.ef.EfGridSourceMutable; import org.fudaa.dodico.fichiers.FileOperationSynthese; import org.fudaa.ebli.calque.ZCalqueAffichageDonnees; import org.fudaa.ebli.calque.ZEbliFilleCalques; import org.fudaa.fudaa.commun.FudaaCommonImplementation; import org.fudaa.fudaa.meshviewer.controle.MvCheckLayerGroup; import org.fudaa.fudaa.meshviewer.controle.MvControlResult; import org.fudaa.fudaa.meshviewer.layer.MvInfoDelegateAbstract; import org.fudaa.fudaa.ressource.FudaaResource; import org.fudaa.fudaa.tr.common.TrResource; import com.memoire.bu.BuMenu; import com.memoire.bu.BuResource; import com.memoire.bu.BuSelectFindReplaceInterface; import com.memoire.bu.BuTask; import com.memoire.bu.BuUndoRedoInterface; /** * @author Fred Deniger * @version $Id: MvInternalFrame.java,v 1.1 2004/06/01 11:27:42 deniger Exp $ */ public class MvInternalFrame extends ZEbliFilleCalques implements MvActView, MvParentInterface, BuUndoRedoInterface, BuSelectFindReplaceInterface { MvCheckLayerGroup gpCheck_; MvControllerSrc src_; /** * @param _impl l'impl parente * @param _src le source */ public MvInternalFrame(FudaaCommonImplementation _impl, MvControllerSrc _src) { super(new MvVisuPanel(_impl), _impl, null); src_ = _src; } /** * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent _e) { if ("CHECK".equals(_e.getActionCommand())) { check(); } else super.actionPerformed(_e); } private void addMvControlResult(MvControlResult _r) { if (_r.getIdx() != null) { if (gpCheck_ == null) { gpCheck_ = new MvCheckLayerGroup(); gpCheck_.setDestructible(false); gpCheck_.setTitle(FudaaResource.getS("Contröles")); pn_.addCalque(gpCheck_, true); ((MvVisuPanel) pn_).getCqInfos().enPremier(); } ZCalqueAffichageDonnees z = _r.buildLayer(getGrid()); gpCheck_.add(z); gpCheck_.enPremier(z); } } protected void check() { src_.check(); } public ProgressionInterface createProgression(BuTask _t) { return getImpl().createProgressionInterface(_t); } protected void fillSpecificMenu(BuMenu _m) { _m.addMenuItem(TrResource.getS("Contrôle"), "CHECK", BuResource.BU.getIcon("valider"), true, KeyEvent.VK_C, this); super.fillSpecificMenu(_m); } public void find() { getMvVisuPanel().find(); } protected EfGrid getGrid() { return src_.getSource().getGrid(); } protected FudaaCommonImplementation getImpl() { return getMvVisuPanel().getImpl(); } public MvVisuPanel getMvVisuPanel() { return (MvVisuPanel) pn_; } /** * @see org.fudaa.fudaa.meshviewer.MvParentInterface#getParentComponent() */ public Component getParentComponent() { return this; } /** * @see org.fudaa.fudaa.meshviewer.MvPanelViewer#init(org.fudaa.dodico.fichiers.FileOperationSynthese) */ public void init(FileOperationSynthese _s) { MvVisuPanel p = getMvVisuPanel(); if (p.getGridGroup() == null) { MvInfoDelegateAbstract delegate = new MvInfoDelegateAbstract() { public EfGrid getGrid() { return MvInternalFrame.this.getGrid(); } }; EfGrid g = ((EfGridSource) _s.getSource()).getGrid(); p.addCqInfos(g); p.addCqMaillage(g, delegate); pack(); setVisible(true); getImpl().addInternalFrame(this); restaurer(); } } public void redo() { getMvVisuPanel().redo(); } /** * @see org.fudaa.fudaa.meshviewer.MvPanelViewer#refresh(org.fudaa.dodico.ef.EfGridSource, * org.fudaa.dodico.ef.EfGridSourceMutable) */ public void refresh(EfGridSource _srcInit, EfGridSourceMutable _enCours) { if (_enCours != null) { if (_enCours.getGrid() != getGrid()) { getMvVisuPanel().getGridGroup().setGrid(_enCours.getGrid()); pn_.restaurer(); } } } public void replace() {} public void select() {} /** * @see org.fudaa.fudaa.meshviewer.MvParentInterface#setActionRunning(boolean) */ public void setActionRunning(boolean _b) {} /** * @see org.fudaa.fudaa.meshviewer.MvParentInterface#setMessage(java.lang.String) */ public void setMessage(String _s) {} public void setParent(MvParentInterface _c) {} /** * @see org.fudaa.fudaa.meshviewer.MvParentInterface#setProgression(int) */ public void setProgression(int _v) {} public void undo() { getMvVisuPanel().undo(); } public void updateCheck(MvControlResult[] _a) { if ((_a != null) && (pn_ != null)) { for (int i = _a.length - 1; i >= 0; i--) { addMvControlResult(_a[i]); } } } } --- NEW FILE: MvFindComponent.java --- (This appears to be a binary file; contents omitted.) --- NEW FILE: MvFindDialog.java --- (This appears to be a binary file; contents omitted.) Index: MvActModifyDefault.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvActModifyDefault.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MvActModifyDefault.java 12 Feb 2004 16:15:20 -0000 1.1 --- MvActModifyDefault.java 1 Jun 2004 11:27:42 -0000 1.2 *************** *** 25,32 **** } - /** - * - */ - public void setParent(MvParentInterface _c) {} } --- 25,28 ---- Index: MvActCheckDefault.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvActCheckDefault.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MvActCheckDefault.java 31 Mar 2004 08:17:50 -0000 1.2 --- MvActCheckDefault.java 1 Jun 2004 11:27:42 -0000 1.3 *************** *** 16,22 **** --- 16,25 ---- import com.memoire.bu.BuScrollPane; import com.memoire.bu.BuTable; + import com.memoire.bu.BuTask; + import com.memoire.bu.BuTaskOperation; import com.memoire.bu.BuTextField; import org.fudaa.dodico.commun.DodicoResource; + import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.ef.EfGridSource; *************** *** 33,42 **** public class MvActCheckDefault implements MvActCheck { - MvParentInterface f_; /** * */ ! public void check(final EfGridSource _s, final MvControllerSrc _source) { ! if ((_s == null) || (_s.getGrid() == null)) { new Throwable("grid is null").printStackTrace(); return; --- 36,44 ---- public class MvActCheckDefault implements MvActCheck { /** * */ ! public void check(final MvControllerSrc _source) { ! if ((_source == null) || (_source.getSource().getGrid() == null)) { new Throwable("grid is null").printStackTrace(); return; *************** *** 44,52 **** final MvControlPanel pn= new MvControlPanel(); if (EbliSimpleDialogPanel ! .isOkResponse(pn.afficheModale(f_.getParentComponent()))) { ! new MvTask(f_) { public void act() { ! f_.setActionRunning(true); ! MvControlResult[] r= pn.execute(_s.getGrid(), prog_); if (r != null) { ArrayList descValue= new ArrayList(); --- 46,54 ---- final MvControlPanel pn= new MvControlPanel(); if (EbliSimpleDialogPanel ! .isOkResponse(pn.afficheModale(_source.getParent().getParentComponent()))) { ! new BuTaskOperation(null,MvResource.getS("Contrôle")) { public void act() { ! ProgressionInterface prog_=_source.getParent().createProgression(this); ! MvControlResult[] r= pn.execute(_source.getSource().getGrid(), prog_); if (r != null) { ArrayList descValue= new ArrayList(); *************** *** 77,85 **** new BuScrollPane(new BuTable(values, name)), BuBorderLayout.CENTER); ! d.afficheModale(f_.getParentComponent(),EbliSimpleDialog.OK_OPTION); } } _source.updateCheckResult(r); ! f_.setActionRunning(false); } } --- 79,87 ---- new BuScrollPane(new BuTable(values, name)), BuBorderLayout.CENTER); ! d.afficheModale(_source.getParent().getParentComponent(),EbliSimpleDialog.OK_OPTION); } } _source.updateCheckResult(r); ! _source.getParent().setActionRunning(false); } } *************** *** 88,97 **** } - /** - * - */ - public void setParent(MvParentInterface _c) { - f_= _c; - } } --- 90,93 ---- --- NEW FILE: MvResource.java --- /** * @creation 27 mai 2004 * @modification $Date: 2004/06/01 11:27:42 $ * @license GNU General Public License 2 * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne * @mail fud...@li... */ package org.fudaa.fudaa.meshviewer; import org.fudaa.fudaa.ressource.FudaaResource; import com.memoire.bu.BuResource; /** * @author Fred Deniger * @version $Id: MvResource.java,v 1.1 2004/06/01 11:27:42 deniger Exp $ */ public class MvResource extends FudaaResource { public final static MvResource MV= new MvResource(FudaaResource.FUDAA); protected MvResource(BuResource _parent) { super(_parent); } /** * A "shortcut" to get i18n String (FudaaResource.FUDAA.getString) */ public static String getS(String _s) { return MV.getString(_s); } /** * A "shortcut" to get i18n String (FudaaResource.FUDAA.getString) */ public static String getS(String _s, String _v0) { return MV.getString(_s, _v0); } /** * A "shortcut" to get i18n String (FudaaResource.FUDAA.getString) */ public static String getS(String _s, String _v0, String _v1) { return MV.getString(_s, _v0, _v1); } } --- Mv.java DELETED --- --- NEW FILE: MvFindActionDefault.java --- (This appears to be a binary file; contents omitted.) Index: MvParentInterface.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvParentInterface.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MvParentInterface.java 12 Feb 2004 16:15:20 -0000 1.1 --- MvParentInterface.java 1 Jun 2004 11:27:42 -0000 1.2 *************** *** 12,15 **** --- 12,16 ---- import com.memoire.bu.BuProgressBar; + import com.memoire.bu.BuTask; import com.memoire.bu.BuTaskView; *************** *** 24,28 **** public Component getParentComponent(); public void setActionRunning(boolean _b); ! public ProgressionInterface createProgression(); public void setMessage(String _s); public void setProgression(int _v); --- 25,29 ---- public Component getParentComponent(); public void setActionRunning(boolean _b); ! public ProgressionInterface createProgression(BuTask _t); public void setMessage(String _s); public void setProgression(int _v); Index: MvActLoadDefault.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvActLoadDefault.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MvActLoadDefault.java 31 Mar 2004 08:17:50 -0000 1.4 --- MvActLoadDefault.java 1 Jun 2004 11:27:42 -0000 1.5 *************** *** 9,15 **** package org.fudaa.fudaa.meshviewer; - import java.awt.Component; import java.io.File; import java.util.List; import javax.swing.JTextField; import javax.swing.event.DocumentEvent; --- 9,15 ---- package org.fudaa.fudaa.meshviewer; import java.io.File; import java.util.List; + import javax.swing.JTextField; import javax.swing.event.DocumentEvent; *************** *** 17,27 **** import javax.swing.text.BadLocationException; import javax.swing.text.Document; ! import org.fudaa.ctulu.CtuluLib; ! import com.memoire.bu.BuComboBox; ! import com.memoire.bu.BuGridLayout; ! import com.memoire.bu.BuTaskOperation; import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; - import org.fudaa.dodico.commun.ProgressionBuAdapter; import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.dunes.io.DunesFileFormat; --- 17,23 ---- import javax.swing.text.BadLocationException; import javax.swing.text.Document; ! import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.dodico.dunes.io.DunesFileFormat; *************** *** 36,42 **** import org.fudaa.dodico.trigrid.TrigridFileFormat; import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; - import org.fudaa.fudaa.commun.FudaaLib; import org.fudaa.fudaa.ressource.FudaaResource; /** * @author deniger --- 32,42 ---- import org.fudaa.dodico.trigrid.TrigridFileFormat; import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; import org.fudaa.fudaa.ressource.FudaaResource; + import com.memoire.bu.BuComboBox; + import com.memoire.bu.BuGridLayout; + import com.memoire.bu.BuTask; + import com.memoire.bu.BuTaskOperation; + /** * @author deniger *************** *** 45,61 **** public class MvActLoadDefault implements MvActLoad { ! public static DodicoPermanentList FT_LIST = ! new DodicoPermanentList( ! DodicoLib.sort( ! new FileFormat[] { ! INPFileFormat.getInstance(), ! DunesFileFormat.getInstance(), ! CorEleBthFileFormat.getInstance(), ! SerafinFileFormat.getInstance(), ! TrigridFileFormat.getInstance()})); ! MvParentInterface parent_; /** ! * * */ public void load(File _f, final MvControllerSrc _s) { --- 45,56 ---- public class MvActLoadDefault implements MvActLoad { ! public static DodicoPermanentList FT_LIST = new DodicoPermanentList(DodicoLib ! .sort(new FileFormat[] { ! INPFileFormat.getInstance(), DunesFileFormat.getInstance(), ! CorEleBthFileFormat.getInstance(), SerafinFileFormat.getInstance(), ! TrigridFileFormat.getInstance() })); /** ! * * */ public void load(File _f, final MvControllerSrc _s) { *************** *** 67,72 **** pn.setLayout(new BuGridLayout(1, 5, 5, false, false)); final BuComboBox cb = new BuComboBox(FT_LIST.toArray()); ! JTextField f = ! pn.addLabelFileChooserPanel(FudaaResource.getS("Fichier"), null, false); f.getDocument().addDocumentListener(new DocumentListener() { --- 62,66 ---- pn.setLayout(new BuGridLayout(1, 5, 5, false, false)); final BuComboBox cb = new BuComboBox(FT_LIST.toArray()); ! JTextField f = pn.addLabelFileChooserPanel(FudaaResource.getS("Fichier"), null, false); f.getDocument().addDocumentListener(new DocumentListener() { *************** *** 85,97 **** private void updateCB(Document d) { try { ! cb.setSelectedItem( ! guessFormat( ! new File(d.getText(0, d.getLength())).getName(), ! FT_LIST)); ! } catch (BadLocationException e) {} } }); pn.add(cb); ! int i = pn.afficheModale(parent_.getParentComponent()); if (EbliSimpleDialogPanel.isOkResponse(i)) { String filename = f.getText(); --- 79,91 ---- private void updateCB(Document d) { try { ! cb ! .setSelectedItem(guessFormat(new File(d.getText(0, d.getLength())).getName(), ! FT_LIST)); ! } ! catch (BadLocationException e) {} } }); pn.add(cb); ! int i = pn.afficheModale(_s.getParent().getParentComponent()); if (EbliSimpleDialogPanel.isOkResponse(i)) { String filename = f.getText(); *************** *** 101,137 **** } } ! } else { ft = guessFormat(file.getName(), FT_LIST); } if ((file != null) && (ft != null)) { ! loadFileAct( ! _s, ! file, ! (FileFormatGridVersion) ft.getLastVersionInstance()); } } ! private void loadFileAct( ! final MvControllerSrc _s, ! final File _file, ! final FileFormatGridVersion _v) { if (_file.exists()) { ! MvTask op = new MvTask(parent_) { ! public void act() { FileOperationSynthese s = _v.readGrid(_file, prog_); EfGridSource src = (EfGridSource) s.getSource(); if (src != null) { ! if (_v.getFileFormat().getID() ! == SerafinFileFormat.getInstance().getID()) { SerafinInterface i = (SerafinInterface) src; ! i.getGrid().computeBordFast( ! i.getGrid(), ! i.getPtsFrontiere(), ! prog_); ! } else { src.getGrid().computeBord(prog_); } } _s.setLoaded(s); } --- 95,128 ---- } } ! } ! else { ! System.out.println("guess format"); ft = guessFormat(file.getName(), FT_LIST); + if(ft==null) System.out.println("non trouvé"); } if ((file != null) && (ft != null)) { ! System.out.println("grid loaded ?"); ! loadFileAct(_s, file, (FileFormatGridVersion) ft.getLastVersionInstance()); } } ! private void loadFileAct(final MvControllerSrc _s, final File _file, ! final FileFormatGridVersion _v) { if (_file.exists()) { ! BuTask op = new BuTaskOperation(null,MvResource.getS("Lecture")) { public void act() { + ProgressionInterface prog_ = _s.getParent().createProgression(this); FileOperationSynthese s = _v.readGrid(_file, prog_); EfGridSource src = (EfGridSource) s.getSource(); if (src != null) { ! if (_v.getFileFormat().getID() == SerafinFileFormat.getInstance().getID()) { SerafinInterface i = (SerafinInterface) src; ! i.getGrid().computeBordFast(i.getGrid(), i.getPtsFrontiere(), prog_); ! } ! else { src.getGrid().computeBord(prog_); } } + System.out.println("grid loaded"); _s.setLoaded(s); } *************** *** 142,162 **** /** - * * - */ - public void setParent(MvParentInterface _c) { - parent_ = _c; - } - - - /** * @param _fileName le nom de fichier * @param _fileFormatList la liste des formats * @return le format correspondant au nom de fichier */ ! public static FileFormat guessFormat( ! String _fileName, ! List _fileFormatList) { ! if ((_fileName == null) || (_fileFormatList == null)) ! return null; int idx = _fileName.indexOf('.'); if ((idx > 0) && (idx < _fileName.length())) { --- 133,142 ---- /** * @param _fileName le nom de fichier * @param _fileFormatList la liste des formats * @return le format correspondant au nom de fichier */ ! public static FileFormat guessFormat(String _fileName, List _fileFormatList) { ! if ((_fileName == null) || (_fileFormatList == null)) return null; int idx = _fileName.indexOf('.'); if ((idx > 0) && (idx < _fileName.length())) { *************** *** 165,184 **** for (int i = _fileFormatList.size() - 1; i >= 0; i--) { temp = (FileFormat) _fileFormatList.get(i); ! if (temp.isExtension(ext)) ! return temp; } - } else if ( - _fileFormatList.contains(SerafinFileFormat.getInstance()) - && (_fileName.startsWith("geo"))) { - return SerafinFileFormat.getInstance(); } return null; } ! /** * @param _fileName le nom du fichier * @return si le nom s'apparent a un fichier serafin */ ! public static boolean isSerafinFile(String _fileName){ int idx = _fileName.indexOf('.'); if ((idx > 0) && (idx < _fileName.length())) { --- 145,161 ---- for (int i = _fileFormatList.size() - 1; i >= 0; i--) { temp = (FileFormat) _fileFormatList.get(i); ! if (temp.isExtension(ext)) return temp; } } + else if (_fileFormatList.contains(SerafinFileFormat.getInstance()) + && (_fileName.startsWith("geo"))) { return SerafinFileFormat.getInstance(); } return null; } ! /** * @param _fileName le nom du fichier * @return si le nom s'apparent a un fichier serafin */ ! public static boolean isSerafinFile(String _fileName) { int idx = _fileName.indexOf('.'); if ((idx > 0) && (idx < _fileName.length())) { *************** *** 186,193 **** return SerafinFileFormat.getInstance().isExtension(ext); } ! if(_fileName.startsWith("geo")) return true; ! if(_fileName.startsWith("res")) return true; return false; } ! } --- 163,170 ---- return SerafinFileFormat.getInstance().isExtension(ext); } ! if (_fileName.startsWith("geo")) return true; ! if (_fileName.startsWith("res")) return true; return false; } ! } \ No newline at end of file Index: MvAct.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvAct.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MvAct.java 12 Feb 2004 16:15:20 -0000 1.1 --- MvAct.java 1 Jun 2004 11:27:42 -0000 1.2 *************** *** 9,13 **** package org.fudaa.fudaa.meshviewer; - import java.awt.Component; /** --- 9,12 ---- *************** *** 16,20 **** */ public interface MvAct { - public void setParent(MvParentInterface _c); } --- 15,18 ---- --- NEW FILE: MvVisuPanel.java --- (This appears to be a binary file; contents omitted.) --- MvPanelLayer.java DELETED --- --- MvPanelViewer.java DELETED --- --- NEW FILE: numnoeuds_16.gif --- (This appears to be a binary file; contents omitted.) Index: MvControllerSrc.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvControllerSrc.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MvControllerSrc.java 12 Feb 2004 16:15:20 -0000 1.1 --- MvControllerSrc.java 1 Jun 2004 11:27:42 -0000 1.2 *************** *** 24,38 **** */ public class MvControllerSrc { ! EfGridSource source_; EfGridSourceMutable gridModified_; ! MvActLoad loader_; ! MvActCheck checker_; ! MvActModify modifier_; ! MvActSave saver_; ! MvActClose close_; ! MvActView viewer_; ! public void setDefaultComponent() { ! loader_= new MvActLoadDefault(); } --- 24,42 ---- */ public class MvControllerSrc { ! ! EfGridSource source_; EfGridSourceMutable gridModified_; ! //MvActLoad loader_; ! MvActCheck checker_; ! MvActModify modifier_; ! //MvActSave saver_; ! //MvActClose close_; ! MvActView viewer_; ! MvParentInterface parent_; ! public void setDefaultComponent() {} ! ! public EfGridSource getSource() { ! return source_; } *************** *** 43,83 **** } public void setParent(MvParentInterface _c) { ! if (loader_ != null) ! loader_.setParent(_c); ! if (checker_ != null) ! checker_.setParent(_c); ! if (modifier_ != null) ! modifier_.setParent(_c); ! if (saver_ != null) ! saver_.setParent(_c); ! if (close_ != null) ! close_.setParent(_c); ! if (viewer_ != null) ! viewer_.setParent(_c); } public void setLoaded(FileOperationSynthese _s) { ! if (_s == null) ! return; ! source_= (EfGridSource)_s.getSource(); ! gridModified_= new EfGridSourceMutable(); ! if (viewer_ != null) ! viewer_.init(_s); } ! public void load() { ! load(null); ! } ! ! public void load(File f) { ! if (loader_ != null) { ! if ((close_ != null) && (!close_.close(this, saver_))) ! return; ! loader_.load(f,this); ! } ! } ! ! public void modify() { --- 47,77 ---- } + public MvParentInterface getParent() { + return parent_; + } + public void setParent(MvParentInterface _c) { ! parent_ = _c; } public void setLoaded(FileOperationSynthese _s) { ! if (_s == null) return; ! System.out.println("loaded"); ! source_ = (EfGridSource) _s.getSource(); ! gridModified_ = new EfGridSourceMutable(); ! if (viewer_ != null) viewer_.init(_s); } ! // public void load() { ! // load(null); ! // } ! // ! // public void load(File f) { ! // if (loader_ != null) { ! // if ((close_ != null) && (!close_.close(this, saver_))) ! // return; ! // loader_.load(f,this); ! // } ! // } public void modify() { *************** *** 90,99 **** public void check() { ! if (source_ == null) ! return; if (checker_ != null) { ! checker_.check( ! ((gridModified_.getGrid() == null) ? source_ : gridModified_), ! this); } } --- 84,90 ---- public void check() { ! if (source_ == null) return; if (checker_ != null) { ! checker_.check(this); } } *************** *** 102,105 **** --- 93,97 ---- viewer_.updateCheck(_r); } + /** * *************** *** 112,122 **** * */ - public MvActClose getClose() { - return close_; - } - - /** - * - */ public EfGridSourceMutable getGridModified() { return gridModified_; --- 104,107 ---- *************** *** 126,136 **** * */ - public MvActLoad getLoader() { - return loader_; - } - - /** - * - */ public MvActModify getModifier() { return modifier_; --- 111,114 ---- *************** *** 140,150 **** * */ - public MvActSave getSaver() { - return saver_; - } - - /** - * - */ public MvActView getViewer() { return viewer_; --- 118,121 ---- *************** *** 155,173 **** */ public void setChecker(MvActCheck _checker) { ! checker_= _checker; ! } ! ! /** ! * ! */ ! public void setClose(MvActClose _close) { ! close_= _close; ! } ! ! /** ! * ! */ ! public void setLoader(MvActLoad _loader) { ! loader_= _loader; } --- 126,130 ---- */ public void setChecker(MvActCheck _checker) { ! checker_ = _checker; } *************** *** 176,187 **** */ public void setModifier(MvActModify _modifier) { ! modifier_= _modifier; ! } ! ! /** ! * ! */ ! public void setSaver(MvActSave _saver) { ! saver_= _saver; } --- 133,137 ---- */ public void setModifier(MvActModify _modifier) { ! modifier_ = _modifier; } *************** *** 190,194 **** */ public void setViewer(MvActView _viewer) { ! viewer_= _viewer; } --- 140,144 ---- */ public void setViewer(MvActView _viewer) { ! viewer_ = _viewer; } --- NEW FILE: MvFindAction.java --- (This appears to be a binary file; contents omitted.) --- MvProgressAdapter.java DELETED --- --- MvTask.java DELETED --- |
