Menu
▾
▴
[Fudaa-cvs-commit] fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux TrRefluxParametres.java,1.20,1.21 TrRefluxAppliManager.java,1.2,1.3 TrRefluxVisuPanel.java,1.3,1.4 TrRefluxProjectDispatcherListener.java,1.8,1.9 TrRefluxSiMultiPlan.java,1.2,1.3 TrRefluxProjectFactory.java,1.11,1.12 TrRefluxXmlProjectWriter.java,1.2,1.3 TrRefluxTimeStepsEditor.java,1.4,1.5 TrRefluxSIPlan.java,1.2,1.3 TrRefluxValueEditorPanel.java,1.2,1.3 TrRefluxImplHelper.java,1.14,1.15 TrRefluxSI.java,1.2,1.3 TrRefluxFilleProjet.java,1.12,1.13 TrRefluxXmlProjectReader.java,1.1,1.2 TrRefluxProjet.java,1.23,1.24 TrRefluxInfoSenderDefault.java,1.5,1.6 TrRefluxBoundaryEditor.java,1.3,1.4
Update of /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3787/src/org/fudaa/fudaa/tr/reflux Modified Files: TrRefluxParametres.java TrRefluxAppliManager.java TrRefluxVisuPanel.java TrRefluxProjectDispatcherListener.java TrRefluxSiMultiPlan.java TrRefluxProjectFactory.java TrRefluxXmlProjectWriter.java TrRefluxTimeStepsEditor.java TrRefluxSIPlan.java TrRefluxValueEditorPanel.java TrRefluxImplHelper.java TrRefluxSI.java TrRefluxFilleProjet.java TrRefluxXmlProjectReader.java TrRefluxProjet.java TrRefluxInfoSenderDefault.java TrRefluxBoundaryEditor.java Log Message: Suppression inter-dépendances Index: TrRefluxProjectFactory.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjectFactory.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** TrRefluxProjectFactory.java 31 Mar 2004 08:17:47 -0000 1.11 --- TrRefluxProjectFactory.java 5 May 2004 12:42:37 -0000 1.12 *************** *** 20,26 **** import org.fudaa.dodico.ef.FileFormatGridVersion; import org.fudaa.dodico.fichiers.FileOperationSynthese; - import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.reflux.H2dRefluxParameters; import org.fudaa.dodico.h2d.reflux.H2dRefluxSICourant2D; import org.fudaa.dodico.h2d.type.H2dProjetType; import org.fudaa.dodico.olb.OLBExec; --- 20,26 ---- import org.fudaa.dodico.ef.FileFormatGridVersion; import org.fudaa.dodico.fichiers.FileOperationSynthese; import org.fudaa.dodico.h2d.reflux.H2dRefluxParameters; import org.fudaa.dodico.h2d.reflux.H2dRefluxSICourant2D; + import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.h2d.type.H2dProjetType; import org.fudaa.dodico.olb.OLBExec; *************** *** 28,33 **** import org.fudaa.dodico.reflux.io.INPInterface; import org.fudaa.dodico.reflux.io.RefluxSolutionInitReader; ! import org.fudaa.fudaa.tr.TrImplementation; ! import org.fudaa.fudaa.tr.TrResource; /** * @author deniger --- 28,34 ---- import org.fudaa.dodico.reflux.io.INPInterface; import org.fudaa.dodico.reflux.io.RefluxSolutionInitReader; ! import org.fudaa.fudaa.tr.common.TrFileFormatManager; ! import org.fudaa.fudaa.tr.common.TrImplementationAbstract; ! import org.fudaa.fudaa.tr.common.TrResource; /** * @author deniger *************** *** 49,53 **** INPFileFormat.INPVersion _ft, ProgressionInterface _progress, ! TrImplementation _ui) { FileOperationSynthese synt = _ft.read(_f, _progress); INPInterface inter = (INPInterface) synt.getSource(); --- 50,54 ---- INPFileFormat.INPVersion _ft, ProgressionInterface _progress, ! TrImplementationAbstract _ui) { FileOperationSynthese synt = _ft.read(_f, _progress); INPInterface inter = (INPInterface) synt.getSource(); *************** *** 106,110 **** INPFileFormat.INPVersion _fileFormat, ProgressionInterface _progress, ! TrImplementation _ui) { TrRefluxParametres params_ = createRefluxParametresFromINP(_file, _fileFormat, _progress, _ui); --- 107,111 ---- INPFileFormat.INPVersion _fileFormat, ProgressionInterface _progress, ! TrImplementationAbstract _ui) { TrRefluxParametres params_ = createRefluxParametresFromINP(_file, _fileFormat, _progress, _ui); *************** *** 112,116 **** if (params_ != null) { TrRefluxProjet p = new TrRefluxProjet(params_); ! File prex = new File(_file.getParentFile(), params_.getFicNameSansExt() + TrRefluxParametres.XML_EXT); if (CtuluLib.DEBUG) { CtuluLib.debug("read .prex"); --- 113,117 ---- if (params_ != null) { TrRefluxProjet p = new TrRefluxProjet(params_); ! File prex = new File(_file.getParentFile(), params_.getFicNameSansExt() + TrFileFormatManager.REFLUX_XML_EXT); if (CtuluLib.DEBUG) { CtuluLib.debug("read .prex"); *************** *** 150,154 **** H2dProjetType _t, ProgressionInterface _op, ! TrImplementation _ui) { EfGrid g = getValidGrid(_f, _ft, _ui, _op); if (g == null) --- 151,155 ---- H2dProjetType _t, ProgressionInterface _op, ! TrImplementationAbstract _ui) { EfGrid g = getValidGrid(_f, _ft, _ui, _op); if (g == null) *************** *** 181,185 **** File _f, FileFormatGridVersion _ft, ! TrImplementation _ui, ProgressionInterface _op) { if ((_f == null) || (_ft == null)) --- 182,186 ---- File _f, FileFormatGridVersion _ft, ! TrImplementationAbstract _ui, ProgressionInterface _op) { if ((_f == null) || (_ft == null)) Index: TrRefluxFilleProjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxFilleProjet.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** TrRefluxFilleProjet.java 31 Mar 2004 08:17:47 -0000 1.12 --- TrRefluxFilleProjet.java 5 May 2004 12:42:37 -0000 1.13 *************** *** 44,48 **** import org.fudaa.fudaa.fdico.FDicoEntitePanel; import org.fudaa.fudaa.fdico.FDicoEntiteTableModel; ! import org.fudaa.fudaa.tr.TrResource; /** * @author deniger --- 44,48 ---- import org.fudaa.fudaa.fdico.FDicoEntitePanel; import org.fudaa.fudaa.fdico.FDicoEntiteTableModel; ! import org.fudaa.fudaa.tr.common.TrResource; /** * @author deniger Index: TrRefluxXmlProjectReader.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxXmlProjectReader.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TrRefluxXmlProjectReader.java 16 Mar 2004 16:47:12 -0000 1.1 --- TrRefluxXmlProjectReader.java 5 May 2004 12:42:37 -0000 1.2 *************** *** 15,20 **** import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.fudaa.commun.FudaaUI; ! import org.fudaa.fudaa.tr.TrResource; ! import org.fudaa.fudaa.tr.TrXmlProjectReader; --- 15,20 ---- import org.fudaa.dodico.commun.ProgressionInterface; import org.fudaa.fudaa.commun.FudaaUI; ! import org.fudaa.fudaa.tr.common.TrResource; ! import org.fudaa.fudaa.tr.common.TrXmlProjectReader; *************** *** 140,144 **** /** ! * @see org.fudaa.fudaa.tr.TrXmlProjectReader#initListener() */ protected void initListener() { --- 140,144 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrXmlProjectReader#initListener() */ protected void initListener() { Index: TrRefluxProjet.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjet.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** TrRefluxProjet.java 30 Apr 2004 13:52:12 -0000 1.23 --- TrRefluxProjet.java 5 May 2004 12:42:37 -0000 1.24 *************** *** 30,36 **** import org.fudaa.dodico.fichiers.FileFormatSoftware; import org.fudaa.dodico.h2d.H2dEvolutionManager; - import org.fudaa.dodico.h2d.H2dResource; import org.fudaa.dodico.h2d.reflux.H2dRefluxElementPropertyMngAbstract; import org.fudaa.dodico.h2d.reflux.H2dRefluxParameters; import org.fudaa.dodico.reflux.RefluxExec; import org.fudaa.ebli.calque.action.EbliActionInterface; --- 30,36 ---- import org.fudaa.dodico.fichiers.FileFormatSoftware; import org.fudaa.dodico.h2d.H2dEvolutionManager; import org.fudaa.dodico.h2d.reflux.H2dRefluxElementPropertyMngAbstract; import org.fudaa.dodico.h2d.reflux.H2dRefluxParameters; + import org.fudaa.dodico.h2d.resource.H2dResource; import org.fudaa.dodico.reflux.RefluxExec; import org.fudaa.ebli.calque.action.EbliActionInterface; *************** *** 44,55 **** import org.fudaa.fudaa.commun.calcul.FudaaCalculOp; import org.fudaa.fudaa.fdico.FDicoProjetInterface; ! import org.fudaa.fudaa.tr.TrExport; ! import org.fudaa.fudaa.tr.TrFilleVisu; ! import org.fudaa.fudaa.tr.TrGrapheFille; ! import org.fudaa.fudaa.tr.TrImplementation; ! import org.fudaa.fudaa.tr.TrLib; ! import org.fudaa.fudaa.tr.TrParametres; ! import org.fudaa.fudaa.tr.TrProjet; ! import org.fudaa.fudaa.tr.TrResource; /** * @author deniger --- 44,56 ---- import org.fudaa.fudaa.commun.calcul.FudaaCalculOp; import org.fudaa.fudaa.fdico.FDicoProjetInterface; ! import org.fudaa.fudaa.tr.common.TrExport; ! import org.fudaa.fudaa.tr.common.TrFilleVisuInterface; ! import org.fudaa.fudaa.tr.common.TrGrapheFille; ! import org.fudaa.fudaa.tr.common.TrImplementationAbstract; ! import org.fudaa.fudaa.tr.common.TrLib; ! import org.fudaa.fudaa.tr.common.TrParametres; ! import org.fudaa.fudaa.tr.common.TrProjet; ! import org.fudaa.fudaa.tr.common.TrResource; ! import org.fudaa.fudaa.tr.data.TrFilleVisu; /** * @author deniger *************** *** 125,129 **** * @return le lanceur du calcul */ ! public static CalculLauncher launchCalcul(final File _f, final TrImplementation _impl) { FudaaCalculOp op = new FudaaCalculOp(new RefluxExec()) { --- 126,130 ---- * @return le lanceur du calcul */ ! public static CalculLauncher launchCalcul(final File _f, final TrImplementationAbstract _impl) { FudaaCalculOp op = new FudaaCalculOp(new RefluxExec()) { *************** *** 161,165 **** TrGrapheFille courbeFille_; TrRefluxFilleProjet fille_; ! TrImplementation impl_; TrRefluxParametres params_; EbliSimpleAction projectAction_; --- 162,166 ---- TrGrapheFille courbeFille_; TrRefluxFilleProjet fille_; ! TrImplementationAbstract impl_; TrRefluxParametres params_; EbliSimpleAction projectAction_; *************** *** 346,352 **** /** ! * @see org.fudaa.fudaa.tr.TrProjet#active(org.fudaa.fudaa.tr.TrImplementation) */ ! public void active(TrImplementation _impl) { if (impl_ != null) return; --- 347,353 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrProjet#active(org.fudaa.fudaa.tr.TrImplementationAbstract) */ ! public void active(TrImplementationAbstract _impl) { if (impl_ != null) return; *************** *** 379,383 **** /** ! * @see org.fudaa.fudaa.tr.TrProjet#activeGrapheFille() */ public synchronized void activeGrapheFille() { --- 380,384 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrProjet#activeGrapheFille() */ public synchronized void activeGrapheFille() { *************** *** 402,406 **** /** ! * @see org.fudaa.fudaa.tr.TrProjet#applicationPreferencesChanged() */ public void applicationPreferencesChanged() { --- 403,407 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrProjet#applicationPreferencesChanged() */ public void applicationPreferencesChanged() { *************** *** 411,415 **** /** ! * @see org.fudaa.fudaa.tr.TrProjet#close() */ public void close() { --- 412,416 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrProjet#close() */ public void close() { *************** *** 462,466 **** /** ! * @see org.fudaa.fudaa.tr.TrProjet#export(java.lang.String) */ public void export(String _actionCommand) { --- 463,467 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrProjet#export(java.lang.String) */ public void export(String _actionCommand) { *************** *** 513,517 **** /** ! * @see org.fudaa.fudaa.tr.TrProjet#getEvolMng() */ public H2dEvolutionManager getEvolMng() { --- 514,518 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrProjet#getEvolMng() */ public H2dEvolutionManager getEvolMng() { *************** *** 559,563 **** /** ! * @see org.fudaa.fudaa.tr.TrProjet#getProjectMenu() */ public BuMenu getProjectMenu() { --- 560,564 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrProjet#getProjectMenu() */ public BuMenu getProjectMenu() { *************** *** 576,580 **** /** ! * @see org.fudaa.fudaa.tr.TrProjet#getSoftwareID() * @return FileFormatSoftware.REFLUX_IS.name */ --- 577,581 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrProjet#getSoftwareID() * @return FileFormatSoftware.REFLUX_IS.name */ *************** *** 592,596 **** /** ! * @see org.fudaa.fudaa.tr.TrProjet#getTrParams() */ public TrParametres getTrParams() { --- 593,597 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrProjet#getTrParams() */ public TrParametres getTrParams() { *************** *** 607,613 **** /** ! * @see org.fudaa.fudaa.tr.TrProjet#getVisuFille() */ ! public TrFilleVisu getVisuFille() { return visu_; } --- 608,614 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrProjet#getVisuFille() */ ! public TrFilleVisuInterface getVisuFille() { return visu_; } *************** *** 623,627 **** /** ! * @see org.fudaa.fudaa.tr.TrProjet#isModified() */ public boolean isModified() { --- 624,628 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrProjet#isModified() */ public boolean isModified() { *************** *** 632,636 **** * Ne fait rien * ! * @see org.fudaa.fudaa.tr.TrProjet#loadAll(org.fudaa.dodico.commun.ProgressionInterface) */ public void loadAll(ProgressionInterface _inter) {} --- 633,637 ---- * Ne fait rien * ! * @see org.fudaa.fudaa.tr.common.TrProjet#loadAll(org.fudaa.dodico.commun.ProgressionInterface) */ public void loadAll(ProgressionInterface _inter) {} *************** *** 646,650 **** /** ! * @see org.fudaa.fudaa.tr.TrProjet#saveAs(org.fudaa.dodico.commun.ProgressionInterface) */ public void saveAs(ProgressionInterface _prog) { --- 647,651 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrProjet#saveAs(org.fudaa.dodico.commun.ProgressionInterface) */ public void saveAs(ProgressionInterface _prog) { *************** *** 654,658 **** /** ! * @see org.fudaa.fudaa.tr.TrProjet#saveCopy(org.fudaa.dodico.commun.ProgressionInterface) */ public void saveCopy(ProgressionInterface _prog) { --- 655,659 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrProjet#saveCopy(org.fudaa.dodico.commun.ProgressionInterface) */ public void saveCopy(ProgressionInterface _prog) { *************** *** 663,667 **** /** ! * @see org.fudaa.fudaa.tr.TrProjet#showGeneralFille() */ public void showGeneralFille() { --- 664,668 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrProjet#showGeneralFille() */ public void showGeneralFille() { *************** *** 670,674 **** /** ! * @see org.fudaa.fudaa.tr.TrProjet#showVisuFille() */ public void showVisuFille() { --- 671,675 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrProjet#showVisuFille() */ public void showVisuFille() { Index: TrRefluxValueEditorPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxValueEditorPanel.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TrRefluxValueEditorPanel.java 12 Dec 2003 11:29:41 -0000 1.2 --- TrRefluxValueEditorPanel.java 5 May 2004 12:42:37 -0000 1.3 *************** *** 34,38 **** import org.fudaa.dodico.h2d.type.H2dVariableType; ! import org.fudaa.fudaa.tr.TrResource; /** * Classe gerant un label, un combobox pour la nature du bord et un textfield pour la valeur --- 34,38 ---- import org.fudaa.dodico.h2d.type.H2dVariableType; ! import org.fudaa.fudaa.tr.common.TrResource; /** * Classe gerant un label, un combobox pour la nature du bord et un textfield pour la valeur Index: TrRefluxSI.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxSI.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TrRefluxSI.java 31 Mar 2004 08:17:47 -0000 1.2 --- TrRefluxSI.java 5 May 2004 12:42:37 -0000 1.3 *************** *** 12,20 **** --- 12,23 ---- import java.io.File; import java.io.IOException; + import javax.swing.Action; + import com.memoire.bu.BuGridLayout; import com.memoire.bu.BuTaskOperation; import com.memoire.bu.BuTextField; import com.memoire.xml.XmlListener; + import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.commun.DodicoAnalyze; *************** *** 33,42 **** import org.fudaa.fudaa.meshviewer.layer.MvLayer; import org.fudaa.fudaa.meshviewer.layer.MvNodeLayer; ! import org.fudaa.fudaa.tr.TrResource; ! import org.fudaa.fudaa.tr.TrXmlProjectWriter; import org.fudaa.fudaa.tr.data.TrInfoSenderDelegate; import org.fudaa.fudaa.tr.data.TrSolutionInitLayer; import org.fudaa.fudaa.tr.data.TrSolutionInitModelDefault; - import sun.security.action.GetIntegerAction; --- 36,44 ---- import org.fudaa.fudaa.meshviewer.layer.MvLayer; import org.fudaa.fudaa.meshviewer.layer.MvNodeLayer; ! import org.fudaa.fudaa.tr.common.TrResource; ! import org.fudaa.fudaa.tr.common.TrXmlProjectWriter; import org.fudaa.fudaa.tr.data.TrInfoSenderDelegate; import org.fudaa.fudaa.tr.data.TrSolutionInitLayer; import org.fudaa.fudaa.tr.data.TrSolutionInitModelDefault; Index: TrRefluxTimeStepsEditor.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxTimeStepsEditor.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TrRefluxTimeStepsEditor.java 21 Jan 2004 11:07:29 -0000 1.4 --- TrRefluxTimeStepsEditor.java 5 May 2004 12:42:37 -0000 1.5 *************** *** 27,32 **** import javax.swing.event.CaretListener; - import org.fudaa.ctulu.CtuluLib; - import com.memoire.bu.BuBorderLayout; import com.memoire.bu.BuComboBox; --- 27,30 ---- *************** *** 39,43 **** import com.memoire.bu.BuVerticalLayout; ! import org.fudaa.dodico.commun.DodicoLib; import org.fudaa.dodico.commun.DodicoPermanentList; import org.fudaa.dodico.h2d.H2dTimeStepGroup; --- 37,41 ---- import com.memoire.bu.BuVerticalLayout; ! import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.commun.DodicoPermanentList; import org.fudaa.dodico.h2d.H2dTimeStepGroup; *************** *** 45,54 **** import org.fudaa.dodico.h2d.type.H2dResolutionSchemaType; import org.fudaa.dodico.h2d.type.H2dVariableType; - import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; import org.fudaa.ebli.tableau.EbliPanelListEditor; import org.fudaa.ebli.tableau.EbliPanelListEditorModel; ! ! import org.fudaa.fudaa.tr.TrResource; /** * @author deniger --- 43,50 ---- import org.fudaa.dodico.h2d.type.H2dResolutionSchemaType; import org.fudaa.dodico.h2d.type.H2dVariableType; import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; import org.fudaa.ebli.tableau.EbliPanelListEditor; import org.fudaa.ebli.tableau.EbliPanelListEditorModel; ! import org.fudaa.fudaa.tr.common.TrResource; /** * @author deniger Index: TrRefluxAppliManager.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxAppliManager.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TrRefluxAppliManager.java 31 Mar 2004 08:17:47 -0000 1.2 --- TrRefluxAppliManager.java 5 May 2004 12:42:37 -0000 1.3 *************** *** 10,22 **** import java.io.File; import javax.swing.Icon; import com.memoire.bu.BuMenuItem; import com.memoire.bu.BuPopupMenu; import com.memoire.bu.BuResource; import org.fudaa.fudaa.commun.exec.FudaaExec; ! import org.fudaa.fudaa.tr.TrApplicationManager; ! import org.fudaa.fudaa.tr.TrExplorer; ! import org.fudaa.fudaa.tr.TrImplementation; ! import org.fudaa.fudaa.tr.TrResource; --- 10,25 ---- import java.io.File; + import javax.swing.Icon; + import com.memoire.bu.BuMenuItem; import com.memoire.bu.BuPopupMenu; import com.memoire.bu.BuResource; + import org.fudaa.fudaa.commun.exec.FudaaExec; ! import org.fudaa.fudaa.tr.common.TrApplicationManager; ! import org.fudaa.fudaa.tr.common.TrExplorer; ! import org.fudaa.fudaa.tr.common.TrImplementationAbstract; ! import org.fudaa.fudaa.tr.common.TrResource; *************** *** 63,72 **** * @param _impl */ ! public TrRefluxAppliManager(TrImplementation _impl) { super(_impl); } /** ! * @see org.fudaa.fudaa.tr.TrApplicationManager#buildCmdForMenuFile(com.memoire.bu.BuPopupMenu, * org.fudaa.fudaa.tr.TrExplorer) */ --- 66,75 ---- * @param _impl */ ! public TrRefluxAppliManager(TrImplementationAbstract _impl) { super(_impl); } /** ! * @see org.fudaa.fudaa.tr.common.TrApplicationManager#buildCmdForMenuFile(com.memoire.bu.BuPopupMenu, * org.fudaa.fudaa.tr.TrExplorer) */ *************** *** 83,87 **** /** ! * @see org.fudaa.fudaa.tr.TrApplicationManager#updateMenuFiles(int, java.io.File) */ public void updateMenuFiles(int _nbFileChoosen, File _f) { --- 86,90 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrApplicationManager#updateMenuFiles(int, java.io.File) */ public void updateMenuFiles(int _nbFileChoosen, File _f) { Index: TrRefluxSIPlan.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxSIPlan.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TrRefluxSIPlan.java 31 Mar 2004 08:17:47 -0000 1.2 --- TrRefluxSIPlan.java 5 May 2004 12:42:37 -0000 1.3 *************** *** 36,42 **** import org.fudaa.fudaa.meshviewer.MvPointEditor; import org.fudaa.fudaa.meshviewer.layer.MvLayer; ! import org.fudaa.fudaa.tr.TrImplementation; ! import org.fudaa.fudaa.tr.TrResource; ! import org.fudaa.fudaa.tr.TrXmlProjectWriter; import org.fudaa.fudaa.tr.data.TrSiPlanLayer; --- 36,42 ---- import org.fudaa.fudaa.meshviewer.MvPointEditor; import org.fudaa.fudaa.meshviewer.layer.MvLayer; ! import org.fudaa.fudaa.tr.common.TrImplementationAbstract; ! import org.fudaa.fudaa.tr.common.TrResource; ! import org.fudaa.fudaa.tr.common.TrXmlProjectWriter; import org.fudaa.fudaa.tr.data.TrSiPlanLayer; *************** *** 211,215 **** if (n != null) { MvPointEditor ed = new MvPointEditor(n); ! if (EbliSimpleDialogPanel.isOkResponse(ed.afficheModale(((TrImplementation) super.proj_ .getUI()).getFrame()))) { if ((ed.getNodeX() != n.getX()) || (ed.getNodeY() != n.getY()) --- 211,215 ---- if (n != null) { MvPointEditor ed = new MvPointEditor(n); ! if (EbliSimpleDialogPanel.isOkResponse(ed.afficheModale(((TrImplementationAbstract) super.proj_ .getUI()).getFrame()))) { if ((ed.getNodeX() != n.getX()) || (ed.getNodeY() != n.getY()) Index: TrRefluxParametres.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxParametres.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** TrRefluxParametres.java 31 Mar 2004 08:17:47 -0000 1.20 --- TrRefluxParametres.java 5 May 2004 12:42:37 -0000 1.21 *************** *** 41,48 **** import org.fudaa.fudaa.commun.projet.FudaaProjetInformationPanel; import org.fudaa.fudaa.ressource.FudaaResource; ! import org.fudaa.fudaa.tr.TrImplementation; ! import org.fudaa.fudaa.tr.TrParametres; ! import org.fudaa.fudaa.tr.TrPreferences; ! import org.fudaa.fudaa.tr.TrResource; /** * @author deniger --- 41,48 ---- import org.fudaa.fudaa.commun.projet.FudaaProjetInformationPanel; import org.fudaa.fudaa.ressource.FudaaResource; ! import org.fudaa.fudaa.tr.common.TrImplementationAbstract; ! import org.fudaa.fudaa.tr.common.TrParametres; ! import org.fudaa.fudaa.tr.common.TrPreferences; ! import org.fudaa.fudaa.tr.common.TrResource; /** * @author deniger *************** *** 51,56 **** public class TrRefluxParametres implements TrParametres { - public final static String XML_EXT="xinp"; - private class TrInpInterface extends EfGridSourcesAbstract implements INPInterface { --- 51,54 ---- *************** *** 189,193 **** private TrRefluxSI solutionInit_; String title_; ! TrImplementation ui_; boolean isDocModified_; --- 187,191 ---- private TrRefluxSI solutionInit_; String title_; ! TrImplementationAbstract ui_; boolean isDocModified_; *************** *** 202,206 **** * @return l'implementation */ ! public TrImplementation getImpl(){ return ui_; } --- 200,204 ---- * @return l'implementation */ ! public TrImplementationAbstract getImpl(){ return ui_; } *************** *** 281,285 **** /** * @return true ! * @see org.fudaa.fudaa.tr.TrParametres#canImportEvolution() */ public boolean canImportEvolution() { --- 279,283 ---- /** * @return true ! * @see org.fudaa.fudaa.tr.common.TrParametres#canImportEvolution() */ public boolean canImportEvolution() { *************** *** 442,446 **** * Ne fais rien * ! * @see org.fudaa.fudaa.tr.TrParametres#loadGeometrie(org.fudaa.dodico.commun.ProgressionInterface) */ public void loadGeometrie(ProgressionInterface _interface) {} --- 440,444 ---- * Ne fais rien * ! * @see org.fudaa.fudaa.tr.common.TrParametres#loadGeometrie(org.fudaa.dodico.commun.ProgressionInterface) */ public void loadGeometrie(ProgressionInterface _interface) {} Index: TrRefluxVisuPanel.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxVisuPanel.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TrRefluxVisuPanel.java 31 Mar 2004 08:17:47 -0000 1.3 --- TrRefluxVisuPanel.java 5 May 2004 12:42:37 -0000 1.4 *************** *** 13,17 **** --- 13,19 ---- import java.util.Set; import java.util.TreeMap; + import javax.swing.Action; + import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.ef.EfGrid; *************** *** 21,25 **** import org.fudaa.dodico.h2d.reflux.H2dRefluxBcListener; import org.fudaa.dodico.h2d.reflux.H2dRefluxBcManager; - import org.fudaa.dodico.h2d.reflux.H2dRefluxSolutionInitialeInterface; import org.fudaa.dodico.h2d.type.H2dBoundaryType; import org.fudaa.dodico.h2d.type.H2dVariableType; --- 23,26 ---- *************** *** 31,36 **** import org.fudaa.fudaa.commun.FudaaCommonImplementation; import org.fudaa.fudaa.meshviewer.layer.MvLayerGroup; ! import org.fudaa.fudaa.tr.TrResource; ! import org.fudaa.fudaa.tr.TrVisuPanel; import org.fudaa.fudaa.tr.data.TrBcBoundaryLegendPanel; import org.fudaa.fudaa.tr.data.TrBcBoundaryMiddleLayer; --- 32,36 ---- import org.fudaa.fudaa.commun.FudaaCommonImplementation; import org.fudaa.fudaa.meshviewer.layer.MvLayerGroup; ! import org.fudaa.fudaa.tr.common.TrResource; import org.fudaa.fudaa.tr.data.TrBcBoundaryLegendPanel; import org.fudaa.fudaa.tr.data.TrBcBoundaryMiddleLayer; *************** *** 41,46 **** import org.fudaa.fudaa.tr.data.TrBcPointModel; import org.fudaa.fudaa.tr.data.TrBcPointModelDefault; ! import org.fudaa.fudaa.tr.data.TrSolutionInitLayer; ! import org.fudaa.fudaa.tr.data.TrSolutionInitModelDefault; /** * @author deniger --- 41,45 ---- import org.fudaa.fudaa.tr.data.TrBcPointModel; import org.fudaa.fudaa.tr.data.TrBcPointModelDefault; ! import org.fudaa.fudaa.tr.data.TrVisuPanel; /** * @author deniger *************** *** 386,390 **** /** ! * @see org.fudaa.fudaa.tr.TrVisuPanel#isGridElementEditable() */ public boolean isGridElementEditable() { --- 385,389 ---- /** ! * @see org.fudaa.fudaa.tr.data.TrVisuPanel#isGridElementEditable() */ public boolean isGridElementEditable() { Index: TrRefluxInfoSenderDefault.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxInfoSenderDefault.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** TrRefluxInfoSenderDefault.java 19 Mar 2004 17:40:24 -0000 1.5 --- TrRefluxInfoSenderDefault.java 5 May 2004 12:42:37 -0000 1.6 *************** *** 24,28 **** import org.fudaa.dodico.h2d.type.H2dVariableType; import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData; ! import org.fudaa.fudaa.tr.TrResource; import org.fudaa.fudaa.tr.data.TrInfoSenderDelegate; --- 24,28 ---- import org.fudaa.dodico.h2d.type.H2dVariableType; import org.fudaa.fudaa.meshviewer.layer.MvPanelInfo.InfoData; ! import org.fudaa.fudaa.tr.common.TrResource; import org.fudaa.fudaa.tr.data.TrInfoSenderDelegate; Index: TrRefluxXmlProjectWriter.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxXmlProjectWriter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TrRefluxXmlProjectWriter.java 31 Mar 2004 08:17:47 -0000 1.2 --- TrRefluxXmlProjectWriter.java 5 May 2004 12:42:37 -0000 1.3 *************** *** 13,18 **** import java.io.IOException; ! import org.fudaa.fudaa.tr.TrParametres; ! import org.fudaa.fudaa.tr.TrXmlProjectWriter; --- 13,19 ---- import java.io.IOException; ! import org.fudaa.fudaa.tr.common.TrFileFormatManager; ! import org.fudaa.fudaa.tr.common.TrParametres; ! import org.fudaa.fudaa.tr.common.TrXmlProjectWriter; *************** *** 33,37 **** try { out_ = new FileWriter(new File(_p.getDirBase(), _p.getFicNameSansExt() ! + TrRefluxParametres.XML_EXT)); } catch (IOException e) { --- 34,38 ---- try { out_ = new FileWriter(new File(_p.getDirBase(), _p.getFicNameSansExt() ! + TrFileFormatManager.REFLUX_XML_EXT)); } catch (IOException e) { *************** *** 42,46 **** /** ! * @see org.fudaa.fudaa.tr.TrXmlProjectWriter#getProjet() */ public TrParametres getProjet() { --- 43,47 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrXmlProjectWriter#getProjet() */ public TrParametres getProjet() { *************** *** 49,53 **** /** ! * @see org.fudaa.fudaa.tr.TrXmlProjectWriter#writeData() */ public void writeData() throws IOException { --- 50,54 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrXmlProjectWriter#writeData() */ public void writeData() throws IOException { Index: TrRefluxProjectDispatcherListener.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxProjectDispatcherListener.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** TrRefluxProjectDispatcherListener.java 31 Mar 2004 08:17:47 -0000 1.8 --- TrRefluxProjectDispatcherListener.java 5 May 2004 12:42:37 -0000 1.9 *************** *** 18,22 **** import org.fudaa.dodico.h2d.type.H2dVariableType; import org.fudaa.fudaa.commun.FudaaLib; ! import org.fudaa.fudaa.tr.TrProjectDispatcherListener; /** * @author deniger --- 18,22 ---- import org.fudaa.dodico.h2d.type.H2dVariableType; import org.fudaa.fudaa.commun.FudaaLib; ! import org.fudaa.fudaa.tr.common.TrProjectDispatcherListener; /** * @author deniger Index: TrRefluxBoundaryEditor.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxBoundaryEditor.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** TrRefluxBoundaryEditor.java 11 Dec 2003 12:50:56 -0000 1.3 --- TrRefluxBoundaryEditor.java 5 May 2004 12:42:37 -0000 1.4 *************** *** 36,40 **** import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; ! import org.fudaa.fudaa.tr.TrResource; /** * @author deniger --- 36,40 ---- import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; ! import org.fudaa.fudaa.tr.common.TrResource; /** * @author deniger Index: TrRefluxImplHelper.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxImplHelper.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** TrRefluxImplHelper.java 16 Mar 2004 16:47:12 -0000 1.14 --- TrRefluxImplHelper.java 5 May 2004 12:42:37 -0000 1.15 *************** *** 10,13 **** --- 10,14 ---- import java.io.File; + import javax.swing.JComboBox; import javax.swing.JFileChooser; *************** *** 15,18 **** --- 16,20 ---- import javax.swing.event.CaretEvent; import javax.swing.event.CaretListener; + import com.memoire.bu.BuComboBox; import com.memoire.bu.BuGridLayout; *************** *** 20,23 **** --- 22,26 ---- import com.memoire.bu.BuMenuItem; import com.memoire.bu.BuTask; + import org.fudaa.ctulu.CtuluLib; import org.fudaa.dodico.commun.ProgressionInterface; *************** *** 27,45 **** import org.fudaa.dodico.h2d.type.H2dProjetType; import org.fudaa.dodico.reflux.io.INPFileFormat; ! import org.fudaa.dodico.telemac.io.TelemacDicoFileFormat; import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; - import org.fudaa.ebli.filechooser.EbliFileChooser; import org.fudaa.fudaa.ressource.FudaaResource; ! import org.fudaa.fudaa.tr.TrApplicationManager; ! import org.fudaa.fudaa.tr.TrFileFormatManager; ! import org.fudaa.fudaa.tr.TrImplHelper; ! import org.fudaa.fudaa.tr.TrImplementation; ! import org.fudaa.fudaa.tr.TrProjet; ! import org.fudaa.fudaa.tr.TrResource; /** * @author deniger * @version $Id$ */ ! public class TrRefluxImplHelper extends TrImplHelper { private class OpenPanel --- 30,47 ---- import org.fudaa.dodico.h2d.type.H2dProjetType; import org.fudaa.dodico.reflux.io.INPFileFormat; ! import org.fudaa.dodico.telemac.TelemacDicoFileFormat; ! import org.fudaa.ebli.dialog.EbliFileChooser; import org.fudaa.ebli.dialog.EbliSimpleDialogPanel; import org.fudaa.fudaa.ressource.FudaaResource; ! import org.fudaa.fudaa.tr.common.TrFileFormatManager; ! import org.fudaa.fudaa.tr.common.TrImplHelperAbstract; ! import org.fudaa.fudaa.tr.common.TrImplementationAbstract; ! import org.fudaa.fudaa.tr.common.TrProjet; ! import org.fudaa.fudaa.tr.common.TrResource; /** * @author deniger * @version $Id$ */ ! public class TrRefluxImplHelper extends TrImplHelperAbstract { private class OpenPanel *************** *** 131,135 **** } ! public TrRefluxImplHelper(TrImplementation _impl) { super(new TrRefluxAppliManager(_impl)); } --- 133,137 ---- } ! public TrRefluxImplHelper(TrImplementationAbstract _impl) { super(new TrRefluxAppliManager(_impl)); } *************** *** 194,198 **** BuMenuItem r = new BuMenuItem(null, TrResource.getS("Projet Dico")); r.setActionCommand( ! TrImplementation.PREF_OUVRIR + TelemacDicoFileFormat.DICO_PROJET_ID); return new BuMenuItem[] { r0, r}; } --- 196,200 ---- BuMenuItem r = new BuMenuItem(null, TrResource.getS("Projet Dico")); r.setActionCommand( ! TrImplementationAbstract.PREF_OUVRIR + TelemacDicoFileFormat.DICO_PROJET_ID); return new BuMenuItem[] { r0, r}; } *************** *** 206,210 **** /** ! * @see org.fudaa.fudaa.tr.TrImplHelper#ouvrir(org.fudaa.dodico.commun.ProgressionInterface, * com.memoire.bu.BuTask) */ --- 208,212 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrImplHelperAbstract#ouvrir(org.fudaa.dodico.commun.ProgressionInterface, * com.memoire.bu.BuTask) */ *************** *** 219,223 **** /** ! * @see org.fudaa.fudaa.tr.TrImplHelper#ouvrir(org.fudaa.dodico.commun.ProgressionInterface, * java.io.File, com.memoire.bu.BuTask) */ --- 221,225 ---- /** ! * @see org.fudaa.fudaa.tr.common.TrImplHelperAbstract#ouvrir(org.fudaa.dodico.commun.ProgressionInterface, * java.io.File, com.memoire.bu.BuTask) */ Index: TrRefluxSiMultiPlan.java =================================================================== RCS file: /cvsroot/fudaa/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/reflux/TrRefluxSiMultiPlan.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TrRefluxSiMultiPlan.java 31 Mar 2004 08:17:47 -0000 1.2 --- TrRefluxSiMultiPlan.java 5 May 2004 12:42:37 -0000 1.3 *************** *** 15,19 **** import org.fudaa.ebli.calque.action.EbliActionInterface; import org.fudaa.fudaa.meshviewer.layer.MvLayer; ! import org.fudaa.fudaa.tr.TrXmlProjectWriter; import org.fudaa.fudaa.tr.data.TrInfoSenderDelegate; --- 15,19 ---- import org.fudaa.ebli.calque.action.EbliActionInterface; import org.fudaa.fudaa.meshviewer.layer.MvLayer; ! import org.fudaa.fudaa.tr.common.TrXmlProjectWriter; import org.fudaa.fudaa.tr.data.TrInfoSenderDelegate; |
