Menu
▾
▴
fudaa-svn-commit
|
From: <emm...@us...> - 2008-09-03 09:36:40
|
Revision: 3869
http://fudaa.svn.sourceforge.net/fudaa/?rev=3869&view=rev
Author: emmanuel_martin
Date: 2008-09-03 09:36:49 +0000 (Wed, 03 Sep 2008)
Log Message:
-----------
suppression d'imports obsol?\195?\168tes (albe et sinavi2)
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3DataSimulation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporDataSimulation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporImplementation.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3DataSimulation.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3DataSimulation.java 2008-09-03 09:33:07 UTC (rev 3868)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3DataSimulation.java 2008-09-03 09:36:49 UTC (rev 3869)
@@ -28,8 +28,6 @@
import org.fudaa.fudaa.commun.projet.FudaaFiltreFichier;
import org.fudaa.fudaa.commun.projet.FudaaProjet;
import org.fudaa.fudaa.ressource.FudaaResource;
-import org.fudaa.fudaa.sinavi2.Sinavi2Implementation;
-
import com.memoire.bu.BuBrowserFrame;
import com.memoire.bu.BuButton;
import com.memoire.bu.BuDialogConfirmation;
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporDataSimulation.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporDataSimulation.java 2008-09-03 09:33:07 UTC (rev 3868)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporDataSimulation.java 2008-09-03 09:36:49 UTC (rev 3869)
@@ -42,8 +42,7 @@
import org.fudaa.dodico.corba.sipor.SParametresResultatsCompletSimulation;
import org.fudaa.dodico.corba.sipor.SParametresSipor2;
import org.fudaa.dodico.corba.sipor.SiporResultatListeevenementsSimu;
-import org.fudaa.fudaa.albe.AlbeLib;
-import org.fudaa.fudaa.albe.AlbePreferences;
+//import org.fudaa.fudaa.albe.AlbePreferences;
import org.fudaa.fudaa.commun.projet.FudaaFiltreFichier;
import org.fudaa.fudaa.commun.projet.FudaaProjet;
import org.fudaa.fudaa.ressource.FudaaResource;
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporImplementation.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporImplementation.java 2008-09-03 09:33:07 UTC (rev 3868)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporImplementation.java 2008-09-03 09:36:49 UTC (rev 3869)
@@ -28,8 +28,6 @@
import javax.swing.KeyStroke;
import org.fudaa.ctulu.CtuluLibString;
-import org.fudaa.dodico.albe.DParametresAlbe;
-import org.fudaa.dodico.albe.DResultatsAlbe;
import org.fudaa.dodico.corba.albe.SParametresAlbe;
import org.fudaa.dodico.corba.albe.SResultatsAlbe;
import org.fudaa.dodico.corba.objet.IConnexion;
@@ -42,9 +40,8 @@
import org.fudaa.dodico.sipor.DCalculSipor;
import org.fudaa.dodico.sipor.DParametresSipor;
import org.fudaa.dodico.sipor.DResultatsSipor;
-import org.fudaa.fudaa.albe.AlbeLib;
-import org.fudaa.fudaa.albe.AlbePreferences;
-import org.fudaa.fudaa.albe.AlbeResource;
+//import org.fudaa.fudaa.albe.AlbePreferences;
+//import org.fudaa.fudaa.albe.AlbeResource;
import org.fudaa.fudaa.commun.dodico.FudaaDodicoTacheConnexion;
import org.fudaa.fudaa.commun.impl.FudaaCommonImplementation;
import org.fudaa.fudaa.commun.impl.FudaaImplementation;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2008-09-17 11:35:21
|
Revision: 3940
http://fudaa.svn.sourceforge.net/fudaa/?rev=3940&view=rev
Author: bmarchan
Date: 2008-09-17 11:34:29 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
modif property svn:eol-style
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/save/FudaaSaveZipLoader.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/save/FudaaSaveZipLoaderAdapter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/cubature/CubaturePreferences.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/d1d2/LidoReflux.java
Property Changed:
----------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/Albe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeAbstractOnglet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeAbstractResultatsOnglet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeAbstractSolCourbe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeAbstractSolCourbeElastoSetraFascicule.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeActionParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeAssistant.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeAstuces.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeCaracteristiquesPieuCaissonParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeCaracteristiquesPieuParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeCaracteristiquesPieuTubulaireParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeCoefficientsPartielsParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeCriteresDimensionnementParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeDefenseParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeDeplacementReactionResultats.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeDialogCalculEnergieAccostage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeDialogConfirmation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeDialogLancementManuelCalculs.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleNoteDeCalculs.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleResultatsCombinaison.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleSchemaOuvrage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeGeometriquesParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeGraphiqueDialog.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeInternalFrameAdapter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeLancementCalculsFrame.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeLib.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeMobilisationButeeResultats.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeMobilisationDefenseResultats.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeModeleTableCoeffModele.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeModeleTableCourbeManuelle.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeModeleTableNonEditable.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeModeleTablePieuEtCoeffMateriaux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeMsg.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeParamEventView.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbePieuTableCellRenderer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbePreferences.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeRecapitulatifResultats.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeRes.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeResistancePieuResultats.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeResource.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeResultatsRecapitulatifsBrowserFrame.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeSchemaOuvragePanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeSolParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeSolParametresCourbeElastoPlastique.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeSolParametresCourbeManuelle.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeSolParametresCourbeSetra.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeSolParametresCourbeTVCourteDuree.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeSolParametresCourbeTVLongueDuree.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeSolParametresCourbeTVTresCourteDuree.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeTableCellRenderer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeTableColorCellRenderer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeValidationParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/SpringUtilities.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/VMessage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/ValidationMessages.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/WHtmlContent.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/WTree.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/WTreeItem.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaAstuces.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaAstucesAbstract.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaBrowserControl.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaInternalFrameSelectorPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaLib.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaPreferences.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaPreferencesAbstract.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaProjectInterface.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaProjectStateFrameListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaProjectStateLabelListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaProjectStateListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaProjectStateSupportLabelListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaProjetStateDefault.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaProjetStateInterface.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaTee.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaUI.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/aide/FudaaAidePreferencesPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/aide/FudaaAstucesDialog.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/aide/FudaaAstucesPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/aide/FudaaHelpHtmlPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/aide/FudaaHelpPane.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/aide/FudaaHelpPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/aide/FudaaHelpParentI.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/calcul/FudaaCalculAction.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/calcul/FudaaCalculOp.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/calcul/FudaaCalculSupportInterface.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/conversion/FudaaElement.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/conversion/FudaaInterpolateurMaillage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/conversion/FudaaMaillageCORELEBTH.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/conversion/FudaaMaillageElement.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/conversion/FudaaNoeud.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/conversion/FudaaPoint.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/conversion/FudaaPolyligne.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeCreateGroupPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeCreatorPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefaultModelName.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeImporter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTime.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeListModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaGrapheSimpleModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaGrapheSimpleTimeFille.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaGrapheTimeAnimatedFille.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaGrapheTimeAnimatedVisuPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaGrapheTimeTreeFille.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaDodicoImplementationInterface.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaDodicoMonitor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaDodicoSearchPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaDodicoSelectionFirstPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaDodicoSelectionServeur.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaDodicoTacheConnexion.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaAppliManagerImpl.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaEditorExterne.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaEditorInterface.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaEditorInterne.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaEditorPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExec.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExecCellEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExecCellRenderer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExecComboBoxEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExecListModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExecManagerPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExecPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaGlobalExecManager.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/Fudaa.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaCommandLineParser.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaCommonImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaDialog.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaDialogImport.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaDurationChooserPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaEditeurRapport.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaExplorer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaFilleRapport.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaFilleTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaGuiLib.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaImageSelection.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaImportCsvPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaInternalFrameList.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaInternalFrameModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaInternalFramePanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaInternalFrameToolTip.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaLookPreferencesPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaPanelNavigation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaPanelTask.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaPanelTaskModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaSplashScreen.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/impl/FudaaStartupExitPreferencesPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet/FudaaCommentModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet/FudaaDialogNewProject.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet/FudaaFiltreFichier.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet/FudaaParamChangeLog.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet/FudaaParamEvent.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet/FudaaParamEventProxy.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet/FudaaParamEventView.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet/FudaaParamListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet/FudaaProjet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet/FudaaProjetEvent.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet/FudaaProjetInformationPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet/FudaaProjetInformations.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet/FudaaProjetInformationsFrame.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/projet/FudaaProjetListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaAlignAction.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaBox.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaBuilder.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaCercle.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaConfigureAbstract.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaConfigurePosition.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaDiamond.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaEllipse.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaFormAbstract.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaFormConfigure.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaFormInterface.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaFormInternalFrame.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaFormListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaFormTransform.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaGrid.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaHLine.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaKeyListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaMouseListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaPaletteForm.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaSquare.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaText.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaDjaVLine.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaReport.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaReportAnimationAdapter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaReportConfigureAction.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaReportFille.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaReportFrameController.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaReportIfManager.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaReportSelecteurTitleTarget.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/report/FudaaReportTextConfigure.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/save/FilleVisuSaver.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/save/FudaaFilleVisuPersistence.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/save/FudaaSavable.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/save/FudaaSaveLib.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/save/FudaaSaveMainData.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/save/FudaaSaveProject.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/save/FudaaSaveZipLoader.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/save/FudaaSaveZipLoaderAdapter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/save/FudaaSaveZipWriter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/undo/FudaaUndoCmdMngListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/undo/FudaaUndoPaneFille.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/cubature/Cubature.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/cubature/CubatureApplication.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/cubature/CubatureImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/cubature/CubaturePreferences.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/Curvi.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviApplet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviApplication.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviAssistant.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviFilleCalques.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviFilleParametresASC.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviFilleParametresINP.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviFilleSurface.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviFilleTableauResultats.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviPreferences.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviPreferencesPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviResource.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviSurfaceResultats.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviTableauASC.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviTableauResultats.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviTacheCalcul.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/curvi/CurviTacheOperation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/d1d2/LidoReflux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/d1d2/Profil1D2D.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/AfficheurNomsFichiers.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/Diapre.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreApplication.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreAssistant.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreAstuces.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreCalculCourtTerme.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreCalculLongTerme.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreCellEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreCommentaires.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreConstruitGrapheRappel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreDiagramme.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreDiagrammePression.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreEauParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreEauStat.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreFilleParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreFilleRappelDonnees.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreFinCalculs.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreGeometrieParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreGrapheResultats.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreInterfaceHorizontale.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreListeEtude.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreNomGif.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreOptionsDiscret.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreOptionsModif.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreOptionsParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreOutilsDonnees.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiaprePrecision.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiaprePreferences.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreRappelDonnees.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreResource.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreSolsParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreSurchargeGraphe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreSurchargesParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreSurcharlin.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreSurchartrap.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreSurchartrapdess.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreSurcharunif.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreSurcharunifdess.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreTable.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreTableGeometrie.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreTableLin.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreTableTrap.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreTableauInclinaison.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreTableauValeurs.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/DiapreValidationParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/MethodesUtiles.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/MyTableModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/diapre/TextFieldsDiapre.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/Dimduc.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducApplication.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducArrondis.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducAssistant.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducAstuces.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducCourbeEDC.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducCourbeEDL.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducCourbeMoments.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducFilleGraphe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducFilleParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducPanneauDuc.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducPreferences.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducPreferencesPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducResource.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducTableauResultats.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducTextField.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/dimduc/DimducValidation.java
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/Albe.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeAbstractOnglet.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeAbstractResultatsOnglet.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeAbstractSolCourbe.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeAbstractSolCourbeElastoSetraFascicule.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeActionParametres.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeAssistant.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeAstuces.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeCaracteristiquesPieuCaissonParametres.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeCaracteristiquesPieuParametres.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeCaracteristiquesPieuTubulaireParametres.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeCoefficientsPartielsParametres.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeCriteresDimensionnementParametres.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeDefenseParametres.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeDeplacementReactionResultats.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeDialogCalculEnergieAccostage.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeDialogConfirmation.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeDialogLancementManuelCalculs.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleNoteDeCalculs.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleParametres.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleResultatsCombinaison.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeFilleSchemaOuvrage.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeGeometriquesParametres.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeGraphiqueDialog.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeImplementation.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeInternalFrameAdapter.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeLancementCalculsFrame.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeLib.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeMobilisationButeeResultats.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeMobilisationDefenseResultats.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeModeleTableCoeffModele.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeModeleTableCourbeManuelle.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeModeleTableNonEditable.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeModeleTablePieuEtCoeffMateriaux.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeMsg.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeParamEventView.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbePieuTableCellRenderer.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbePreferences.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeRecapitulatifResultats.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeRes.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeResistancePieuResultats.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeResource.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeResultatsRecapitulatifsBrowserFrame.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeSchemaOuvragePanel.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeSolParametres.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeSolParametresCourbeElastoPlastique.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeSolParametresCourbeManuelle.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeSolParametresCourbeSetra.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeSolParametresCourbeTVCourteDuree.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeSolParametresCourbeTVLongueDuree.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeSolParametresCourbeTVTresCourteDuree.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeTableCellRenderer.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeTableColorCellRenderer.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/AlbeValidationParametres.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/SpringUtilities.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/VMessage.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/ValidationMessages.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/WHtmlContent.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/WTree.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/albe/WTreeItem.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaAstuces.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaAstucesAbstract.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaBrowserControl.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaInternalFrameSelectorPanel.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaLib.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaPreferences.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaPreferencesAbstract.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaProjectInterface.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaProjectStateFrameListener.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaProjectStateLabelListener.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaProjectStateListener.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaProjectStateSupportLabelListener.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaProjetStateDefault.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaProjetStateInterface.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaTee.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/FudaaUI.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/aide/FudaaAidePreferencesPanel.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/aide/FudaaAstucesDialog.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/aide/FudaaAstucesPanel.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/aide/FudaaHelpHtmlPanel.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/aide/FudaaHelpPane.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/aide/FudaaHelpPanel.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/aide/FudaaHelpParentI.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/calcul/FudaaCalculAction.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/calcul/FudaaCalculOp.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/calcul/FudaaCalculSupportInterface.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/conversion/FudaaElement.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/conversion/FudaaInterpolateurMaillage.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/conversion/FudaaMaillageCORELEBTH.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/conversion/FudaaMaillageElement.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/conversion/FudaaNoeud.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/conversion/FudaaPoint.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/conversion/FudaaPolyligne.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeCreateGroupPanel.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeCreatorPanel.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefaultModelName.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeDefautModel.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeImporter.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeModel.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTime.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeListModel.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaCourbeTimeModel.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaGrapheSimpleModel.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaGrapheSimpleTimeFille.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaGrapheTimeAnimatedFille.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaGrapheTimeAnimatedVisuPanel.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/courbe/FudaaGrapheTimeTreeFille.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaDodicoImplementationInterface.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaDodicoMonitor.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaDodicoSearchPanel.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaDodicoSelectionFirstPanel.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaDodicoSelectionServeur.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/dodico/FudaaDodicoTacheConnexion.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaAppliManagerImpl.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaEditor.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaEditorExterne.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaEditorInterface.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaEditorInterne.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaEditorPanel.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExec.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExecCellEditor.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExecCellRenderer.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/exec/FudaaExecComboBoxEditor.java
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: branches/FudaaModeleur_TC1Bis/...
[truncated message content] |
|
From: <bma...@us...> - 2008-09-17 12:34:21
|
Revision: 3941
http://fudaa.svn.sourceforge.net/fudaa/?rev=3941&view=rev
Author: bmarchan
Date: 2008-09-17 12:33:18 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
modif property svn:eol-style
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectImportPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectImportTreeModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/CalqueNewCalqueAction.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dCloud.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLevel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dLine.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dMultiPoint.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/layer/MdlLayer2dProfile.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dLinePersistence.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/persistence/MdlLayer2dMultiPointPersistence.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/refonde/RefondeGroupeProprietes.java
Property Changed:
----------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDIcoFiltreChooserMode.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDico.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoBooleanCellEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoCalculLocalBuilder.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoCalculLocalOp.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoChooserPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoComparator.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoEditorInterface.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoEntiteFileTableModelInterface.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoEntitePanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoEntiteTableModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoFilleProjet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoFiltre.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoFiltreChooserAbstract.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoFiltreChooserListAbstract.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoFiltreChooserModified.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoFiltreChooserName.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoFiltreChooserRubrique.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoFiltreChooserSimple.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoFiltreController.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoFiltreEntiteList.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoLib.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoMultiEntiteViewer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoNewProjectPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoOpenDialog.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoParams.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoPreferences.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoProjectPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoProjectState.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoProjet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoProjetInterface.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoResource.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoTableColumn.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoTableColumnIdentifier.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoTableEditorChooser.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoTableRendererChooser.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/fdico/FDicoTableSortIndicator.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/Hiswa.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaApplication.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaAssistant.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaFilleCalques.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaFilleEditeur.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaFilleParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaFilleTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaOutilsResultats.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaPreferences.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaPreferencesPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaResource.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaSelectionResultats.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaTableauResultats.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hiswa/HiswaTokenMarker.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/CGlobal.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dBaseApplication.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dBaseImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dDialogContraintes.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dExport.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dExportPanneau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dExportXMLPanneau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImport.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImportCasPanneau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dImportXMLPanneau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dPoint.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dPreferences.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilDataEvent.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilDataListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilSelectionEvent.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProfilSelectionListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dProjet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/Hydraulique1dResource.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/CConversionHydraulique1d.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvH1D_Masc.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvMasc_H1D.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/conv/ConvUnite.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dApportEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dBiefEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dBornesGrapheEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dConcentrationsInitialesEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dConditionsInitialesEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCrueCalagePanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCruesCalageEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCustomizer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dCustomizerImprimable.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dDeversoirEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dExtremLibreEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dFiltrageProfilEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dGraphesResultatsEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dInsererProfilEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLaissesEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLigneInitialeEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLissageProfilEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dListeLoiCombo.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dListingsCalageEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLoiHydrauliqueCellEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLoiHydrauliqueChooser.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLoiHydrauliqueEditor2.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLoiHydrauliqueLibraryEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dLoiSeuilEditor2.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dMaillageEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dMeteoEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dModeleQEauEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dNoeudFluvEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dNoeudTransEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dNoeudTransParamEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dNoyauEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresCalageEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresGenerauxAvancesEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresGenerauxEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresRepriseEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresResultatsEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresResultatsQualiteDEauEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParametresTemporelsEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParamsGenerauxQualiteDEauEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dParamsPhysiqueQEEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dPerteChargeEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dPlanimetrageEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dResultatsGenerauxEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSectionsSeriesEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSeuilAvecLoiEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSeuilChooser.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSeuilLoiEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSeuilVanneEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSitesEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dSourceEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dTableauZoneEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dTableauxEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dTranslaterProfilEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dVariablesResultatsEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dVisuInitialeEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dZoneFrottementCalageEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dZoneFrottementEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/Hydraulique1dZoneSecheEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/PanneauGraphesResultats.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierApportDebitPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierCaracLiaisonPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierGeometriePanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierLiaisonEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierNumeriqueEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierPlanimEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierSemiPointsEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierTableauPlanimPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/Hydraulique1dCasierTableauXYZPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/tableau/Hydraulique1dCasierTabPlanim.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/tableau/Hydraulique1dCasierTabPlanimModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/tableau/Hydraulique1dCasierTabXYZ.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/casier/tableau/Hydraulique1dCasierTabXYZModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeAucun.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeBuseArche.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeBuseCirculaire.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeBuseDemiCirculaire.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeDalot.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeRectangle.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeSimple.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilFormeTrapeze.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilSimpleEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/editor/profil/Hydraulique1dProfilTableauPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dAbstractGraphe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dGrapheConditionsInitiales.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dGrapheProfil.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dGrapheProfilDataset.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dGrapheResuBief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dGrapheTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dTableauCasierPlanimSurGraphe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dTableauCasierPlanimVolGraphe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dTableauCasierSemiPointsGraphe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/graphe/Hydraulique1dTableauLoiSeuilGraphe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHMRepository.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Apport2.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Base.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Bief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Casier.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_CasierLiaison.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_CasierNumerique.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_CasierPlanim.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_CasierSemiPoints.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ConcentrationsInitiales.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ConditionsInitiales.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_CruesCalage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Deversoir.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ExtremiteLibre.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_GraphesResultats.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Laisse.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_LibraryLoiHydraulique.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_LigneInitiale.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ListingsCalage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_LoiHydraulique2.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Maillage2.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Meteo.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ModeleQEau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Noyau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamCalage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamGeneraux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamReprise.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamResultat.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamResultatQualiteDEau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamTemporel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamsGenerauxQualiteDEau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ParamsPhysiqueQE.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Planimetrage2.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Profil.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ProfilResultats.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ResultatsGeneraux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SectionsParSections.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SectionsParSerie2.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SeuilAvecLoi.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SeuilLoi.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SeuilVanne.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_SitesStockage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Source.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_Tableaux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_VariableResultat.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_VisuInitiale.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ZonesFrottement.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ZonesFrottementACaler.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ZonesFrottementCalees.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/ihmhelper/Hydraulique1dIHM_ZonesSeches.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauApport.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBarragePrincipal.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBiefCourbe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauBiefDroit.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauCasier.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauDeversoir.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauElementInterf.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauExtremLibre.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauFrame.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauGridAdapter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauLiaisonCasier.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauMouseAdapter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauNoeud.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauPalette.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauPaletteBracket.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauPerteCharge.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauSeuil.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauSingularite.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauSource.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/reseau/Hydraulique1dReseauVerificateur.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/ActionDoubleClickEvent.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/ActionDoubleClickListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dAbstractTableauModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigne1EntierEtBooleensTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigne1EntierEtReelsTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneBooleensTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneChaineEtBooleensTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneChaineEtReelsTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneChaineTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneConcentrationsInitialesTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneLaisseTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneLigneDEauTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneOptionsTraceurTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneParamsPhysiqueQETableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneProfilTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneReelTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneSiteTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneZoneFrottementTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneZoneTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dLigneZoneTailleTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableau1EntierEtReelsModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauBooleenModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauCellRenderer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauChaineEtBooleensModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauChaineEtReelsModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauChainesModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauConcInitsModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauLaisseModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauLigneEauModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauOptionsTraceurModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauParamsPhysQEModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauProfilsModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauReel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauReelModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauSiteModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementCalageModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneFrottementModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneSecheModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/hydraulique1d/tableau/Hydraulique1dTableauZoneTailleModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/Lido.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoApplication.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoAssistant.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoAstuces.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoDialogContraintes.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoDialogStartup.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoExport.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoExportPanneau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoFilleReseau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoFilleReseauUtils.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoImport.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoModifStructRecord.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoPreferences.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoPreferencesPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoReseauException.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/LidoResource.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/dnd/LidoDnDTransfer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/dnd/LidoDnDTransferParam.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoBiefEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoCustomizer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoCustomizerImprimable.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoDialogTableau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoLimiteChooser.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoLimiteCourbeEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoLimiteEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoLimiteMareeEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoLimitePermEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoLoiclmLibraryEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoNoeudEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoNombreSectionsEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoNonpermTempEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoPermCalEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoPermPlanimetrageEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoPermPlanimetrageMinmaxEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoPermSectionsEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoProfilEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoSingulariteChooser.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoSingulariteCourbeEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoSingulariteEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoSingulariteSeuilDenoyeEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoSingulariteSeuilNoyeEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/LidoStricklerEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/profil/LidoProfilFormeAucun.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/profil/LidoProfilFormeRectangle.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/profil/LidoProfilFormeSimple.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/profil/LidoProfilFormeTrapeze.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/editor/profil/LidoProfilSimpleEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/graphe/LidoGrapheCourbe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/graphe/LidoGrapheLignedeau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/graphe/LidoGrapheLimiteCourbe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/graphe/LidoGrapheProfil.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/graphe/LidoGrapheResultatEnLong.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/graphe/LidoGrapheSeuilDenoye.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/graphe/LidoGrapheSeuilNoye.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/graphe/LidoGrapheSingulariteCourbe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/LidoIHMParams.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/LidoIHM_Apport.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/LidoIHM_Base.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/LidoIHM_Bief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/LidoIHM_Calage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/LidoIHM_Laisse.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/LidoIHM_Limite.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/LidoIHM_Noeud.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/LidoIHM_Paramcalcul.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/LidoIHM_Perte.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/LidoIHM_Planimetrage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/LidoIHM_Profil.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/LidoIHM_Reseau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/LidoIHM_Resultatenlong.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/LidoIHM_Resultaterreurs.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/LidoIHM_Resultatlaisse.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/LidoIHM_Resultatprofil.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/LidoIHM_Sectioncalcul.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/LidoIHM_Singularite.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/LidoIHM_Vartemp.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/ApportComparator.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/BiefComparator.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LaisseComparator.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Apport.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Base.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Bief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Calcul.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Laisse.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Limite.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Loiclm.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Loisng.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Noeud.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_PermSection2.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_PermSection3.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Perte.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Profil.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoPH_Singularite.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LidoParamsHelper.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LimiteComparator.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LoiclmComparator.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/LoiclmPointComparator.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/NoeudComparator.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/PermSection2Comparator.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/PermSection3Comparator.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/PerteComparator.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/ProfilComparator.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/ihmhelper/gestion/SingulariteComparator.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/tableau/LidoLoiclmCellEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/tableau/LidoTableauAbstract.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/tableau/LidoTableauApports.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/tableau/LidoTableauBase.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/tableau/LidoTableauBaseModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/tableau/LidoTableauBiefs.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/tableau/LidoTableauLaisses.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/tableau/LidoTableauLimites.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/tableau/LidoTableauNoeuds.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/tableau/LidoTableauPermSection2s.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/tableau/LidoTableauPermSection3s.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/tableau/LidoTableauPertes.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/tableau/LidoTableauProfils.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/tableau/LidoTableauResultats.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/tableau/LidoTableauSingularites.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/visu/LidoVisuLignedeau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/visu/LidoVisuProfilTravers.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/lido/visu/LidoVisuResultatEnLong.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/Mascaret.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretApplication.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretAstuces.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretPreferences.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/mascaret/MascaretResource.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvAct.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvActCheck.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvActClose.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvActLoad.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvActModify.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvActModifyDefault.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvActSave.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvActView.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvControlResult.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvControllerSrc.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvLayerGrid.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvParentInterface.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvResource.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/MvSelectionNodeOrEltData.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/action/MvItemAction.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/action/MvItemActionUI.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/action/MvItemActionsPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle/MvCheckElementLayer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle/MvCheckElementModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle/MvCheckElementModelDefault.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle/MvCheckLayerGroup.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle/MvCheckNodeLayer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle/MvCheckNodeModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle/MvCheckNodeModelDefault.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle/MvControlAngle.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle/MvControlArea.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle/MvControlElementOrientation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle/MvControlElementResult.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle/MvControlItemUI.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle/MvControlNodeResult.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle/MvControlOverstressed.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/controle/MvControlPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExport4T3.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportActAbstract.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportActDataStoreSrc.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportActGrid.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportActInterface.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportActSerafin.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportActX3D.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportAdaptI.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportChooseVarAndTime.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportCorEleBthGridAct.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportDecorator.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportDecoratorEltData.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportDecoratorNodeData.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportDecoratorTranslation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportFactory.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportFilterBuilderInterface.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportFilterBuilderSelectedElt.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportFilterBuilderSelectedPoint.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportFilterBuilderSimple.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportFilterBuilderTime.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportPanelFilter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportPanelFilterDefault.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportRubarTaskSkeleton.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportSerafinFormatAdapter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportSourceFilterActivity.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportSrcTimeAdapter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportT6Activity.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportT6T3Activity.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportTaskSkeleton.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportToNodeDataActivity.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportToT3Activity.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/export/MvExportX3D.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/filter/MvFilterSelectedElement.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/filter/MvFilterSelectedNode.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/impl/MvActCheckDefault.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/impl/MvActLoadDefault.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/impl/MvInternalFrame.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MVFindActionFrontierPt.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MVFlecheLayer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvEdgeNumberLayer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvElementLayer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvElementNumberLayer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvFindActionNodeElt.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvFindComponentFrontierPt.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvFrontierLayer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvFrontierLayerAbstract.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvFrontierPointLayer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvFrontierPolygonLayer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvGridLayerGroup.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvIsoElementPainter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvIsoPaintersLayer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvNodeLayer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/meshviewer/layer/MvNodeNumberLayer....
[truncated message content] |
|
From: <bma...@us...> - 2008-09-17 13:24:44
|
Revision: 3942
http://fudaa.svn.sourceforge.net/fudaa/?rev=3942&view=rev
Author: bmarchan
Date: 2008-09-17 13:23:28 +0000 (Wed, 17 Sep 2008)
Log Message:
-----------
modif property svn:eol-style
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatHistorique.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatsDureesParcours.java
Property Changed:
----------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/simboat/Radar.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/simboat/Simboat.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/simboat/SimboatAffichage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/simboat/SimboatAffichageImage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/simboat/SimboatCommande.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/simboat/SimboatRadarInfos.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/simboat/SimboatResource.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/simflu/SimfluTextField.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/DureeField.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/LongueurField.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/Sinavi.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviAnimation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviAnimationNord.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviAnimationSud.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviApplication.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviBateauCellRenderer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviBateauListModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviBateauPartantListModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviBateauxParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviBiefCellRenderer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviBiefListModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviBiefsParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviDefinitionXmlListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviDonneesGeneralesParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviDureesESCellRenderer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviEcluseCellRenderer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviEcluseListModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviEclusesParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviElementListModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviElementsCellRenderer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleCalendrier.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleChoixCalcul.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleChoixLoiTrajet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleChoixRappelDonnees.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleChoixResultats.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleCreneauHoraire.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleDureesManoeuvres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleEditionNaviresGeneres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleLoiAleatoireTrajet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleLoiDeterministeTrajet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleReseauBief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleReseauEcluse.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleReseauGare.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleResultats.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviFilleTrajetBateau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviGareCellRenderer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviGareListModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviGaresParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviGestionProjet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviGraphiqueResultat.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviHeuresDeterministesListModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviLoiCellRenderer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviOutilsDonnees.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviPreferences.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviRappelDonnees.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviReseauBief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviReseauEcluse.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviReseauFrame.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviReseauGare.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviReseauGridAdapter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviReseauMouseAdapter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviResource.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviTableCreneauModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviTableDureeESModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviTableLoiModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviTableTrajetModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi/SinaviTrajetCellRenderer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/DureeField.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/DureeFieldValidator.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/LongueurField.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/LongueurFieldValidator.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2AffTableauResultat.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2Application.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2Astuces.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAddModBateaux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAddModBateauxold.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAddModBiefs.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAddModConnexion.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAddModEcluses.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAddModIndisponibilites.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAddModTrajets.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAffBateaux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAffBiefs.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAffConnexions.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAffControles.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAffCroisements.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAffEcluses.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAffGeneration.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAffHistorique.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAffIndisponibilites.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAffManoeuvres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAffTrajets.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAffTrematages.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleAffVitesses.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleGraphe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleInitialiserTirage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleModManoeuvres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2FilleModVitesses.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2GestionProjet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2Implementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2Lib.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2OutilsDonnees.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2Preferences.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2ResAffTableauConso.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2ResAffTableauResultat.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2ResAttentesBateaux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2ResAttentesElements.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2ResComparaisonSimulations.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2ResConsommationDEau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2ResDureeParcours.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2ResGestionSimulations.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2Reseau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2ReseauOld.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2Resource.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauAttenteElementDuree.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauAttentesBateaux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauAttentesElements.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauBassinee.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauBateau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauBief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauConnexion.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauConsommation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauConsommationDEau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauCroisement.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauDureeDeParcours.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauEcluse.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauGeneration.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauHistorique.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauIndisponibilites.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauManoeuvre.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauRemplissage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauResultat.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauResultatAvalant.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauResultatMontant.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauResultatTotal.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauTrajet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauTrematage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TableauVitesse.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TrajetMng.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TypeAttente.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TypeBateau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TypeBief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TypeConsommation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TypeConsommationDEau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TypeCroisement.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TypeDureeDeParcours.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TypeEcluse.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TypeGeneration.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TypeHistorique.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/Sinavi2TypeTrajet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/SinaviLib.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/SinaviReseauArcArrow.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/SinaviReseauOld.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/SinaviTypeAttente.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/SinaviTypeBateau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/SinaviTypeBief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/SinaviTypeConsommation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/SinaviTypeConsommationDEau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/SinaviTypeCroisement.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/SinaviTypeDureeDeParcours.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/SinaviTypeEcluse.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/SinaviTypeGeneration.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/SinaviTypeHistorique.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi2/SinaviTypeTrajet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/AfficheurNomsFichiers.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/CoupleLoiDeterministe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/CreneauxLoiJournaliere.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/DureeField.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/FonctionsSimu.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/GenarrFrameAffichage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/GenarrListeNavires.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/GenarrModeleTable.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/GenarrNavire.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/LoiDeterministeTableModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/MethodesUtiles.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ActionClicUSer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ActionListModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3AlgorithmeAttentesGenerales.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3AlgorithmeCroisementsChenal.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3AlgorithmeDureesParcours.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3AlgorithmeGenerationBateaux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3AlgorithmeHistorique.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3AlgorithmeTOUTESAttentesTrajet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3AlgorithmeTOUTESDureesParcours.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3AlgorithmeTrematageChenal.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3AlgorithmesComparaisonSimulation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Application.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Assistant.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Bateau.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Bief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Biefs.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Bordures.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3CellEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3CellEditorDureeParcours.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3DataSimulation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3DessinerPort.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3DessinerPortFrame.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3DialogueParametresAffichageGraphiques.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3DonneesGenerales.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3DonneesGeneralesParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Ecluse.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Ecluses.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3FrameGenerationRappelDonnees.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3FrameSaisieDonneesGenerales.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3FrameSaisieHoraires.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3FrameSaisieHorairesComplet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3FrameSaisieHorairesCompletSemaine.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3FrameSaisieHorairesResume.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3FrameSaisieLoiDeterministe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3FrameSaisieLoiJournaliere.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3FrameSaisieLoiJournaliere2.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Gares.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3GenereNoteHtml.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Horaire.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Implementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3InternalFrame.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3JFreeChartCamembert.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3JProgressBarreProgression.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Lib.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ListeHoraires.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ListeSimulations.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ModeleDurManeuvreEclEntrant.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ModeleDurManeuvreEclSortant.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ModeleExcel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ModeleVitesseBiefAvalant.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ModeleVitesseBiefMontant.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Modeletrajets.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Navires.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ObservableSupport.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3OutilsDonnees.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelAffichageBateaux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelAffichageBief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelAffichageEcluse.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelAffichageGares.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelDureeManeuvresEcluses.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelGestionTrajetsBateaux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelReglesCroisementBief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelReglestrematageBief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelSaisieBateaux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelSaisieBief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelSaisieEcluse.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelSaisieGare.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelTopologieBief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelTopologieEcluse.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PanelVitessesBief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Preferences.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3PreferencesPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ProgressFrame.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Resource.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatComparaisonAttenteElement.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatComparaisonAttentetrajet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatComparaisonDureeParcours.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatComparaisonGenerationBateaux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatGenerationBateaux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatHistorique.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatsAttenteGeneraleCategories.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatsAttenteGeneraleElement.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatsAttenteTrajet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatsCroisementsBief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatsDureesParcours.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3ResultatsTrematagesBief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3StrutureReglesDureesParcours.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3StrutureReglesNavigation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3TableModelMaree.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3TextField.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3TextFieldDuree.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3TextFieldDureeJournee.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3TextFieldDureePM.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3TextFieldFloat.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3TextFieldInteger.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3TraduitHoraires.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Trajet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3Trajets.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3VisualiserBateaux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3VisualiserBief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3VisualiserEcluses.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/Sinavi3VisualiserGares.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sinavi3/TextFieldsMeters.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/AfficheurNomsFichiers.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/CoupleLoiDeterministe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/CreneauxLoiJournaliere.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/DureeField.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/FonctionsSimu.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/GenarrFrameAffichage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/GenarrListeNavires.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/GenarrModeleTable.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/GenarrNavire.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/GenerateurPostScript.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/LoiDeterministeTableModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/MethodesUtiles.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/Sipor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporActionClicUSer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporActionListModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporAlgorithmeAttentesGenerales.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporAlgorithmeCroisementsCercle.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporAlgorithmeCroisementsChenal.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporAlgorithmeDureesParcours.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporAlgorithmeGenerationBateaux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporAlgorithmeHistorique.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporAlgorithmeOccupGlobale.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporAlgorithmeOccupationsQuais.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporAlgorithmeTOUTESAttentesTrajet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporAlgorithmeTOUTESDureesParcours.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporAlgorithmesComparaisonSimulation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporApplication.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporAssistant.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporBassin.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporBassins.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporBordures.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporCellEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporCellEditorDureeParcours.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporCercle.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporCercles.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporChenal.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporChenaux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporDataSimulation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporDessinerPort.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporDessinerPortFrame.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporDialogueParametresAffichageGraphiques.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporDonneesGenerales.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporDonneesGeneralesParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporEcluse.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporEcluses.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporFrameGenerationRappelDonnees.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporFrameSaisieDonneesGenerales.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporFrameSaisieHoraires.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporFrameSaisieHorairesComplet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporFrameSaisieHorairesCompletSemaine.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporFrameSaisieHorairesResume.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporFrameSaisieLoiDeterministe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporFrameSaisieLoiJournaliere.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporFrameSaisieLoiJournaliere2.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporFrameSaisieMaree.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporGares.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporGenereNoteHtml.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporHoraire.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporInternalFrame.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporJFreeChartCamembert.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporJProgressBarreProgression.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporLib.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporListeHoraires.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporListeQuais.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporListeSimulations.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporMareeParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporModeleDureeParcoursCercles.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporModeleDureeParcoursChenaux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporModeleExcel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporNavire.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporNavires.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporObservableSupport.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporOutilsDonnees.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelAffichageBassins_.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelAffichageCercles.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelAffichageChenal.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelAffichageEcluse.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelAffichageGares.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelAffichageNavires.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelAffichageQuais.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelReglesNavigationCercle.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelReglesNavigationChenal.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelReglesParcoursCercle.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelReglesParcoursChenal.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelSaisieBassin_.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelSaisieCercle.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelSaisieChenal.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelSaisieEcluse.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelSaisieGare.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelSaisieNavires.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelSaisieQuais.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelTopologieBassin.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelTopologieCercle.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelTopologieChenal.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPanelTopologieEcluse.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPreferences.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporPreferencesPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporProgressFrame.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporQuais.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporResource.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporResultatComparaisonAttenteElement.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporResultatComparaisonAttentetrajet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporResultatComparaisonDureeParcours.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporResultatComparaisonGenerationBateaux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporResultatComparaisonOccupQuais.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporResultatComparaisonOccupationGlobale.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporResultatGenerationBateaux.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporResultatHistorique.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporResultatOccupationGlobales.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporResultatsAttenteGeneraleCategories.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporResultatsAttenteGeneraleElement.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporResultatsAttenteTrajet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporResultatsCroisementsCercle.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporResultatsCroisementsChenal.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporResultatsDureesParcours.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporResultatsOccupationQuai.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporStrutureReglesDureesParcours.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporStrutureReglesNavigation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporTableModelMaree.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporTextField.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporTextFieldDuree.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporTextFieldDureeJournee.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporTextFieldDureePM.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporTextFieldFloat.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporTextFieldInteger.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporTraduitHoraires.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporVisualiserBassins.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporVisualiserCercles.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporVisualiserChenal.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporVisualiserEcluses.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporVisualiserGares.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporVisualiserNavires.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/SiporVisualiserQuais.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sipor/TextFieldsMeters.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sisyphe/Sisyphe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sisyphe/SisypheApplication.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sisyphe/SisypheAssistant.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sisyphe/SisypheFilleParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sisyphe/SisypheImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sisyphe/SisypheImport.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sisyphe/SisyphePreferences.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sisyphe/SisypheResource.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/Taucomac.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacAccostage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacAmarrage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacApplication.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacAssistant.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacCasCharge.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacCellEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacCotesPrinc.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacDefense.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacDessin.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacDessinContent.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacDessinNew.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacDonGen.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacEssai.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacFilleParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacFilleResultats.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacGraphe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacLireDiam.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacMerePanParm.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacPreferences.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacPreferencesPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacPressio.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacPressioDialog.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacResource.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacSolRupt.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacTest.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacTubes.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/taucomac/TaucomacUnite.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/Tr.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrChainePreferencePanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrEditorImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrInvocationHandler.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrLauncherDefault.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrMesh.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrMeshImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrPost.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrPostImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrProjectManager.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrSingleMainPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrSoftUpdater.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrSupervisor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrSupervisorImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/TrUncaughtExceptionHandler.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/Tr3DBathy.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/Tr3DCalque.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/Tr3DFactory.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/Tr3DImage.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/Tr3DInitialiser.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrApplicationManager.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrBugCommentGenerator.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrCommonImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrCourbeComboBoxRenderer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrCourbeComboboxModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrCourbeTemporelleManager.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrCourbeUseAction.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrCourbeUseCounter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrCourbeUseFinder.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrCourbeUseFinderAbstract.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrCourbeUseResultsAbstract.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrCourbeUseResultsI.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrEvolutionManager.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrExecBatchPreferencesPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrExplorer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrFileFormatManager.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrFileRenderer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrFilleVisuInterface.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrGrapheSimpleTimeFille.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrGrapheTreeTimeFille.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrImplHelperAbstract.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrImplementationEditorAbstract.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrLauncher.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrLib.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrParametres.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrPreferences.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrProjectDispatcherListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrProjectImportPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrProjectPersistence.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrProjet.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrProjetCommon.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrResource.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrRubarCourbeTarageUseFinder.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrRubarCourbeUseFinder.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrRubarCourbeUseResults.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/common/TrSuffixeDocListener.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrAreteExprSupplier.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryBlockModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryBlockModelDefault.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryLayer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryLayerAbstract.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryLegendPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryMiddleModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcBoundaryMiddleModelDefault.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcLayerGroup.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBcPointModelDefault.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBordTraceLigneData.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrBoundaryLineEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrExpressionSupplierForData.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrFilleVisu.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrFindActionFrontierPt.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrGisProjectEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrIconeInput.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrIconeOutput.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrInfoSenderDelegate.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrInfoSenderH2dDelegate.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrIsoPainter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrIsoPainterElement.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrLayerMulti.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrRefluxBcBoundaryMiddleLayer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrRubarAreteEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSIZone.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSaisiePoint.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSaisiePointAction.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSiFlecheModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSiInterpolAction.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSiLayer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSiNodeLayer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSiNodeModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSiPlanEditorPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSiPlanLayer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSiPlanLayerSaver.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSiProfilLayer.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSiProfilLayerProperties.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSiProfilModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSiProfileSplitter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSiZoneOperation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrSolutionInitModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrValuesEditorBuilder.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrVarTableModel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrVisuPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/data/TrVisuPanelEditor.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/export/TrExportFactory.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/export/TrExportFilterItemHauteur.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/export/TrExportFilterItemHauteurAbstract.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/export/TrExportFilterItemHauteurTime.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/tr/export/TrExportPanelFilter...
[truncated message content] |
|
From: <bma...@us...> - 2009-01-07 13:34:34
|
Revision: 4329
http://fudaa.svn.sourceforge.net/fudaa/?rev=4329&view=rev
Author: bmarchan
Date: 2009-01-07 13:34:28 +0000 (Wed, 07 Jan 2009)
Log Message:
-----------
Sauvegarde/restituion de la fenetre 1d, position, taille, bief selectionn?\195?\169, etc.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/save/FudaaSaveLib.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/MdlFille1d.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerBief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerProfil.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueBief.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueTableau.java
Added Paths:
-----------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/save/FilleSaver.java
Added: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/save/FilleSaver.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/save/FilleSaver.java (rev 0)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/save/FilleSaver.java 2009-01-07 13:34:28 UTC (rev 4329)
@@ -0,0 +1,101 @@
+/*
+ * @creation 5 janv. 2009
+ * @modification $Date:$
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2009 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail fud...@li...
+ */
+package org.fudaa.fudaa.commun.save;
+
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Point;
+import java.beans.PropertyVetoException;
+import java.util.Properties;
+
+import com.memoire.bu.BuDesktop;
+import com.memoire.bu.BuInternalFrame;
+
+/**
+ * Un saver pour une fenetre interne, sauvegard\xE9 en db4o. Ne peut pas \xEAtre d\xE9riv\xE9. Si la fenetre sauvegarde des infos particuli\xE8res,
+ * elles peuvent \xEAtre mises dans le tableau des propri\xE9t\xE9s.
+ * @author Bertrand Marchand
+ * @version $Id:$
+ */
+public final class FilleSaver {
+
+ /** Le nom de la fenetre */
+ protected String name_;
+ /** La localisation de la fenetre */
+ protected Point ifLocation_;
+ /** La dimension de la fenetre */
+ protected Dimension ifDim_;
+ /** Est-elle contenue par le desktop ? */
+ protected boolean isVisible_;
+ /** Est-elle iconifie ? */
+ protected boolean isIconified_;
+ /** Est-elle selectionn\xE9e ? */
+ protected boolean isSelected_;
+ /** Proprietes autres (specifiques de la fenetre) */
+ protected Properties props_;
+
+ /**
+ *
+ */
+ public FilleSaver() {
+ super();
+ }
+
+ /**
+ * Sauvegarde les propri\xE9t\xE9s standards, la taille, la position, etc.
+ * @param _f La fenetre
+ * @param _dk Le desktop.
+ */
+ public void setStandardData(final BuInternalFrame _f, final BuDesktop _dk) {
+ name_ = _f.getName();
+ ifDim_ = _f.getSize();
+ ifLocation_ = _f.getLocation();
+ isIconified_=_f.isIcon();
+ // On verifie que la fenetre est contenue par le desktop. Sinon, visibilt\xE9 a false, pour ne pas la
+ // reafficher \xE0 la restitution.
+ if (!isIconified_) {
+ isVisible_=false;
+ for (Component c : _dk.getComponents()) {
+ if (c==_f) {
+ isVisible_=true;
+ break;
+ }
+ }
+ }
+ else {
+ isVisible_=true;
+ }
+
+ isSelected_=_f.isSelected();
+ }
+
+ /**
+ * Restitue les propri\xE9t\xE9s standards. La fenetre doit exister. Elle peut \xEAtre
+ * contenue ou non par le desktop.
+ * @param _f La fenetre
+ * @param _dk Le desktop.
+ */
+ public void restoreStandardData(final BuInternalFrame _f, final BuDesktop _dk) {
+ _f.setSize(ifDim_);
+ _f.setLocation(ifLocation_);
+ _f.setVisible(isVisible_);
+ try {
+ _f.setIcon(isIconified_);
+ _f.setSelected(isSelected_);
+ }
+ catch (PropertyVetoException _exc) {}
+ }
+
+ public Properties getSpecificProps() {
+ return props_;
+ }
+
+ public void setSpecificProps(Properties _props) {
+ props_=_props;
+ }
+}
\ No newline at end of file
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/save/FilleSaver.java
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/save/FudaaSaveLib.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/save/FudaaSaveLib.java 2009-01-06 20:21:36 UTC (rev 4328)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/commun/save/FudaaSaveLib.java 2009-01-07 13:34:28 UTC (rev 4329)
@@ -127,6 +127,11 @@
return q.execute().size();
}
+ /**
+ * Supprime tous les objets d'une classe donn\xE9e
+ * @param _db La base de donn\xE9es.
+ * @param _c La classe des objets a supprimer.
+ */
public static void deleteAll(final ObjectContainer _db, final Class _c) {
if (_db == null) {
return;
@@ -136,6 +141,11 @@
deleteAll(_db, q);
}
+ /**
+ * Supprime tous les objets d'un set resultant.
+ * @param _db La base de donn\xE9es
+ * @param _set Le set.
+ */
public static void deleteAll(final ObjectContainer _db, final ObjectSet _set) {
if (_db == null) {
return;
@@ -145,6 +155,11 @@
}
}
+ /**
+ * Supprime tous les objets d'une requete.
+ * @param _db La base de donn\xE9es
+ * @param _q La requete.
+ */
public static void deleteAll(final ObjectContainer _db, final Query _q) {
if (_db != null) {
for (final ObjectSet s = _q.execute(); s.hasNext();) {
@@ -338,7 +353,7 @@
* @param _visu La fille des calques.
* @param _prog L'interface de progression de tache.
* @param _loader Le zip loader contenant l'\xE9tat du projet.
- * @return The thread de tache.
+ * @return The thread qui remettra a jour les propri\xE9t\xE9s graphiques de la fenetre, tout a la fin.
*/
public static Runnable restoreFille(final BuCommonImplementation _impl, final ZEbliFilleCalques _visu,
final ProgressionInterface _prog, final FudaaSaveZipLoader _loader) {
@@ -348,7 +363,8 @@
final FudaaFilleVisuPersistence fudaaFilleVisuPersistence = new FudaaFilleVisuPersistence(_visu);
res = fudaaFilleVisuPersistence.restore(_impl, _loader, _prog);
- } finally {
+ }
+ finally {
if (_loader != null) {
try {
_loader.close();
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java 2009-01-06 20:21:36 UTC (rev 4328)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlImplementation.java 2009-01-07 13:34:28 UTC (rev 4329)
@@ -181,6 +181,15 @@
}
/**
+ * Creation de la vue 1D. Ajout a la demande.
+ */
+ void createNew1dFrame() {
+ if (mdl1dFrame_==null) {
+ mdl1dFrame_=new MdlFille1d(this);
+ }
+ }
+
+ /**
* @return La vue 2D, ou null si inexistante.
*/
public MdlFille2d get2dFrame() {
@@ -191,9 +200,6 @@
* Installe la vue 1d sur le desktop, et la rend active.
*/
public void install1dFrame() {
- if (mdl1dFrame_==null) {
- mdl1dFrame_ = new MdlFille1d(this);
- }
boolean alreadyInstalled=false;
for (JInternalFrame f: getAllInternalFrames()) {
if (f.equals(mdl1dFrame_)) {
@@ -201,8 +207,10 @@
break;
}
}
- if (!alreadyInstalled) addInternalFrame(mdl1dFrame_);
- activateInternalFrame(mdl1dFrame_);
+ if (!alreadyInstalled)
+ addInternalFrame(mdl1dFrame_);
+ else
+ activateInternalFrame(mdl1dFrame_);
}
protected boolean buildExportDataToolIcon() {
@@ -226,6 +234,7 @@
project_.close();
try {
mdl2dFrame_.setClosed(true);
+ mdl1dFrame_.setClosed(true);
} catch (PropertyVetoException _evt) {
FuLog.error(_evt);
@@ -244,6 +253,7 @@
project_.setOpening(true);
if (_add) createNew2dFrame();
else ((MdlVisuPanel)mdl2dFrame_.getVisuPanel()).initCalques(false);
+ createNew1dFrame();
project_.install(this);
BuLib.invokeLater(new Runnable() {
@@ -408,6 +418,20 @@
public void run() {
try {
addInternalFrame(mdl2dFrame_);
+
+ // Met a jour la fenetre 1d
+ FudaaSaveZipLoader loader=null;
+ try {
+ loader=new FudaaSaveZipLoader(f);
+ mdl1dFrame_.restoreFrom(loader, null);
+ }
+ catch (IOException _exc) {}
+ finally {
+ if (loader!=null) {
+ try { loader.close(); } catch (IOException _exc) {}
+ }
+ }
+
if (swingRun != null) swingRun.run();
// le projet a ete install\xE9: on enl\xE8ve les flag de modification
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/MdlFille1d.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/MdlFille1d.java 2009-01-06 20:21:36 UTC (rev 4328)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/MdlFille1d.java 2009-01-07 13:34:28 UTC (rev 4329)
@@ -10,23 +10,37 @@
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.print.PageFormat;
+import java.io.IOException;
+import java.util.Properties;
import javax.swing.JComponent;
import javax.swing.JSplitPane;
+import javax.swing.SwingUtilities;
import org.fudaa.ctulu.CtuluCommandManager;
import org.fudaa.ctulu.CtuluExportDataInterface;
import org.fudaa.ctulu.CtuluUI;
import org.fudaa.ctulu.CtuluUndoRedoInterface;
+import org.fudaa.ctulu.ProgressionInterface;
import org.fudaa.ctulu.gui.CtuluFilleWithComponent;
+import org.fudaa.ebli.geometrie.GrBoite;
import org.fudaa.ebli.impression.EbliFilleImprimable;
import org.fudaa.fudaa.commun.FudaaLib;
+import org.fudaa.fudaa.commun.save.FilleSaver;
+import org.fudaa.fudaa.commun.save.FudaaSavable;
+import org.fudaa.fudaa.commun.save.FudaaSaveZipLoader;
+import org.fudaa.fudaa.commun.save.FudaaSaveZipWriter;
import org.fudaa.fudaa.modeleur.MdlImplementation;
import org.fudaa.fudaa.modeleur.modeleur1d.controller.Controller1d;
import org.fudaa.fudaa.sig.FSigResource;
+import com.db4o.ObjectContainer;
+import com.db4o.ObjectSet;
+import com.db4o.query.Query;
import com.memoire.bu.BuBorderLayout;
+import com.memoire.bu.BuCommonImplementation;
import com.memoire.bu.BuUndoRedoInterface;
+import com.memoire.fu.FuLog;
/**
* La fenetre interne vue 2D des donn\xE9es du modeleur. Elle construit le composant arbre de
@@ -39,17 +53,20 @@
* @version $Id$
*/
public class MdlFille1d extends EbliFilleImprimable implements BuUndoRedoInterface, CtuluFilleWithComponent,
- CtuluUndoRedoInterface, CtuluExportDataInterface {
+ CtuluUndoRedoInterface, CtuluExportDataInterface, FudaaSavable {
/** Le controller 1d */
private Controller1d controller_;
+ /** L'implementation */
+ private BuCommonImplementation impl_=null;
public MdlFille1d(MdlImplementation _appli) {
super("", true, false, true, true, _appli, null);
+ impl_=_appli;
+
// Configuration de la fen\xEAtre 1d \\
setName("mdlFille1d");
setTitle(FSigResource.FSIG.getString("Vue 1D"));
- setPreferredSize(new Dimension(500, 400));
setClosable(true);
controller_=new Controller1d(_appli, this);
// Construction des vues contenues dans la fen\xEAtre. \\
@@ -57,7 +74,7 @@
add(new JSplitPane(JSplitPane.VERTICAL_SPLIT, controller_.getVueBief(), new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, controller_.getVueTableau(), controller_.getVueCourbe())), BuBorderLayout.CENTER);
add(controller_.getVueError(), BuBorderLayout.SOUTH);
setPreferredSize(new Dimension(500, 500));
- setSize(getPreferredSize());
+ pack();
}
/* (non-Javadoc)
@@ -126,4 +143,163 @@
public void startExport(CtuluUI _impl) {
controller_.export();
}
+
+ /**
+ * Recupere l'objet de la base stockant les propri\xE9t\xE9s pour cette fenetre.
+ * @param _db La base.
+ * @return Les propri\xE9t\xE9s pour la fenetre.
+ */
+ private FilleSaver findDataInDb(final ObjectContainer _db) {
+ if (_db == null) {
+ return null;
+ }
+ final Query q = _db.query();
+ q.constrain(FilleSaver.class);
+ q.descend("name_").constrain(getName());
+ final ObjectSet set = q.execute();
+
+ FilleSaver saveData=null;
+ if (set.size() == 1) {
+ saveData = (FilleSaver) set.next();
+ }
+ return saveData;
+ }
+
+ /* (non-Javadoc)
+ * @see org.fudaa.fudaa.commun.save.FudaaSavable#saveIn(com.db4o.ObjectContainer, org.fudaa.ctulu.ProgressionInterface)
+ */
+ public void saveIn(ObjectContainer _db, ProgressionInterface _prog) {
+ if (_db == null) {
+ return;
+ }
+ FilleSaver saveData=findDataInDb(_db);
+ if (saveData==null)
+ saveData = new FilleSaver();
+
+ saveData.setStandardData(this,impl_.getMainPanel().getDesktop());
+ saveData.setSpecificProps(fillSpecificProps());
+ _db.set(saveData);
+ _db.commit();
+ }
+
+ /* (non-Javadoc)
+ * @see org.fudaa.fudaa.commun.save.FudaaSavable#saveIn(org.fudaa.fudaa.commun.save.FudaaSaveZipWriter, org.fudaa.ctulu.ProgressionInterface)
+ */
+ public void saveIn(FudaaSaveZipWriter _writer, ProgressionInterface _prog) {
+ try {
+ saveIn(_writer.getDb(), _prog);
+ } catch (final IOException _evt) {
+ FuLog.error(_evt);
+ }
+ }
+
+ /**
+ * Restaure la fenetre (donn\xE9es et propri\xE9t\xE9s) depuis le fichier projet.
+ * @param _loader Le fichier projet.
+ * @param _prog La progression de la tache.
+ */
+ public void restoreFrom(FudaaSaveZipLoader _loader, ProgressionInterface _prog) {
+ restoreFrom(_loader.getDb(), _prog);
+ }
+
+ /**
+ * Restaure les propri\xE9t\xE9s de la fenetre, depuis la bd contenue dans le fichier projet.
+ * @param _db La bd.
+ * @param _prog La progression de la tache.
+ */
+ public void restoreFrom(ObjectContainer _db, ProgressionInterface _prog) {
+ FilleSaver saveData=findDataInDb(_db);
+ if (saveData==null) return;
+
+ saveData.restoreStandardData(this,impl_.getMainPanel().getDesktop());
+ restoreSpecificProps(saveData.getSpecificProps());
+ // Si les propri\xE9t\xE9s restitu\xE9es indiquent que la fenetre est visible, alors elle est ajout\xE9e au desktop.
+ if (isVisible()) impl_.addInternalFrame(this);
+ }
+
+ /**
+ * Remplit le tableau des propri\xE9t\xE9s sp\xE9cifiques de cette fenetre
+ * @return Les propri\xE9t\xE9s
+ */
+ private Properties fillSpecificProps() {
+ Properties props=new Properties();
+
+ // Taille des vues
+ Dimension vuesize=controller_.getVueBief().getSize();
+ props.setProperty("viewBief.width",Integer.toString(vuesize.width));
+ props.setProperty("viewBief.height",Integer.toString(vuesize.height));
+ vuesize=controller_.getVueTableau().getSize();
+ props.setProperty("viewTableau.width",Integer.toString(vuesize.width));
+ props.setProperty("viewTableau.height",Integer.toString(vuesize.height));
+
+ // Viewport du bief
+ final GrBoite b = controller_.getVueBief().getVueCalque().getViewBoite();
+ props.setProperty("viewBief.xmin",Double.toString(b.o_.x_));
+ props.setProperty("viewBief.ymin",Double.toString(b.o_.y_));
+ props.setProperty("viewBief.xmax",Double.toString(b.e_.x_));
+ props.setProperty("viewBief.ymax",Double.toString(b.e_.y_));
+
+ // Bief selectionne
+ int idx=controller_.getControllerBief().getBiefSelectionModel().getSelectedBief();
+ props.setProperty("selectedBief",Integer.toString(idx));
+
+ // Profil selectionne
+ idx=controller_.getControllerProfil().getProfilSelectionModel().getSelectedProfil();
+ props.setProperty("selectedProfil",Integer.toString(idx));
+
+ return props;
+ }
+
+ /**
+ * Restaure les propri\xE9t\xE9s sp\xE9cifiques de la fenetre.
+ * @param _props Les propri\xE9t\xE9s
+ */
+ private void restoreSpecificProps(final Properties _props) {
+ if (_props==null) return;
+
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ // Taille des vues
+ try {
+ int w=Integer.parseInt(_props.getProperty("viewBief.width"));
+ int h=Integer.parseInt(_props.getProperty("viewBief.height"));
+ ((JSplitPane)controller_.getVueBief().getParent()).setDividerLocation(h);
+ }
+ catch (NumberFormatException _exc) {}
+ try {
+ int w=Integer.parseInt(_props.getProperty("viewTableau.width"));
+ int h=Integer.parseInt(_props.getProperty("viewTableau.height"));
+ ((JSplitPane)controller_.getVueTableau().getParent()).setDividerLocation(w);
+ }
+ catch (NumberFormatException _exc) {}
+
+ // Viewport du bief
+ try {
+ double xmin=Double.parseDouble(_props.getProperty("viewBief.xmin", "null"));
+ double ymin=Double.parseDouble(_props.getProperty("viewBief.ymin", "null"));
+ double xmax=Double.parseDouble(_props.getProperty("viewBief.xmax", "null"));
+ double ymax=Double.parseDouble(_props.getProperty("viewBief.ymax", "null"));
+ GrBoite bt=new GrBoite();
+ bt.ajuste(xmin, ymin, 0);
+ bt.ajuste(xmax, ymax, 0);
+ controller_.getVueBief().getVueCalque().changeRepere(this, bt);
+ }
+ catch (NumberFormatException _exc) {}
+
+ // Bief selectionne
+ try {
+ int idx=Integer.parseInt(_props.getProperty("selectedBief", "-1"));
+ controller_.getControllerBief().getBiefSelectionModel().setSelectedBief(idx);
+ }
+ catch (NumberFormatException _exc) {}
+
+ // Profil selectionne
+ try {
+ int idx=Integer.parseInt(_props.getProperty("selectedProfil", "-1"));
+ controller_.getControllerProfil().getProfilSelectionModel().setSelectedProfil(idx);
+ }
+ catch (NumberFormatException _exc) {}
+ }
+ });
+ }
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java 2009-01-06 20:21:36 UTC (rev 4328)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/Controller1d.java 2009-01-07 13:34:28 UTC (rev 4329)
@@ -155,6 +155,14 @@
return appli_;
}
+ public ControllerBief getControllerBief() {
+ return controllerBief_;
+ }
+
+ public ControllerProfil getControllerProfil() {
+ return controllerProfil_;
+ }
+
// Gestion de l'affichage des erreurs. \\
public void showError(String _message){
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerBief.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerBief.java 2009-01-06 20:21:36 UTC (rev 4328)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerBief.java 2009-01-07 13:34:28 UTC (rev 4329)
@@ -217,6 +217,20 @@
}
/**
+ * Retourne le bief selectionn\xE9.
+ */
+ public int getSelectedBief() {
+ return getMinSelectionIndex();
+ }
+
+ /**
+ * Selectionne un bief d'indice donn\xE9.
+ */
+ public void setSelectedBief(int _idx) {
+ setSelectionInterval(_idx,_idx);
+ }
+
+ /**
* Met \xE0 jour dataGeomAdapter_ pour qu'il tienne compte de la nouvelle selection.
*/
private void updateBief() {
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerProfil.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerProfil.java 2009-01-06 20:21:36 UTC (rev 4328)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/controller/ControllerProfil.java 2009-01-07 13:34:28 UTC (rev 4329)
@@ -113,6 +113,10 @@
return getMinSelectionIndex();
}
+ public void setSelectedProfil(int _idx) {
+ setSelectionInterval(_idx,_idx);
+ }
+
public void valueChanged(ListSelectionEvent e) {
// Le bief selectionn\xE9 \xE0 chang\xE9. \\
clearSelection();
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueBief.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueBief.java 2009-01-06 20:21:36 UTC (rev 4328)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueBief.java 2009-01-07 13:34:28 UTC (rev 4329)
@@ -53,7 +53,6 @@
public String edit() {return null;}
});
setPreferredSize(new Dimension(200, 200));
- setSize(getPreferredSize());
generateCalques();
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java 2009-01-06 20:21:36 UTC (rev 4328)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueCourbe.java 2009-01-07 13:34:28 UTC (rev 4329)
@@ -363,7 +363,6 @@
add(containerCourbe_, BuBorderLayout.CENTER);
setPreferredSize(new Dimension(200, 200));
- setSize(getPreferredSize());
}
/** Ajout un listener \xE0 la selection dans le tableau. */
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueTableau.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueTableau.java 2009-01-06 20:21:36 UTC (rev 4328)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/modeleur1d/view/VueTableau.java 2009-01-07 13:34:28 UTC (rev 4329)
@@ -138,7 +138,6 @@
add(absCurv, BuBorderLayout.SOUTH);
// Taille
setPreferredSize(new Dimension(200, 200));
- setSize(getPreferredSize());
}
/** Ajout un listener \xE0 la selection dans le tableau. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <emm...@us...> - 2009-01-22 13:43:21
|
Revision: 4392
http://fudaa.svn.sourceforge.net/fudaa/?rev=4392&view=rev
Author: emmanuel_martin
Date: 2009-01-22 13:43:18 +0000 (Thu, 22 Jan 2009)
Log Message:
-----------
Tache #134 : " Pouvoir exporter uniquement les objets s?\195?\169lectionn?\195?\169s."
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectExportPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigLayerFilter.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java 2009-01-22 10:07:02 UTC (rev 4391)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlEditionManager.java 2009-01-22 13:43:18 UTC (rev 4392)
@@ -124,26 +124,26 @@
MdlProjectExportPanel pn=new MdlProjectExportPanel(getUi());
if (CtuluDialogPanel.isCancelResponse(pn.afficheModale(getFrame(), FudaaLib.getS("Exporter les donn\xE9es de la fen\xEAtre active")))) return;
- final FSigLayerFilter filter = new FSigLayerFilter();
- if (pn.isAllLayers()) {
+ final FSigLayerFilter filter=new FSigLayerFilter();
+ if (pn.isAllLayers())
getPanel().getDonneesCalque().apply(filter);
- }
else if (pn.isSelectedLayers()) {
- final BCalque[] parent = super.getPanel().getArbreCalqueModel().getSelection();
- if (parent!=null) {
- for (int i = 0; i < parent.length; i++) {
+ final BCalque[] parent=getPanel().getArbreCalqueModel().getSelection();
+ if (parent!=null)
+ for (int i=0; i<parent.length; i++)
parent[i].apply(filter);
- }
- }
}
- else {
+ else if (pn.isVisibleLayers()) {
filter.setTreatmentOnlyOnVisible(true);
getPanel().getDonneesCalque().apply(filter);
}
+ else { // Only selected geometries
+ filter.setTreatmentOnlySelectedGeometries(true);
+ getPanel().getDonneesCalque().apply(filter);
+ }
- if (filter.isEmpty()) {
+ if (filter.isEmpty())
return;
- }
final File f=pn.getFile();
final FSigLayerExporter exporter=pn.getSelectedExporter();
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectExportPanel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectExportPanel.java 2009-01-22 10:07:02 UTC (rev 4391)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlProjectExportPanel.java 2009-01-22 13:43:18 UTC (rev 4392)
@@ -8,75 +8,33 @@
package org.fudaa.fudaa.modeleur;
import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
import java.util.Map;
-import javax.swing.BorderFactory;
import javax.swing.ButtonGroup;
import javax.swing.JFileChooser;
-import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTree;
-import javax.swing.UIManager;
-import javax.swing.border.Border;
-import javax.swing.event.CaretEvent;
-import javax.swing.event.CaretListener;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
-import javax.swing.filechooser.FileFilter;
-import javax.swing.tree.TreeCellRenderer;
-import javax.swing.tree.TreePath;
-import com.memoire.bu.BuButton;
-import com.memoire.bu.BuCheckBox;
-import com.memoire.bu.BuFileFilter;
-import com.memoire.bu.BuHorizontalLayout;
-import com.memoire.bu.BuLabel;
-import com.memoire.bu.BuRadioButton;
-import com.memoire.bu.BuResource;
-import com.memoire.bu.BuVerticalLayout;
-import com.memoire.fu.FuLog;
-
-import org.fudaa.ctulu.CtuluArkLoader;
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.CtuluLibFile;
-import org.fudaa.ctulu.CtuluLibString;
import org.fudaa.ctulu.CtuluUI;
-import org.fudaa.ctulu.gis.factory.GISExportDataStoreFactory;
-import org.fudaa.ctulu.gui.CtuluCellRenderer;
import org.fudaa.ctulu.gui.CtuluDialogPanel;
-import org.fudaa.ctulu.gui.CtuluFileChooser;
import org.fudaa.ctulu.gui.CtuluFileChooserPanel;
import org.fudaa.dodico.dunes.io.DunesGEOFileFormat;
import org.fudaa.dodico.rubar.io.RubarStCnFileFormat;
import org.fudaa.dodico.telemac.io.SinusxFileFormat;
-
-import org.fudaa.ebli.calque.BCalquePersistenceGroupe;
-
import org.fudaa.fudaa.commun.FudaaLib;
-import org.fudaa.fudaa.commun.impl.FudaaGuiLib;
-import org.fudaa.fudaa.commun.save.FudaaSaveLib;
-import org.fudaa.fudaa.commun.save.FudaaSaveZipLoader;
-import org.fudaa.fudaa.modeleur.MdlImplementation.MdlFileFilter;
-import org.fudaa.fudaa.modeleur.MdlProjectImportTreeModel.LayerNode;
import org.fudaa.fudaa.sig.FSigLib;
import org.fudaa.fudaa.sig.layer.FSigLayerExporter;
-import org.fudaa.fudaa.tr.common.TrProjectPersistence;
-import org.fudaa.fudaa.tr.common.TrResource;
-import org.geotools.data.FileDataStoreFactorySpi;
+import com.memoire.bu.BuFileFilter;
+import com.memoire.bu.BuLabel;
+import com.memoire.bu.BuRadioButton;
+import com.memoire.bu.BuVerticalLayout;
+
/**
* Un panneau pour exporter les donn\xE9es 2D.
* @author Bertrand Marchand
@@ -84,69 +42,19 @@
*/
public class MdlProjectExportPanel extends CtuluDialogPanel implements DocumentListener {
-
-/* public static class CellRenderer extends JLabel implements TreeCellRenderer {
- final Color selectedBackground_ = UIManager.getColor("Tree.selectionBackground");
- final Color selectedForground_ = UIManager.getColor("Tree.selectionForeground");
- final Border focusBorderColor_ = BorderFactory.createLineBorder(UIManager.getColor("Tree.selectionBorderColor"), 1);
-
- public CellRenderer() {
- this.setOpaque(true);
-// setPreferredSize(new Dimension(120, 25));
- }
-
- protected boolean isSelectable(final Object _value, final boolean _leaf) {
- return true;
- }
-
- public Component getTreeCellRendererComponent(final JTree _tree, final Object _value, final boolean _selected,
- final boolean _expanded, final boolean _leaf, final int _row, final boolean _hasFocus) {
- this.setFont(_tree.getFont());
- setIcon(BuResource.BU.getIcon("calque"));
- setText(_value.toString());
- final boolean selectable = isSelectable(_value, _leaf);
- if (_selected && selectable) {
- setBackground(selectedBackground_);
- setForeground(selectedForground_);
- } else {
- setBackground(_tree.getBackground());
- setForeground(_tree.getForeground());
- }
- if (selectable) {
- setToolTipText(getText());
- } else {
- setToolTipText(getText() + ": " + CtuluLib.getS("Non s\xE9lectionnable"));
- }
- setBorder((selectable && _hasFocus) ? focusBorderColor_ : CtuluCellRenderer.BORDER_NO_FOCUS);
- setEnabled(_tree.isEnabled());
- return this;
- }
- }
-*/
CtuluFileChooserPanel pn_;
String filename_="";
BuRadioButton rbAllLayers_;
BuRadioButton rbSelectedLayers_;
BuRadioButton rbVisibleLayers_;
+ protected BuRadioButton rbSelectedGeometries_;
BuFileFilter[] filters_;
CtuluUI ui_;
BuFileFilter selectedFilter_=null;
- Map filter2Exporter_;
-
-// JTree trLayers_;
-// FudaaSaveZipLoader loader_=null;
+ Map<BuFileFilter, FSigLayerExporter> filter2Exporter_;
public MdlProjectExportPanel(CtuluUI _ui) {
ui_=_ui;
-// ActionListener rbListener=new ActionListener() {
-// public void actionPerformed(ActionEvent _evt) {
-// if (rbSelectedLayers_.isSelected()) {
-// if (isFileOK()) loadFile();
-// }
-// trLayers_.setEnabled(rbSelectedLayers_.isSelected());
-// trLayers_.setModel(new MdlProjectImportTreeModel(loader_));
-// }
-// };
filters_=buildFilter2Export();
@@ -165,50 +73,32 @@
pnFile.add(pn_, BorderLayout.CENTER);
add(pnFile);
- rbAllLayers_=new BuRadioButton("Exporter tous les calques");
-// rbAllLayers_.addActionListener(rbListener);
+ rbAllLayers_=new BuRadioButton(FudaaLib.getS("Exporter tous les calques"));
+ rbSelectedLayers_=new BuRadioButton(FudaaLib.getS("Exporter les calques s\xE9lectionn\xE9s (et leurs sous-calques)"));
+ rbVisibleLayers_=new BuRadioButton(FudaaLib.getS("Exporter les seuls calques visibles"));
+ rbSelectedGeometries_=new BuRadioButton(FudaaLib.getS("Exporter les g\xE9om\xE9tries selectionn\xE9es."));
add(rbAllLayers_);
-
- rbSelectedLayers_=new BuRadioButton("Exporter les calques s\xE9lectionn\xE9s (et leurs sous-calques)");
-// rbSelectedLayers_.addActionListener(rbListener);
add(rbSelectedLayers_);
-
- rbVisibleLayers_=new BuRadioButton("Exporter les seuls calques visibles");
-// rbSelectedLayers_.addActionListener(rbListener);
add(rbVisibleLayers_);
-//
+ add(rbSelectedGeometries_);
ButtonGroup bgLayers=new ButtonGroup();
bgLayers.add(rbAllLayers_);
bgLayers.add(rbSelectedLayers_);
bgLayers.add(rbVisibleLayers_);
-//
-// trLayers_=new JTree();
-// trLayers_.setShowsRootHandles(true);
-// trLayers_.setRootVisible(false);
-// trLayers_.setCellRenderer(new CellRenderer());
-// JScrollPane sp=new JScrollPane(trLayers_);
-// sp.setPreferredSize(new Dimension(300,200));
-// add(sp);
-//
+ bgLayers.add(rbSelectedGeometries_);
+
rbAllLayers_.doClick();
-// pn_.getTf().getDocument().addDocumentListener(this);
-//
}
private BuFileFilter[] buildFilter2Export() {
final BuFileFilter sx = SinusxFileFormat.getInstance().createFileFilter();
final BuFileFilter st = RubarStCnFileFormat.createStFilter();
final BuFileFilter dunes= DunesGEOFileFormat.getInstance().createFileFilter();
- filter2Exporter_ = new HashMap(5);// pour l'instant .....
+ filter2Exporter_ = new HashMap<BuFileFilter, FSigLayerExporter>(5);// pour l'instant .....
filter2Exporter_.put(sx, new FSigLayerExporter.ToSinusX());
filter2Exporter_.put(st, new FSigLayerExporter.ToRubar());
filter2Exporter_.put(dunes, new FSigLayerExporter.ToDunes());
-// final Map dataStores = GISExportDataStoreFactory.buildFileFilterMap(false);
-// for (final Iterator it = dataStores.entrySet().iterator(); it.hasNext();) {
-// final Map.Entry e = (Map.Entry) it.next();
-// filter2Exporter_.put(e.getKey(), new FSigLayerExporter.DataStore((FileDataStoreFactorySpi) e.getValue()));
-// }
filters_ = new BuFileFilter[filter2Exporter_.size()];
filter2Exporter_.keySet().toArray(filters_);
@@ -217,41 +107,9 @@
public boolean valide() {
if (!isFileOK()) return false;
-//
-// // Mise a jour des \xE9tats des calques. Par defaut, les calques sopnt r\xE9cup\xE9r\xE9s.
-// if (rbSelectedLayers_.isSelected()) {
-// List<LayerNode> nds=getChildrenLeafs((LayerNode)trLayers_.getModel().getRoot());
-//
-// TreePath[] paths=trLayers_.getSelectionPaths();
-// if (paths!=null) {
-// for (TreePath path : paths) {
-// nds.remove((LayerNode)path.getLastPathComponent());
-// }
-// }
-//
-// for (LayerNode nd : nds) {
-// loader_.setOption(CtuluArkLoader.OPTION_LAYER_IGNORE+nd.name_,CtuluLibString.toString(true));
-// }
-// }
return true;
}
-// private List<LayerNode> getChildrenLeafs(LayerNode _nd) {
-// List<LayerNode> r=new ArrayList<LayerNode>();
-// int nb=_nd.getChildCount();
-// for (int i=0; i<nb; i++) {
-// LayerNode nd=(LayerNode)_nd.getChildAt(i);
-// if (nd.isLeaf()) {
-// r.add(nd);
-// }
-// else {
-// List<LayerNode> ls=getChildrenLeafs(nd);
-// r.addAll(ls);
-// }
-// }
-// return r;
-// }
-
private boolean isFileOK() {
final File f = pn_.getFile();
if (f == null) {
@@ -319,31 +177,17 @@
public boolean isVisibleLayers() {
return rbVisibleLayers_.isSelected();
}
-// private FudaaSaveZipLoader loadFile() {
-// if (loader_!=null) return loader_;
-//
-// try {
-// loader_=new FudaaSaveZipLoader(pn_.getFile());
-// }
-// catch (IOException _exc) {
-// setErrorText(TrResource.getS("Le fichier n'est pas accessible"));
-// }
-// return loader_;
-// }
+
+ public boolean isSelectedGeometries() {
+ return rbSelectedGeometries_.isSelected();
+ }
public void changedUpdate(final DocumentEvent _e) {
-// valide();
}
public void insertUpdate(final DocumentEvent _e) {
-// valide();
}
public void removeUpdate(final DocumentEvent _e) {
-// valide();
}
-
-// public FudaaSaveZipLoader getLoader() throws IOException {
-// return loader_;
-// }
}
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigLayerFilter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigLayerFilter.java 2009-01-22 10:07:02 UTC (rev 4391)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigLayerFilter.java 2009-01-22 13:43:18 UTC (rev 4392)
@@ -13,20 +13,26 @@
import java.util.List;
import java.util.Set;
-import com.vividsolutions.jts.geom.LineString;
-import com.vividsolutions.jts.geom.MultiPoint;
-import com.vividsolutions.jts.geom.Point;
-
import org.fudaa.ctulu.CtuluIOOperationSynthese;
import org.fudaa.ctulu.CtuluUI;
import org.fudaa.ctulu.ProgressionInterface;
+import org.fudaa.ctulu.gis.GISAttributeModel;
import org.fudaa.ctulu.gis.GISZoneCollection;
-
+import org.fudaa.ctulu.gis.GISZoneCollectionLigneBrisee;
+import org.fudaa.ctulu.gis.GISZoneCollectionMultiPoint;
+import org.fudaa.ctulu.gis.GISZoneCollectionPoint;
import org.fudaa.ebli.calque.BCalque;
import org.fudaa.ebli.calque.BCalqueVisitor;
import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
+import org.fudaa.ebli.calque.ZCalqueGeometry;
import org.fudaa.ebli.calque.ZModeleGeometry;
+import org.fudaa.ebli.calque.edition.ZModeleGeometryDefault;
+import org.fudaa.ebli.calque.edition.ZModelePointEditable;
+import com.vividsolutions.jts.geom.LineString;
+import com.vividsolutions.jts.geom.MultiPoint;
+import com.vividsolutions.jts.geom.Point;
+
/**
* Un filtre sur les calques a exporter. Les calques a exporter peuvent \xEAtre uniquement les calques visibles.
* @author Fred Deniger
@@ -34,11 +40,12 @@
*/
public class FSigLayerFilter implements BCalqueVisitor {
- final Set cqs_ = new HashSet();
- List pointCq_ = new ArrayList();
- List polyCq_ = new ArrayList();
- List mlptsCq_=new ArrayList();
+ final Set<BCalque> cqs_ = new HashSet<BCalque>();
+ List<BCalque> pointCq_ = new ArrayList<BCalque>();
+ List<BCalque> polyCq_ = new ArrayList<BCalque>();
+ List<BCalque> mlptsCq_=new ArrayList<BCalque>();
boolean bonlyVisible_=false;
+ protected boolean onlySelectedGeometries_=false;
/**
*
@@ -85,22 +92,85 @@
bonlyVisible_=_b;
}
+ /**
+ * Le traitement s'applique uniquement aux g\xE9om\xE9tries selectionn\xE9es.
+ */
+ public void setTreatmentOnlySelectedGeometries(boolean _b) {
+ onlySelectedGeometries_=_b;
+ }
+
+ /**
+ * Retourne les donn\xE9es de la g\xE9om\xE9tries de _zone.
+ * retourne null si _idxGeom est invalide.
+ */
+ private Object[] getData(int _idxGeom, GISZoneCollection _zone) {
+ Object[] data=null;
+ if (_idxGeom>=0&&_idxGeom<_zone.getNbGeometries()) {
+ GISAttributeModel[] models=_zone.getModels();
+ data=new Object[models.length];
+ for (int i=0; i<data.length; i++)
+ data[i]=models[i].getObjectValueAt(_idxGeom);
+ }
+ return data;
+ }
+
+ /**
+ * Ajout les attributs n\xE9c\xE9ssaires \xE0 _destination puis ajout les g\xE9om\xE9tries de
+ * la _source \xE0 la _destination.
+ */
+ private void addGeoms(int[] _idx, GISZoneCollection _source, GISZoneCollection _destination) {
+ _destination.setAttributes(_source.getAttributes(), null);
+ for(int i=0;i<_idx.length;i++)
+ _destination.addGeometry(_source.getGeometry(_idx[i]), getData(_idx[i], _source), null);
+ }
+
+ /**
+ * Cr\xE9e un nouveau calque dupliquant les g\xE9om\xE9ries selectionn\xE9es dans celui pass\xE9 en param\xE8tre.
+ */
+ private BCalque duplicateCalque(ZCalqueAffichageDonneesInterface _calque) {
+ ZModeleGeometryDefault model=new ZModeleGeometryDefault(null);
+ addGeoms(_calque.getSelectedObjectInTable(), ((ZModeleGeometry)_calque.modeleDonnees()).getGeomData(), model.getGeomData());
+ return new ZCalqueGeometry(model);
+ }
+
public boolean visit(final BCalque _cq) {
// Calque non trait\xE9 si invisible.
- if (bonlyVisible_ && !_cq.isVisible()) return true;
-
- if (!cqs_.contains(_cq) && _cq instanceof ZCalqueAffichageDonneesInterface
- && ((ZCalqueAffichageDonneesInterface) _cq).modeleDonnees() instanceof ZModeleGeometry) {
+ if (bonlyVisible_&&!_cq.isVisible())
+ return true;
+
+ if (!cqs_.contains(_cq)&&_cq instanceof ZCalqueAffichageDonneesInterface
+ &&((ZCalqueAffichageDonneesInterface)_cq).modeleDonnees() instanceof ZModeleGeometry) {
cqs_.add(_cq);
- final ZModeleGeometry geom = (ZModeleGeometry) ((ZCalqueAffichageDonneesInterface) _cq).modeleDonnees();
- if (geom.getGeomData().getDataStoreClass().equals(Point.class)) {
- pointCq_.add(_cq);
- } else if (LineString.class.isAssignableFrom(geom.getGeomData().getDataStoreClass())) {
- polyCq_.add(_cq);
- } else if (MultiPoint.class.isAssignableFrom(geom.getGeomData().getDataStoreClass())) {
- mlptsCq_.add(_cq);
+ ZCalqueAffichageDonneesInterface calque=(ZCalqueAffichageDonneesInterface)_cq;
+ final ZModeleGeometry geom=(ZModeleGeometry)calque.modeleDonnees();
+
+ if (onlySelectedGeometries_) {
+ if (!calque.isSelectionEmpty()) {
+ if (geom.getGeomData().getDataStoreClass().equals(Point.class)) {
+ ZModelePointEditable model=new ZModelePointEditable(new GISZoneCollectionPoint());
+ addGeoms(calque.getSelectedObjectInTable(), geom.getGeomData(), model.getGeomData());
+ pointCq_.add(new ZCalqueGeometry(model));
+ }
+ else if (LineString.class.isAssignableFrom(geom.getGeomData().getDataStoreClass())) {
+ ZModeleGeometryDefault model=new ZModeleGeometryDefault(new GISZoneCollectionLigneBrisee());
+ addGeoms(calque.getSelectedObjectInTable(), geom.getGeomData(), model.getGeomData());
+ polyCq_.add(new ZCalqueGeometry(model));
+ }
+ else if (MultiPoint.class.isAssignableFrom(geom.getGeomData().getDataStoreClass())) {
+ ZModeleGeometryDefault model=new ZModeleGeometryDefault(new GISZoneCollectionMultiPoint());
+ addGeoms(calque.getSelectedObjectInTable(), geom.getGeomData(), model.getGeomData());
+ mlptsCq_.add(new ZCalqueGeometry(model));
+ }
+ }
}
-
+ else {
+ if (geom.getGeomData().getDataStoreClass().equals(Point.class))
+ pointCq_.add(_cq);
+ else if (LineString.class.isAssignableFrom(geom.getGeomData().getDataStoreClass()))
+ polyCq_.add(_cq);
+ else if (MultiPoint.class.isAssignableFrom(geom.getGeomData().getDataStoreClass()))
+ mlptsCq_.add(_cq);
+ }
}
return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2009-03-16 14:47:57
|
Revision: 4548
http://fudaa.svn.sourceforge.net/fudaa/?rev=4548&view=rev
Author: bmarchan
Date: 2009-03-16 14:47:47 +0000 (Mon, 16 Mar 2009)
Log Message:
-----------
Exports casiers des calques selectionn?\195?\169s vers MAscaret.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/MdlCasierExportAction.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java
Added Paths:
-----------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasierExportPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasierExporter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasierExporterFilter.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/resource/exporter-casier.png
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/resource/new-casier.png
Removed Paths:
-------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasiersExportPanel.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/MdlCasierExporter.java
Copied: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasierExportPanel.java (from rev 4547, branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasiersExportPanel.java)
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasierExportPanel.java (rev 0)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasierExportPanel.java 2009-03-16 14:47:47 UTC (rev 4548)
@@ -0,0 +1,342 @@
+/*
+ * @creation 8 sept. 06
+ * @modification $Date: 2009-03-10 17:37:38 +0100 (mar., 10 mars 2009) $
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail de...@fu...
+ */
+package org.fudaa.fudaa.modeleur;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.io.File;
+
+import javax.swing.ButtonGroup;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTree;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.TreePath;
+
+import org.fudaa.ctulu.CtuluLib;
+import org.fudaa.ctulu.CtuluLibFile;
+import org.fudaa.ctulu.CtuluListSelection;
+import org.fudaa.ctulu.CtuluUI;
+import org.fudaa.ctulu.fileformat.FileFormatVersionInterface;
+import org.fudaa.ctulu.gis.GISAttributeConstants;
+import org.fudaa.ctulu.gis.GISAttributeInterface;
+import org.fudaa.ctulu.gis.GISDataModel;
+import org.fudaa.ctulu.gis.GISLib;
+import org.fudaa.ctulu.gis.GISZoneCollection;
+import org.fudaa.ctulu.gui.CtuluDialogPanel;
+import org.fudaa.ctulu.gui.CtuluFileChooserPanel;
+import org.fudaa.dodico.mascaret.io.MascaretCasierFileFormat;
+import org.fudaa.ebli.calque.BArbreCalqueModel;
+import org.fudaa.ebli.calque.CalqueGISTreeModel;
+import org.fudaa.ebli.calque.ZCalqueAffichageDonneesAbstract;
+import org.fudaa.ebli.calque.ZCalqueGeometry;
+import org.fudaa.ebli.calque.ZEbliCalquesPanel;
+import org.fudaa.ebli.calque.ZModeleGeometry;
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.ebli.calque.edition.ZModeleGeometryDefault;
+import org.fudaa.ebli.commun.EbliListeSelectionMulti;
+import org.fudaa.ebli.geometrie.GrBoite;
+import org.fudaa.ebli.trace.TraceIcon;
+import org.fudaa.ebli.trace.TraceIconModel;
+import org.fudaa.ebli.trace.TraceLigne;
+import org.fudaa.ebli.trace.TraceLigneModel;
+import org.fudaa.ebli.trace.TraceSurface;
+import org.fudaa.ebli.trace.TraceSurfaceModel;
+import org.fudaa.fudaa.commun.FudaaLib;
+import org.fudaa.fudaa.modeleur.resource.MdlResource;
+import org.fudaa.fudaa.sig.FSigLib;
+
+import com.memoire.bu.BuFileFilter;
+import com.memoire.bu.BuLabel;
+import com.memoire.bu.BuRadioButton;
+import com.memoire.bu.BuVerticalLayout;
+import com.sun.java_cup.internal.internal_error;
+import com.vividsolutions.jts.geom.Geometry;
+import com.vividsolutions.jts.geom.Polygon;
+
+/**
+ * Un panneau de saisie des g\xE9om\xE9tries altim\xE9triques pour l'export de casiers.
+ * @author Bertrand Marchand
+ * @version $Id$
+ */
+public class MdlCasierExportPanel extends CtuluDialogPanel {
+
+ private ZEbliCalquesPanel pn_;
+ private GrBoite initZoom_;
+ private JTree trLayers_;
+ private ZCalqueGeometry cqTmp_;
+ private GISZoneCollection support_;
+ private CtuluListSelection sel_=new CtuluListSelection();
+ private CtuluFileChooserPanel fileChooser_;
+ private CtuluUI ui_;
+ private FileFormatVersionInterface[] ffs_;
+ BuRadioButton rbAllLayers_;
+ BuRadioButton rbSelectedLayers_;
+ BuRadioButton rbVisibleLayers_;
+ protected BuRadioButton rbSelectedGeometries_;
+
+ public MdlCasierExportPanel(FileFormatVersionInterface[] _ffs, CtuluUI _ui, ZEbliCalquesPanel _pn, boolean _preselect) {
+ pn_=_pn;
+ ffs_=_ffs;
+ ui_=_ui;
+ setLayout(new BuVerticalLayout(5,true,true));
+
+ BuLabel lbTitle=new BuLabel(FSigLib.getS("S\xE9lectionnez les semis \xE0 int\xE9grer aux casiers"));
+ add(lbTitle);
+
+ CalqueGISTreeModel md=new CalqueGISTreeModel(null,_pn.getDonneesCalque());
+ md.setMask(GISLib.MASK_MULTIPOINT);
+ trLayers_=md.createView(true,true);
+
+ trLayers_.addTreeSelectionListener(new TreeSelectionListener() {
+ public void valueChanged(TreeSelectionEvent e) {
+ treeSelectionChanged(getSelectedGeomInTree(),true);
+ }
+ });
+ JScrollPane sp=new JScrollPane(trLayers_);
+ sp.setPreferredSize(new Dimension(300,200));
+ add(sp);
+
+ BuFileFilter[] filters=new BuFileFilter[_ffs.length];
+ for (int i=0; i<_ffs.length; i++) {
+ filters[i]=_ffs[i].getFileFormat().createFileFilter();
+ }
+
+ final String title=FSigLib.getS("Fichier d'exportation");
+ fileChooser_=new CtuluFileChooserPanel(title);
+ fileChooser_.setAllFileFilter(false);
+ fileChooser_.setWriteMode(true);
+ fileChooser_.setFilter(filters);
+
+ BuLabel lbFile=new BuLabel(title);
+ JPanel pnFile=new JPanel();
+ pnFile.setLayout(new BorderLayout(3, 3));
+ pnFile.add(lbFile, BorderLayout.WEST);
+ pnFile.add(fileChooser_, BorderLayout.CENTER);
+ add(pnFile);
+
+ rbAllLayers_=new BuRadioButton(FudaaLib.getS("Exporter les casiers de tous les calques"));
+ rbSelectedLayers_=new BuRadioButton(FudaaLib.getS("Exporter les casiers des calques s\xE9lectionn\xE9s (et leurs sous-calques)"));
+ rbVisibleLayers_=new BuRadioButton(FudaaLib.getS("Exporter les casiers des seuls calques visibles"));
+ rbSelectedGeometries_=new BuRadioButton(FudaaLib.getS("Exporter les casiers selectionn\xE9s"));
+ add(rbAllLayers_);
+ add(rbSelectedLayers_);
+ add(rbVisibleLayers_);
+ add(rbSelectedGeometries_);
+ ButtonGroup bgLayers=new ButtonGroup();
+ bgLayers.add(rbAllLayers_);
+ bgLayers.add(rbSelectedLayers_);
+ bgLayers.add(rbVisibleLayers_);
+ bgLayers.add(rbSelectedGeometries_);
+
+ rbAllLayers_.setSelected(true);
+ if (_preselect)
+ rbSelectedGeometries_.setSelected(true);
+ else
+ rbSelectedGeometries_.setEnabled(false);
+ }
+
+ /**
+ * Retourne les indexs s\xE9lectionn\xE9es de la scene.
+ * @return Les indexs sous la forme d'une liste.
+ */
+ private CtuluListSelection getSelectedGeomInTree() {
+ sel_.clear();
+
+ if (trLayers_.isSelectionEmpty()) {
+ return sel_;
+ }
+
+ ZScene scn=pn_.getScene();
+
+ TreePath[] selpaths=trLayers_.getSelectionPaths();
+ for (int i=0; i<selpaths.length; i++) {
+ final CalqueGISTreeModel.LayerNode node=(CalqueGISTreeModel.LayerNode)selpaths[i].getLastPathComponent();
+ final ZCalqueAffichageDonneesAbstract cq = (ZCalqueAffichageDonneesAbstract) node.getUserObject();
+ final int idx=node.getIdxGeom();
+
+ sel_.add(scn.layerId2SceneId(cq,idx));
+ }
+
+ return sel_;
+ }
+
+ /**
+ * R\xE9affichage de la fenetre 2D en cas de selection d'un objet.
+ * @param _geoms Les g\xE9om\xE9tries s\xE9lectionn\xE9es.
+ * @param _zoom True si le zoom doit se faire sur les g\xE9ometries s\xE9lectionn\xE9es.
+ */
+ private void treeSelectionChanged(final CtuluListSelection _sel, final boolean _zoom) {
+ if (pn_==null) {
+ return;
+ }
+ if (_sel == null || _sel.isEmpty()) {
+ if (cqTmp_ != null) {
+ cqTmp_.setVisible(false);
+ }
+ return;
+ }
+
+ ZModeleGeometryDefault mdl=new ZModeleGeometryDefault();
+ support_=mdl.getGeomData();
+ ZScene scn=pn_.getScene();
+
+ for (int i=_sel.getMinIndex(); i<=_sel.getMaxIndex(); i++) {
+ if (!_sel.isSelected(i)) continue;
+ support_.addGeometry((Geometry)scn.getObject(i), null, null);
+ }
+
+ // Ajout de l'enveloppe externe pour visualisation.
+ Geometry g=support_.convexHull();
+ if (g instanceof Polygon)
+ support_.addGeometry(((Polygon)g).getExteriorRing(), null, null);
+ else
+ support_.addGeometry(g, null, null);
+
+ if (cqTmp_ == null) {
+ initZoom_ = pn_.getVueCalque().getViewBoite();
+ cqTmp_ = new ZCalqueGeometry(mdl);
+ cqTmp_.setDestructible(true);
+ final TraceIconModel model = new TraceIconModel(TraceIcon.PLUS_DOUBLE, 4, Color.RED);
+ cqTmp_.setIconModel(0, model);
+ cqTmp_.setIconModel(1, model);
+ final TraceLigneModel ligne = new TraceLigneModel(TraceLigne.INVISIBLE, 2, Color.RED);
+ cqTmp_.setLineModel(0, ligne);
+ cqTmp_.setLineModel(1, ligne);
+ final TraceSurfaceModel surfMdl=new TraceSurfaceModel(TraceSurface.UNIFORME,new Color(255,50,0,40),null);
+ cqTmp_.setSurfaceModel(0,surfMdl);
+ pn_.getVueCalque().getCalque().enPremier(cqTmp_);
+ pn_.getCqInfos().enPremier();
+ }
+ cqTmp_.modele(mdl);
+ cqTmp_.setVisible(true);
+
+ if (_zoom) {
+ BArbreCalqueModel.actionCenter(cqTmp_, pn_);
+ }
+ }
+
+ @Override
+ public boolean valide() {
+ if (trLayers_.getSelectionCount()==0) {
+ setErrorText(MdlResource.getS("Vous devez s\xE9lectionner au moins 1 semis"));
+ return false;
+ }
+ if (isFileOK())
+ return true;
+ return false;
+ }
+ private boolean isFileOK() {
+ final File f=fileChooser_.getFile();
+ if (f==null) {
+ setErrorText(MdlResource.getS("Donnez un nom au fichier d'exportation"));
+ return false;
+ }
+
+ // Verification de l'extension
+ if (getFileFormat()==null) {
+ setErrorText(MdlResource.getS("Le fichier choisi a une extension inconnue"));
+ return false;
+ }
+
+ // Verification que le fichier n'existe pas.
+ if(f.exists()) {
+ if (ui_.question(CtuluLib.getS("Attention"), CtuluLib.getS("Le fichier {0} existe d\xE9j\xE0. Voulez-vous l'\xE9craser?",
+ CtuluLibFile.getSansExtension(f.getName()))))
+ f.delete();
+ else
+ return false;
+ }
+
+ if (CtuluLibFile.getExtension(CtuluLibFile.getSansExtension(f.getName()))!=null) {
+ setErrorText(CtuluLib.getS("Ne mettez pas plusieurs '.' dans le nom."));
+ return false;
+ }
+ setErrorText(null);
+ return true;
+ }
+
+ /**
+ * Retourne la selection. Elle peut \xEAtre vide.
+ */
+ public CtuluListSelection getSelection() {
+ return sel_;
+ }
+
+ /**
+ * L'export se fait-il sur tous les calques casiers.
+ */
+ public boolean isExportOnAllLayers() {
+ return rbAllLayers_.isSelected();
+ }
+
+ /**
+ * L'export se fait-il sur les calques casiers selectionn\xE9s uniquement.
+ */
+ public boolean isExportOnSelectedLayers() {
+ return rbSelectedLayers_.isSelected();
+ }
+
+ /**
+ * L'export se fait-il sur les calques casiers visibles uniquement.
+ */
+ public boolean isExportOnVisibleLayers() {
+ return rbVisibleLayers_.isSelected();
+ }
+
+ /**
+ * L'export se fait-il sur les casiers selectionn\xE9s uniquement.
+ */
+ public boolean isExportOnSelectedGeometries() {
+ return rbSelectedGeometries_.isSelected();
+ }
+
+ /**
+ * Fermeture du dialogue, et suppression du calque qui visualise les g\xE9om\xE9tries s\xE9lectionn\xE9es.
+ */
+ private void close() {
+ if (cqTmp_!=null) {
+ cqTmp_.detruire();
+ cqTmp_=null;
+ // Suppression de l'enveloppe externe.
+ support_.removeGeometries(new int[]{support_.getNbGeometries()-1}, null);
+ pn_.getVueCalque().getCalque().repaint();
+ }
+ pn_.getVueCalque().changeRepere(this, initZoom_);
+ }
+
+ @Override
+ public void cancel() {
+ close();
+ super.cancel();
+ }
+
+ @Override
+ public boolean ok() {
+ close();
+ return super.ok();
+ }
+
+ public File getFile() {
+ return fileChooser_.getFile();
+ }
+
+ public FileFormatVersionInterface getFileFormat() {
+ File file=getFile();
+ FileFormatVersionInterface ff=null;
+ for (int i=0; i<ffs_.length; i++) {
+ if (ffs_[i].getFileFormat().createFileFilter().accept(file)) {
+ ff=ffs_[i];
+ break;
+ }
+ }
+ return ff;
+ }
+}
\ No newline at end of file
Copied: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasierExporter.java (from rev 4547, branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/MdlCasierExporter.java)
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasierExporter.java (rev 0)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasierExporter.java 2009-03-16 14:47:47 UTC (rev 4548)
@@ -0,0 +1,158 @@
+/*
+ * @creation 11 mars 2009
+ * @modification $Date:$
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2009 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail fud...@li...
+ */
+package org.fudaa.fudaa.modeleur;
+
+import gnu.trove.TIntArrayList;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.fudaa.ctulu.CtuluAnalyze;
+import org.fudaa.ctulu.CtuluIOOperationSynthese;
+import org.fudaa.ctulu.CtuluListSelection;
+import org.fudaa.ctulu.fileformat.FileFormatVersionInterface;
+import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
+import org.fudaa.ctulu.gis.GISAttributeConstants;
+import org.fudaa.ctulu.gis.GISAttributeInterface;
+import org.fudaa.ctulu.gis.GISDataModel;
+import org.fudaa.ctulu.gis.GISDataModelFilterAdapter;
+import org.fudaa.ctulu.gis.GISGeometryFactory;
+import org.fudaa.ctulu.gis.GISLib;
+import org.fudaa.ctulu.gis.GISMultiPoint;
+import org.fudaa.ctulu.gis.GISPolygone;
+import org.fudaa.ctulu.gis.GISZoneCollectionMultiPoint;
+import org.fudaa.dodico.commun.DodicoLib;
+import org.fudaa.dodico.mascaret.io.MascaretCasierFileFormat;
+import org.fudaa.ebli.calque.ZScene;
+import org.fudaa.fudaa.modeleur.resource.MdlResource;
+
+import com.vividsolutions.jts.algorithm.PointInRing;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.CoordinateSequence;
+
+/**
+ * @author Bertrand Marchand
+ * @version $Id$
+ */
+public abstract class MdlCasierExporter {
+
+ public abstract CtuluIOOperationSynthese export(File _f, ZScene _scn, GISDataModel _mdCasiers, CtuluListSelection _selSemis);
+
+ public abstract FileFormatVersionInterface getFileFormat();
+
+ public static class Mascaret extends MdlCasierExporter {
+
+ public CtuluIOOperationSynthese export(File _f, ZScene _scn, GISDataModel _mdCasiers, CtuluListSelection _selSemis) {
+ GISDataModel mdCasiers=_mdCasiers;
+
+ CtuluAnalyze ana=new CtuluAnalyze();
+
+ if (mdCasiers!=null&&mdCasiers.getNumGeometries()!=0) {
+ int nbCasiers=mdCasiers.getNumGeometries();
+ TIntArrayList idxConserves=new TIntArrayList();
+ GISZoneCollectionMultiPoint mdSemis=buildSemis(_scn, mdCasiers, idxConserves, _selSemis, ana);
+ if (mdSemis.getNumGeometries()!=0) {
+ // On ne conserve du mod\xE8le que les indexs conserv\xE9s.
+ if (idxConserves.size()!=nbCasiers) {
+ mdCasiers=new GISDataModelFilterAdapter(mdCasiers, null, idxConserves.toNativeArray());
+ }
+
+ FileWriteOperationAbstract writer=getFileFormat().createWriter();
+ CtuluAnalyze ana2=writer.write(new GISDataModel[]{mdCasiers, mdSemis}, _f, null).getAnalyze();
+ ana.merge(ana2);
+ }
+
+ if (!ana.containsErrors()&&!ana.containsFatalError()) {
+ if (nbCasiers>mdSemis.getNumGeometries()) {
+ ana.addWarn(DodicoLib.getS("{0} casiers sur {1} ont \xE9t\xE9 export\xE9s", ""+mdSemis.getNumGeometries(), ""+nbCasiers), -1);
+ }
+ else {
+ ana.addInfo(DodicoLib.getS("{0} casiers sur {1} ont \xE9t\xE9 export\xE9s", ""+mdSemis.getNumGeometries(), ""+nbCasiers), -1);
+ }
+ }
+ }
+ else {
+ ana.addWarn(DodicoLib.getS("Aucun casiers \xE0 exporter"), -1);
+ }
+
+ CtuluIOOperationSynthese synt=new CtuluIOOperationSynthese();
+ synt.setAnalyze(ana);
+ return synt;
+ }
+
+ public FileFormatVersionInterface getFileFormat() {
+ return MascaretCasierFileFormat.getInstance();
+ }
+ }
+
+
+ /**
+ * Construit les semis internes aux casiers. En fait, on recr\xE9e des semis pour chaque contour de casier.
+ * Les casiers sans semis interne ou non conformes sont supprim\xE9s du mod\xE8le.
+ *
+ * @param _scn La scene.
+ * @param _mdCasiers Le modele des casiers.
+ * @param _idxConserves Les index casiers conserv\xE9s. (Parametre de retour)
+ * @param _selSemis La selection des semis.
+ * @return Les semis.
+ */
+ protected GISZoneCollectionMultiPoint buildSemis(ZScene _scn,
+ GISDataModel _mdCasiers, TIntArrayList _idxConserves, CtuluListSelection _selSemis, CtuluAnalyze _ana) {
+
+ GISZoneCollectionMultiPoint zsemis=new GISZoneCollectionMultiPoint();
+ zsemis.setAttributes(new GISAttributeInterface[]{GISAttributeConstants.BATHY},null);
+ zsemis.setAttributeIsZ(GISAttributeConstants.BATHY);
+
+ List<Coordinate> coords=new ArrayList<Coordinate>();
+
+ for (int idxgeom=0; idxgeom<_mdCasiers.getNumGeometries(); idxgeom++) {
+ int iattr=_mdCasiers.getIndiceOf(GISAttributeConstants.TITRE);
+ String name="";
+ if (iattr!=-1)
+ name=(String)_mdCasiers.getValue(iattr,idxgeom);
+
+ coords.clear();
+ GISPolygone geom=(GISPolygone)_mdCasiers.getGeometry(idxgeom);
+
+ // On controle que le casier est conforme.
+ if (geom.getCoordinateSequence().size()<5) {
+ _ana.addWarn(DodicoLib.getS("Casier '{0}' : Le contour n'est pas conforme",name), 0);
+ continue;
+ }
+
+ // On teste que le contour contient bien au moins 1 point.
+ PointInRing pir=GISLib.createPolygoneTester(geom);
+
+ for (int j=_selSemis.getMinIndex(); j<=_selSemis.getMaxIndex(); j++) {
+ if (!_selSemis.isSelected(j)) continue;
+
+ GISMultiPoint semis=(GISMultiPoint)_scn.getObject(j);
+ CoordinateSequence seq=semis.getCoordinateSequence();
+ for (int k=0; k<seq.size(); k++) {
+ Coordinate c=seq.getCoordinate(k);
+ if (GISLib.isIn(c, geom, pir, 0))
+ coords.add(c);
+ }
+ }
+
+ // Le casier ne poss\xE8de aucun point interne => On le retire des casiers a exporter.
+ if (coords.size()==0) {
+ _ana.addWarn(MdlResource.getS("Casier '{0}' : Aucun point des semis s\xE9lectionn\xE9s ne se trouve \xE0 l'int\xE9rieur",name), -1);
+ continue;
+ }
+ _idxConserves.add(idxgeom);
+
+ // Recup\xE9ration des points, et cr\xE9ation d'un semis.
+ GISMultiPoint semis=GISGeometryFactory.INSTANCE.createMultiPoint(coords.toArray(new Coordinate[0]));
+ zsemis.addGeometry(semis,null,null);
+ }
+
+ return zsemis;
+ }
+}
Added: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasierExporterFilter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasierExporterFilter.java (rev 0)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasierExporterFilter.java 2009-03-16 14:47:47 UTC (rev 4548)
@@ -0,0 +1,116 @@
+/*
+ * @creation 16 mars 2009
+ * @modification $Date:$
+ * @license GNU General Public License 2
+ * @copyright (c)1998-2009 CETMEF 2 bd Gambetta F-60231 Compiegne
+ * @mail fud...@li...
+ */
+package org.fudaa.fudaa.modeleur;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.fudaa.ctulu.gis.GISDataModel;
+import org.fudaa.ctulu.gis.GISDataModelFilterAdapter;
+import org.fudaa.ctulu.gis.GISDataModelMultiAdapter;
+import org.fudaa.ebli.calque.BArbreCalqueModel;
+import org.fudaa.ebli.calque.BCalque;
+import org.fudaa.ebli.calque.BCalqueVisitor;
+import org.fudaa.fudaa.modeleur.layer.MdlLayer2dCasier;
+
+/**
+ * Un filtre qui retourne un modele de donn\xE9es pour des calques/g\xE9om\xE9tries selectionn\xE9es
+ * de l'arbre des calques.
+ *
+ * @author Bertrand Marchand
+ * @version $Id:$
+ */
+public class MdlCasierExporterFilter implements BCalqueVisitor {
+
+ boolean isOnlyOnSelectedLayers_;
+ boolean isOnlyOnVisibleLayers_;
+ boolean isOnlyOnSelectedGeometries_;
+ BArbreCalqueModel mdTree_;
+ List<GISDataModel> zones=new ArrayList<GISDataModel>();
+
+
+ public MdlCasierExporterFilter(BArbreCalqueModel _mdTree) {
+ mdTree_=_mdTree;
+ }
+
+ public boolean visit(BCalque _cq) {
+ if (_cq instanceof MdlLayer2dCasier) {
+ MdlLayer2dCasier cq=(MdlLayer2dCasier)_cq;
+ GISDataModel md;
+
+ // Si pas visible on passe.
+ if (isOnlyOnVisibleLayers_ && !_cq.isVisible())
+ return true;
+ // Si pas de g\xE9om\xE9tries on passe.
+ if (cq.modeleDonnees().getNombre()==0)
+ return true;
+
+ md=cq.modeleDonnees().getGeomData();
+
+ if (isOnlyOnSelectedGeometries_) {
+ // Si pas de g\xE9om\xE9tries selectionn\xE9es on passe.
+ if (cq.isSelectionEmpty())
+ return true;
+
+ // Si des g\xE9om\xE9tries s\xE9lectionn\xE9es, on trie.
+ if (cq.getNbSelected()!=cq.modeleDonnees().getNombre()) {
+ int[] sel=cq.getSelectedIndex();
+ md=new GISDataModelFilterAdapter(md,null,sel);
+ }
+ }
+ zones.add(md);
+ }
+ return true;
+ }
+
+ /**
+ * Lance le traitement et retourne le modele de data en cons\xE9quence. Peut \xEAtre null si
+ * aucune donn\xE9e r\xE9cup\xE9r\xE9e apr\xE8s filtre.
+ */
+ public GISDataModel filter() {
+ zones.clear();
+
+ if (isOnlyOnSelectedLayers_) {
+ final BCalque[] parent=mdTree_.getSelection();
+ if (parent!=null)
+ for (int i=0; i<parent.length; i++)
+ parent[i].apply(this);
+ }
+ else {
+ mdTree_.getRootCalque().apply(this);
+ }
+
+ if (zones.size()==0)
+ return null;
+ else
+ return new GISDataModelMultiAdapter(zones.toArray(new GISDataModel[0]));
+ }
+
+ /**
+ * Le traitement ne s'applique qu'aux seuls calques s\xE9l\xE9ectionn\xE9s.
+ * @param _b True : Uniquement les calques visibles sont consid\xE9r\xE9s.
+ */
+ public void setTreatmentOnlyOnSelectedLayers(boolean _b) {
+ isOnlyOnSelectedLayers_=_b;
+ }
+
+ /**
+ * Le traitement ne s'applique qu'aux seuls calques visibles.
+ * @param _b True : Uniquement les calques visibles sont consid\xE9r\xE9s.
+ */
+ public void setTreatmentOnlyOnVisibleLayers(boolean _b) {
+ isOnlyOnVisibleLayers_=_b;
+ }
+
+ /**
+ * Le traitement s'applique uniquement aux g\xE9om\xE9tries selectionn\xE9es.
+ */
+ public void setTreatmentOnlySelectedGeometries(boolean _b) {
+ isOnlyOnSelectedGeometries_=_b;
+ }
+}
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasierExporterFilter.java
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Deleted: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasiersExportPanel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasiersExportPanel.java 2009-03-16 09:42:56 UTC (rev 4547)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlCasiersExportPanel.java 2009-03-16 14:47:47 UTC (rev 4548)
@@ -1,298 +0,0 @@
-/*
- * @creation 8 sept. 06
- * @modification $Date: 2009-03-10 17:37:38 +0100 (mar., 10 mars 2009) $
- * @license GNU General Public License 2
- * @copyright (c)1998-2001 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail de...@fu...
- */
-package org.fudaa.fudaa.modeleur;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.io.File;
-
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTree;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
-import javax.swing.tree.TreePath;
-
-import org.fudaa.ctulu.CtuluLib;
-import org.fudaa.ctulu.CtuluLibFile;
-import org.fudaa.ctulu.CtuluListSelection;
-import org.fudaa.ctulu.CtuluUI;
-import org.fudaa.ctulu.fileformat.FileFormatVersionInterface;
-import org.fudaa.ctulu.gis.GISAttributeConstants;
-import org.fudaa.ctulu.gis.GISAttributeInterface;
-import org.fudaa.ctulu.gis.GISDataModel;
-import org.fudaa.ctulu.gis.GISLib;
-import org.fudaa.ctulu.gis.GISZoneCollection;
-import org.fudaa.ctulu.gui.CtuluDialogPanel;
-import org.fudaa.ctulu.gui.CtuluFileChooserPanel;
-import org.fudaa.dodico.mascaret.io.MascaretCasierFileFormat;
-import org.fudaa.ebli.calque.BArbreCalqueModel;
-import org.fudaa.ebli.calque.CalqueGISTreeModel;
-import org.fudaa.ebli.calque.ZCalqueAffichageDonneesAbstract;
-import org.fudaa.ebli.calque.ZCalqueGeometry;
-import org.fudaa.ebli.calque.ZEbliCalquesPanel;
-import org.fudaa.ebli.calque.ZModeleGeometry;
-import org.fudaa.ebli.calque.ZScene;
-import org.fudaa.ebli.calque.edition.ZModeleGeometryDefault;
-import org.fudaa.ebli.commun.EbliListeSelectionMulti;
-import org.fudaa.ebli.geometrie.GrBoite;
-import org.fudaa.ebli.trace.TraceIcon;
-import org.fudaa.ebli.trace.TraceIconModel;
-import org.fudaa.ebli.trace.TraceLigne;
-import org.fudaa.ebli.trace.TraceLigneModel;
-import org.fudaa.ebli.trace.TraceSurface;
-import org.fudaa.ebli.trace.TraceSurfaceModel;
-import org.fudaa.fudaa.modeleur.resource.MdlResource;
-import org.fudaa.fudaa.sig.FSigLib;
-
-import com.memoire.bu.BuFileFilter;
-import com.memoire.bu.BuLabel;
-import com.memoire.bu.BuVerticalLayout;
-import com.sun.java_cup.internal.internal_error;
-import com.vividsolutions.jts.geom.Geometry;
-import com.vividsolutions.jts.geom.Polygon;
-
-/**
- * Un panneau de saisie des g\xE9om\xE9tries altim\xE9triques pour l'export de casiers.
- * @author Bertrand Marchand
- * @version $Id$
- */
-public class MdlCasiersExportPanel extends CtuluDialogPanel {
-
- private ZEbliCalquesPanel pn_;
- private GrBoite initZoom_;
- private JTree trLayers_;
- private ZCalqueGeometry cqTmp_;
- private GISZoneCollection support_;
- private CtuluListSelection sel_=new CtuluListSelection();
- private CtuluFileChooserPanel fileChooser_;
- private CtuluUI ui_;
- private FileFormatVersionInterface[] ffs_;
-
- public MdlCasiersExportPanel(FileFormatVersionInterface[] _ffs, CtuluUI _ui, ZEbliCalquesPanel _pn) {
- pn_=_pn;
- ffs_=_ffs;
- ui_=_ui;
- setLayout(new BuVerticalLayout(5,true,true));
-
- BuLabel lbTitle=new BuLabel(FSigLib.getS("S\xE9lectionnez les semis \xE0 int\xE9grer aux casiers"));
- add(lbTitle);
-
- CalqueGISTreeModel md=new CalqueGISTreeModel(null,_pn.getDonneesCalque());
- md.setMask(GISLib.MASK_MULTIPOINT);
- trLayers_=md.createView(true,true);
-
- trLayers_.addTreeSelectionListener(new TreeSelectionListener() {
- public void valueChanged(TreeSelectionEvent e) {
- treeSelectionChanged(getSelectedGeomInTree(),true);
- }
- });
- JScrollPane sp=new JScrollPane(trLayers_);
- sp.setPreferredSize(new Dimension(300,200));
- add(sp);
-
- BuFileFilter[] filters=new BuFileFilter[_ffs.length];
- for (int i=0; i<_ffs.length; i++) {
- filters[i]=_ffs[i].getFileFormat().createFileFilter();
- }
-
- final String title=FSigLib.getS("Fichier d'exportation");
- fileChooser_=new CtuluFileChooserPanel(title);
- fileChooser_.setAllFileFilter(false);
- fileChooser_.setWriteMode(true);
- fileChooser_.setFilter(filters);
-
- BuLabel lbFile=new BuLabel(title);
- JPanel pnFile=new JPanel();
- pnFile.setLayout(new BorderLayout(3, 3));
- pnFile.add(lbFile, BorderLayout.WEST);
- pnFile.add(fileChooser_, BorderLayout.CENTER);
- add(pnFile);
- }
-
- /**
- * Retourne les indexs s\xE9lectionn\xE9es de la scene.
- * @return Les indexs sous la forme d'une liste.
- */
- private CtuluListSelection getSelectedGeomInTree() {
- sel_.clear();
-
- if (trLayers_.isSelectionEmpty()) {
- return sel_;
- }
-
- ZScene scn=pn_.getScene();
-
- TreePath[] selpaths=trLayers_.getSelectionPaths();
- for (int i=0; i<selpaths.length; i++) {
- final CalqueGISTreeModel.LayerNode node=(CalqueGISTreeModel.LayerNode)selpaths[i].getLastPathComponent();
- final ZCalqueAffichageDonneesAbstract cq = (ZCalqueAffichageDonneesAbstract) node.getUserObject();
- final int idx=node.getIdxGeom();
-
- sel_.add(scn.layerId2SceneId(cq,idx));
- }
-
- return sel_;
- }
-
- /**
- * R\xE9affichage de la fenetre 2D en cas de selection d'un objet.
- * @param _geoms Les g\xE9om\xE9tries s\xE9lectionn\xE9es.
- * @param _zoom True si le zoom doit se faire sur les g\xE9ometries s\xE9lectionn\xE9es.
- */
- private void treeSelectionChanged(final CtuluListSelection _sel, final boolean _zoom) {
- if (pn_==null) {
- return;
- }
- if (_sel == null || _sel.isEmpty()) {
- if (cqTmp_ != null) {
- cqTmp_.setVisible(false);
- }
- return;
- }
-
- ZModeleGeometryDefault mdl=new ZModeleGeometryDefault();
- support_=mdl.getGeomData();
- ZScene scn=pn_.getScene();
-
- for (int i=_sel.getMinIndex(); i<=_sel.getMaxIndex(); i++) {
- if (!_sel.isSelected(i)) continue;
- support_.addGeometry((Geometry)scn.getObject(i), null, null);
- }
-
- // Ajout de l'enveloppe externe pour visualisation.
- Geometry g=support_.convexHull();
- if (g instanceof Polygon)
- support_.addGeometry(((Polygon)g).getExteriorRing(), null, null);
- else
- support_.addGeometry(g, null, null);
-
- if (cqTmp_ == null) {
- initZoom_ = pn_.getVueCalque().getViewBoite();
- cqTmp_ = new ZCalqueGeometry(mdl);
- cqTmp_.setDestructible(true);
- final TraceIconModel model = new TraceIconModel(TraceIcon.PLUS_DOUBLE, 4, Color.RED);
- cqTmp_.setIconModel(0, model);
- cqTmp_.setIconModel(1, model);
- final TraceLigneModel ligne = new TraceLigneModel(TraceLigne.INVISIBLE, 2, Color.RED);
- cqTmp_.setLineModel(0, ligne);
- cqTmp_.setLineModel(1, ligne);
- final TraceSurfaceModel surfMdl=new TraceSurfaceModel(TraceSurface.UNIFORME,new Color(255,50,0,40),null);
- cqTmp_.setSurfaceModel(0,surfMdl);
- pn_.getVueCalque().getCalque().enPremier(cqTmp_);
- pn_.getCqInfos().enPremier();
- }
- cqTmp_.modele(mdl);
- cqTmp_.setVisible(true);
-
- if (_zoom) {
- BArbreCalqueModel.actionCenter(cqTmp_, pn_);
- }
- }
-
- @Override
- public boolean valide() {
- if (trLayers_.getSelectionCount()==0) {
- setErrorText(MdlResource.getS("Vous devez s\xE9lectionner au moins 1 semis"));
- return false;
- }
- if (isFileOK())
- return true;
- return false;
- }
- private boolean isFileOK() {
- final File f=fileChooser_.getFile();
- if (f==null) {
- setErrorText(MdlResource.getS("Donnez un nom au fichier d'exportation"));
- return false;
- }
-
- // Verification de l'extension
- if (getFileFormat()==null) {
- setErrorText(MdlResource.getS("Le fichier choisi a une extension inconnue"));
- return false;
- }
-
- // Verification que le fichier n'existe pas.
- if(f.exists()) {
- if (ui_.question(CtuluLib.getS("Attention"), CtuluLib.getS("Le fichier {0} existe d\xE9j\xE0. Voulez-vous l'\xE9craser?",
- CtuluLibFile.getSansExtension(f.getName()))))
- f.delete();
- else
- return false;
- }
-
- if (CtuluLibFile.getExtension(CtuluLibFile.getSansExtension(f.getName()))!=null) {
- setErrorText(CtuluLib.getS("Ne mettez pas plusieurs '.' dans le nom."));
- return false;
- }
- setErrorText(null);
- return true;
- }
-
- /**
- * Retourne la selection. Elle peut \xEAtre vide.
- */
- public CtuluListSelection getSelection() {
- return sel_;
- }
-
- /**
- * Retourne le modele des g\xE9om\xE9tries supports (les g\xE9om\xE9tries s\xE9l\xE9ectionn\xE9es dans l'arbre).
- * @return Le mod\xE8le.
- */
-// public GISDataModel getSupportCollection() {
-// support_.setAttributes(new GISAttributeInterface[]{GISAttributeConstants.BATHY}, null);
-// support_.setAttributeIsZ(GISAttributeConstants.BATHY);
-// support_.postImport(0);
-// return support_;
-// }
-
- /**
- * Fermeture du dialogue, et suppression du calque qui visualise les g\xE9om\xE9tries s\xE9lectionn\xE9es.
- */
- private void close() {
- if (cqTmp_!=null) {
- cqTmp_.detruire();
- cqTmp_=null;
- // Suppression de l'enveloppe externe.
- support_.removeGeometries(new int[]{support_.getNbGeometries()-1}, null);
- pn_.getVueCalque().getCalque().repaint();
- }
- pn_.getVueCalque().changeRepere(this, initZoom_);
- }
-
- @Override
- public void cancel() {
- close();
- super.cancel();
- }
-
- @Override
- public boolean ok() {
- close();
- return super.ok();
- }
-
- public File getFile() {
- return fileChooser_.getFile();
- }
-
- public FileFormatVersionInterface getFileFormat() {
- File file=getFile();
- FileFormatVersionInterface ff=null;
- for (int i=0; i<ffs_.length; i++) {
- if (ffs_[i].getFileFormat().createFileFilter().accept(file)) {
- ff=ffs_[i];
- break;
- }
- }
- return ff;
- }
-}
\ No newline at end of file
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java 2009-03-16 09:42:56 UTC (rev 4547)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlVisuPanel.java 2009-03-16 14:47:47 UTC (rev 4548)
@@ -8,11 +8,14 @@
package org.fudaa.fudaa.modeleur;
import java.awt.event.ActionEvent;
+import java.util.List;
import javax.swing.Action;
import org.fudaa.ebli.calque.BGroupeCalque;
+import org.fudaa.ebli.calque.ZEbliCalquePanelController;
import org.fudaa.ebli.calque.ZSelectionEvent;
+import org.fudaa.ebli.calque.action.EbliCalqueActionVariableChooser;
import org.fudaa.ebli.calque.action.SceneShowOrientationAction;
import org.fudaa.ebli.commun.EbliActionInterface;
import org.fudaa.ebli.commun.EbliActionMap;
@@ -81,6 +84,11 @@
mng_=editor.getMng();
return editor;
}
+
+ protected void initButtonGroupSpecific(final List<EbliActionInterface> _l, final ZEbliCalquePanelController _res) {
+ super.initButtonGroupSpecific(_l, _res);
+ _l.add(new MdlCasierExportAction((MdlEditionManager)gisEditor_));
+ }
protected BuMenu[] createSpecificMenus(final String _title) {
BuMenu[] ret=new BuMenu[3];
@@ -99,7 +107,6 @@
EbliActionInterface[] actions=super.getActionsInterface();
EbliActionInterface[] allActions=new EbliActionInterface[actions.length+4];
allActions[0]=null;
- allActions[1]=new MdlCasierExportAction((MdlEditionManager)gisEditor_);
allActions[2]=new SceneShowOrientationAction(gisEditor_.getPanel().getArbreCalqueModel());
allActions[3]=new SceneShowLabelAction(gisEditor_.getPanel().getArbreCalqueModel());
for(int i=0;i<actions.length;i++)
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/MdlCasierExportAction.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/MdlCasierExportAction.java 2009-03-16 09:42:56 UTC (rev 4547)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/MdlCasierExportAction.java 2009-03-16 14:47:47 UTC (rev 4548)
@@ -15,6 +15,7 @@
import org.fudaa.ctulu.CtuluLib;
import org.fudaa.ctulu.fileformat.FileFormatVersionInterface;
import org.fudaa.ctulu.gis.GISAttributeConstants;
+import org.fudaa.ctulu.gis.GISDataModel;
import org.fudaa.ctulu.gis.GISZoneCollection;
import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
import org.fudaa.ebli.calque.ZCalqueGeometry;
@@ -24,8 +25,11 @@
import org.fudaa.ebli.calque.ZSelectionListener;
import org.fudaa.ebli.commun.EbliActionSimple;
import org.fudaa.fudaa.commun.FudaaLib;
-import org.fudaa.fudaa.modeleur.MdlCasiersExportPanel;
+import org.fudaa.fudaa.modeleur.MdlCasierExporter;
+import org.fudaa.fudaa.modeleur.MdlCasierExporterFilter;
+import org.fudaa.fudaa.modeleur.MdlCasierExportPanel;
import org.fudaa.fudaa.modeleur.MdlEditionManager;
+import org.fudaa.fudaa.modeleur.resource.MdlResource;
import org.fudaa.fudaa.ressource.FudaaResource;
@@ -33,15 +37,13 @@
* Une action pour exporter des casiers.
* @author Bertrand Marchand
*/
-public class MdlCasierExportAction extends EbliActionSimple implements ZSelectionListener {
+public class MdlCasierExportAction extends EbliActionSimple {
MdlEditionManager editor_;
public MdlCasierExportAction(MdlEditionManager _editor) {
- super(FudaaResource.FUDAA.getString("Exporter les casiers"), null, "EXPORT_CASIER");
- setDefaultToolTip(FudaaResource.FUDAA.getString("Exporte les casiers s\xE9lectionn\xE9s"));
- setEnabled(false);
+ super(FudaaResource.FUDAA.getString("Exporter les casiers..."), MdlResource.MDL.getIcon("exporter-casier"), "EXPORT_CASIER");
+ setDefaultToolTip(FudaaResource.FUDAA.getString("Exporte les casiers de la vue 2D"));
editor_=_editor;
- editor_.getSupport().addSelectionListener(this);
}
public void actionPerformed(final ActionEvent _e) {
@@ -52,27 +54,30 @@
FileFormatVersionInterface[] ffs=ff2Exporter.keySet().toArray(new FileFormatVersionInterface[0]);
- MdlCasiersExportPanel pn=new MdlCasiersExportPanel(ffs,editor_.getUi(),editor_.getPanel());
+ ZScene scn=editor_.getSupport();
+ boolean bpreselect=
+ !scn.isAtomicMode() &&
+ !scn.isSelectionEmpty() &&
+ containsOnlyCasiers();
+
+ MdlCasierExportPanel pn=new MdlCasierExportPanel(ffs,editor_.getUi(),editor_.getPanel(),bpreselect);
if (pn.afficheModaleOk(editor_.getFrame(), FudaaLib.getS("Export de casiers"))) {
- ZScene scn=editor_.getSupport();
+
+ // R\xE9cup\xE9ration du modele des casiers a exporter.
+ MdlCasierExporterFilter flt=new MdlCasierExporterFilter(editor_.getPanel().getArbreCalqueModel());
+ flt.setTreatmentOnlySelectedGeometries(pn.isExportOnSelectedGeometries());
+ flt.setTreatmentOnlyOnVisibleLayers(pn.isExportOnVisibleLayers());
+ flt.setTreatmentOnlyOnSelectedLayers(pn.isExportOnSelectedLayers());
+ GISDataModel mdCasiers=flt.filter();
+
File f=pn.getFile();
exporter=ff2Exporter.get(pn.getFileFormat());
- CtuluIOOperationSynthese synt=exporter.export(f,scn,scn.getLayerSelection(),pn.getSelection());
+ CtuluIOOperationSynthese synt=exporter.export(f,scn,mdCasiers,pn.getSelection());
editor_.getUi().manageErrorOperationAndIsFatal(synt);
}
}
- public void updateForSelectionChanged() {
- ZScene scn=editor_.getSupport();
-
- // Si la selection est en mode global et que seuls des casiers sont selectionn\xE9s.
- setEnabled(
- !scn.isAtomicMode() &&
- !scn.isSelectionEmpty() &&
- containsOnlyCasiers());
- }
-
public String getEnableCondition() {
return CtuluLib.getS("S\xE9lectionner des casiers.");
}
@@ -95,11 +100,4 @@
}
return true;
}
-
- /* (non-Javadoc)
- * @see org.fudaa.ebli.calque.ZSelectionListener#selectionChanged(org.fudaa.ebli.calque.ZSelectionEvent)
- */
- public void selectionChanged(ZSelectionEvent _evt) {
- updateForSelectionChanged();
- }
}
Deleted: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/MdlCasierExporter.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/MdlCasierExporter.java 2009-03-16 09:42:56 UTC (rev 4547)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/action/MdlCasierExporter.java 2009-03-16 14:47:47 UTC (rev 4548)
@@ -1,201 +0,0 @@
-/*
- * @creation 11 mars 2009
- * @modification $Date:$
- * @license GNU General Public License 2
- * @copyright (c)1998-2009 CETMEF 2 bd Gambetta F-60231 Compiegne
- * @mail fud...@li...
- */
-package org.fudaa.fudaa.modeleur.action;
-
-import gnu.trove.TIntArrayList;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-
-import org.fudaa.ctulu.CtuluAnalyze;
-import org.fudaa.ctulu.CtuluIOOperationSynthese;
-import org.fudaa.ctulu.CtuluListSelection;
-import org.fudaa.ctulu.CtuluListSelectionInterface;
-import org.fudaa.ctulu.fileformat.FileFormatVersionInterface;
-import org.fudaa.ctulu.fileformat.FileWriteOperationAbstract;
-import org.fudaa.ctulu.gis.GISAttributeConstants;
-import org.fudaa.ctulu.gis.GISAttributeInterface;
-import org.fudaa.ctulu.gis.GISDataModel;
-import org.fudaa.ctulu.gis.GISDataModelFilterAdapter;
-import org.fudaa.ctulu.gis.GISDataModelMultiAdapter;
-import org.fudaa.ctulu.gis.GISGeometryFactory;
-import org.fudaa.ctulu.gis.GISLib;
-import org.fudaa.ctulu.gis.GISMultiPoint;
-import org.fudaa.ctulu.gis.GISPolygone;
-import org.fudaa.ctulu.gis.GISZoneCollection;
-import org.fudaa.ctulu.gis.GISZoneCollectionMultiPoint;
-import org.fudaa.dodico.commun.DodicoLib;
-import org.fudaa.dodico.mascaret.io.MascaretCasierFileFormat;
-import org.fudaa.ebli.calque.ZCalqueAffichageDonneesInterface;
-import org.fudaa.ebli.calque.ZCalqueGeometry;
-import org.fudaa.ebli.calque.ZModeleGeometry;
-import org.fudaa.ebli.calque.ZScene;
-import org.fudaa.fudaa.modeleur.resource.MdlResource;
-
-import com.vividsolutions.jts.algorithm.PointInRing;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.CoordinateSequence;
-import com.vividsolutions.jts.geom.Geometry;
-
-/**
- * @author Bertrand Marchand
- * @version $Id:$
- */
-public abstract class MdlCasierExporter {
-
- public abstract CtuluIOOperationSynthese export(File _f, ZScene _scn, CtuluListSelectionInterface _selCasiers, CtuluListSelection _selSemis);
-
- public abstract FileFormatVersionInterface getFileFormat();
-
- static class Mascaret extends MdlCasierExporter {
-
- public CtuluIOOperationSynthese export(File _f, ZScene _scn, CtuluListSelectionInterface _selCasiers, CtuluListSelection _selSemis) {
- CtuluListSelection selCasiers=new CtuluListSelection(_selCasiers);
- CtuluAnalyze ana=new CtuluAnalyze();
-
- int nbCasiers=_selCasiers.getNbSelectedIndex();
- GISZoneCollectionMultiPoint mdSemis=buildSemis(_scn, selCasiers, _selSemis, ana);
- if (mdSemis.getNumGeometries()!=0) {
- GISDataModel mdCasiers=getCasiersDataModel(_scn, selCasiers);
-
- FileWriteOperationAbstract writer=getFileFormat().createWriter();
- CtuluAnalyze ana2=writer.write(new GISDataModel[]{mdCasiers,mdSemis}, _f, null).getAnalyze();
- ana.merge(ana2);
- }
-
- if (!ana.containsErrors()&&!ana.containsFatalError()) {
- if (nbCasiers>mdSemis.getNumGeometries()) {
- ana.addWarn(DodicoLib.getS("{0} casiers sur {1} ont \xE9t\xE9 export\xE9s", ""+mdSemis.getNumGeometries(), ""+nbCasiers), -1);
- }
- else {
- ana.addInfo(DodicoLib.getS("{0} casiers sur {1} ont \xE9t\xE9 export\xE9s", ""+mdSemis.getNumGeometries(), ""+nbCasiers), -1);
- }
- }
-
- CtuluIOOperationSynthese synt=new CtuluIOOperationSynthese();
- synt.setAnalyze(ana);
- return synt;
- }
-
- public FileFormatVersionInterface getFileFormat() {
- return MascaretCasierFileFormat.getInstance();
- }
- }
-
- /**
- * Recuperation du data model des casiers.
- */
- protected GISDataModel getCasiersDataModel(ZScene _scn, CtuluListSelection _selcasiers) {
- // Association entre une zone et les indexs selectionn\xE9s sur celle ci
- class ZoneComposite {
- GISZoneCollection zone;
- TIntArrayList idxs=new TIntArrayList();
-
- public ZoneComposite(GISZoneCollection _zone) {
- zone=_zone;
- }
- }
-
- // R\xE9cup\xE9ration des zones des casiers et indexs selectionn\xE9s.
- List<ZoneComposite> comps=new ArrayList<ZoneComposite>();
- for (int i=_selcasiers.getMinIndex(); i<=_selcasiers.getMaxIndex(); i++) {
- if (_selcasiers.isSelected(i)) {
- GISZoneCollection zone=((ZCalqueGeometry)_scn.getLayerForId(i)).modeleDonnees().getGeomData();
- ZoneComposite comp;
- if (comps.size()==0 || comps.get(comps.size()-1).zone!=zone) {
- comp=new ZoneComposite(zone);
- comps.add(comp);
- }
- else {
- comp=comps.get(comps.size()-1);
- }
- comp.idxs.add(_scn.sceneId2LayerId(i));
- }
- }
-
- int i=0;
- GISDataModel[] models=new GISDataModel[comps.size()];
- for (ZoneComposite comp : comps) {
- comp.zone.prepareExport();
- models[i++]=new GISDataModelFilterAdapter(comp.zone,null,comp.idxs.toNativeArray());
- }
- return new GISDataModelMultiAdapter(models);
- }
-
- /**
- * Construit les semis internes aux casiers. En fait, on recr\xE9e des semis pour chaque contour de casier.
- * Les casiers sans semis interne ou non conformes sont supprim\xE9s de la selection.
- *
- * @param _scn La scene.
- * @param _selCasiers La selection des casiers.
- * @param _selSemis La selection des semis.
- * @return Les semis.
- */
- protected GISZoneCollectionMultiPoint buildSemis(ZScene _scn,
- CtuluListSelection _selCasiers, CtuluListSelection _selSemis, CtuluAnalyze _ana) {
-
- GISZoneCollectionMultiPoint zsemis=new GISZoneCollectionMultiPoint();
- zsemis.setAttributes(new GISAttributeInterface[]{GISAttributeConstants.BATHY},null);
- zsemis.setAttributeIsZ(GISAttributeConstants.BATHY);
-
- List<Coordinate> coords=new ArrayList<Coordinate>();
-
- for (int i=_selCasiers.getMinIndex(); i<=_selCasiers.getMaxIndex(); i++) {
- if (!_selCasiers.isSelected(i)) continue;
-
- GISZoneCollection zone=((ZCalqueGeometry)_scn.getLayerForId(i)).modeleDonnees().getGeomData();
- int idxgeom=_scn.sceneId2LayerId(i);
- int iattr=zone.getIndiceOf(GISAttributeConstants.TITRE);
- String name="";
- if (iattr!=-1)
- name=(String)zone.getValue(iattr,idxgeom);
-
- coords.clear();
- GISPolygone geom=(GISPolygone)zone.getGeometry(idxgeom);
-
- // On controle que le casier est conforme.
- if (geom.getCoordinateSequence().size()<5) {
- _ana.addWarn(DodicoLib.getS("Casier '{0}' : Le contour n'est pas conforme",name), 0);
- _selCasiers.remove(i);
- continue;
- }
-
- // On teste que le contour contient bien au moins 1 point.
- PointInRing pir=GISLib.createPolygoneTester(geom);
-
- for (int j=_selSemis.getMinIndex(); j<=_selSemis.getMaxIndex(); j++) {
- if (!_selSemis.isSelected(j)) continue;
-
- GISMultiPoint semis=(GISMultiPoint)_scn.getObject(j);
- CoordinateSequence seq=semis.getCoordinateSequence();
- for (int k=0; k<seq.size(); k++) {
- Coordinate c=seq.getCoordinate(k);
- if (GISLib.isIn(c, geom, pir, 0))
- coords.add(c);
- }
- }
-
- // Le casier ne poss\xE8de aucun point interne => On le retire des casiers a exporter.
- if (coords.size()==0) {
- _ana.addWarn(MdlResource.getS("Casier '{0}' : Aucun point des semis s\xE9lectionn\xE9s ne se trouve \xE0 l'int\xE9rieur",name), -1);
- _selCasiers.remove(i);
- continue;
- }
-
- // Recup\xE9ration des points, et cr\xE9ation d'un semis.
- GISMultiPoint semis=GISGeometryFactory.INSTANCE.createMultiPoint(coords.toArray(new Coordinate[0]));
- zsemis.addGeometry(semis,null,null);
- }
-
- return zsemis;
- }
-}
Added: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/resource/exporter-casier.png
===================================================================
(Binary files differ)
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/resource/exporter-casier.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: svn:keywords
+ Id
Added: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/resource/new-casier.png
===================================================================
(Binary files differ)
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/resource/new-casier.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: svn:keywords
+ Id
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java 2009-03-16 09:42:56 UTC (rev 4547)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/layer/FSigVisuPanel.java 2009-03-16 14:47:47 UTC (rev 4548)
@@ -121,7 +121,7 @@
/**
* @return un tableau contenant les actions sp\xE9cifiques \xE0 l'application qui
- * seront dans le menu Vue2D.
+ * seront dans le menu Vue2D (et pas dans la barre d'outils).
*/
protected EbliActionInterface[] getActionsInterface(){
return new EbliActionInterface[] {
@@ -155,7 +155,7 @@
return theme_;
}
- protected void initButtonGroupSpecific(final List _l, final ZEbliCalquePanelController _res) {}
+ protected void initButtonGroupSpecific(final List<EbliActionInterface> _l, final ZEbliCalquePanelController _res) {}
/**
* Pour etre accessible depuis inner classes.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bma...@us...> - 2009-06-04 15:26:25
|
Revision: 4848
http://fudaa.svn.sourceforge.net/fudaa/?rev=4848&view=rev
Author: bmarchan
Date: 2009-06-04 15:26:18 +0000 (Thu, 04 Jun 2009)
Log Message:
-----------
Fixbug sur import quand 2 calques destination ont m?\195?\170me nom.
Modified Paths:
--------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImportStepDestination.java
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/FSigExportImportAttributesMapper.java
Property Changed:
----------------
branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/FSigExportImportAttributesMapper.java
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImportStepDestination.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImportStepDestination.java 2009-06-04 09:40:18 UTC (rev 4847)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/modeleur/MdlWizardImportStepDestination.java 2009-06-04 15:26:18 UTC (rev 4848)
@@ -20,6 +20,7 @@
import java.util.LinkedList;
import javax.swing.AbstractCellEditor;
+import javax.swing.JComboBox;
import javax.swing.JPanel;
import javax.swing.JTable;
import javax.swing.UIManager;
@@ -49,7 +50,6 @@
import com.memoire.bu.BuBorderLayout;
import com.memoire.bu.BuCheckBox;
-import com.memoire.bu.BuComboBox;
import com.memoire.bu.BuLabel;
import com.memoire.bu.BuPanel;
import com.memoire.bu.BuResource;
@@ -75,9 +75,6 @@
private final String[] titreColonnes_;
private final Object[][] data_;
- private final String[][] calquesAvailable_;
- /** Table de correspondance entre les noms de claque et les calques. */
- private final HashMap<String, BCalque> titreToCalque_;
public ModelTableImport(String[] _columnTitles, Object[][] _data){
if(_columnTitles==null||_data==null)
@@ -86,8 +83,6 @@
throw new IllegalArgumentException("Il doit y avoir 4 colonnes.");
// Verification de la doh\xE9rence des donn\xE9es \\
int rowSize=_columnTitles.length;
- calquesAvailable_ = new String[_data.length][];
- titreToCalque_ = new HashMap<String, BCalque>();
// Parcours ligne par ligne
for (int i=0; i<_data.length; i++) {
if(_data[i]==null)
@@ -95,51 +90,20 @@
if(rowSize!=_data[i].length)
throw new IllegalArgumentException("Toutes les lignes doivent avoir la m\xEAme taille.");
// Verification de la coh\xE9rence des calques
- if(!(_data[i][_data[i].length-1] instanceof BCalque[]))
- throw new IllegalArgumentException("La derni\xE8re colonne doit contenir les calques possibles pour l'importation.");
- // Construction du tableau de calque selectionn\xE9 et du mappage titre->calque
- BCalque[] calques = ((BCalque[])_data[i][_data[i].length-1]); // Simplification
- if(calques.length>0){
- calquesAvailable_[i] = new String[calques.length];
- // Parcours ce tout les calques
- for (int j=0; j<calques.length; j++) {
- String titreCalque;
- // Extraction du titre du calque avec cas particulier 'nouveau
- // calque'
- if (calques[j]==null)
- titreCalque=NEW_CALQUE;
- else
- titreCalque=calques[j].getTitle();
- // Stockage du titre
- calquesAvailable_[i][j]=titreCalque;
- // Table de mapping entre titreCalque et le calque
- if (!titreToCalque_.containsKey(titreCalque))
- titreToCalque_.put(titreCalque, calques[j]);
- }
- }
- else
- calquesAvailable_[i] = new String[]{NO_CALQUE};
- // Remplacement du tableau de claque dans data par le calque selectionn\xE9
- BCalque defaultCalque = getDefaultCalque((String) _data[i][1], (String) _data[i][0], (BCalque[]) _data[i][_data[i].length-1]);
- if(defaultCalque!=null)
- _data[i][_data[i].length-1] = defaultCalque.getTitle();
- else
- _data[i][_data[i].length-1] = NO_CALQUE;
+ if(!(_data[i][_data[i].length-1] instanceof BCalque))
+ throw new IllegalArgumentException("La derni\xE8re colonne doit contenir un calques pour l'importation.");
}
+
titreColonnes_ = _columnTitles;
data_ = _data;
}
- public BCalque getCalque(String _name){
- return titreToCalque_.get(_name);
- }
-
public Class<?> getColumnClass(int columnIndex) {
switch(columnIndex){
case 0: return String.class;
case 1: return String.class;
case 2: return Boolean.class;
- case 3: return String.class;
+ case 3: return BCalque.class;
default: return null;
}
}
@@ -165,13 +129,6 @@
else
return new String();
}
-
- public String[] getCalqueNameAvailable(int _rowIndex){
- if(_rowIndex >=0&&_rowIndex<calquesAvailable_.length)
- return calquesAvailable_[_rowIndex];
- else
- return null;
- }
public boolean isCellEditable(int rowIndex, int columnIndex) {
switch(columnIndex){
@@ -199,13 +156,24 @@
int _column) {
Color selectionBackground = UIManager.getColor("Table.selectionBackground");
JPanel pn=new JPanel();
- pn.setLayout(new FlowLayout(FlowLayout.CENTER, 0, 0));
+ pn.setLayout(new FlowLayout(FlowLayout.CENTER,0,0));
if(_isSelected)
pn.setBackground(selectionBackground);
else
pn.setBackground(Color.WHITE);
- if (_column==2) {
+ BuLabel lbl;
+ switch (_column) {
+ case 1:
+ lbl =new BuLabel(_value.toString());
+ lbl.setOpaque(true);
+ lbl.setHorizontalAlignment(BuLabel.CENTER);
+ if(_isSelected)
+ lbl.setBackground(selectionBackground);
+ pn.add(lbl);
+ return pn;
+
+ case 2:
BuCheckBox cb=new BuCheckBox("", (Boolean)_value);
if(_isSelected)
cb.setBackground(selectionBackground);
@@ -213,34 +181,28 @@
cb.setBackground(Color.WHITE);
pn.add(cb);
return pn;
- }
- else if (_column==3) {
- String value=_value.toString();
- if (_value==ModelTableImport.NEW_CALQUE||_value==ModelTableImport.NO_CALQUE)
- value=FSigLib.getS(value);
- BuLabel lbl =new BuLabel(value);
+
+ case 3:
+ String value;
+ if (_value==null)
+ value=FSigLib.getS(ModelTableImport.NEW_CALQUE);
+ else
+ value=((BCalque)_value).getTitle();
+ lbl =new BuLabel(value);
lbl.setHorizontalAlignment(BuLabel.CENTER);
if(_isSelected)
lbl.setBackground(selectionBackground);
pn.add(lbl);
return pn;
- }
- else if (_column==1){
- BuLabel lbl =new BuLabel(_value.toString());
+
+ default:
+ lbl =new BuLabel(_value.toString());
lbl.setHorizontalAlignment(BuLabel.CENTER);
if(_isSelected)
lbl.setBackground(selectionBackground);
pn.add(lbl);
return pn;
}
- else {
- BuLabel lbl =new BuLabel(_value.toString());
- lbl.setHorizontalAlignment(BuLabel.CENTER);
- if(_isSelected)
- lbl.setBackground(selectionBackground);
- pn.add(lbl);
- return pn;
- }
}
}
@@ -251,26 +213,29 @@
*/
public class ImportTableEditorForBCalqueSelection extends AbstractCellEditor implements TableCellEditor, ActionListener {
- private BuComboBox cb_;
+ private JComboBox cb_;
public ImportTableEditorForBCalqueSelection(){
- cb_ = new BuComboBox();
+ cb_ = new JComboBox();
cb_.addActionListener(this);
}
public Component getTableCellEditorComponent(JTable _table, Object _value, boolean _isSelected, int _row, int _column) {
- String[] values = ((ModelTableImport) _table.getModel()).getCalqueNameAvailable(_row);
cb_.removeAllItems();
- cb_.addAllItems(values);
- cb_.setSelectedItem(_value);
- if(values.length > 1)
- return cb_;
- else
- return new BuLabel((String)_value);
+ for (int i=0; i<allDestLayers_.length; i++) {
+ // On ajoute le num\xE9ro d'ordre:
+ // 1. pour que l'utilisateur s'y retrouve
+ // 2. Car sinon en cas de String identique, le setSelectedIndex ne fonctionne pas ??!!
+ cb_.addItem((i+1)+". "+allDestLayers_[i]);
+ if (allDestLayers_[i]==_value) {
+ cb_.setSelectedIndex(i);
+ }
+ }
+ return cb_;
}
public Object getCellEditorValue() {
- return cb_.getSelectedItem();
+ return allDestLayers_[cb_.getSelectedIndex()];
}
public void actionPerformed(ActionEvent _e) {
@@ -281,6 +246,8 @@
// Les calques
private ZCalqueEditable selectedLayer_;
private BGroupeCalque racine_;
+ /** Tous les calques destination possibles */
+ private ZCalqueAffichageDonneesAbstract[] allDestLayers_;
// Les donn\xE9es fournies par le panel de chargement des fichiers
private FSigGeomSrcData data_;
@@ -299,6 +266,12 @@
data_=_data;
selectedLayer_=_selectedLayer;
racine_=(BGroupeCalque)_racine;
+
+ // R\xE9cup\xE9ration des calques \\
+ CalqueSelectorVisitor visitor = new CalqueSelectorVisitor(ZModeleGeometry.class);
+ racine_.apply(visitor);
+ allDestLayers_= visitor.getSelectedCalques();
+
setLayout(new BuVerticalLayout(2, true, true));
// Frame d'information \\
pnInfo_ = new FSigWizardImportHelper.InfoPanel();
@@ -336,6 +309,10 @@
};
}
+ /**
+ * Genere les datas de la table de mapping des g\xE9om\xE9tries, contenant entre autres les calques de destination.
+ * @return Les datas de la table.
+ */
protected Object[][] generateDataTable() {
if (data_==null)
return new Object[0][];
@@ -397,18 +374,13 @@
geometrieAndType.add(new String[]{FSigLib.getS("Polygone"), it.next()});
}
- // R\xE9cup\xE9ration des calques \\
- CalqueSelectorVisitor visitor = new CalqueSelectorVisitor(ZModeleGeometry.class);
- racine_.apply(visitor);
- ZCalqueAffichageDonneesAbstract[] c= visitor.getSelectedCalques();
-
// G\xE9n\xE9ration du model de donn\xE9 du tableau \\
Object[][] dataTable=new Object[geometrieAndType.size()][];
for (int i=0; i<geometrieAndType.size(); i++) {
- dataTable[i]=new Object[]{geometrieAndType.get(i)[0], // Nom g\xE9om\xE9trie
+ dataTable[i]=new Object[]{geometrieAndType.get(i)[0], // Nature
geometrieAndType.get(i)[1], // Type g\xE9om\xE9trie
true, // Import selectionn\xE9
- c, // Liste de calque disponible
+ getDefaultCalque(geometrieAndType.get(i)[1],geometrieAndType.get(i)[0]), // Calque par defaut
};
}
@@ -420,17 +392,15 @@
* La nature que doit g\xE9rer le calque.
* @param _geometrie
* La g\xE9om\xE9trie que doit contenir le calque.
- * @param _calques
- * Le tableau de calque dans lequel extraire le calque par defaut.
* @return le claque par defaut pour la nature et la g\xE9om\xE9trie donn\xE9es.
*/
- protected BCalque getDefaultCalque(String _nature, String _geometrie, BCalque[] _calques){
+ protected BCalque getDefaultCalque(String _nature, String _geometrie){
// Tentative de d\xE9termination avec la nature
if(_nature!=null&&_nature.length()!=0){
ArrayList<BCalque> found = new ArrayList<BCalque>();
- for(int i=0;i<_calques.length;i++)
- if(((ZModeleGeometry)((ZCalqueAffichageDonneesAbstract)_calques[i]).modeleDonnees()).getGeomData().getFixedAttributValue(GISAttributeConstants.NATURE)== _nature)
- found.add(_calques[i]);
+ for(int i=0;i<allDestLayers_.length;i++)
+ if(((ZModeleGeometry)allDestLayers_[i].modeleDonnees()).getGeomData().getFixedAttributValue(GISAttributeConstants.NATURE)== _nature)
+ found.add(allDestLayers_[i]);
if(found.size()>0)
if(found.contains(selectedLayer_))
return (BCalque) selectedLayer_;
@@ -440,18 +410,18 @@
// Tentative de d\xE9termination avec la g\xE9om\xE9trie
if (_geometrie!=null&&_geometrie.length()!=0) {
ArrayList<BCalque> found=new ArrayList<BCalque>();
- for (int i=0; i<_calques.length; i++) {
+ for (int i=0; i<allDestLayers_.length; i++) {
if (_geometrie==FSigLib.getS("MultiPoint")) {
- if (((ZCalqueEditable)_calques[i]).canAddForme(DeForme.MULTI_POINT))
- found.add(_calques[i]);
+ if (((ZCalqueEditable)allDestLayers_[i]).canAddForme(DeForme.MULTI_POINT))
+ found.add(allDestLayers_[i]);
}
else if (_geometrie==FSigLib.getS("Polyligne")) {
- if (((ZCalqueEditable)_calques[i]).canAddForme(DeForme.LIGNE_BRISEE))
- found.add(_calques[i]);
+ if (((ZCalqueEditable)allDestLayers_[i]).canAddForme(DeForme.LIGNE_BRISEE))
+ found.add(allDestLayers_[i]);
}
else if (_geometrie==FSigLib.getS("Polygone")) {
- if (((ZCalqueEditable)_calques[i]).canAddForme(DeForme.POLYGONE))
- found.add(_calques[i]);
+ if (((ZCalqueEditable)allDestLayers_[i]).canAddForme(DeForme.POLYGONE))
+ found.add(allDestLayers_[i]);
}
}
if (found.size()>0)
@@ -461,12 +431,12 @@
return found.get(0);
}
// A defaut retourne le calque selectionn\xE9 si il est dans la liste
- for(int i=0;i<_calques.length;i++)
- if(_calques[i]==selectedLayer_)
+ for(int i=0;i<allDestLayers_.length;i++)
+ if(allDestLayers_[i]==selectedLayer_)
return (BCalque) selectedLayer_;
// Il reste plus qu'a retourner un claque arbitrairement si il y en a un qui existe
- if(_calques.length>0)
- return _calques[0];
+ if(allDestLayers_.length>0)
+ return allDestLayers_[0];
else
return null;
}
@@ -508,8 +478,7 @@
if(_indexLigne<0||_indexLigne>=table_.getRowCount())
return false;
// Calque concern\xE9
- ZCalqueAffichageDonneesAbstract calque=(ZCalqueAffichageDonneesAbstract)((ModelTableImport)table_.getModel())
- .getCalque((String)table_.getValueAt(_indexLigne, table_.getColumnCount()-1));
+ ZCalqueAffichageDonneesAbstract calque=(ZCalqueAffichageDonneesAbstract)table_.getValueAt(_indexLigne, table_.getColumnCount()-1);
if (!mappers_.containsKey(_indexLigne)||(mappers_.containsKey(_indexLigne)&&((BCalque)mappers_.get(_indexLigne)[0])!=calque)) {
// Cr\xE9ation d'une liste reliante les attributs lus aux attributs du calque. \\
// R\xE9cup\xE9ration des informations sur les attributs du calques
@@ -601,7 +570,7 @@
// Nature d'origine
row[1] = table_.getValueAt(i, 1);
// Calque de destination
- row[5] = ((ModelTableImport)table_.getModel()).getCalque(((String)table_.getValueAt(i, 3)));
+ row[5] = table_.getValueAt(i, 3);
// G\xE9om\xE9trie de destination
if(((ZCalqueEditable)row[5]).canAddForme((Integer) row[0]))
row[2]=(Integer) row[0];
Modified: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/FSigExportImportAttributesMapper.java
===================================================================
--- branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/FSigExportImportAttributesMapper.java 2009-06-04 09:40:18 UTC (rev 4847)
+++ branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/FSigExportImportAttributesMapper.java 2009-06-04 15:26:18 UTC (rev 4848)
@@ -31,7 +31,7 @@
* Import de donn\xE9es spatiales pour double, String le reste est ignor\xE9...
*
* @author Fred Deniger
- * @version $Id: FSigExportImportAttributesMapper.java,v 1.12 2007-05-04 14:00:26 deniger Exp $
+ * @version $Id$
*/
public class FSigExportImportAttributesMapper {
@@ -186,7 +186,7 @@
}
/**
- * @return la table de correpondance attribut attribut de destination -> source (lu)
+ * @return la table de correpondance attribut de destination -> attribut source (lu)
*/
public Map<GISAttributeInterface, GISAttributeInterface> getDestReadMap() {
return model_.getDestReadMap();
Property changes on: branches/FudaaModeleur_TC1Bis/fudaa_devel/fudaa/src/org/fudaa/fudaa/sig/FSigExportImportAttributesMapper.java
___________________________________________________________________
Added: svn:keywords
+ Id
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X